cant_wait 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,16 @@
+# branches:
+#   only:
+#     - development
+#   except:
+#     - master
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode  # JRuby in 1.9 mode (last was 1.7.3)
+  - rbx-19mode    # Rubinius in 1.9 mode (last was 2.0.0, weekly build)
+before_script:
+  - psql -c "CREATE ROLE tester WITH LOGIN PASSWORD 'secret';" -U postgres
+  - psql -c 'CREATE DATABASE test WITH OWNER=tester;' -U postgres
+script: rake test:all

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+0.0.2 (June 15, 2013)
+=====================
+
+Documentation:
+
+  - Minor changes in the documentation
+
+Development:
+
+  - Integration with travis-ci.org
+  - Added tests for Rails 4.0.0.rc2
+  - Minor code refactoring (no changes in functionality)
+  - Added a new rake task to run test:bundle and test:run in one pass

data/README.md

@@ -1,11 +1,9 @@
 # cant_wait
+[![Gem Version](https://badge.fury.io/rb/cant_wait.png)](https://badge.fury.io/rb/cant_wait)
+[![Build Status](https://api.travis-ci.org/CarlosCD/cant_wait.png)](https://travis-ci.org/CarlosCD/cant_wait)
 
-This ruby gem allows to add a statement timeout for PostgreSQL databases within a Ruby on Rails application.
 
-If any SQL statement takes more time than the timeout value (measured in milliseconds), its execution will be cancelled, and Active Record
-would raise a PGError exception.
-
-    ActiveRecord::StatementInvalid: PGError: ERROR:  canceling statement due to statement timeout
+This Ruby gem allows to add a statement timeout for PostgreSQL databases within a Ruby on Rails application.
 
 From the PostgreSQL documentation:
 
@@ -20,38 +18,55 @@ From the PostgreSQL documentation:
 (Visit <http://www.postgresql.org/docs/devel/static/runtime-config-client.html> for more information)
 
 
-The gem has been tested for ruby 1.9.2 and above, as well as with Rails 3.0.3 and above.  Tested also with PostgreSQL 8 and 9, but it may work also in other versions supported by Active Record (see PostgreSQL documentation).
+The gem has been tested with Rails 3.0.3 and above.  Tested also with PostgreSQL 8 and 9, but it may work also in other versions supported by Active Record (see PostgreSQL documentation). See also test/README.md for more details.
 
-If you find any problems, please feel free to open any issues within the gem repository ([GitHub](https://github.com/CarlosCD/cant_wait)).
+If any SQL statement takes more time than the timeout value (measured in milliseconds), its execution will be cancelled, and Active Record would raise a PGError exception.
+
+    ActiveRecord::StatementInvalid: PGError: ERROR:  canceling statement due to statement timeout
+
+If you find any problems, please feel free to open an issue in the gem repository ([GitHub](https://github.com/CarlosCD/cant_wait)).
 
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'cant_wait', '~> 0.0.1'
+    gem 'cant_wait', '~> 0.0.2'
 
 And then execute:
 
     $ bundle
 
 
+## Supported Rubies
+
+**cant_wait** has been tested with the following versions of Ruby:
+
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- jruby
+- Rubinius
+
+The gem may work just fine with a Ruby flavors/version not listed above.  See the development documentation for more details.
+
+
 ## Usage
 
-In the file config/database.yml, indicate a timeout in milliseconds for each environment:
+In the file <tt>config/database.yml<tt /> of the Rails application, indicate a timeout in milliseconds for each environment:
 
     production:
       adapter: postgresql
-      timeout: 120_000  # 2 minutes
+      timeout: 180_000  # 3 minutes
       ...
 
-Then restart the application to establish the new configuration parameter(s).
+Then restart the application to establish the new database settings.
 
 
 ## Development / Contributing
 
 * Source hosted on [GitHub](https://github.com/CarlosCD/cant_wait)
-* Details on the test setup are in the file Readme.md within the test folder. It includes details on testing in several Ruby and Rails versions.
+* Details on the test setup are in the file README.md within the test folder.  It includes details on testing in several Ruby and Rails versions.
 
 Contributing:
 
@@ -62,4 +77,9 @@ Contributing:
 5. Create new Pull Request
 
 
-May 2013
+## License
+
+**cant_wait** is released under the [MIT License](http://opensource.org/licenses/MIT).
+
+
+June 2013

data/cant_wait.gemspec

@@ -6,30 +6,26 @@ require 'cant_wait/version'
 Gem::Specification.new do |spec|
   spec.name          = 'cant_wait'
   spec.version       = CantWait::VERSION
-  spec.authors       = ['Carlos A. Carro Duplá']
-  spec.email         = ['ccarrodupla@gmail.com']
-  spec.description   = <<-EOF
-    Adds a timeout setting for PostgreSQL databases in a Ruby on Rails application.
-    If any SQL statement takes more time than the timeout value, it will be cancelled, and ActiveRecord
-    would raise a PGError exception.
-    In the config/database.yml file, indicate a timeout in milliseconds for each environment:
-      production:
-        adapter: postgresql
-        timeout: 120_000  # 2 minutes
-        ...
-    (see documentation for more details)
-  EOF
-  spec.summary       = %q{Adds statement timeout for PostgreSQL databases in Ruby on Rails. Timeout is measured in milliseconds.}
-  spec.homepage      = 'https://github.com/CarlosCD/cant_wait'
+  spec.platform      = Gem::Platform::RUBY
+  spec.summary       = 'Complements the Ruby on Rails web application framework by providing statement timeouts for PostgreSQL databases.'
+  spec.description   = 'Provides statement timeouts for PostgreSQL databases in a Ruby on Rails web application. Stops any SQL statement ' <<
+                       'that takes more than a specified number of milliseconds.'
+
   spec.license       = 'MIT'
-  spec.signing_key = '/users/CarlosCD/.ssh/private_key.pem'
-  spec.cert_chain  = ['/users/CarlosCD/.ssh/public_cert.pem']
 
-  spec.add_dependency 'rails', '>= 3.0.3'
+  spec.author        = 'Carlos A. Carro Duplá'
+  spec.email         = 'ccarrodupla@gmail.com'
+  spec.homepage      = 'https://github.com/CarlosCD/cant_wait'
+
   spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'rails', '>= 3.0.3'
+
+  spec.signing_key = '/users/CarlosCD/.ssh/private_key.pem'
+  spec.cert_chain  = ['/users/CarlosCD/.ssh/public_cert.pem']
+
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   if RUBY_ENGINE == 'jruby' && RUBY_PLATFORM == 'java'

data/lib/cant_wait/cant_wait_railtie.rb

@@ -1,20 +1,24 @@
-##
-# This class is a Railtie which adds an initializer to Rails
-#
-# It reads the database configuration timeout, and if the adapter is PostgreSQL,
-# sets its value as the PostgreSQL statement_timeout.
+module CantWait
 
-class CantWaitRailtie < Rails::Railtie
+  ##
+  # This class is a Railtie which adds an initializer to Rails
+  #
+  # It reads the database configuration timeout, and if the adapter is PostgreSQL,
+  # sets its value as the statement_timeout.
 
-  initializer 'cant_wait.set_timeout' do
-    begin
-      database_config = Rails.configuration.database_configuration[Rails.env]
-      if (database_config['adapter'].downcase == 'postgresql') && database_config['timeout']
-        ActiveRecord::Base.connection.execute "set statement_timeout = #{database_config['timeout']}"
+  class CantWaitRailtie < Rails::Railtie
+
+    initializer 'cant_wait.set_timeout' do
+      begin
+        database_config = Rails.configuration.database_configuration[Rails.env]
+        if (database_config['adapter'].downcase == 'postgresql') && database_config['timeout']
+          ActiveRecord::Base.connection.execute "set statement_timeout = #{database_config['timeout']}"
+        end
+      rescue Exception => e
+        puts "\n#{e.message}\n\n"
       end
-    rescue Exception => e
-      puts "\n#{e.message}\n\n"
     end
+
   end
 
 end

data/lib/cant_wait/version.rb

@@ -1,3 +1,3 @@
 module CantWait
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/tasks/publishing.rake

@@ -2,13 +2,13 @@
 #
 #  rake gemspec_valid     # Validate the gemspec
 #
-#  rake build             # Build cant_wait-0.0.1.gem into the pkg directory.
+#  rake build             # Build cant_wait-X.Y.Z.gem into the pkg directory.
 #  rake clean             # Clean automatically generated gem files (removes the pkg folder).
 #
-#  rake install           # Build and install cant_wait-0.0.1.gem into system gems.
+#  rake install           # Build and install cant_wait-X.Y.Z.gem into system gems.
 #
-#  rake push              # Push pkg/cant_wait-0.0.1.gem to rubygems, if it exists.
-#  rake release           # Create tag v0.0.1 and build and push cant_wait-0.0.1.gem to Rubygems
+#  rake push              # Push pkg/cant_wait-X.Y.Z.gem to rubygems, if it exists.
+#  rake release           # Create tag vX.Y.Z and build and push cant_wait-X.Y.Z.gem to Rubygems
 
 begin
   require 'bundler/gem_tasks'  # Adds these tasks: build, install and release

data/tasks/testing.rake

@@ -1,15 +1,34 @@
-# Testing:
+# Testing tasks:
 #
 #  rake test:bundle       # Installs gems needed for the test apps (Bundle Install for each Rails app's Gemfile)
 #  rake test:run          # Tests the gem's behavior, using 5 test rails apps of different versions, and random timeouts
+#  rake test:all          # Tests the gem's behavior, installing needed gems for the test apps first
 
 namespace :test do
 
-  TEST_RAILS_APP = [{ version: '3.0.3',     rails_root: 'test/test_apps/Test_3_0_3'},
+  TEST_RAILS_APP = [{ version: '3.0.3',     rails_root: 'test/test_apps/Test_3_0_03'},
                     { version: '3.0.20',    rails_root: 'test/test_apps/Test_3_0_20'},
                     { version: '3.1.12',    rails_root: 'test/test_apps/Test_3_1_12'},
                     { version: '3.2.13',    rails_root: 'test/test_apps/Test_3_2_13'},
-                    { version: '4.0.0.rc1', rails_root: 'test/test_apps/Test_4_0_0_rc1'}]
+                    { version: '4.0.0.rc2', rails_root: 'test/test_apps/Test_4_0_0_rc2'}]
+
+  # Argument (env.):
+  #   REBUILD=f   It doesn't remove the Gemfile.lock for the test apps, not forcing a clean bundle install
+  #   Other possible values (meaning the same): f, false, n, no, off, nope
+  #   Default: Rebuild all when no flag is present.
+  #            (The opposite default as for test:bundle)
+  # Examples:
+  #   $ rake test:all
+  #   $ rake test:all REBUILD=no
+  desc "Tests the gem's behavior, installing needed gems for the test apps first"
+  task :all do
+    # Rebuild setting:
+    rebuild = !boolean_env_param('REBUILD', 'f', 'n', 'off', 'nope', 'no', 'false')
+    ENV['REBUILD'] = rebuild.to_s
+    puts 'Not rebuilding the Gemfile.lock for the test rails apps' unless rebuild
+    Rake::Task['test:bundle'].invoke
+    Rake::Task['test:run'].invoke
+  end
 
   # Argument (env.):
   #    VERBOSE=t     Gives more information about what's going on
@@ -27,6 +46,7 @@ namespace :test do
       puts "We'll run 5 times the test #1 (5 rails versions)"
       puts "Gem's ENV['BUNDLE_GEMFILE']='#{ENV['BUNDLE_GEMFILE']}'"
     end
+    all_passing = true  # Used to signal to travis-ci a build failure
     can_wait_bundle_gemfile = ENV['BUNDLE_GEMFILE']
     5.times do |num|
       puts "====TESTING Rails version #{TEST_RAILS_APP[num][:version]}================="
@@ -34,7 +54,7 @@ namespace :test do
         puts 'At least Ruby 1.9.3 is required for rails 4 or above...'
       else
         # Uses Gemfile for the given version of rails
-        gemfile_path = escape_filename_espaces TEST_RAILS_APP[num][:rails_root]
+        gemfile_path = escape_filename_spaces TEST_RAILS_APP[num][:rails_root]
         gemfile = gemfile_path<<'/Gemfile'
         ENV['BUNDLE_GEMFILE'] = gemfile
         if verbose
@@ -51,10 +71,11 @@ namespace :test do
           end
           # Run several timeouts test for that version of rails (bundle exec...)
           #   Only the last argument (V) is optional here:
-          system "bundle exec ruby test/cant_wait_test.rb #{num} #{@gem_spec.version} #{'V' if verbose}"
+          all_passing = false unless system "bundle exec ruby test/cant_wait_test.rb #{num} #{@gem_spec.version} #{'V' if verbose}"
         else
           puts ' bundle check and bundle failed! Check your rails test app Gemfile.'
-          puts ' If there are missing gems, run rake test:bundle_apps'
+          puts ' If there are missing gems, run rake test:bundle'
+          all_passing = false
         end
       end
     end
@@ -64,13 +85,14 @@ namespace :test do
       puts "Finally set again the gem ENV['BUNDLE_GEMFILE'] as:"
       puts "  '#{ENV['BUNDLE_GEMFILE']}'"
     end
+    exit(1) unless all_passing  # non zero meand build failure
   end
 
   # Arguments (env.):
   #   VERBOSE=t   It gives more information about what's going on
   #   REBUILD=t   It removes the Gemfile.lock, so it forces a clean bundle install
   #   Other possible values (meaning the same): t, true, y, yes, on, ok
-  #   Default: no verbose (no flags)
+  #   Default: no verbose, and no rebuild (no flags)
   # Example:
   #   $ rake test:bundle_apps REBUILD=y
   desc "Installs gems needed for the test apps (Bundle Install for each Rails app's Gemfile)"
@@ -98,9 +120,9 @@ namespace :test do
           puts "  Present directory (pwd): #{FileUtils.pwd}"
           puts "  Changing to the app root..."
         end
-        FileUtils.cd escape_filename_espaces TEST_RAILS_APP[num][:rails_root]
+        FileUtils.cd escape_filename_spaces TEST_RAILS_APP[num][:rails_root]
         puts "  Now present directory (pwd) is: #{FileUtils.pwd}" if verbose
-        app_root = escape_filename_espaces FileUtils.pwd
+        app_root = escape_filename_spaces FileUtils.pwd
         puts " App Root: #{app_root}" if verbose
         # Rebuilding the Gemfile.lock installs missing gems
         if rebuild
@@ -127,7 +149,7 @@ namespace :test do
 
   private
 
-  def escape_filename_espaces(filename)
+  def escape_filename_spaces(filename)
     filename.gsub(' ', '\ ')
   end
 

data/test/README.md

@@ -1,8 +1,9 @@
-# cant_wait
-# Development and Test
+# cant_wait ~ development and test
+[![Gem Version](https://badge.fury.io/rb/cant_wait.png)](https://badge.fury.io/rb/cant_wait)
+[![Build Status](https://api.travis-ci.org/CarlosCD/cant_wait.png)](https://travis-ci.org/CarlosCD/cant_wait)
 
 
-## Test preferences and setup
+## Test setup and choices
 
 - Minitest, to keep things simple.
 - PostgreSQL database server (localhost or not).
@@ -11,13 +12,23 @@
 
 ## Test strategy: different Rails apps with random timeouts
 
-The approach of using minimal Rails components (ActiveRecord, Railties) is problematic due to the amount of code that Rails loads and of how it changes in the default behavior of Ruby.  Running several Rails apps at the same time, and even if it is done in different threads, may result in:
+### The problem
+
+The approach of using minimal Rails components (ActiveRecord, Railties) is problematic due to the amount of code that Rails loads and of how it changes in the default Ruby behavior.  I opted here to test the same way an end user would use the gem.
+
+To test in different Rails versions requires running several Rails apps simultaneous or sequentially. Even if it is done in different threads, may result in:
 
     RuntimeError: You cannot have more than one Rails::Application
 
-This approach also makes the test cases too distant to the real conditions you may encounter in isolated Rails applications.  I finally choose to test several versions of Rails/ActiveRecord independently.
+This approach also makes the test cases too distant to the real conditions you may encounter in isolated Rails applications.
+
+### A solution
+
+I finally chose to test several versions of Rails/ActiveRecord independently.
 
-I created 5 simple Rails apps in the folder test/test_apps.  Then I modified their Gemfile by adding gems for PostgreSQL, Minitest and Growl:
+I created 5 simple Rails apps, of different versions, in the folder test/test_apps.
+
+Then I modified their Gemfile by adding gems for PostgreSQL, Minitest and Growl:
 
     if RUBY_ENGINE == 'jruby' && RUBY_PLATFORM == 'java'
       gem 'activerecord-jdbc-adapter', '~> 1.2'
@@ -36,20 +47,22 @@ I created 5 simple Rails apps in the folder test/test_apps.  Then I modified the
 
     gem 'cant_wait', path: File.expand_path('../../../..', __FILE__)
 
-The rails apps require bundle install, specially when changing the version of Ruby to be used. To make it easier, I added a rake task (rake test:bundle).
-
-The test is run through the rake test:run command.  Due to the complex setup needed, I choose not to use the rake default to run the test.
+The rails apps require bundle install, specially when changing the version of Ruby to be used. To make it easier, I added a rake task (<tt>rake test:bundle<tt />).
 
-The test (rake test:run) goes over each rails app in sequence and:
+The test is run through the <tt>rake test:run command<tt />.  The test goes over each rails app in sequence and:
 
 1. It sets Bundle to use the test app's Gemfile
-2. It creates the app's config/database.yml with a random timeout
+2. It creates the app's <tt>config/database.yml<tt /> with a random timeout
 3. It starts Rails
 4. It checks the version of Rails and ActiveRecord running.
 5. It checks that the PostgreSQL connection's statement_timeout is the expected.
 
+Due to the complex setup needed, I choose not to use the rake default to run the test, just to signal the tester to stop to consider these choices.
+
+And additional <tt>rake test:all<tt /> will do both the bundle install and run the tests. This is the way travis-ci is set to run.
 
-## The Testing process
+
+## The Testing process in detail
 
 After cloning the gem, you can start testing it by following these steps:
 
@@ -58,13 +71,13 @@ After cloning the gem, you can start testing it by following these steps:
 
         rvm use 1.9.3@mygemset
 
-2. Optional: if you are using Mac OS, get Growl
+2. Optional: if you are using Mac OS X, get Growl
 
 3. Get the gem's dependencies:
 
         bundle
 
-4. Set up your PostgreSQL test database and edit accordingly the file test/database.yml
+4. Set up your PostgreSQL test database and edit accordingly the file <tt>test/database.yml<tt />
 
 5. Get the Rails gems used by the test rails apps included:
 
@@ -76,15 +89,25 @@ After cloning the gem, you can start testing it by following these steps:
 
 If so wanted, run the tests several times.  The tests use different random timeout scenarios, so each run may be a bit different.
 
+## Travis
+
+I added travis-ci.org to check every build, as well as a badge to check the status last commit.
+
+Check the .travis.yml file for details.
 
-## Tested for
+
+## Tested with
 
 * Versions of Ruby:
 
-        jruby 1.7.4
-        1.9.2-p320  (MRI's last patchlevel of 1.9.2)
-        1.9.3-p429  (MRI last patchlevel of 1.9.3)
-        2.0.0-p195  (MRI last patchlevel of 2.0.0)
+        1.9.2-p320       (MRI's last patchlevel of 1.9.2)  Linux and MacOS X
+        1.9.3-p327       (MRI)                             Linux
+        1.9.3-p429       (MRI last patchlevel of 1.9.3)    MacOS X
+        2.0.0-p0         (MRI)                             Linux
+        2.0.0-p195       (MRI last patchlevel of 2.0.0)    MacOS X
+        jruby 1.7.3      (java 1.7.0_15)                   Linux
+        jruby 1.7.4      (java 1.6.0_45)                   MacOS X
+        Rubinius 2.0.0   (1.9.3, 2013-06-12 JI)            Linux
 
 * Versions of Rails:
 
@@ -92,7 +115,13 @@ If so wanted, run the tests several times.  The tests use different random timeo
         Rails 3.0.20     Last patchlevel of Rails 3.0 (at this moment)
         Rails 3.1.12     Last patchlevel of Rails 3.1
         Rails 3.2.13     Last patchlevel of Rails 3.2 (many security fixes, last stable version)
-        Rails 4.0.0.rc1  Last Release candidate for Rails 4, the most stable version at this point in time.
+        Rails 4.0.0.rc2  Last Release candidate for Rails 4, the most stable at this point in time.
+
+  **Note:** in the case of versions of Rails not final yet, <tt>rake test:bundle<tt /> may complain.  In those cases you may need to manually install the gems before running the tests.  For example:
+
+        $ gem install rails --version 4.0.0.rc2 --no-ri --no-rdoc
+        $ gem install sass-rails -v 4.0.0.rc2
+        ...
 
 * PostgreSQL versions 8.3.6 and 9.2.4.
 

data/test/cant_wait_test.rb

@@ -6,11 +6,11 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))  # We require the rails environment f
 
 class CantWait1Test < MiniTest::Unit::TestCase
 
-  TEST_RAILS_APP = [{ version: '3.0.3',     rails_root: 'test_apps/Test_3_0_3',    },
+  TEST_RAILS_APP = [{ version: '3.0.3',     rails_root: 'test_apps/Test_3_0_03',    },
                     { version: '3.0.20',    rails_root: 'test_apps/Test_3_0_20',   },
                     { version: '3.1.12',    rails_root: 'test_apps/Test_3_1_12',   },
                     { version: '3.2.13',    rails_root: 'test_apps/Test_3_2_13'    },
-                    { version: '4.0.0.rc1', rails_root: 'test_apps/Test_4_0_0_rc1' }]
+                    { version: '4.0.0.rc2', rails_root: 'test_apps/Test_4_0_0_rc2' }]
 
   # Set a random timeout and rails app to be tested
   def setup

data/test/test_apps/Test_3_0_03/.gitignore

@@ -0,0 +1,12 @@
+# Ignore bundler config
+.bundle
+
+# Ignore database.yml
+config/database.yml
+
+# Ignore the default SQLite database.
+db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+log/*.log
+tmp/

data/test/test_apps/{Test_3_0_3 → Test_3_0_03}/Gemfile

@@ -2,9 +2,6 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
 #-- Special additions-----------------
 # PostgreSQL as the database for ActiveRecord
 if RUBY_ENGINE == 'jruby' && RUBY_PLATFORM == 'java'
@@ -27,26 +24,3 @@ end
 # Gem cant_wait from sources, relative path:
 gem 'cant_wait', path: File.expand_path('../../../..', __FILE__)
 #-------------------------
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/test/test_apps/Test_3_0_20/.gitignore

@@ -1,4 +1,12 @@
+# Ignore bundler config
 .bundle
+
+# Ignore database.yml
+config/database.yml
+
+# Ignore the default SQLite database.
 db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
 log/*.log
 tmp/

data/test/test_apps/Test_3_0_20/Gemfile

@@ -2,9 +2,6 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.20'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
 #-- Special additions-----------------
 # PostgreSQL as the database for ActiveRecord
 if RUBY_ENGINE == 'jruby' && RUBY_PLATFORM == 'java'
@@ -27,26 +24,3 @@ end
 # Gem cant_wait from sources, relative path:
 gem 'cant_wait', path: File.expand_path('../../../..', __FILE__)
 #-------------------------
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/test/test_apps/Test_3_1_12/.gitignore

@@ -1,12 +1,9 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
 # Ignore bundler config
 /.bundle
 
+# Ignore database.yml
+config/database.yml
+
 # Ignore the default SQLite database.
 /db/*.sqlite3
 

data/test/test_apps/Test_3_1_12/Gemfile

@@ -2,8 +2,20 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.1.12'
 
-# Bundle edge Rails instead:
-# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.5'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier',     '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+group :test do
+  # Pretty printed test output
+  gem 'turn', '~> 0.8.3', :require => false
+end
 
 #-- Special additions-----------------
 # PostgreSQL as the database for ActiveRecord
@@ -27,34 +39,3 @@ end
 # Gem cant_wait from sources, relative path:
 gem 'cant_wait', path: File.expand_path('../../../..', __FILE__)
 #-------------------------
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer'
-
-  gem 'uglifier', '>= 1.0.3'
-end
-
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-group :test do
-  # Pretty printed test output
-  gem 'turn', '~> 0.8.3', :require => false
-end