flag_shih_tzu 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f838aaf59bd28697db5750c2102f66f23dfaed0b
-  data.tar.gz: e61cc31873a236b52648fce2815f58b090ffd69d
+  metadata.gz: 72a4bf4078f8e813036f4c041b813891e9486d85
+  data.tar.gz: 2e5b44bc01f7b80731840242717839f97b935e05
 SHA512:
-  metadata.gz: 02d87e4ec423ab7053d0b460bc51a889ba5a96ad343f6939f46b2056c024ed858520349b788a7d2a608a380d01e8eaae2374d945be4e3912eb3d3abe707c5d91
-  data.tar.gz: 0a0b3097c2b6494b838a3b0536c7407117a6d6f4a78cca2cac19b677b03acf6ea6506d130604b2de06fb9b319e52f47a0fe98eec0ab8fff8f16c308e85c1d53f
+  metadata.gz: 5dad706a0cfa3a779af31de3a14e919312d40b7cd1a2390a45f6ea9c4825bed963c0f453ce7c7483d67b5249f153ce09050dd0faf317ef7d2f64c2ca45e0915e
+  data.tar.gz: 6bca2c375c2afbb2d71a064869e8667f86ad8aaa2533443b261621277b12cce03d19b6cd8e231d9ec5d8e28554b569ca878a4ee139dfdc771744baee722cc18c

data/.travis.yml

@@ -3,7 +3,8 @@ rvm:
   - 2.0.0
   - 2.1.5
   - 2.2.3
-  - jruby
+  - jruby-1.7.22
+  - jruby-9.0.1.0
 gemfile:
   - gemfiles/Gemfile.activerecord-2.3.x
   - gemfiles/Gemfile.activerecord-3.0.x
@@ -14,15 +15,25 @@ gemfile:
   - gemfiles/Gemfile.activerecord-4.2.x
 matrix:
   exclude:
-    - rvm: jruby
+    - rvm: jruby-9.0.1.0
       gemfile: gemfiles/Gemfile.activerecord-2.3.x
-    - rvm: jruby
+    - rvm: jruby-9.0.1.0
       gemfile: gemfiles/Gemfile.activerecord-3.0.x
-    - rvm: jruby
+    - rvm: jruby-9.0.1.0
       gemfile: gemfiles/Gemfile.activerecord-3.1.x
-    - rvm: jruby
+    - rvm: jruby-9.0.1.0
       gemfile: gemfiles/Gemfile.activerecord-3.2.x
-    - rvm: jruby
+    - rvm: jruby-9.0.1.0
+      gemfile: gemfiles/Gemfile.activerecord-4.0.x
+    - rvm: jruby-1.7.22
+      gemfile: gemfiles/Gemfile.activerecord-2.3.x
+    - rvm: jruby-1.7.22
+      gemfile: gemfiles/Gemfile.activerecord-3.0.x
+    - rvm: jruby-1.7.22
+      gemfile: gemfiles/Gemfile.activerecord-3.1.x
+    - rvm: jruby-1.7.22
+      gemfile: gemfiles/Gemfile.activerecord-3.2.x
+    - rvm: jruby-1.7.22
       gemfile: gemfiles/Gemfile.activerecord-4.0.x
     - rvm: 2.2.3
       gemfile: gemfiles/Gemfile.activerecord-2.3.x

data/CHANGELOG.md

@@ -2,12 +2,18 @@
 
 * Work merged into master branch goes here until it is released.
 
+# Version 0.3.15 - OCT.11.2015
+
+* Fixed testing for all supported environments by Peter Boling
+* Testing on Travis: added Ruby jruby-9.0.1.0 by Peter Boling
+* Documented compatibility matrix in table in README by Peter Boling
+
 # Version 0.3.14 - OCT.08.2015
 
 * Allow use without ActiveRecord (experimental) by jfcaiceo
 * Many net-zero code cleanups to follow Ruby Style Guide
 * Improved local testing script rake test:all
-* Testing on Travis: added Ruby 1.9.3, 2.1.5, 2.2.3, jruby
+* Testing on Travis: added Ruby 1.9.3, 2.1.5, 2.2.3, jruby-1.7.0
 * Testing on Travis: removed Ruby 2.1.2
 
 # Version 0.3.13 - MAR.13.2015

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 
 # SO the gem can run the simple test suite against the raw bundled gems without the complex BUNDLE_GEMFILE setup
 gem "sqlite3", :platforms => [:ruby]
+gem "reek", ">= 2.2.1", :platforms => [:ruby] # Last version to support Ruby 1.9
+gem "roodi", ">= 5", :platforms => [:ruby]
 
 # Specify your gem's dependencies in flag_shih_tzu.gemspec
 gemspec

data/README.md

@@ -47,11 +47,21 @@ What is a ["Shih Tzu"](http://en.wikipedia.org/wiki/Shih_Tzu)?
 
 The gem is actively being tested with:
 
-* MySQL, PostgreSQL and SQLite3 databases
-* ActiveRecord versions 2.3.x, 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x ;)
-* Ruby 1.9.3, 2.0.0, 2.1.5, 2.2.3
-* Travis tests the most important builds. See [.travis.yml](https://github.com/pboling/flag_shih_tzu/blob/master/.travis.yml) for the matrix.
-* All of the supported builds are run locally by me.  See [bin/test.bash](https://github.com/pboling/flag_shih_tzu/blob/master/bin/test.bash)
+* MySQL, PostgreSQL and SQLite3 databases (Both Ruby and JRuby adapters)
+* ActiveRecord versions 2.3.x, 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x
+* Ruby 1.9.3, 2.0.0, 2.1.5, 2.2.3, jruby-1.7.22, jruby-9.0.1.0
+* Travis tests the supportedt builds. See [.travis.yml](https://github.com/pboling/flag_shih_tzu/blob/master/.travis.yml) for the matrix.
+* All of the supported builds can also be run locally.  See [bin/test.bash](https://github.com/pboling/flag_shih_tzu/blob/master/bin/test.bash)
+
+### Compatibility Matrix
+
+| Ruby / Active Record  | 2.3.x | 3.0.x | 3.1.x | 3.2.x | 4.0.x | 4.1.x | 4.2.x |
+| 1.9.3                 | ✓     | ✓     | ✓     | ✓     |       |       |       |
+| 2.0.0                 |       | ✓     | ✓     | ✓     | ✓     | ✓     |       |
+| 2.1.5                 |       |       |       | ✓     | ✓     | ✓     | ✓     |
+| 2.2.3                 |       |       |       | ✓     | ✓     | ✓     | ✓     |
+| jruby-1.7.22          |       |       | ✓     | ✓     | ✓     | ✓     | ✓     |
+| jruby-9.0.1.0         |       |       |       | ✓     | ✓     | ✓     | ✓     |
 
 **Legacy**
 

data/Rakefile

@@ -24,17 +24,20 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'reek/rake/task'
-Reek::Rake::Task.new do |t|
-  t.fail_on_error = true
-  t.verbose = false
-  t.source_files = 'lib/**/*.rb'
+if defined?(Reek) # No Reek on JRuby
+  require 'reek/rake/task'
+  Reek::Rake::Task.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
 end
 
-require 'roodi'
-require 'roodi_task'
-RoodiTask.new do |t|
-  t.verbose = false
+if defined?(Roodi) # No Roodi on JRuby
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
 end
 
 namespace :test do

data/bin/test.bash

@@ -5,73 +5,87 @@ gem_installed() {
     if [ $num -eq "1" ]; then
       echo "already installed $1"
     else
+      echo "installing $1"
       gem install $1
     fi
     return 0
 }
 
+run_all_tests_for() {
+  gemfile_location="gemfiles/Gemfile.activerecord-$2"
+  rm -rf $gemfile_location.lock
+  echo "rvm use $1@flag_shih_tzu-$2"
+  rvm use $1@flag_shih_tzu-$2 --create
+  gem_installed "bundler"
+  echo "BUNDLE_GEMFILE=$gemfile_location bundle update --quiet"
+  BUNDLE_GEMFILE=$gemfile_location bundle update --quiet
+  echo "NOCOVER=true BUNDLE_GEMFILE=$gemfile_location bundle exec rake test"
+  NOCOVER=true BUNDLE_GEMFILE=$gemfile_location bundle exec rake test
+  Count=$(( $Count + 1 ))
+}
+
 # First run the tests for all versions supported on Ruby 1.9.3
+#COMPATIBLE_VERSIONS=(2.3.x)
 COMPATIBLE_VERSIONS=(2.3.x 3.0.x 3.1.x 3.2.x)
-count=0
-while [ "x${COMPATIBLE_VERSIONS[count]}" != "x" ]
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
 do
-  version=${COMPATIBLE_VERSIONS[count]}
-  rvm use 1.9.3@flag_shih_tzu-$version --create
-  gem_installed "bundler"
-  BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle update --quiet
-  NOCOVER=true BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle exec rake test
-  count=$(( $count + 1 ))
+  rvm_ruby_version=1.9.3
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
 done
 
 # Then run the tests for all versions supported on Ruby 2.0.0
 COMPATIBLE_VERSIONS=(3.0.x 3.1.x 3.2.x 4.0.x 4.1.x)
-count=0
-while [ "x${COMPATIBLE_VERSIONS[count]}" != "x" ]
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
 do
-  version=${COMPATIBLE_VERSIONS[count]}
-  rvm use 2.0.0@flag_shih_tzu-$version --create
-  gem_installed "bundler"
-  BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle install --quiet
-  NOCOVER=true BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle exec rake test
-  count=$(( $count + 1 ))
+  rvm_ruby_version=2.0.0
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
 done
 
 # Then run the tests for all versions supported on Ruby 2.1.5
 COMPATIBLE_VERSIONS=(3.2.x 4.0.x 4.1.x 4.2.x)
-count=0
-while [ "x${COMPATIBLE_VERSIONS[count]}" != "x" ]
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
 do
-  version=${COMPATIBLE_VERSIONS[count]}
-  rvm use 2.1.5@flag_shih_tzu-$version --create
-  gem_installed "bundler"
-  BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle install --quiet
-  NOCOVER=true BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle exec rake test
-  count=$(( $count + 1 ))
+  rvm_ruby_version=2.1.5
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
 done
 
 # Then run the tests for all versions supported on Ruby 2.2.3
 COMPATIBLE_VERSIONS=(3.2.x 4.0.x 4.1.x 4.2.x)
-count=0
-while [ "x${COMPATIBLE_VERSIONS[count]}" != "x" ]
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
 do
-  version=${COMPATIBLE_VERSIONS[count]}
-  rvm use 2.2.3@flag_shih_tzu-$version --create
-  gem_installed "bundler"
-  BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle install --quiet
-  NOCOVER=true BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle exec rake test
-  count=$(( $count + 1 ))
+  rvm_ruby_version=2.2.3
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
+done
+
+# Then run the tests for all versions supported on jruby-1.7.22
+#   (which appears to pass for 3.1 - 4.2 inclusive)
+# TODO: Investigate 2 failures on Rails 2.3 and 3.0
+#       assert_equal true, my_spaceship.update_flag!(:jeanlucpicard, false, true)
+#       assert_equal true, my_spaceship.update_flag!(:jeanlucpicard, false)
+COMPATIBLE_VERSIONS=(3.1.x 3.2.x 4.0.x 4.1.x 4.2.x)
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
+do
+  rvm_ruby_version=jruby-1.7.22
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
 done
 
 # Then run the tests for all versions supported on jruby-9.0.1.0
 #   (which should be the same as the Ruby 2.2.3 compatibility set)
 COMPATIBLE_VERSIONS=(3.2.x 4.0.x 4.1.x 4.2.x)
-count=0
-while [ "x${COMPATIBLE_VERSIONS[count]}" != "x" ]
+Count=0
+while [ "x${COMPATIBLE_VERSIONS[Count]}" != "x" ]
 do
-  version=${COMPATIBLE_VERSIONS[count]}
-  rvm use jruby-9.0.1.0@flag_shih_tzu-$version --create
-  gem_installed "bundler"
-  BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle install --quiet
-  NOCOVER=true BUNDLE_GEMFILE="gemfiles/Gemfile.activerecord-$version" bundle exec rake test
-  count=$(( $count + 1 ))
+  rvm_ruby_version=jruby-9.0.1.0
+  rails_version=${COMPATIBLE_VERSIONS[Count]}
+  run_all_tests_for $rvm_ruby_version $rails_version
 done

data/flag_shih_tzu.gemspec

@@ -28,8 +28,6 @@ ActiveRecord object.
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc", ">= 2.4.2"
-  s.add_development_dependency "reek", ">= 2.2.1" # Last version to support Ruby 1.9
-  s.add_development_dependency "roodi", ">= 5"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "test-unit"
 end

data/gemfiles/Gemfile.activerecord-2.3.x

@@ -7,11 +7,12 @@ gem "mime-types", "< 2.0.0", :platforms => [:ruby_18]
 gem "activerecord", "~> 2.3.0"
 gem "sqlite3", "~> 1.3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
-gem "activerecord-mysql2-adapter", :platforms => [:ruby]
+gem "mysql", :platforms => [:ruby_19]
+gem "activerecord-mysql2-adapter", :platforms => [:ruby_20]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
 
 gem "rake", "~> 0.9.6"
-gem "reek", "~> 2.2.1"
-gem "roodi", "~> 5.0.0"
+gem "reek", "~> 2.2.1", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-3.0.x

@@ -7,10 +7,11 @@ gem "mime-types", "< 2.0.0", :platforms => [:ruby_18]
 gem "activerecord", "~> 3.0.0"
 gem "sqlite3", "~> 1.3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
-gem "activerecord-mysql2-adapter", :platforms => [:ruby]
+gem "mysql", :platforms => [:ruby_19]
+gem "activerecord-mysql2-adapter", :platforms => [:ruby_20]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
 
-gem "reek", "~> 2.2.1"
-gem "roodi", "~> 5.0.0"
+gem "reek", "~> 2.2.1", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-3.1.x

@@ -7,10 +7,11 @@ gem "mime-types", "< 2.0.0", :platforms => [:ruby_18]
 gem "activerecord", "~> 3.1.0"
 gem "sqlite3", "~> 1.3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
-gem "activerecord-mysql2-adapter", :platforms => [:ruby]
+gem "mysql", :platforms => [:ruby_19]
+gem "activerecord-mysql2-adapter", :platforms => [:ruby_20]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
 
-gem "reek", "~> 2.2.1"
-gem "roodi", "~> 5.0.0"
+gem "reek", "~> 2.2.1", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-3.2.x

@@ -7,10 +7,11 @@ gem "mime-types", "< 2.0.0", :platforms => [:ruby_18]
 gem "activerecord", "~> 3.2.0"
 gem "sqlite3", "~> 1.3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
-gem "activerecord-mysql2-adapter", :platforms => [:ruby]
+gem "activerecord-mysql-adapter", :platforms => [:ruby_19]
+gem "activerecord-mysql2-adapter", :platforms => [:ruby_20]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
 
-gem "reek", "~> 2.2.1"
-gem "roodi", "~> 5.0.0"
+gem "reek", "~> 2.2.1", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-4.0.x

@@ -9,3 +9,6 @@ gem "activerecord-mysql2-adapter", :platforms => [:ruby]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+
+gem "reek", "~> 3.5.0", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-4.1.x

@@ -9,3 +9,6 @@ gem "activerecord-mysql2-adapter", :platforms => [:ruby]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+
+gem "reek", "~> 3.5.0", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/gemfiles/Gemfile.activerecord-4.2.x

@@ -9,3 +9,6 @@ gem "activerecord-mysql2-adapter", :platforms => [:ruby]
 gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 gem "pg", :platforms => [:ruby_18]
 gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+
+gem "reek", "~> 3.5.0", :platforms => [:ruby]
+gem "roodi", "~> 5.0.0", :platforms => [:ruby]

data/lib/flag_shih_tzu/version.rb

@@ -1,3 +1,3 @@
 module FlagShihTzu
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flag_shih_tzu
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Peter Boling
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,34 +70,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.2
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-- !ruby/object:Gem::Dependency
-  name: roodi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -193,3 +165,4 @@ test_files:
 - test/flag_shih_tzu_test.rb
 - test/schema.rb
 - test/test_helper.rb
+has_rdoc: