schema_dev 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73255f1d328d7ee245068d7dec68bfa26033a5d
-  data.tar.gz: 4af8f98640f02ef2e6f43285012f5f0075510620
+  metadata.gz: a243f89c4a9cfec2c3e29c123bc4fad4ac11721a
+  data.tar.gz: 6d27a4c8b794f4ffee20189ad29214988b88ca47
 SHA512:
-  metadata.gz: 573331d9d8303346b607a5e68a7d6d765c446bb2beaa73e617d395250debeae0d4caaafcd4a67db69e2a1dc815af51f5657d0fc21bb70c85f389de4e25785f10
-  data.tar.gz: e0612131f0f42fcaf79de5f2e0f4ee1efecb1909987e208c7e947dd281647e2c6e5694bc98a56c73136df330a150c0742f3d0359253955c4a984e61e5ecfcbbb
+  metadata.gz: 2f18188fb84170286ad74ca6a86ad6b979d2a034dbf40b02ed7004df7fea65767aedc8139d8bd069d2362ccce4a0fa08029930eb5830b51de0b56c93db7fa7b9
+  data.tar.gz: e7d2ecdf9fd7463aba97017b7bcf2319e575d37f3295f89a4b66550c5631e5c22a1acf278add87f126c921461bcbde798484206f9eb7a48f417ab0c5744f6e19

data/lib/schema_dev/executor.rb

@@ -1,4 +1,6 @@
 require 'json'
+require 'open3'
+
 require_relative "ruby_selector"
 require_relative "gemfile_selector"
 
@@ -17,10 +19,13 @@ module SchemaDev
       puts "* #{fullcommand}"
       return true if dry_run
 
-      Tempfile.open('SchemaDev') do |file|
-        @error = !system(%Q[ (#{fullcommand}) 2>& 1 | tee #{file.path} ])
-        file.rewind
-        @error ||= file.readlines.grep(/(^Failed examples)|(rake aborted)|(LoadError)/).any?
+      @error = false
+      Open3.popen2e(fullcommand) do |i, oe, t|
+        oe.each {|line|
+          puts line
+          @error ||= (line =~ /(^Failed examples)|(rake aborted)|(LoadError)/)
+        }
+        @error ||= !t.value.success?
       end
 
       return !@error

data/lib/schema_dev/matrix_executor.rb

@@ -15,7 +15,7 @@ module SchemaDev
         rails = tuple[:rails]
         db = tuple[:db]
 
-        label = "ruby #{ruby} - rails #{rails} = db #{db}"
+        label = "ruby #{ruby} - rails #{rails} - db #{db}"
         msg = "#{label} [#{i+1} of #{@matrix.size}]"
         puts "\n\n*** #{msg}\n\n"
 

data/lib/schema_dev/runner.rb

@@ -2,6 +2,7 @@ require 'shellwords'
 
 require_relative 'matrix_executor'
 require_relative 'travis'
+require_relative 'gemfiles'
 
 module SchemaDev
   class Runner
@@ -10,7 +11,7 @@ module SchemaDev
     end
 
     def travis
-      Travis.update(@config) and puts "* Updated #{filepath}"
+      Travis.update(@config) and puts "* Updated #{Travis::TRAVIS_FILE}"
     end
 
     def gemfiles

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/gemfiles_spec.rb

@@ -4,11 +4,9 @@ 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])
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        SchemaDev::Gemfiles.build(config)
-        expect(relevant_diff(config, "gemfiles")).to be_empty
-      end
+    in_tmpdir do
+      SchemaDev::Gemfiles.build(config)
+      expect(relevant_diff(config, "gemfiles")).to be_empty
     end
   end
 

data/spec/runner_spec.rb

@@ -0,0 +1,70 @@
+require 'schema_dev/runner'
+
+describe SchemaDev::Runner do
+
+  it "creates gemfiles" 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(Pathname.new("gemfiles")).to be_directory
+    end
+  end
+
+  it "creates travis" do
+    config = get_config(ruby: "2.1.3", rails: "4.0", db: "sqlite3")
+    runner = SchemaDev::Runner.new(config)
+    in_tmpdir do
+      expect{ runner.travis }.to output("* Updated .travis.yml\n").to_stdout
+      expect(Pathname.new(".travis.yml")).to be_file
+    end
+  end
+
+  describe "matrix" do
+    let(:config) { get_config(ruby: RUBY_VERSION, rails: "4.0", db: %W[sqlite3 postgresql]) }
+    let(:runner) { SchemaDev::Runner.new(config) }
+
+    let(:expected_output) { <<ENDOUTPUT.strip }
+* Updated .travis.yml
+
+
+*** ruby #{RUBY_VERSION} - rails 4.0 - db sqlite3 [1 of 2]
+
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.sqlite3 SHELL=`which bash` chruby-exec ruby-#{RUBY_VERSION} -- %{cmd}
+%{output}
+
+*** ruby #{RUBY_VERSION} - rails 4.0 - db postgresql [2 of 2]
+
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-#{RUBY_VERSION} -- %{cmd}
+%{output}
+ENDOUTPUT
+
+    it "runs successfully" do
+      in_tmpdir do
+        expect{ runner.run("true") }.to output(expected_output % {cmd: 'true', output: nil}).to_stdout
+      end
+    end
+
+    it "reports error exits" do
+      in_tmpdir do
+        expect{ runner.run("false") }.to output(expected_output % {cmd: 'false', output: nil} + <<-ENDERR).to_stdout
+
+*** 2 failures:
+	ruby #{RUBY_VERSION} - rails 4.0 - db sqlite3
+	ruby #{RUBY_VERSION} - rails 4.0 - db postgresql
+ENDERR
+      end
+    end
+
+    it "reports error messages" do
+      in_tmpdir do
+        expect{ runner.run("echo", "LoadError") }.to output(expected_output % {cmd: 'echo LoadError', output: "LoadError\n"} + <<-ENDERR).to_stdout
+
+*** 2 failures:
+	ruby #{RUBY_VERSION} - rails 4.0 - db sqlite3
+	ruby #{RUBY_VERSION} - rails 4.0 - db postgresql
+ENDERR
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,12 +5,18 @@ require 'tmpdir'
 
 require 'schema_dev/config'
 
-def get_config(data)
-  SchemaDev::Config._reset
+def in_tmpdir
   Dir.mktmpdir do |dir|
     Dir.chdir(dir) do
-      Pathname.new(SchemaDev::CONFIG_FILE).open("w") {|f| f.write data.to_yaml }
-      SchemaDev::Config.load
+      yield
     end
   end
 end
+
+def get_config(data)
+  SchemaDev::Config._reset
+  in_tmpdir do
+    Pathname.new(SchemaDev::CONFIG_FILE).open("w") {|f| f.write data.to_yaml }
+    SchemaDev::Config.load
+  end
+end

data/spec/travis_spec.rb

@@ -8,10 +8,9 @@ describe SchemaDev::Travis do
                         db: %W[sqlite3 postgresql],
                         exclude: { ruby: "1.9.3", db: "postgresql" },
                         notify: 'me@example.com')
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        SchemaDev::Travis.update(config)
-        expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
+    in_tmpdir do
+      SchemaDev::Travis.update(config)
+      expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
 # This file was auto-generated by the schema_dev tool, based on the data in
 #                 ./schema_dev.yml
 # Please do not edit this file; any changes will be overwritten next time
@@ -40,7 +39,6 @@ matrix:
     gemfile: gemfiles/rails-4.1/Gemfile.postgresql
     env: POSTGRESQL_DB_USER=postgres
 ENDTRAVIS
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ronen barzel
@@ -181,6 +181,7 @@ files:
 - schema_dev.gemspec
 - spec/config_spec.rb
 - spec/gemfiles_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/travis_spec.rb
 - templates/gemfiles/Gemfile.base
@@ -228,5 +229,6 @@ summary: SchemaPlus development tools
 test_files:
 - spec/config_spec.rb
 - spec/gemfiles_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/travis_spec.rb