activerecord-nuodb-adapter 1.0.4 → 1.1

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 .idea
 rdoc
+.gem

data/.travis.yml

@@ -10,29 +10,12 @@ env:
   - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.2
   - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.1
 
-install:
-  - gem install bundler
-  - gem install thread_safe
-  - gem install minitest
-  - gem install io-console
-  - gem install atomic
-  - gem install bigdecimal
-  - gem install mocha
-  - sudo apt-get update
-  - sudo apt-get install libtool libxml2 openssl sqlite
-  - sudo apt-get install rbenv
-  #- rbenv install 1.9.3-p392
-  #- rbenv global 1.9.3-p392
-  #- rbenv rehash
-  - gem install nuodb
-  - gem install activerecord-nuodb-adapter
-  - gem install rails -v "=3.2.8"
-
 notifications:
   recipients:
     - buck.robert.j@gmail.com
     - rbuck@nuodb.com
     - lbayas@nuodb.com
+    - jgetto@nuodb.com
 
 before_install:
   - wget http://www.nuodb.com/latest/releases/nuodb-${NUODB_VERSION}.linux.x64.deb --output-document=/var/tmp/nuodb.deb
@@ -49,8 +32,11 @@ before_script:
   - sleep 10
 
 script:
-  - ./active_setup_linux.sh
-  - ARCONN=nuodb ruby -I~/tmpy/rails-latest/:~/tmpy/rails-latest/activerecord/test/:/home/travis/.rvm/gems/ruby-1.9.3-p448/gems/mocha-0.14.0/lib/ ~/tmpy/rails-latest/activerecord/test/cases/migration_test.rb
+  - . ./active_setup_linux.sh
+  - cd ~/rails-latest
+  - bundle install
+  - gem list -d
+  - ARCONN=nuodb ruby -I"~/rails-latest/activerecord/test/" activerecord/test/cases/base_test.rb
 
 after_script:
   - sudo dpkg -r nuodb

data/active_setup_linux.sh

@@ -1,61 +1,13 @@
 #!/bin/bash
 #Script to set up activerecord tests on Ubuntu
 
-#installing dependencies
-# sudo apt-get update
-# sudo apt-get install libtool libxml2 openssl sqlite
-# sudo apt-get install rbenv
-# sudo apt-get install ruby-build
-
-echo "eval \"\$(rbenv init -)\"" >> ~/.bash_profile
-
-# rbenv install 1.9.3-p392
-# rbenv global 1.9.3-p392
-# rbenv rehash
-eval "$(rbenv init -)"
-
-# sudo gem list | cut -d" " -f1 | xargs gem uninstall -aIx
-# gem install bundler
-
-# Writes to .bash_profile
-echo "export NUODB_ROOT=/opt/nuodb/bin
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" #  Load RVM function" >> ~/.bash_profile
-
-cd ~/
-mkdir tmpy
-git clone https://github.com/nuodb/ruby-nuodb.git ~/tmpy/ruby-nuodb-latest
-cd ~/tmpy/ruby-nuodb-latest
-bundle
-rbenv rehash
-
-cd ~/tmpy/ruby-nuodb-latest
-chmod 777 nuodb.gemspec
-sed -i '/README.rdoc/d' ./nuodb.gemspec #Removes README.rdoc to resolve rake errors
-gem build nuodb.gemspec
-#rake clean build
-#cd pkg
-sudo gem install nuodb-1.0.2.gem
-
-#Getting the driver
-# git clone https://github.com/nuodb/ruby-activerecord-nuodb-adapter.git ~/tmpy/ruby-activerecord-nuodb-adapter-latest
-# cd ~/tmpy/ruby-activerecord-nuodb-adapter-latest
-# bundle
-# rbenv rehash
-# rake clean build
-# cd pkg
-# gem install activerecord-nuodb-adapter-1.0.3.gem #Make robust
-
 #Getting rails
-git clone https://github.com/rails/rails.git ~/tmpy/rails-latest
-cd ~/tmpy/rails-latest
-git checkout v3.2.8
-bundle
-rbenv rehash
-cd activerecord
+echo "=== Getting Rails Source ==="
+git clone https://github.com/rails/rails.git ~/rails-latest
+cd ~/rails-latest
+git checkout v3.2.13
 
-echo "if ENV['NUODB_AR']
-    gem 'activerecord-nuodb-adapter'
-end" >> ~/tmpy/rails-latest/Gemfile
+echo "=== Apply NuoDB Specific Settings ==="
 
 echo "
   nuodb:
@@ -71,25 +23,15 @@ echo "
       username: cloud
       password: user
       schema: test
-" >> ~/tmpy/rails-latest/activerecord/test/config.example.yml
-
-sed -i 's/%w( mysql mysql2 postgresql/%w( nuodb mysql mysql2 postgresql/g' Rakefile
+" >> ~/rails-latest/activerecord/test/config.example.yml
 
-echo "gem 'activerecord-nuodb-adapter'" >> ~/tmpy/rails-latest/Gemfile
-bundle install
-
-export GEM_PATH=/home/travis/.rvm/gems/ruby-1.9.3-p448
-
-#RUBYLIB="~/tmpy/rails-latest/activerecord/test/cases:$RUBYLIB"
-#export RUBYLIB
+cp ~/rails-latest/activerecord/test/config.example.yml ~/rails-latest/activerecord/test/config.yml
 
+sed -i 's/%w( mysql mysql2 postgresql/%w( nuodb mysql mysql2 postgresql/g' Rakefile
 
-# Helpful information, make sure that NuoDB is running
+echo "gem 'activerecord-nuodb-adapter'" >> ~/rails-latest/Gemfile
 
-# Starting NuoDB
-#java -jar /opt/nuodb/jar/nuoagent.jar --broker &
-#/opt/nuodb/bin/nuodb --chorus test --password bar --dba-user cloud --dba-password user --verbose debug --archive /var/tmp/nuodb --initialize --force &
-#/opt/nuodb/bin/nuodb --chorus test --password bar --dba-user cloud --dba-password user &
+echo "=== Finished Setting up AR tests ==="
 
 # Running Tests
 #cd /tmp/rails-latest/activerecord

data/activerecord-nuodb-adapter.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('activerecord', '~> 3.2.11')
   gem.add_development_dependency('rake', '~> 10.0.3')
   gem.add_development_dependency('rdoc', '~> 3.10')
-  gem.add_dependency('nuodb', '~> 1.0.2')
+  gem.add_dependency('nuodb', '~> 1.1')
 
   gem.files = `git ls-files`.split($\)
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

data/lib/active_record/connection_adapters/nuodb/version.rb

@@ -29,7 +29,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module NuoDB
-      VERSION = '1.0.4'
+      VERSION = '1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nuodb-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
 description: An adapter for ActiveRecord and AREL to support the NuoDB distributed
   database backend.
 email: