schema_dev 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f65f2737e8dd3ad7d448a9b25d11a647c63d165
-  data.tar.gz: 5dcd3fd57461dbe65856e124f701b7e8a00e3e0c
+  metadata.gz: d4cb75b3a5a0fde6048fbf09539056ab9be8bbd5
+  data.tar.gz: c710664f19c291598f88ead2ed83eadcc44cd964
 SHA512:
-  metadata.gz: 2ebea918d37f256c76ef1f6223dacad9f1deb80bbfa1d5e18695980bd2fce69f7d8a995518988b335b49ddafe683e998c1a888eede4bb5b014dc63d85cd5136c
-  data.tar.gz: ce1fcf40f94ad3338947b73f81885635980172af34121d5b1d4ad68d9b266af7bba84a198d7c9df492f131ceede47130e54831ba084dc649426b569be9318866
+  metadata.gz: 3d3337897220b5917a33fe4106c990630a620801838efe3cc3644fc3ad7d3254de11bca3db6ed2b117de2d25bb590ee06a1edaf7e2111cd00703e795d9103fa2
+  data.tar.gz: e5dfbf9698aa68e9e7cba1e7c29364f81267fac4aed58315a9d4670c953797b17ab09684a60955b48bc11b0c3d75cad6d158a9d32f04d2a6d737a0ee510c41ab

data/README.md

@@ -6,7 +6,7 @@
 
 Development tools for the SchemaPlus family of gems.
 
-Provides support for working with multiple ruby versions, rails adapaters, and db versions.  In particular provides a command `schema_dev` for running rspec (or whatever) on the matrix or  a slice or element of it.  It also auto-generates the `.travis.yml` file for [travis-ci](https://travis-ci.org) testing.
+Provides support for working with multiple ruby versions, ActiveRecord, and db versions.  In particular provides a command `schema_dev` for running rspec (or whatever) on the matrix or  a slice or element of it.  It also auto-generates the `.travis.yml` file for [travis-ci](https://travis-ci.org) testing.
 
 ## Creating a new gem for the SchemaPlus family
 
@@ -25,9 +25,9 @@ Similar to `bundle gem`, this creates a skeleton structure for a new gem.  The s
 The client gem needs a file `schema_dev.yml` in it's root, which specifies the testing matrix among other things.
 
 * `ruby`:  A single version of ruby, or a list of ruby versions.
-* `rails`: A single version of rails, or a list of rails versions
+* `activerecord`: A single version of ActiveRecord, or a list of ActiveRecord versions
 * `db`:  A single db adapter, or a list of db adapters.
-* `quick`: (Optional) Hash listing the version of ruby, rails, and db to use with `--quick` option.  If not specified, the default is to use the last entry in each list.
+* `quick`: (Optional) Hash listing the version of ruby, activerecord, and db to use with `--quick` option.  If not specified, the default is to use the last entry in each list.
 
 If you change this file, it's a good idea to run `schema_dev freshen`
 
@@ -55,9 +55,9 @@ In the root directory, you can run, e.g.,
     $ schema_dev bundle install  # or schema_dev bundle update
     $ schema_dev rspec
 
-Which will run those commands over the whole matrix.  You can also specify slices, via any combination of `--ruby`, `--rails` and `--db`
+Which will run those commands over the whole matrix.  You can also specify slices, via any combination of `--ruby`, `--activerecord` and `--db`
 
-    $ schema_dev rspec --ruby 2.1.3 --rails 4.0
+    $ schema_dev rspec --ruby 2.1.3 --activerecord 4.0
 
 For convenience you can also use `--quick` to run just one as specified in `schema_dev.yml`
 
@@ -69,14 +69,14 @@ For interactive debugging you may want to run rspec directly from the shell rath
 
 	$ schema_dev rspec --quick -- -e 'select which spec' -n
 
-	*** ruby 2.1.5 - rails 4.2 - db postgresql [1 of 1]
+	*** ruby 2.1.5 - activerecord 4.2 - db postgresql [1 of 1]
 
-	* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
+	* /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
 
 
 There's no hidden environment setup; so you can copy and paste the command line into a shell:
 
-	$ /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
+	$ /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
 
 	
 For more info, see

data/bin/schema_dev

@@ -20,12 +20,10 @@ class CLI < Thor
     method_option :dry_run, aliases: "-n", type: :boolean, desc: "Show what the commands would be without running them"
     method_option :quick, type: :boolean, desc: "Only execute on the 'quick' choice: #{$config ? $config.quick.inspect : "[from schema_dev.yml]"}"
     method_option :ruby, type: :string, desc: "Only execute for the specified version of ruby"
-    method_option :rails, type: :string, desc: "Only execute for the specified version of rails"
+    method_option :activerecord, aliases: "--ar", type: :string, desc: "Only execute for the specified version of activerecord"
     method_option :db, type: :string, desc: "Only execute for the specified database"
   end
 
-  default_task :rspec
-
   desc "freshen", "update files that depend on schema_dev.yml: .travis, gemfiles/, README.md"
   def freshen
       runner.freshen
@@ -63,7 +61,6 @@ class CLI < Thor
 end
 
 case
-when ARGV.empty? then CLI.start(["--help"])
 when ARGV[0] == "--version" then puts "SchemaDev #{SchemaDev::VERSION}"
 else CLI.start(ARGV)
 end

data/lib/schema_dev/config.rb

@@ -12,7 +12,7 @@ module SchemaDev
 
   class Config
 
-    attr_accessor :quick, :db, :ruby, :rails, :notify, :exclude
+    attr_accessor :quick, :db, :ruby, :activerecord, :notify, :exclude
 
     def self._reset ; @@config = nil end  # for use by rspec
 
@@ -25,13 +25,13 @@ module SchemaDev
     end
 
     def initialize(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
-      opts = opts.keyword_args(ruby: :required, rails: :required, db: :required, exclude: nil, notify: nil, quick: nil)
+      opts = opts.keyword_args(ruby: :required, activerecord: :required, db: :required, exclude: nil, notify: nil, quick: nil)
       @ruby = Array.wrap(opts.ruby)
-      @rails = Array.wrap(opts.rails)
+      @activerecord = Array.wrap(opts.activerecord)
       @db = Array.wrap(opts.db)
       @exclude = Array.wrap(opts.exclude).map(&:symbolize_keys).map {|tuple| Tuple.new(tuple)}
       @notify = Array.wrap(opts.notify)
-      @quick = Array.wrap(opts.quick || {ruby: @ruby.last, rails: @rails.last, db: @db.last})
+      @quick = Array.wrap(opts.quick || {ruby: @ruby.last, activerecord: @activerecord.last, db: @db.last})
     end
 
     def dbms
@@ -39,25 +39,25 @@ module SchemaDev
     end
 
     def matrix(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
-      opts = opts.keyword_args(quick: false, ruby: nil, rails: nil, db: nil, excluded: nil)
+      opts = opts.keyword_args(quick: false, ruby: nil, activerecord: nil, db: nil, excluded: nil)
       use_ruby = @ruby
-      use_rails = @rails
+      use_activerecord = @activerecord
       use_db = @db
       if opts.quick
         use_ruby = @quick.map{|q| q[:ruby]}
-        use_rails = @quick.map{|q| q[:rails]}
+        use_activerecord = @quick.map{|q| q[:activerecord]}
         use_db = @quick.map{|q| q[:db]}
       end
       use_ruby = Array.wrap(opts.ruby) if opts.ruby
-      use_rails = Array.wrap(opts.rails) if opts.rails
+      use_activerecord = Array.wrap(opts.activerecord) if opts.activerecord
       use_db = Array.wrap(opts.db) if opts.db
 
       use_ruby = [nil] unless use_ruby.any?
-      use_rails = [nil] unless use_rails.any?
+      use_activerecord = [nil] unless use_activerecord.any?
       use_db = [nil] unless use_db.any?
 
-      m = use_ruby.product(use_rails, use_db)
-      m = m.map { |_ruby, _rails, _db| Tuple.new(ruby: _ruby, rails: _rails, db: _db) }.compact
+      m = use_ruby.product(use_activerecord, use_db)
+      m = m.map { |_ruby, _activerecord, _db| Tuple.new(ruby: _ruby, activerecord: _activerecord, db: _db) }.compact
       m = m.reject(&it.match_any?(@exclude)) unless opts.excluded == :none
       m = m.map(&:to_hash)
 
@@ -68,10 +68,10 @@ module SchemaDev
       end
     end
 
-    class Tuple < KeyStruct[:ruby, :rails, :db]
+    class Tuple < KeyStruct[:ruby, :activerecord, :db]
       def match?(other)
         return false if self.ruby and other.ruby and self.ruby != other.ruby
-        return false if self.rails and other.rails and self.rails != other.rails
+        return false if self.activerecord and other.activerecord and self.activerecord != other.activerecord
         return false if self.db and other.db and self.db != other.db
         true
       end

data/lib/schema_dev/executor.rb

@@ -7,11 +7,11 @@ require_relative "gemfile_selector"
 module SchemaDev
   class Executor
 
-    attr_reader :ruby, :rails, :db, :error
+    attr_reader :ruby, :activerecord, :db, :error
 
-    def initialize(ruby:, rails:, db:)
+    def initialize(ruby:, activerecord:, db:)
       @ruby_selector = RubySelector.command(ruby)
-      @gemfile_selector = GemfileSelector.command(rails: rails, db: db)
+      @gemfile_selector = GemfileSelector.command(activerecord: activerecord, db: db)
     end
 
     def run(cmd, dry_run: false)

data/lib/schema_dev/gemfile_selector.rb

@@ -7,18 +7,18 @@ module SchemaDev
     extend self
 
     def gemfile(opts = {})
-      opts = opts.keyword_args(rails: :required, db: :required)
-      Pathname.new(GEMFILES_DIR).join("rails-#{opts.rails}", "Gemfile.#{opts.db}")
+      opts = opts.keyword_args(activerecord: :required, db: :required)
+      Pathname.new(GEMFILES_DIR).join("activerecord-#{opts.activerecord}", "Gemfile.#{opts.db}")
     end
 
     def command(opts={})
-      opts = opts.keyword_args(rails: :required, db: :required)
-      "BUNDLE_GEMFILE=#{gemfile(rails: opts.rails, db: opts.db)}"
+      opts = opts.keyword_args(activerecord: :required, db: :required)
+      "BUNDLE_GEMFILE=#{gemfile(activerecord: opts.activerecord, db: opts.db)}"
     end
 
     def infer_db
-      (env = ENV['BUNDLE_GEMFILE']) =~ %r{rails.*/Gemfile[.](.*)}
-      $1 or raise "Can't infer db: Env BUNDLE_GEMFILE=#{env.inspect}) isn't a schema_dev standard Gemfile path"
+      (env = ENV['BUNDLE_GEMFILE']) =~ %r{activerecord.*/Gemfile[.](.*)}
+      $1 or raise "Can't infer db: Env BUNDLE_GEMFILE=#{env.inspect}) isn't a schema_dev standard Gemfile path.  (Run 'schema_dev rspec' instead of 'rspec'?)"
     end
   end
 end

data/lib/schema_dev/gemfiles.rb

@@ -18,13 +18,13 @@ module SchemaDev
 
         _copy(relpath, 'Gemfile.base')
 
-        config.rails.each do |rails|
+        config.activerecord.each do |activerecord|
 
-          rails_path = relpath + "rails-#{rails}"
-          _copy(rails_path, 'Gemfile.base')
+          activerecord_path = relpath + "activerecord-#{activerecord}"
+          _copy(activerecord_path, 'Gemfile.base')
 
           config.db.each do |db|
-            _copy(rails_path, "Gemfile.#{db}")
+            _copy(activerecord_path, "Gemfile.#{db}")
           end
         end
 

data/lib/schema_dev/matrix_executor.rb

@@ -12,14 +12,14 @@ module SchemaDev
       @errors = []
       @matrix.each_with_index do |tuple, i|
         ruby = tuple[:ruby]
-        rails = tuple[:rails]
+        activerecord = tuple[:activerecord]
         db = tuple[:db]
 
-        label = "ruby #{ruby} - rails #{rails} - db #{db}"
+        label = "ruby #{ruby} - activerecord #{activerecord} - db #{db}"
         msg = "#{label} [#{i+1} of #{@matrix.size}]"
         puts "\n\n*** #{msg}\n\n"
 
-        if not Executor.new(ruby: ruby, rails: rails, db: db).run(cmd, dry_run: dry_run)
+        if not Executor.new(ruby: ruby, activerecord: activerecord, db: db).run(cmd, dry_run: dry_run)
           @errors << label
         end
       end

data/lib/schema_dev/readme.rb

@@ -34,8 +34,8 @@ module SchemaDev
       contents = []
       contents << "<!-- SCHEMA_DEV: MATRIX - begin -->\n"
       contents << "<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->\n"
-      self.matrix.group_by(&it.slice(:ruby, :rails)).each do |pair, items|
-        contents << "* ruby **#{pair[:ruby]}** with rails **#{pair[:rails]}**, using #{items.map{|item| "**#{item[:db]}**"}.to_sentence(last_word_connector: ' or ')}\n"
+      self.matrix.group_by(&it.slice(:ruby, :activerecord)).each do |pair, items|
+        contents << "* ruby **#{pair[:ruby]}** with activerecord **#{pair[:activerecord]}**, using #{items.map{|item| "**#{item[:db]}**"}.to_sentence(last_word_connector: ' or ')}\n"
       end
       contents << "\n"
       contents << "<!-- SCHEMA_DEV: MATRIX - end -->\n"

data/lib/schema_dev/rspec/db.rb

@@ -26,6 +26,10 @@ module SchemaDev
         @tmproot ||= Pathname.new('tmp').tap { |path| path.mkpath }
       end
 
+      def logroot
+        @logroot ||= Pathname.new('log').tap { |path| path.mkpath }
+      end
+
       def configuration
         case @db
         when 'mysql'
@@ -72,8 +76,8 @@ module SchemaDev
 
       def set_logger
         ruby = "#{RUBY_ENGINE}-#{RUBY_VERSION}"
-        rails = "rails-#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-        ActiveRecord::Base.logger = Logger.new(tmproot.join("#{ruby}.#{rails}.#{@db}.log").open("w"))
+        activerecord = "activerecord-#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+        ActiveRecord::Base.logger = Logger.new(logroot.join("#{ruby}.#{activerecord}.#{@db}.log").open("w"))
       end
 
       module Helpers

data/lib/schema_dev/runner.rb

@@ -35,10 +35,10 @@ module SchemaDev
       self.readme(quiet: quiet)
     end
 
-    def run(*args, dry_run: false, quick: false, ruby: nil, rails: nil, db: nil, freshen: true)
+    def run(*args, dry_run: false, quick: false, ruby: nil, activerecord: nil, db: nil, freshen: true)
       self.freshen if freshen
 
-      matrix = MatrixExecutor.new @config.matrix(quick: quick, ruby: ruby, rails: rails, db: db)
+      matrix = MatrixExecutor.new @config.matrix(quick: quick, ruby: ruby, activerecord: activerecord, db: db)
 
       return true if matrix.run(Shellwords.join(args.flatten), dry_run: dry_run)
 

data/lib/schema_dev/travis.rb

@@ -21,11 +21,11 @@ module SchemaDev
       end
       env = env.join(' ')
 
-      gemfiles = config.matrix.map{|entry| GemfileSelector.gemfile(entry.slice(:rails, :db)).to_s}.uniq
+      gemfiles = config.matrix.map{|entry| GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s}.uniq
 
       exclude = config.matrix(excluded: :only).map { |entry| {}.tap {|ex|
         ex["rvm"] = entry[:ruby]
-        ex["gemfile"] = GemfileSelector.gemfile(entry.slice(:rails, :db)).to_s
+        ex["gemfile"] = GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s
         ex["env"] = env unless env.empty?
       }}.reject{|ex| not gemfiles.include? ex["gemfile"]}
 

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "2.0.4"
+  VERSION = "3.0.0"
 end

data/spec/config_spec.rb

@@ -1,59 +1,59 @@
 describe SchemaDev::Config do
 
   it "computes matrix" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql])
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
     expect(config.matrix).to match_array [
-      { ruby: "1.9.3", rails: "4.0", db: "sqlite3" },
-      { ruby: "1.9.3", rails: "4.0", db: "postgresql" },
-      { ruby: "1.9.3", rails: "4.1", db: "sqlite3" },
-      { ruby: "1.9.3", rails: "4.1", db: "postgresql" },
-      { ruby: "2.1.5", rails: "4.0", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.0", db: "postgresql" },
-      { ruby: "2.1.5", rails: "4.1", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.1", db: "postgresql" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "postgresql" },
+      { ruby: "1.9.3", activerecord: "4.1", db: "sqlite3" },
+      { ruby: "1.9.3", activerecord: "4.1", db: "postgresql" },
+      { ruby: "2.1.5", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.0", db: "postgresql" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "postgresql" },
     ]
   end
 
   it "excludes explicit elements from matrix" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql],
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql],
                         exclude: [
-                          { ruby: "1.9.3", rails: "4.1", db: "postgresql" },
-                          { ruby: "2.1.5", rails: "4.0", db: "sqlite3" } ]
+                          { ruby: "1.9.3", activerecord: "4.1", db: "postgresql" },
+                          { ruby: "2.1.5", activerecord: "4.0", db: "sqlite3" } ]
                        )
     expect(config.matrix).to match_array [
-      { ruby: "1.9.3", rails: "4.0", db: "sqlite3" },
-      { ruby: "1.9.3", rails: "4.0", db: "postgresql" },
-      { ruby: "1.9.3", rails: "4.1", db: "sqlite3" },
-      # { ruby: "1.9.3", rails: "4.1", db: "postgresql" },
-      # { ruby: "2.1.5", rails: "4.0", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.0", db: "postgresql" },
-      { ruby: "2.1.5", rails: "4.1", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.1", db: "postgresql" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "postgresql" },
+      { ruby: "1.9.3", activerecord: "4.1", db: "sqlite3" },
+      # { ruby: "1.9.3", activerecord: "4.1", db: "postgresql" },
+      # { ruby: "2.1.5", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.0", db: "postgresql" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "postgresql" },
     ]
   end
 
   it "excludes slices from matrix" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql],
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql],
                         exclude: [
-                          { ruby: "1.9.3", rails: "4.1"},
+                          { ruby: "1.9.3", activerecord: "4.1"},
                           { ruby: "2.1.5", db: "sqlite3" } ]
                        )
     expect(config.matrix).to match_array [
-      { ruby: "1.9.3", rails: "4.0", db: "sqlite3" },
-      { ruby: "1.9.3", rails: "4.0", db: "postgresql" },
-      #{ ruby: "1.9.3", rails: "4.1", db: "sqlite3" },
-      #{ ruby: "1.9.3", rails: "4.1", db: "postgresql" },
-      #{ ruby: "2.1.5", rails: "4.0", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.0", db: "postgresql" },
-      #{ ruby: "2.1.5", rails: "4.1", db: "sqlite3" },
-      { ruby: "2.1.5", rails: "4.1", db: "postgresql" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "1.9.3", activerecord: "4.0", db: "postgresql" },
+      #{ ruby: "1.9.3", activerecord: "4.1", db: "sqlite3" },
+      #{ ruby: "1.9.3", activerecord: "4.1", db: "postgresql" },
+      #{ ruby: "2.1.5", activerecord: "4.0", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.0", db: "postgresql" },
+      #{ ruby: "2.1.5", activerecord: "4.1", db: "sqlite3" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "postgresql" },
     ]
   end
 
   it "uses last cell for --quick" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql])
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
     expect(config.matrix quick: true).to match_array [
-      { ruby: "2.1.5", rails: "4.1", db: "postgresql" },
+      { ruby: "2.1.5", activerecord: "4.1", db: "postgresql" },
     ]
   end
 

data/spec/gemfile_sepector_spec.rb

@@ -4,7 +4,7 @@ describe SchemaDev::GemfileSelector do
 
   it "infers db from env" do
     test_dbname = 'this_is_a_test'
-    ENV['BUNDLE_GEMFILE'] = SchemaDev::GemfileSelector.gemfile(rails: '4.1', db: test_dbname).to_s
+    ENV['BUNDLE_GEMFILE'] = SchemaDev::GemfileSelector.gemfile(activerecord: '4.1', db: test_dbname).to_s
     expect(SchemaDev::GemfileSelector.infer_db).to eq test_dbname
   end
 end

data/spec/gemfiles_spec.rb

@@ -3,7 +3,7 @@ require 'schema_dev/gemfiles'
 describe SchemaDev::Gemfiles do
 
   it "copies listed files" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql])
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
     in_tmpdir do
       expect(SchemaDev::Gemfiles.build(config)).to be_truthy
       expect(relevant_diff(config, "gemfiles")).to be_empty
@@ -11,7 +11,7 @@ describe SchemaDev::Gemfiles do
   end
 
   it "only copies files once" do
-    config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql])
+    config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
     in_tmpdir do
       expect(SchemaDev::Gemfiles.build(config)).to be_truthy
       expect(SchemaDev::Gemfiles.build(config)).to be_falsey
@@ -22,8 +22,8 @@ describe SchemaDev::Gemfiles do
     src = SchemaDev::Templates.root + dir
     diff = `diff -rq #{src} #{dir} 2>&1`.split("\n")
 
-    # expect copy not to have entry for rails not in config
-    diff.reject!{ |d| d =~ %r[Only in #{src}: rails-(.*)] and not config.rails.include? $1 }
+    # expect copy not to have entry for activerecord not in config
+    diff.reject!{ |d| d =~ %r[Only in #{src}: activerecord-(.*)] and not config.activerecord.include? $1 }
 
     # expect copy not to have entry for db not in config
     diff.reject!{ |d| d =~ %r[Only in #{src}.*: Gemfile.(.*)] and not config.db.include? $1 }

data/spec/runner_spec.rb

@@ -3,7 +3,7 @@ require 'schema_dev/runner'
 describe SchemaDev::Runner do
 
   it "creates gemfiles" do
-    config = get_config(ruby: "2.1.3", rails: "4.0", db: "sqlite3")
+    config = get_config(ruby: "2.1.3", activerecord: "4.0", db: "sqlite3")
     runner = SchemaDev::Runner.new(config)
     in_tmpdir do
       expect{ runner.gemfiles }.to output("* Updated gemfiles\n").to_stdout
@@ -12,7 +12,7 @@ describe SchemaDev::Runner do
   end
 
   it "creates travis" do
-    config = get_config(ruby: "2.1.3", rails: "4.0", db: "sqlite3")
+    config = get_config(ruby: "2.1.3", activerecord: "4.0", db: "sqlite3")
     runner = SchemaDev::Runner.new(config)
     in_tmpdir do
       expect{ runner.travis }.to output("* Updated .travis.yml\n").to_stdout
@@ -54,7 +54,7 @@ describe SchemaDev::Runner do
         }
       end
 
-      let(:config) { get_config(ruby: RUBY_VERSION, rails: "4.0", db: %W[sqlite3 postgresql]) }
+      let(:config) { get_config(ruby: RUBY_VERSION, activerecord: "4.0", db: %W[sqlite3 postgresql]) }
       let(:runner) { SchemaDev::Runner.new(config) }
 
 
@@ -63,14 +63,14 @@ describe SchemaDev::Runner do
 * Updated gemfiles
 
 
-*** ruby #{RUBY_VERSION} - rails 4.0 - db sqlite3 [1 of 2]
+*** ruby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3 [1 of 2]
 
-* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.sqlite3 #{selection_command} %{cmd}
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.0/Gemfile.sqlite3 #{selection_command} %{cmd}
 %{output}
 
-*** ruby #{RUBY_VERSION} - rails 4.0 - db postgresql [2 of 2]
+*** ruby #{RUBY_VERSION} - activerecord 4.0 - db postgresql [2 of 2]
 
-* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.postgresql #{selection_command} %{cmd}
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.0/Gemfile.postgresql #{selection_command} %{cmd}
 %{output}
 ENDOUTPUT
 
@@ -85,8 +85,8 @@ ENDOUTPUT
           expect{ runner.run("false") }.to output(expected_output % {cmd: 'false', output: nil} + <<-ENDERR).to_stdout
 
 *** 2 failures:
-\truby #{RUBY_VERSION} - rails 4.0 - db sqlite3
-\truby #{RUBY_VERSION} - rails 4.0 - db postgresql
+\truby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3
+\truby #{RUBY_VERSION} - activerecord 4.0 - db postgresql
           ENDERR
         end
       end
@@ -96,8 +96,8 @@ ENDOUTPUT
           expect{ runner.run("echo", "LoadError") }.to output(expected_output % {cmd: 'echo LoadError', output: "LoadError\n"} + <<-ENDERR).to_stdout
 
 *** 2 failures:
-\truby #{RUBY_VERSION} - rails 4.0 - db sqlite3
-\truby #{RUBY_VERSION} - rails 4.0 - db postgresql
+\truby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3
+\truby #{RUBY_VERSION} - activerecord 4.0 - db postgresql
           ENDERR
         end
       end

data/spec/travis_spec.rb

@@ -4,7 +4,7 @@ describe SchemaDev::Travis do
 
   it "creates travis file" do
     config = get_config(ruby: %W[1.9.3 2.1.5],
-                        rails: %W[4.0 4.1],
+                        activerecord: %W[4.0 4.1],
                         db: %W[mysql2 postgresql],
                         exclude: { ruby: "1.9.3", db: "postgresql" },
                         notify: 'me@example.com')
@@ -21,10 +21,10 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-4.0/Gemfile.mysql2
-- gemfiles/rails-4.0/Gemfile.postgresql
-- gemfiles/rails-4.1/Gemfile.mysql2
-- gemfiles/rails-4.1/Gemfile.postgresql
+- gemfiles/activerecord-4.0/Gemfile.mysql2
+- gemfiles/activerecord-4.0/Gemfile.postgresql
+- gemfiles/activerecord-4.1/Gemfile.mysql2
+- gemfiles/activerecord-4.1/Gemfile.postgresql
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.3'
@@ -37,10 +37,10 @@ notifications:
 matrix:
   exclude:
   - rvm: 1.9.3
-    gemfile: gemfiles/rails-4.0/Gemfile.postgresql
+    gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
     env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
   - rvm: 1.9.3
-    gemfile: gemfiles/rails-4.1/Gemfile.postgresql
+    gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
     env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 ENDTRAVIS
     end

data/templates/gem/README.md

@@ -37,7 +37,7 @@ Are you interested in contributing to %GEM_MODULE%?  Thanks!  Please follow the
 Some things to know about to help you develop and test:
 
 * **schema_dev**:  %GEM_MODULE% uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
-  facilitate running rspec tests on the matrix of ruby, rails, and database
+  facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
   [travis-ci](http://travis-ci.org/SchemaPlus/%GEM_NAME%)
 

data/templates/gem/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
     - 1.9.3
     - 2.1.5
-rails:
+activerecord:
     - 4.2
 db:
     - mysql2

data/templates/gemfiles/{rails-3.2 → activerecord-3.2}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 3.2.0"
+gem "activerecord", "~> 3.2.0"

data/templates/gemfiles/{rails-4.0 → activerecord-4.0}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"

data/templates/gemfiles/{rails-4.1 → activerecord-4.1}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"

data/templates/gemfiles/{rails-4.2 → activerecord-4.2}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"

data/templates/gemfiles/activerecord-edge/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 4.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -246,27 +246,27 @@ files:
 - templates/gem/spec/sanity_spec.rb
 - templates/gem/spec/spec_helper.rb
 - templates/gemfiles/Gemfile.base
-- templates/gemfiles/rails-3.2/Gemfile.base
-- templates/gemfiles/rails-3.2/Gemfile.mysql
-- templates/gemfiles/rails-3.2/Gemfile.mysql2
-- templates/gemfiles/rails-3.2/Gemfile.postgresql
-- templates/gemfiles/rails-3.2/Gemfile.sqlite3
-- templates/gemfiles/rails-4.0/Gemfile.base
-- templates/gemfiles/rails-4.0/Gemfile.mysql2
-- templates/gemfiles/rails-4.0/Gemfile.postgresql
-- templates/gemfiles/rails-4.0/Gemfile.sqlite3
-- templates/gemfiles/rails-4.1/Gemfile.base
-- templates/gemfiles/rails-4.1/Gemfile.mysql2
-- templates/gemfiles/rails-4.1/Gemfile.postgresql
-- templates/gemfiles/rails-4.1/Gemfile.sqlite3
-- templates/gemfiles/rails-4.2/Gemfile.base
-- templates/gemfiles/rails-4.2/Gemfile.mysql2
-- templates/gemfiles/rails-4.2/Gemfile.postgresql
-- templates/gemfiles/rails-4.2/Gemfile.sqlite3
-- templates/gemfiles/rails-edge/Gemfile.base
-- templates/gemfiles/rails-edge/Gemfile.mysql2
-- templates/gemfiles/rails-edge/Gemfile.postgresql
-- templates/gemfiles/rails-edge/Gemfile.sqlite3
+- templates/gemfiles/activerecord-3.2/Gemfile.base
+- templates/gemfiles/activerecord-3.2/Gemfile.mysql
+- templates/gemfiles/activerecord-3.2/Gemfile.mysql2
+- templates/gemfiles/activerecord-3.2/Gemfile.postgresql
+- templates/gemfiles/activerecord-3.2/Gemfile.sqlite3
+- templates/gemfiles/activerecord-4.0/Gemfile.base
+- templates/gemfiles/activerecord-4.0/Gemfile.mysql2
+- templates/gemfiles/activerecord-4.0/Gemfile.postgresql
+- templates/gemfiles/activerecord-4.0/Gemfile.sqlite3
+- templates/gemfiles/activerecord-4.1/Gemfile.base
+- templates/gemfiles/activerecord-4.1/Gemfile.mysql2
+- templates/gemfiles/activerecord-4.1/Gemfile.postgresql
+- templates/gemfiles/activerecord-4.1/Gemfile.sqlite3
+- templates/gemfiles/activerecord-4.2/Gemfile.base
+- templates/gemfiles/activerecord-4.2/Gemfile.mysql2
+- templates/gemfiles/activerecord-4.2/Gemfile.postgresql
+- templates/gemfiles/activerecord-4.2/Gemfile.sqlite3
+- templates/gemfiles/activerecord-edge/Gemfile.base
+- templates/gemfiles/activerecord-edge/Gemfile.mysql2
+- templates/gemfiles/activerecord-edge/Gemfile.postgresql
+- templates/gemfiles/activerecord-edge/Gemfile.sqlite3
 homepage: https://github.com/SchemaPlus/schema_dev
 licenses:
 - MIT

data/templates/gemfiles/rails-edge/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "rails", "~> 4.0.0"