schema_dev 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065e03de91b32086d40e9503141ba424c3c08414
-  data.tar.gz: fffb037423b5964c2c3b336008c8db4c2f4bccd6
+  metadata.gz: b3e90e72ec9c8d5f4ad5f33892d5a17f496700bf
+  data.tar.gz: caf430be490dde34eb6e58082c2fe9de12e7d96b
 SHA512:
-  metadata.gz: d4ff7b29b23e8d439ffd7e511ab6f729e48536e8d005dac22378d7cb3b258653417992011e6c663b5ca77f8f6ad6fd5738e19b4854d551a2c3d6850f29bb22ef
-  data.tar.gz: 774c1251427f514aba1cc3dde84539aa122faa2d1a6b9c1e8e5af6553a1f013967b0437438d16ce7cea821eb13d35fb435b59b2e6d494541af5b258c5114ec62
+  metadata.gz: 3a08016cbd5d97ec57805fcc60ef43f890378434c31cf22ce180af876f04c55e911ff9b5d96bf592abc053f32dd35f1982e8c06a9ce6296ce46b20206a63d7cd
+  data.tar.gz: 0327f9e26f5afc36ba900e6cbcfa09312737dc3fcde6377da84afec6de577ac2fc5f80f0db08af0d86c932edb970010338d331d3448bce64c004e58cc396fd66

data/.travis.yml

@@ -1,2 +1,3 @@
 sudo: false
 rvm: 2.1.5
+script: bundle exec rake travis

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/schema_dev.svg)](http://badge.fury.io/rb/schema_dev)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_dev.svg)](http://travis-ci.org/SchemaPlus/schema_dev)
+[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_dev.svg)](https://coveralls.io/r/SchemaPlus/schema_dev)
 
 Development tools for the SchemaPlus family of gems.
 

data/Rakefile

@@ -2,3 +2,7 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+task :travis => [:spec, 'coveralls:push']

data/lib/schema_dev/ruby_selector.rb

@@ -8,6 +8,9 @@ module SchemaDev
                      end.new
       @@selector.command ruby
     end
+    def self._reset # for rspec, to avoid stickiness
+      @@selector = nil
+    end
 
     class Chruby
       def initialize

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/runner_spec.rb

@@ -20,50 +20,85 @@ describe SchemaDev::Runner do
     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) }
+  Selectors = {
+    'chruby-exec' => "SHELL=`which bash` chruby-exec ruby-#{RUBY_VERSION} --",
+    'rvm' => "rvm #{RUBY_VERSION} do",
+    'rbenv' => "RBENV_VERSION=#{RUBY_VERSION}"
+  }
 
-    let(:expected_output) { <<ENDOUTPUT.strip }
+  Selectors.each do |selector, selection_command|
+
+    describe "matrix (#{selector})" do
+      before(:each) do
+        # mocking RubySelector to find selector
+        SchemaDev::RubySelector._reset
+        Selectors.keys.each do |k|
+          allow(SchemaDev::RubySelector).to receive(:system).with("which -s #{k}").and_return k == selector
+        end
+        case selector
+        when 'chruby-exec'
+          expect_any_instance_of(Pathname).to receive(:entries).and_return [Pathname.new("ruby-#{RUBY_VERSION}")]
+        when 'rbenv'
+          expect_any_instance_of(SchemaDev::RubySelector::Rbenv).to receive(:`).with("rbenv versions --bare").and_return RUBY_VERSION
+        end
+
+        # mocking execution
+        original_popen2e = Open3.method(:popen2e)
+        allow(Open3).to receive(:popen2e) { |cmd, &block| 
+          cmd = case cmd
+                when /false$/ then "false"
+                when /true$/ then "true"
+                else cmd.sub(/.*echo/, "echo")
+                end
+          original_popen2e.call(cmd, &block)
+        }
+      end
+
+      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}
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.sqlite3 #{selection_command} %{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}
+* /usr/bin/env BUNDLE_GEMFILE=gemfiles/rails-4.0/Gemfile.postgresql #{selection_command} %{cmd}
 %{output}
 ENDOUTPUT
 
-    it "runs successfully" do
-      in_tmpdir do
-        expect{ runner.run("true") }.to output(expected_output % {cmd: 'true', output: nil}).to_stdout
+      it "runs successfully" do
+        in_tmpdir do
+          expect{ runner.run("true") }.to output(expected_output % {cmd: 'true', output: nil}).to_stdout
+        end
       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
+      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
+\truby #{RUBY_VERSION} - rails 4.0 - db sqlite3
+\truby #{RUBY_VERSION} - rails 4.0 - db postgresql
+          ENDERR
+        end
       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
+      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
+\truby #{RUBY_VERSION} - rails 4.0 - db sqlite3
+\truby #{RUBY_VERSION} - rails 4.0 - db postgresql
+          ENDERR
+        end
       end
     end
   end

data/templates/gemfiles/Gemfile.base

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-gem "byebug" if RUBY_VERSION > "2"
+platform :ruby do
+    gem "byebug" if RUBY_VERSION > "2"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - ronen barzel