busser 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 800f39c4cfe169cf851757eca11e4e278759066d
-  data.tar.gz: 82795ffc0a8d04d0390bc03dcbe84c12d8856bf8
+  metadata.gz: 7b72fd59135ca003d371dd87f7424b419b1c6b4c
+  data.tar.gz: b54e624af6811629926648fb49b9506e8c3b4def
 SHA512:
-  metadata.gz: da2598e151602e7b976c03137060bfa3a3a582d08f89b172109c5d28a59baaa02eebcf86c25130f42a5d8e15b0978c5b24431ff8d108a573dea1726c239558c3
-  data.tar.gz: 79414b62137ed0a2e8bd6622fb3d35b6ab3e47755ba81023763f2de9d69fe42954f3a5a996232fbc7de63a30c64f7f44bcf65548f65a4f9d25854faaf7c64dce
+  metadata.gz: e884518990da3a8a31c6076e2f9cbd386b5ef3aa940e70c8d346010f425418ec14cd5372e92aa0e8fb32ba50356b6188ce473b37bd18f9f9cb476525b9eab666
+  data.tar.gz: a806bd91b9f165c6588c54b5ae69a6ba9972be466fa5b5ad3327355697f5e08310c002c33662a032fe98300e3dd612bc0118c9620f3ce7468a37896b2f357384

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.6.1 / 2014-03-23
+
+### Bug fixes
+
+* Issue [#7][]: Ensure that Pathname is coerced to a String before calling Thor's #say. ([@fnichol][])
+* Pull request [#4][], issue [#3][]: /usr/bin/env sh shouldn't assume bourne shell. ([@jtimberman][])
+* Pull request [#5][]: Remove binstub before create. ([@sawanoboly][])
+* Pull request [#6][]: Support binstub on SmartOS. ([@neuhalje][])
+
+
 ## 0.6.0 / 2013-11-27
 
 ### Breaking changes
@@ -84,4 +94,12 @@
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#2]: https://github.com/test-kitchen/busser/issues/2
-[@fnichol]: https://github.com/fnichol
+[#3]: https://github.com/test-kitchen/busser/issues/3
+[#4]: https://github.com/test-kitchen/busser/issues/4
+[#5]: https://github.com/test-kitchen/busser/issues/5
+[#6]: https://github.com/test-kitchen/busser/issues/6
+[#7]: https://github.com/test-kitchen/busser/issues/7
+[@fnichol]: https://github.com/fnichol
+[@jtimberman]: https://github.com/jtimberman
+[@neuhalje]: https://github.com/neuhalje
+[@sawanoboly]: https://github.com/sawanoboly

data/busser.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Busser::VERSION
   spec.authors       = ["Fletcher Nichol"]
   spec.email         = ["fnichol@nichol.ca"]
-  spec.description   = %q{Kitchen Busser - Runs tests for projects in test-kitchen}
+  spec.description   = %q{Busser - Runs tests for projects in Test Kitchen}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/fnichol/busser"
+  spec.homepage      = "https://github.com/test-kitchen/busser"
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.1"
 
-  spec.add_dependency 'thor'
+  spec.add_dependency 'thor', '<= 0.19.0'
 
   spec.add_development_dependency "chef"
 

data/lib/busser/command/setup.rb

@@ -46,6 +46,7 @@ module Busser
         binstub = root_path + "bin/busser"
 
         info "Creating busser binstub"
+        File.unlink(binstub) if File.exists?(binstub)
         create_file(binstub, :verbose => false) do
           <<-BUSSER_BINSTUB.gsub(/^ {12}/, '')
             #!/usr/bin/env sh
@@ -62,7 +63,7 @@ module Busser
             # resolved path.
             SOURCE="#{ruby_bin}"
             while [ -h "$SOURCE" ] ; do SOURCE="`readlink "$SOURCE"`"; done
-            DIR="`cd -P "\\`dirname "$SOURCE"\\`" && pwd`"
+            DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
 
             # Set Busser Root path
             BUSSER_ROOT="#{root_path}"

data/lib/busser/command/suite_path.rb

@@ -31,7 +31,7 @@ module Busser
       argument :suite_name, :required => false
 
       def path
-        say suite_path(suite_name)
+        say suite_path(suite_name).to_s
       end
     end
   end

data/lib/busser/ui.rb

@@ -43,10 +43,11 @@ module Busser
     def run!(cmd)
       run(cmd, :capture => false, :verbose => false)
 
-      if $?.success?
+      if status.success?
         true
       else
-        die "Command [#{cmd}] exit code was #{$?.exitstatus}", $?.exitstatus
+        code = status.exitstatus
+        die "Command [#{cmd}] exit code was #{code}", code
       end
     end
 
@@ -54,15 +55,21 @@ module Busser
       config = { :capture => false, :verbose => false }.merge(config)
       run_ruby_script(cmd, config)
 
-      if $?.success?
+      if status.success?
         true
       else
-        die "Ruby Script[#{cmd}] exit code was #{$?.exitstatus}", $?.exitstatus
+        code = status.exitstatus
+        die "Ruby Script [#{cmd}] exit code was #{code}", code
       end
     end
+
     def die(msg, exitstatus = 1)
       $stderr.puts(msg)
       exit(exitstatus)
     end
+
+    def status
+      $?
+    end
   end
 end

data/lib/busser/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Busser
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/busser/ui_spec.rb

@@ -0,0 +1,171 @@
+require_relative '../spec_helper'
+
+require 'busser/ui'
+
+# Dummy class containing diagnostic methods approximating Thor mixins
+class SneakyUI
+
+  include Busser::UI
+
+  attr_reader :run_args, :run_ruby_script_args
+  attr_accessor :status
+
+  def say(msg)
+     msg
+  end
+
+  def run(cmd, opts)
+    @run_args = [cmd, opts]
+  end
+
+  def run_ruby_script(cmd, opts)
+    @run_ruby_script_args = [cmd, opts]
+  end
+
+  def exit(status)
+    @died = true
+    status
+  end
+
+  def died?
+    @died
+  end
+
+  # these methods are technically private, so we'll avoid straight send
+  # calls in the specs
+  %w{banner info warn die run! run_ruby_script!}.each do |meth|
+    define_method("invoke_#{meth}") { |*args| send(meth, *args) }
+  end
+end
+
+# Stub that mimicks a Process::Status object
+class FakeStatus
+
+  attr_reader :exitstatus
+
+  def initialize(success = true, exitstatus = 0)
+    @success, @exitstatus = success, exitstatus
+  end
+
+  def success?
+    @success
+  end
+end
+
+describe Busser::UI do
+
+  let(:ui) do
+    ui = SneakyUI.new
+    ui.status = FakeStatus.new(true)
+    ui
+  end
+
+  it "#banner should display a formatted message" do
+    ui.invoke_banner("coffee").must_equal "-----> coffee"
+  end
+
+  it "#info should display a formatted message" do
+    ui.invoke_info("beans").must_equal "       beans"
+  end
+
+  it "#warn should display a formatted message" do
+    ui.invoke_warn("grinder").must_equal ">>>>>> grinder"
+  end
+
+  describe "#die" do
+    it "prints a message to stderr" do
+      capture_stderr { ui.invoke_die("noes") }.must_equal "noes\n"
+    end
+
+    it "calls exit with 1 by default" do
+      capture_stderr do
+        ui.invoke_die("fail").must_equal 1
+      end
+    end
+
+    it "exits with a custom exit status" do
+      capture_stderr do
+        ui.invoke_die("fail", 16).must_equal 16
+      end
+    end
+  end
+
+  describe "#run!" do
+
+    it "calls #run with correct options" do
+      ui.invoke_run!("doitpls")
+
+      ui.run_args.must_equal([
+        "doitpls",
+        { :capture => false, :verbose => false}
+      ])
+    end
+
+    it "returns true if command succeeded" do
+      ui.invoke_run!("great-stuff").must_equal true
+    end
+
+    it "terminates the program if the command failed" do
+      ui.status = FakeStatus.new(false)
+      capture_stderr { ui.invoke_run!("failwhale") }
+
+      ui.died?.must_equal true
+    end
+
+    it "terminates with the exit code of the failed command" do
+      ui.status = FakeStatus.new(false, 24)
+
+      capture_stderr do
+        ui.invoke_run!("failwhale").must_equal 24
+      end
+    end
+  end
+
+  describe "#run_ruby_script!" do
+
+    it "calls #run_ruby_script with correct default options" do
+      ui.invoke_run_ruby_script!("theworks.rb")
+
+      ui.run_ruby_script_args.must_equal([
+        "theworks.rb",
+        { :capture => false, :verbose => false }
+      ])
+    end
+
+    it "calls #run_ruby_script with correct default options" do
+      ui.invoke_run_ruby_script!("theworks.rb", :verbose => true)
+
+      ui.run_ruby_script_args.must_equal([
+        "theworks.rb",
+        { :capture => false, :verbose => true }
+      ])
+    end
+
+    it "returns true if command succeeded" do
+      ui.invoke_run_ruby_script!("thewin.rb").must_equal true
+    end
+
+    it "terminates the program if the script failed" do
+      ui.status = FakeStatus.new(false)
+      capture_stderr { ui.invoke_run_ruby_script!("nope.rb") }
+
+      ui.died?.must_equal true
+    end
+
+    it "terminates with the exit code of the failed script" do
+      ui.status = FakeStatus.new(false, 97)
+
+      capture_stderr do
+        ui.invoke_run_ruby_script!("nadda.rb").must_equal 97
+      end
+    end
+  end
+
+  def capture_stderr
+    original_stderr, $stderr = $stderr, StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = original_stderr
+  end
+end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: busser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Kitchen Busser - Runs tests for projects in test-kitchen
+description: Busser - Runs tests for projects in Test Kitchen
 email:
 - fnichol@nichol.ca
 executables:
@@ -186,11 +186,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .simplecov
-- .tailor
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".simplecov"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -230,6 +230,7 @@ files:
 - lib/busser/ui.rb
 - lib/busser/version.rb
 - spec/busser/helpers_spec.rb
+- spec/busser/ui_spec.rb
 - spec/spec_helper.rb
 - templates/plugin/CHANGELOG.md.erb
 - templates/plugin/Gemfile.erb
@@ -249,7 +250,7 @@ files:
 - templates/plugin/tailor.erb
 - templates/plugin/travis.yml.erb
 - templates/plugin/version.rb.erb
-homepage: https://github.com/fnichol/busser
+homepage: https://github.com/test-kitchen/busser
 licenses:
 - Apache 2.0
 metadata: {}
@@ -259,20 +260,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Kitchen Busser - Runs tests for projects in test-kitchen
+summary: Busser - Runs tests for projects in Test Kitchen
 test_files:
 - features/deserialize_command.feature
 - features/files/base64.txt
@@ -283,4 +284,5 @@ test_files:
 - features/suite_path_command.feature
 - features/support/env.rb
 - spec/busser/helpers_spec.rb
+- spec/busser/ui_spec.rb
 - spec/spec_helper.rb