Changeset: 59b23c62bf02 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59b23c62bf02 Removed Files: clients/ruby/Changelog clients/ruby/Makefile.ag clients/ruby/TODO clients/ruby/Tests/rubytest.rb.in clients/ruby/Tests/rubytest.stable.err clients/ruby/Tests/rubytest.stable.out clients/ruby/doc/readme.txt clients/ruby/lib/MonetDB.rb clients/ruby/lib/MonetDBConnection.rb clients/ruby/lib/MonetDBData.rb clients/ruby/lib/MonetDBExceptions.rb clients/ruby/lib/example.rb clients/ruby/lib/hasher.rb clients/ruby/ruby-monetdb-sql-0.2.gemspec debian/ruby-monetdb-client.install Modified Files: MonetDB.spec NT/rules.msc buildtools/autogen/autogen/am.py buildtools/autogen/autogen/msc.py clients/Makefile.ag clients/ruby/Tests/All clients/ruby/Tests/gemtest.rb configure.ag debian/control testing/Mtest.py.in Branch: default Log Message:
Moved the Ruby driver to a new repository. See http://dev.monetdb.org/hg/monetdb-ruby/ or (if you have write access) ssh://h...@dev.monetdb.org/monetdb-ruby/. diffs (truncated from 2053 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -134,15 +134,6 @@ BuildRequires: python-devel BuildRequires: python3-devel %endif BuildRequires: readline-devel -# On RedHat Enterprise Linux and derivatives (CentOS, Scientific -# Linux), the rubygem-activerecord package is not available (also not -# in the Extra Packages for Enterprise Linux EPEL), so it makes no -# sense providing our ruby packages. -%if %{?rhel:0}%{!?rhel:1} -BuildRequires: ruby -BuildRequires: rubygems -BuildRequires: rubygems-devel -%endif BuildRequires: unixODBC-devel # BuildRequires: uriparser-devel BuildRequires: zlib-devel @@ -402,35 +393,6 @@ program. %defattr(-,root,root) %{perl_vendorlib}/* -%if %{?rhel:0}%{!?rhel:1} -%package -n rubygem-monetdb-sql -Summary: MonetDB ruby interface -Group: Applications/Databases -Requires: ruby(release) -Obsoletes: %{name}-client-ruby -BuildArch: noarch - -%description -n rubygem-monetdb-sql -MonetDB is a database management system that is developed from a -main-memory perspective with use of a fully decomposed storage model, -automatic index management, extensibility of data types and search -accelerators. It also has an SQL frontend. - -This package contains the files needed to use MonetDB from a Ruby -program. - -%files -n rubygem-monetdb-sql -%defattr(-,root,root) -%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.2 -%if (0%{?fedora} <= 23) -%{gem_dir}/doc/ruby-monetdb-sql-0.2/* -%endif -%{gem_dir}/cache/ruby-monetdb-sql-0.2.gem -# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.2 -%{gem_dir}/gems/ruby-monetdb-sql-0.2 -%{gem_dir}/specifications/ruby-monetdb-sql-0.2.gemspec -%endif - %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases @@ -990,8 +952,6 @@ developer, but if you do want to test, t --with-python2=yes \ --with-python3=%{?rhel:no}%{!?rhel:yes} \ --with-readline=yes \ - --with-rubygem=%{?rhel:no}%{!?rhel:yes} \ - --with-rubygem-dir=%{?rhel:no}%{!?rhel:"%{gem_dir}"} \ --with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \ --with-sphinxclient=no \ --with-unixodbc=yes \ diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -161,10 +161,6 @@ GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i.lib !ENDIF GEOS_INCS = -I$(LIBGEOS)\include -!IFNDEF RUBY_DIR -RUBY_DIR = lib\ruby\gems\1.9.1 -!ENDIF - !IFDEF HAVE_LIBR # This is the location of the R library libr_LIBDEP = R.lib @@ -411,11 +407,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_PYTHON3_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_RUBYGEM - $(ECHO) HAVE_RUBYGEM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_RUBYGEM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_SAMTOOLS $(ECHO) HAVE_SAMTOOLS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -471,7 +462,6 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \ "PYTHON2_LIBDIR=$(PYTHON2_LIBDIR)" \ "PYTHON3=$(PYTHON3)" \ "PYTHON3_LIBDIR=$(PYTHON3_LIBDIR)" \ - "RUBY_DIR=$(RUBY_DIR)" \ "TOPDIR=$(TOPDIR)" \ "VERSION=$(VERSION)" \ "builtby=%USER%@%COMPUTERNAME%" \ diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -928,63 +928,6 @@ def am_libs(fd, var, libsmap, am): am_find_ins(am, libsmap) am_deps(fd, libsmap['DEPS'], am) -def am_gem(fd, var, gem, am): - gemre = re.compile(r'\.files *= *\[ *(.*[^ ]) *\]') - rd = 'RUBY_DIR' - if 'DIR' in gem: - rd = gem['DIR'][0] - rd = am_translate_dir(rd, am) - fd.write('if HAVE_RUBYGEM\n') - fd.write('all-local-%s:' % var) - am['ALL'].append(var) - for f in gem['FILES']: - fd.write(' %s' % f[:-4]) - fd.write('\n') - for f in gem['FILES']: - srcs = list(map(lambda x: x.strip('" '), - gemre.search(open(os.path.join(am['CWDRAW'], f)).read()).group(1).split(', '))) - srcs.append(f) - sf = f.replace('.', '_') - am['INSTALL'].append(sf) - am['UNINSTALL'].append(sf) - fd.write('%s: %s\n' % (f[:-4], ' '.join(srcs))) - dirs = [] - for src in srcs: - if '/' in src: - d = posixpath.dirname(src) - if d not in dirs: - fd.write("\t[ '$(srcdir)' -ef . ] || mkdir -p '%s'\n" % posixpath.dirname(src)) - dirs.append(d) - while '/' in d: - d = posixpath.dirname(d) - dirs.append(d) - fd.write("\t[ '$(srcdir)' -ef . ] || cp -p '$(srcdir)/%s' '%s'\n" % (src, src)) - fd.write("\tgem build '%s'\n" % f) - # use deprecated --rdoc and --ri options instead of --document=rdoc,ri - # since we're still building on systems with old gem - fd.write("\tgem install --local --install-dir ./'%s' --bindir .'%s' --force --rdoc --ri %s\n" % (rd, am_translate_dir('bindir', am), f[:-4])) - fd.write('mostlyclean-local: mostlyclean-local-%s\n' % sf) - fd.write('.PHONY: mostlyclean-local-%s\n' % sf) - fd.write('mostlyclean-local-%s:\n' % sf) - for src in srcs: - fd.write("\t[ '$(srcdir)' -ef . ] || rm -f '%s'\n" % src) - for d in sorted(dirs, reverse = True): - fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rmdir '%s'\n" % (d, d)) - fd.write("install-exec-local-%s: %s\n" % (sf, f[:-4])) - fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd) - fd.write("\tcp -a ./'%s'/* $(DESTDIR)'%s'\n" % (rd, rd)) - fd.write("uninstall-local-%s: %s\n" % (sf, f[:-4])) - # remove "-0.1.gemspec" from end of `f' - fd.write("\tgem uninstall --install-dir $(DESTDIR)'%s' '%s'\n" % (rd, f[:-12])) - am['BUILT_SOURCES'].append(f[:-4]) - am['CLEAN'].append(f[:-4]) - fd.write('else\n') - for f in gem['FILES']: - sf = f.replace('.', '_') - fd.write("install-exec-local-%s:\n" % sf) - fd.write('uninstall-local-%s:\n' % sf) - fd.write('endif\n') - def am_python_generic(fd, var, python, am, PYTHON): pyre = re.compile(r'packages *= *\[ *(.*[^ ]) *\]') pynmre = re.compile('name *= *([\'"])([^\'"]+)\\1') @@ -1153,7 +1096,6 @@ output_funcs = {'SUBDIRS': am_subdirs, 'largeTOC_SHARED_MODS': am_mods_to_libs, 'HEADERS': am_headers, 'ANT': am_ant, - 'GEM': am_gem, 'PYTHON2': am_python2, 'PYTHON3': am_python3, } diff --git a/buildtools/autogen/autogen/msc.py b/buildtools/autogen/autogen/msc.py --- a/buildtools/autogen/autogen/msc.py +++ b/buildtools/autogen/autogen/msc.py @@ -963,38 +963,6 @@ def msc_includes(fd, var, values, msc): + msc_add_srcdir(i, msc, " -I") fd.write("INCLUDES = " + incs + "\n") -def msc_gem(fd, var, gem, msc): - gemre = re.compile(r'\.files *= *\[ *(.*[^ ]) *\]') - rd = 'RUBY_DIR' - if 'DIR' in gem: - rd = gem['DIR'][0] - rd = msc_translate_dir(rd, msc) - fd.write('!IF defined(HAVE_RUBYGEM)\n') - for f in gem['FILES']: - msc['SCRIPTS'].append(f[:-4]) - srcs = list(map(lambda x: x.strip('" '), - gemre.search(open(os.path.join(msc['cwd'], f)).read()).group(1).split(', '))) - srcs.append(f) - fd.write('%s: %s\n' % (f[:-4], ' '.join(srcs))) - fd.write('\tgem build %s\n' % f) - for src in srcs: - src = src.replace('/', '\\') - fd.write('%s: "$(srcdir)\\%s"\n' % (src, src)) - if '\\' in src: - d = src[:src.rfind('\\')] - fd.write('\tif not exist "%s" $(MKDIR) "%s"\n' % (d, d)) - fd.write('\t$(INSTALL) "$(srcdir)\\%s" "%s"\n' % (src, src)) - msc['INSTALL'][f] = f, '', '', '', 'defined(HAVE_RUBYGEM)' - fd.write('install_%s: "%s" "%s"\n' % (f, f[:-4], rd)) - fd.write('\tgem install "%s" --local --install-dir "%s" --force --rdoc\n' % (f[:-4], rd)) - fd.write('"%s":\n' % rd) - fd.write('\tif not exist "%s" $(MKDIR) "%s"\n' % (rd, rd)) - fd.write('!ELSE\n') - for f in gem['FILES']: - fd.write('%s:\n' % f[:-4]) - fd.write('install_%s:\n' % f) - fd.write('!ENDIF\n') - def msc_python_generic(fd, var, python, msc, PYTHON): pyre = re.compile(r'packages *= *\[ *(.*[^ ]) *\]') for f in python['FILES']: @@ -1090,7 +1058,6 @@ output_funcs = {'SUBDIRS': msc_subdirs, 'largeTOC_SHARED_MODS': msc_mods_to_libs, 'HEADERS': msc_headers, 'ANT': msc_ant, - 'GEM': msc_gem, 'PYTHON2': msc_python2, 'PYTHON3': msc_python3, } diff --git a/clients/Makefile.ag b/clients/Makefile.ag --- a/clients/Makefile.ag +++ b/clients/Makefile.ag @@ -4,6 +4,6 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3 NATIVE_WIN32?NT +SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3 NATIVE_WIN32?NT -EXTRA_DIST_DIR = Tests R +EXTRA_DIST_DIR = Tests R ruby diff --git a/clients/ruby/Changelog b/clients/ruby/Changelog deleted file mode 100644 --- a/clients/ruby/Changelog +++ /dev/null @@ -1,38 +0,0 @@ -* Tue 30 Jun 2009 22:14:38 CEST -Added test cases for the standalone driver (ruby unit test). - -* Thu 25 Jun 2009 17:31:02 CEST -Fixed a major bug that resulted in data corruption; -MAPI implementation code cleanup and bug fixes; -Support to ruby 1.9; -Both the standalone driver and activerecord now support transactions; nested transactions -are simulated via savepoints in activerecord. -Added a Rakefile and script to run activerecord unit test suite. -Type conversion in the standalone driver is now performed after data has been retrieved and can be executed on single fields. - -* Mon 25 May 2009 17:52:01 CEST -Imported last week changes (protocol 9 support, parametrized the connection options in the activerecord adapter, fixed a bug in the auth protocol v8). -Fixed a bug in the mapi protocol that resulted in data loss (wrong handling of TRANSACTIONS). -Began to port the activerecord test suite to monetdb (not all test cases can be performed). -Removed an unneeded file ('lib/MonetDBStatement.rb') from the gemspec of the standalone driver (the feature will be moved to HEAD). -Began to port the driver to ruby 1.9. -Removed *.gem files from cvs. - -* Mon 18 May 2009 15:22:31 CEST -Fixed bugs that prevented the correct working of activerecords' migration; -The activerecord connector now supports insertion, update and alter table operations; -Type casting is working in activerecord; -Added a rubygem and rakefile for activerecord-monetdb-adapter; -Added a new usage example for activerecord to the README file; -Added an example directory to the cvs tree; -The driver now correctly works with merovingian. - - -* Sat 9 May 2009 15:58:36 CEST -Fixed bugs with the query processing in the standalone driver; -Added INSERT and UPDATE methods in the activerecord connector. - -* Thu 7 May 2009 17:03:01 CEST - -Added a check against the protocol version during authentication; -Imported the activerecord code (available under adapter/). diff --git a/clients/ruby/Makefile.ag b/clients/ruby/Makefile.ag deleted file mode 100644 --- a/clients/ruby/Makefile.ag +++ /dev/null @@ -1,13 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - -gem_monetdb = { - FILES = ruby-monetdb-sql-0.2.gemspec - DIR = $(prefix)/$(RUBY_DIR) -} - -EXTRA_DIST = Changelog TODO ruby-monetdb-sql-0.2.gemspec -EXTRA_DIST_DIR = lib diff --git a/clients/ruby/TODO b/clients/ruby/TODO deleted file mode 100644 --- a/clients/ruby/TODO +++ /dev/null _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
