nuodb 2.0 → 2.0.3

data/.gitignore

@@ -2,11 +2,12 @@
 *.log
 *.o
 *.so
-ext/nuodb/Makefile
-coverage/
-doc/
-rdoc/
-pkg/
+/ext/nuodb/Makefile
+/coverage/
+/doc/
+/rdoc/
+/pkg/
 tmp
-.idea
+/.idea
 .DS_Store
+Gemfile.lock

data/.travis.yml

@@ -5,32 +5,28 @@ rvm:
   - 1.9.3
 
 env:
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.2
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1.1
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1 
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.2
-  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.1
+  - NUODB_HOME=/opt/nuodb NUODB_VERSION=2.0.3
 
 notifications:
   recipients:
     - buck.robert.j@gmail.com
     - rbuck@nuodb.com
     - lbayas@nuodb.com
+    - jgetto@nuodb.com
+    - tgates@nuodb.com
 
 before_install:
-  - wget http://www.nuodb.com/latest/releases/nuodb-${NUODB_VERSION}.linux.x64.deb --output-document=/var/tmp/nuodb.deb
+  - wget http://download.nuohub.org/nuodb-${NUODB_VERSION}.linux.x64.deb --output-document=/var/tmp/nuodb.deb
   - sudo dpkg -i /var/tmp/nuodb.deb
   - sleep 2
 
 before_script:
-  - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
-  - sleep 4
-  - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
-  - sleep 4
-  - echo "create user cloud password 'user';" | ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
+  - java -jar ${NUODB_HOME}/jar/nuodbmanager.jar --broker localhost --user domain --password bird --command "start process sm database test host localhost archive /var/tmp/nuodb initialize true waitForRunning true"
+  - java -jar ${NUODB_HOME}/jar/nuodbmanager.jar --broker localhost --user domain --password bird --command "start process te database test host localhost options '--dba-user dba --dba-password baz' waitForRunning true"
+  - echo "create user cloud password 'user';" | ${NUODB_HOME}/bin/nuosql test@localhost --user dba --password baz
 
 script:
-  - NUODB_ROOT=/opt/nuodb bundle exec rake spec
+  - NUODB_ROOT="$NUODB_HOME" bundle exec rake spec
 
 after_script:
   - sudo dpkg -r nuodb

data/AUTHORS

@@ -1,4 +1,4 @@
-# The following people have contributed to ruby-nuodb:
+The following people have contributed to ruby-nuodb:
 
-Robert Buck <rbuck@nuodb.com>
-Dave Meppelink <davemepp@gmail.com>
+* Robert Buck
+* Dave Meppelink

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012, NuoDB, Inc.
+Copyright (c) 2012 - 2013, NuoDB, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.rdoc

@@ -0,0 +1,45 @@
+== NuoDB Ruby Interface
+
+{<img src="https://api.travis-ci.org/nuodb/ruby-nuodb.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nuodb/ruby-nuodb]
+{<img src="https://gemnasium.com/nuodb/ruby-nuodb.png?travis" alt="Dependency Status" />}[https://gemnasium.com/nuodb/ruby-nuodb]
+{<img src="https://codeclimate.com/github/nuodb/ruby-nuodb.png" />}[https://codeclimate.com/github/nuodb/ruby-nuodb]
+
+== Description
+
+This is the official Ruby Gem for {NuoDB}[http://www.nuodb.com/]. It wraps the
+NuoDB C++ API, providing a natural API for Ruby.
+
+To use NuoDB with Rails you will also want the {ActiveRecord NuoDB
+Adapter}[https://github.com/nuodb/ruby-activerecord-nuodb-adapter]
+
+Note: At this time the Ruby/NuoDB Interface does not support Windows.
+
+== Getting Started
+
+1.  If you haven't already, {Download and Install NuoDB}[http://nuodb.com/download-nuodb/]
+
+2.  Install the gem
+
+        gem install nuodb
+
+3.  Use NuoDB in Ruby
+
+        require "nuodb"
+
+        conn = NuoDB::Connection.new(:database => 'test@localhost', :username => 'dba', :password => 'goalie', :schema => 'hockey')
+        stmt = conn.statement
+        stmt.execute("SELECT * FROM hockey")
+        stmt.results.each do |res|
+            puts res.inspect
+        end
+
+== More Information
+
+*   {Ruby/NuoDB Interface Rdoc}[http://nuodb.github.io/ruby-nuodb/site/]
+*   {NuoDB Community Forum}[http://www.nuodb.com/community/forum.php]
+*   {NuoDB Online Documentation}[http://doc.nuodb.com/display/doc/NuoDB+Online+Documentation]
+
+== Contributing
+
+See {Contribution}[http://nuodb.github.io/ruby-nuodb/site/files/rdoc/GETTING_STARTED_rdoc.html] for information about contributing to
+the NuoDB Ruby Adapter.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, NuoDB, Inc.
+# Copyright (c) 2012 - 2013, NuoDB, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -129,7 +129,7 @@ namespace :nuodb do
       case RUBY_PLATFORM
         when /linux/i
           unless File.exists? '/etc/redhat-release'
-            puts %x(wget http://www.nuodb.com/latest/releases/nuodb-1.1.linux.x64.deb --output-document=/var/tmp/nuodb.deb)
+            puts %x(wget http://download.nuohub.org/nuodb-2.0.3.linux.x64.deb --output-document=/var/tmp/nuodb.deb)
             puts %x(sudo dpkg -i /var/tmp/nuodb.deb)
           end
         else
@@ -152,7 +152,7 @@ namespace :nuodb do
   end
 
   task :create_user do
-    #puts %x( echo "create user arunit password 'arunit';" | nuosql arunit@localhost --user dba --password baz )
+    #puts %x( echo "create user arunit password 'arunit';" | nuosql arunit@localhost --user dba --password dba )
   end
 
   task :start_server do

data/ext/nuodb/nuodb.cpp

@@ -1,5 +1,5 @@
 /****************************************************************************
-* Copyright (c)2012, NuoDB, Inc.
+* Copyright (c) 2012 - 2013, NuoDB, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -26,10 +26,6 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ****************************************************************************/
 
-/*
- * NuoDB Adapter
- */
-
 #include <ruby.h>
 #include "atomic.h"
 #include <assert.h>
@@ -505,6 +501,7 @@ VALUE nuodb_map_sql_type(int type)
     }
     return symbol;
 }
+
 static
 VALUE nuodb_result_init(VALUE parent, NuoDB::ResultSet* results, NuoDB::Connection* connection)
 {
@@ -2151,8 +2148,12 @@ void nuodb_define_connection_api()
 extern "C" void Init_nuodb(void)
 {
     /*
+     * Document-module: NuoDB
+     *
+     * == Description
+     *
      * The NuoDB module contains classes and function definitions enabling use
-     * of the NuoDB database.
+     * of the NuoDB database from the Ruby language.
      */
     m_nuodb = rb_define_module("NuoDB");
 

data/lib/nuodb.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, NuoDB, Inc.
+# Copyright (c) 2012 - 2013, NuoDB, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/lib/nuodb/column.rb

@@ -1,5 +1,34 @@
+#
+# Copyright (c) 2012 - 2013, NuoDB, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of NuoDB, Inc. nor the names of its contributors may
+#       be used to endorse or promote products derived from this software
+#       without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL NUODB, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
 require 'set'
 
+# :nodoc:
 module NuoDB
 
   class Column

data/lib/nuodb/error.rb

@@ -1,3 +1,32 @@
+#
+# Copyright (c) 2012 - 2013, NuoDB, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of NuoDB, Inc. nor the names of its contributors may
+#       be used to endorse or promote products derived from this software
+#       without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL NUODB, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# :nodoc:
 module NuoDB
 
   class DatabaseError < StandardError

data/lib/nuodb/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, NuoDB, Inc.
+# Copyright (c) 2012 - 2013, NuoDB, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+# :nodoc:
 module NuoDB
-  VERSION = '2.0'
+  VERSION = '2.0.3'
 end

data/nuodb.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license     = 'BSD'
 
   spec.rdoc_options = %w(--charset=UTF-8)
-  #spec.extra_rdoc_files = %w[AUTHORS README.rdoc LICENSE]
+  spec.extra_rdoc_files = %w[AUTHORS rdoc/CONTRIBUTION.rdoc rdoc/GETTING_STARTED.rdoc LICENSE]
 
   spec.extensions = %w(ext/nuodb/extconf.rb)
 

data/tasks/rdoc.rb

@@ -1,19 +1,19 @@
 require 'rdoc/task'
 
-RDOC_FILES = FileList['README.rdoc', 'LICENSE', 'ext/nuodb/nuodb.cpp', 'lib/**/*.rb']
+RDOC_FILES = FileList['rdoc/GETTING_STARTED.rdoc', 'rdoc/CONTRIBUTION.rdoc', 'LICENSE', 'ext/nuodb/nuodb.cpp', 'lib/**/*.rb']
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.title = "#{name} #{version}"
-  rdoc.main = 'README.rdoc'
+  rdoc.main = 'GETTING_STARTED.rdoc'
   rdoc.rdoc_dir = 'doc/site/api'
   rdoc.options << "-a" << "-U" << "-D" << "-v" << '-f' << 'hanna'
   rdoc.rdoc_files.include(RDOC_FILES)
 end
 
 Rake::RDocTask.new(:ri) do |rdoc|
-  rdoc.main = "README.rdoc"
-  rdoc.rdoc_dir = "doc/ri"
+  rdoc.main = 'GETTING_STARTED.rdoc'
+  rdoc.rdoc_dir = 'doc/ri'
   rdoc.options << "--ri-system"
   rdoc.rdoc_files.include(RDOC_FILES)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nuodb
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -257,19 +257,21 @@ email:
 executables: []
 extensions:
 - ext/nuodb/extconf.rb
-extra_rdoc_files: []
+extra_rdoc_files:
+- AUTHORS
+- rdoc/CONTRIBUTION.rdoc
+- rdoc/GETTING_STARTED.rdoc
+- LICENSE
 files:
 - .gitignore
 - .rspec
 - .travis.yml
 - AUTHORS
-- CONTRIBUTION.md
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE
 - Manifest.txt
-- README.md
+- README.rdoc
 - Rakefile
 - ext/nuodb/atomic.c
 - ext/nuodb/atomic.h
@@ -280,6 +282,8 @@ files:
 - lib/nuodb/error.rb
 - lib/nuodb/version.rb
 - nuodb.gemspec
+- rdoc/CONTRIBUTION.rdoc
+- rdoc/GETTING_STARTED.rdoc
 - spec/data/.gitignore
 - spec/functional/column_spec.rb
 - spec/functional/connection_spec.rb

data/CONTRIBUTION.md

@@ -1,71 +0,0 @@
-# Contributing to the Ruby NuoDB Driver
-
-## BUILDING THE GEM
-
-To compile and test run this command:
-
-    rake clean build rdoc spec
-
-## INSTALLING THE GEM
-
-    NUODB_ROOT=/Users/rbuck/tmp/nuodb gem install nuodb-1.1.gem
-
-Or from the source tree:
-
-    NUODB_ROOT=/Users/rbuck/tmp/nuodb gem install pkg/nuodb-1.1.gem
-
-## TESTING THE GEM
-
-Start up a minimal chorus as follows:
-
-    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
-    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
-    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
-
-Create a user in the database:
-
-    ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
-    > create user cloud password 'user';
-    > exit
-
-Run the tests:
-
-    rake spec
-
-## PUBLISHING THE GEM
-
-### TAGGING
-
-Tag the product using tags per the SemVer specification; our tags have a
-v-prefix:
-
-    git tag -a v1.1 -m "SemVer Version: v1.1"
-
-If you make a mistake, take it back quickly:
-
-    git tag -d v1.1
-    git push origin :refs/tags/v1.1
-
-### PUBLISHING
-
-Here are the commands used to publish:
-
-    gem push pkg/nuodb-1.1.gem
-
-## INSPECTING THE GEM
-
-It is often useful to inspect the contents of a Gem before distribution. To do
-this you dump the contents of a gem thus:
-
-    gem unpack pkg/nuodb-1.1.gem
-
-## INSPECTING THE EXPORTED SYMBOLS
-
-To inspec the symbols on Linux:
-
-    nm -gU ext/nuodb/nuodb.bundle
-
-To inspec the symbols on Mac:
-
-    otool -l ext/nuodb/nuodb.bundle
-

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nuodb (2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    haml (3.0.25)
-    hanna-nouveau (0.2.7)
-      haml (= 3.0.25)
-      rdoc (~> 3.1)
-    json (1.8.0)
-    multi_json (1.7.9)
-    optiflag (0.7)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    ruby-prof (0.13.0)
-    rubydoc (0.0.1)
-      optiflag (~> 0.7)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  erubis (~> 2.7.0)
-  hanna-nouveau
-  nuodb!
-  rake (~> 10.1.0)
-  rdoc
-  rspec (~> 2.11.0)
-  rspec-core (~> 2.11.0)
-  rspec-expectations (~> 2.11.0)
-  rspec-mocks (~> 2.11.0)
-  ruby-prof
-  rubydoc
-  sdoc
-  simplecov

data/README.md

@@ -1,43 +0,0 @@
-# Ruby/NuoDB Interface [<img src="https://api.travis-ci.org/nuodb/ruby-nuodb.png?branch=master" alt="Build Status" />](http://travis-ci.org/nuodb/ruby-nuodb) [<img src="https://gemnasium.com/nuodb/ruby-nuodb.png?travis" alt="Dependency Status" />](https://gemnasium.com/nuodb/ruby-nuodb) [<img src="https://codeclimate.com/github/nuodb/ruby-nuodb.png" />](https://codeclimate.com/github/nuodb/ruby-nuodb)
-
-This is the official Ruby Gem for [NuoDB](http://www.nuodb.com/). It wraps the
-NuoDB C++ API, providing a natural API for Ruby.
-
-To use NuoDB with Rails you will also want the [ActiveRecord NuoDB
-Adapter](https://github.com/nuodb/ruby-activerecord-nuodb-adapter)
-
-Note: At this time the Ruby/NuoDB Interface does not support Windows.
-
-## Getting Started
-
-1.  If you haven't already, [Download and Install NuoDB](http://nuodb.com/download-nuodb/)
-
-2.  Install the gem
-
-        gem install nuodb
-
-3.  Use NuoDB in Ruby
-
-        require "nuodb"
-
-        conn = NuoDB::Connection.new(:database => 'test@localhost', :username => 'dba', :password => 'goalie', :schema => 'hockey')
-        stmt = conn.statement
-        stmt.execute("SELECT * FROM hockey")
-        stmt.results.each do |res|
-            puts res.inspect
-        end
-
-
-## More Information
-
-*   [Ruby/NuoDB Interface Rdoc](http://nuodb.github.io/ruby-nuodb/rdoc/)
-*   [NuoDB Community Forum](http://www.nuodb.com/community/forum.php)
-*   [NuoDB Online Documentation](http://www.nuodb.com/community/documentation.php)
-
-
-## Contributing
-
-See [Contribution](CONTRIBUTION.md) for information about contributing to
-the Ruby ActiveRecord NuoDB Adapter.
-
-[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/9acbb24d79760ffb071e5e653305e21e "githalytics.com")](http://githalytics.com/nuodb/ruby-nuodb)