schema_dev 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5501878ebb98b75ed4ae0b47daa25a4f4a9d9584
-  data.tar.gz: 9a8df3284f811dad2d66bea819338c8dff3a3361
+  metadata.gz: a9f90059fcb7c1988ac49bab9ce3ef9533d429b8
+  data.tar.gz: cd263a6bf93f7b999995c045b8a37fe55175d43c
 SHA512:
-  metadata.gz: fb22cb1d8f5b7bbd0560799220d7209eb02a5272a74597f2647e264a100af2de5c70ab4699ce36b81c8ee8c13a6de25b966efcbe25aff7fbe6da9a15061bb575
-  data.tar.gz: e56887177fa4b182a50ba52503740bfe5f9b591b6b06e62faab706b81d9e09763789c7028a04db397dd7d0df28936da22921d2d00f2f4f7583940c845b66b8e4
+  metadata.gz: daa5d2797c86906c01b25636bfb75c58f06a0aee7056b505f76466a9bff948a43f882142d60ffcfc10ae38f6d4c7abaeff13b9dcb9d57dc1df63769c72880b44
+  data.tar.gz: 24fe7d3ebc7b35a6ba166c9266e3acac6d249b1de647cac6de859c6a7c92df372c549cade7c655f89405722e91128433c117c08f9274e786d6d4a5a402753769

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in schema_dev.gemspec
 gemspec
+
+gem 'byebug'

data/README.md

@@ -25,10 +25,12 @@ The client gem needs a file `schema_dev.yml` in it's root, which specifies the t
 * `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.
 
+If you change this file, it's a good idea to run `schema_dev refresh` to update the auto-generated `gemfiles` and `.travis.yml` (see below).
+
 #### Gemfiles
 
 The client gem must contain a "gemfiles" directory containing the matrix of
-possible gemfiles; Generate it by running
+possible gemfiles; It will be generated/updated automatically by the `schema_dev` script whenever you run a matrix command.  You can also generate it explicitly by running
 
         $ schema_dev gemfiles
 
@@ -78,7 +80,7 @@ For PostgreSQL and MySQL you must explicitly create the databases used by the te
 
 In the root directory, you can run, e.g.,
 
-    $ schema_dev bundle install
+    $ 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`
@@ -90,6 +92,20 @@ For convenience you can also use `--quick` to run just one as specified in `sche
 If you want to pass extra arguments to a command, make sure to use `--` to avoid them being processed by `schema_dev`.  e.g.
 
 	$ schema_dev rspec --quick -- -e 'select which spec'
+
+For interactive debugging you may want to run rspec directly from the shell rather than through`schema_dev` (which doesn't give you an interactive ptty).  schema_dev echoes each command being run, preceded by a `*`.  E.g. 
+
+	$ schema_dev rspec --quick -- -e 'select which spec' -n
+
+	*** ruby 2.1.5 - rails 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
+
+
+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
+
 	
 For more info, see
 

data/bin/schema_dev

@@ -11,6 +11,8 @@ def runner
     $runner ||= SchemaDev::Runner.new($config)
 end
 
+$cmd = File.basename $0
+
 class CLI < Thor
 
   def self.matrix_options
@@ -21,35 +23,40 @@ class CLI < Thor
     method_option :db, type: :string, desc: "Only execute for the specified database"
   end
 
-  desc "travis", "create .travis.yml based on schema_dev.yml values"
+  desc "travis", "create/update .travis.yml based on schema_dev.yml values"
   def travis
     runner.travis
   end
 
-  desc "gemfiles", "create gemfiles/* hierarchy based on schema_dev.yml values"
+  desc "gemfiles", "create/update gemfiles/* hierarchy based on schema_dev.yml values"
   def gemfiles
     runner.gemfiles
   end
 
+  desc "refresh", "shorthand for runnin both '#{$cmd} travis' and '#{$cmd} gemfiles'"
+  def refresh
+      runner.refresh
+  end
+
   desc "matrix", "run a command over the matrix"
   matrix_options
   def matrix(*args)
     runner.run(args, **options.to_h.symbolize_keys)
   end
 
-  desc "bundle", "shorthand for '#{$0} matrix bundle ...'"
+  desc "bundle", "shorthand for '#{$cmd} matrix bundle ...'"
   matrix_options
   def bundle(*args)
     runner.run('bundle', args, **options.to_h.symbolize_keys)
   end
 
-  desc "rake", "shorthand for '#{$0} matrix bundle exec rake ...'"
+  desc "rake", "shorthand for '#{$cmd} matrix bundle exec rake ...'"
   matrix_options
   def rake(*args)
     runner.run('bundle', 'exec', 'rake', args, **options.to_h.symbolize_keys)
   end
 
-  desc "rspec", "shorthand for '#{$0} bundle exec rspec ...'"
+  desc "rspec", "shorthand for '#{$cmd} bundle exec rspec ...'"
   matrix_options
   def rspec(*args)
     runner.run('bundle', 'exec', 'rspec', args, **options.to_h.symbolize_keys)

data/lib/schema_dev/gemfiles.rb

@@ -8,38 +8,47 @@ module SchemaDev
     TEMPLATES_ROOT = Pathname.new(__FILE__).dirname.parent.parent + "templates"
 
     def build(config)
-      @src_root = TEMPLATES_ROOT
-      @dst_root = Pathname.new('.')
+      Dir.mktmpdir do |tmpdir|
+        @src_root = TEMPLATES_ROOT
+        @dst_root = Pathname.new(tmpdir).realpath
 
-      path = Pathname.new("gemfiles")
+        relpath = Pathname.new("gemfiles")
+        abspath = @dst_root + relpath
+        target_abspath = Pathname.new(".").realpath + relpath
 
-      _blow_away(path)
+        _copy(relpath, 'Gemfile.base')
 
-      _copy(path, 'Gemfile.base')
+        config.rails.each do |rails|
 
-      config.rails.each do |rails|
+          rails_path = relpath + "rails-#{rails}"
+          _copy(rails_path, 'Gemfile.base')
 
-        rails_path = path + "rails-#{rails}"
-        _copy(rails_path, 'Gemfile.base')
+          config.db.each do |db|
+            _copy(rails_path, "Gemfile.#{db}")
+          end
+        end
 
-        config.db.each do |db|
-          _copy(rails_path, "Gemfile.#{db}")
+        if `diff -rq #{abspath} gemfiles 2>&1 | grep -v lock`.length == 0
+          return false
         end
+
+        _blow_away(target_abspath)
+        abspath.rename(target_abspath)
+        return true
       end
-      return true
     end
 
-    def _copy(path, filename)
-      srcfile = @src_root + path + filename
-      dstfile = @dst_root + path + filename
+    def _copy(relpath, filename)
+      srcfile = @src_root + relpath + filename
+      dstfile = @dst_root + relpath + filename
       return unless srcfile.exist?
 
       dstfile.dirname.mkpath
       FileUtils.copy_file(srcfile, dstfile)
     end
 
-    def _blow_away(path)
-      (@dst_root + path).rmtree
+    def _blow_away(relpath)
+      (@dst_root + relpath).rmtree
     rescue Errno::ENOENT
     end
   end

data/lib/schema_dev/runner.rb

@@ -15,11 +15,16 @@ module SchemaDev
     end
 
     def gemfiles
-      Gemfiles.build(@config) and puts "* Created gemfiles"
+      Gemfiles.build(@config) and puts "* Updated gemfiles"
+    end
+
+    def refresh
+      self.travis
+      self.gemfiles
     end
 
     def run(*args, dry_run: false, quick: false, ruby: nil, rails: nil, db: nil, freshen: true)
-      self.travis if freshen
+      self.refresh if freshen
 
       matrix = MatrixExecutor.new @config.matrix(quick: quick, ruby: ruby, rails: rails, db: db)
 

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

data/spec/config_spec.rb

@@ -49,5 +49,13 @@ describe SchemaDev::Config do
       { ruby: "2.1.5", rails: "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])
+    expect(config.matrix quick: true).to match_array [
+      { ruby: "2.1.5", rails: "4.1", db: "postgresql" },
+    ]
+  end
+
   
 end

data/spec/gemfile_sepector_spec.rb

@@ -0,0 +1,10 @@
+require 'schema_dev/gemfile_selector'
+
+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
+    expect(SchemaDev::GemfileSelector.infer_db).to eq test_dbname
+  end
+end

data/spec/gemfiles_spec.rb

@@ -5,11 +5,19 @@ 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])
     in_tmpdir do
-      SchemaDev::Gemfiles.build(config)
+      expect(SchemaDev::Gemfiles.build(config)).to be_truthy
       expect(relevant_diff(config, "gemfiles")).to be_empty
     end
   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])
+    in_tmpdir do
+      expect(SchemaDev::Gemfiles.build(config)).to be_truthy
+      expect(SchemaDev::Gemfiles.build(config)).to be_falsey
+    end
+  end
+
   def relevant_diff(config, dir)
     src = SchemaDev::Gemfiles::TEMPLATES_ROOT + dir
     diff = `diff -rq #{src} #{dir} 2>&1`.split("\n")

data/spec/runner_spec.rb

@@ -6,7 +6,7 @@ describe SchemaDev::Runner do
     config = get_config(ruby: "2.1.3", rails: "4.0", db: "sqlite3")
     runner = SchemaDev::Runner.new(config)
     in_tmpdir do
-      expect{ runner.gemfiles }.to output("* Created gemfiles\n").to_stdout
+      expect{ runner.gemfiles }.to output("* Updated gemfiles\n").to_stdout
       expect(Pathname.new("gemfiles")).to be_directory
     end
   end
@@ -60,6 +60,7 @@ describe SchemaDev::Runner do
 
       let(:expected_output) { <<ENDOUTPUT.strip }
 * Updated .travis.yml
+* Updated gemfiles
 
 
 *** ruby #{RUBY_VERSION} - rails 4.0 - db sqlite3 [1 of 2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -197,6 +197,7 @@ files:
 - lib/schema_dev/version.rb
 - schema_dev.gemspec
 - spec/config_spec.rb
+- spec/gemfile_sepector_spec.rb
 - spec/gemfiles_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
@@ -249,6 +250,7 @@ specification_version: 4
 summary: SchemaPlus development tools
 test_files:
 - spec/config_spec.rb
+- spec/gemfile_sepector_spec.rb
 - spec/gemfiles_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb