test-kitchen 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171b533c12aff1ff5286b5104bc974626dbf07f9
-  data.tar.gz: 0fd02124f28895f3cf0215c465226927bd1affc7
+  metadata.gz: 665e48e9f78d624f8aa062b4ca790ebca42acaf4
+  data.tar.gz: b962301704633bb76408ae13ad354cbbee216371
 SHA512:
-  metadata.gz: 173544009b952361cf1cde034662ee8c48781ed2f7ffd7c5a86a0211f331f8ebba0e73e1b339c53a920697fa99621e98124ffda5919793e8926090813de5f4d3
-  data.tar.gz: 5becb091d620d1b2c8167f41a410fa89734aefc7110694518f22a5fcba91afa84d1bcf6317a65ef9ac1bbef5c5c3bb82348178d70b0a16917bd584466feb66fe
+  metadata.gz: a9b4dc5ae5d985f1674c65b9823cf1f0979f731aadbea863c565e057e93147c2d62ef7650afcb8db361f0c3557ad4647a991ac7095878ef26790c6ec1ee86909
+  data.tar.gz: 18e1cbc9626ab891381425303685f9525791f9313d2a1dbbb3df002d061cebaf6b1f8898ab8ce19994ba5d8fe2d3e7aee2e9cfc4d91939152f339b3d3e3d3c8f

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3
@@ -8,6 +9,7 @@ rvm:
 
 env:
   - RUBYGEMS_VERSION=
+  - RUBYGEMS_VERSION=2.4.5
   - RUBYGEMS_VERSION=2.2.2
   - RUBYGEMS_VERSION=2.1.11
   - RUBYGEMS_VERSION=2.0.14
@@ -25,10 +27,24 @@ matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.2.2
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.1.11
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.0.14
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=1.8.29
     - rvm: 2.1
       env: RUBYGEMS_VERSION=1.8.29
     - rvm: 2.0.0
       env: RUBYGEMS_VERSION=1.8.29
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.2.2
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.1.11
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.0.14
     - rvm: ruby-head
       env: RUBYGEMS_VERSION=1.8.29
 

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## 1.3.0 / 2014-12-1X
+## 1.3.1 / 2015-01-16
+
+### Bug fixes
+
+* Pull request [#581][], issue [#580][]: Fix omnibus install argument passing bug with missing space character. ([@fnichol][], [@tknerr][])
+
+### Improvements
+
+* Pull request [#579][]: Update README.md badges to use SVG. ([@miketheman][])
+
+
+## 1.3.0 / 2015-01-15
 
 ### Upstream changes
 
@@ -561,6 +572,9 @@ The initial release.
 [#557]: https://github.com/test-kitchen/test-kitchen/issues/557
 [#558]: https://github.com/test-kitchen/test-kitchen/issues/558
 [#567]: https://github.com/test-kitchen/test-kitchen/issues/567
+[#579]: https://github.com/test-kitchen/test-kitchen/issues/579
+[#580]: https://github.com/test-kitchen/test-kitchen/issues/580
+[#581]: https://github.com/test-kitchen/test-kitchen/issues/581
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
 [@adamhjk]: https://github.com/adamhjk
@@ -604,6 +618,7 @@ The initial release.
 [@mconigliaro]: https://github.com/mconigliaro
 [@mcquin]: https://github.com/mcquin
 [@michaelkirk]: https://github.com/michaelkirk
+[@miketheman]: https://github.com/miketheman
 [@mthssdrbrg]: https://github.com/mthssdrbrg
 [@oferrigni]: https://github.com/oferrigni
 [@patcon]: https://github.com/patcon
@@ -627,4 +642,5 @@ The initial release.
 [@srenatus]: https://github.com/srenatus
 [@stevendanna]: https://github.com/stevendanna
 [@thommay]: https://github.com/thommay
-[@zts]: https://github.com/zts
+[@tknerr]: https://github.com/tknerr
+[@zts]: https://github.com/zts

data/README.md

@@ -1,11 +1,11 @@
 # Test Kitchen
 
-[![Gem Version](https://badge.fury.io/rb/test-kitchen.png)](http://badge.fury.io/rb/test-kitchen)
-[![Build Status](https://secure.travis-ci.org/test-kitchen/test-kitchen.png?branch=master)](https://travis-ci.org/test-kitchen/test-kitchen)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/test-kitchen.png)](https://codeclimate.com/github/test-kitchen/test-kitchen)
-[![Test Coverage](https://codeclimate.com/github/test-kitchen/test-kitchen/coverage.png)](https://codeclimate.com/github/test-kitchen/test-kitchen)
-[![Dependency Status](https://gemnasium.com/test-kitchen/test-kitchen.png)](https://gemnasium.com/test-kitchen/test-kitchen)
-[![Inline docs](http://inch-ci.org/github/test-kitchen/test-kitchen.png?branch=master)](http://inch-ci.org/github/test-kitchen/test-kitchen)
+[![Gem Version](https://badge.fury.io/rb/test-kitchen.svg)](http://badge.fury.io/rb/test-kitchen)
+[![Build Status](https://secure.travis-ci.org/test-kitchen/test-kitchen.svg?branch=master)](https://travis-ci.org/test-kitchen/test-kitchen)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/test-kitchen.svg)](https://codeclimate.com/github/test-kitchen/test-kitchen)
+[![Test Coverage](https://codeclimate.com/github/test-kitchen/test-kitchen/coverage.svg)](https://codeclimate.com/github/test-kitchen/test-kitchen)
+[![Dependency Status](https://gemnasium.com/test-kitchen/test-kitchen.svg)](https://gemnasium.com/test-kitchen/test-kitchen)
+[![Inline docs](http://inch-ci.org/github/test-kitchen/test-kitchen.svg?branch=master)](http://inch-ci.org/github/test-kitchen/test-kitchen)
 
 |             |                                               |
 |-------------|-----------------------------------------------|

data/lib/kitchen/provisioner/chef_base.rb

@@ -157,14 +157,14 @@ module Kitchen
                          end
         install_flags = %w[latest true].include?(version) ? "" : "-v #{version}"
         if config[:chef_omnibus_install_options]
-          install_flags += config[:chef_omnibus_install_options]
+          install_flags << " " << config[:chef_omnibus_install_options]
         end
 
         <<-INSTALL.gsub(/^ {10}/, "")
           if should_update_chef "#{config[:chef_omnibus_root]}" "#{version}" ; then
             echo "-----> Installing Chef Omnibus (#{pretty_version})"
             do_download #{config[:chef_omnibus_url]} /tmp/install.sh
-            #{sudo("sh")} /tmp/install.sh #{install_flags}
+            #{sudo("sh")} /tmp/install.sh #{install_flags.strip}
           else
             echo "-----> Chef Omnibus installation detected (#{pretty_version})"
           fi

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -200,6 +200,13 @@ describe Kitchen::Provisioner::ChefBase do
         "Installing Chef Omnibus (install only if missing)", :partial_line)
     end
 
+    it "will pass install options and version info, when given" do
+      config[:require_chef_omnibus] = "11"
+      config[:chef_omnibus_install_options] = "-d /tmp/place"
+
+      provisioner.install_command.must_match regexify(
+        "sudo -E sh /tmp/install.sh -v 11 -d /tmp/place")
+    end
   end
 
   describe "#init_command" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout