vagrant-omnibus 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.1 (December 17, 2013)
+
+IMPROVEMENTS:
+
+* Acceptance test coverage that verifies Chef is not reinstalled into a system where the desired version of Chef already exists.
+
+BUG FIXES:
+
+* PR [#57][]: Filter `stdin is not a tty` when querying installed Chef version. ([@scalp42][])
+
 ## 1.2.0 (December 17, 2013)
 
 FEATURES:
@@ -8,6 +18,7 @@ IMPROVEMENTS:
 
 * PR [#48][]: Don't install Chef if `--no-provision` is specified. ([@tmatilai][])
 * PR [#50][]: Update README.md with vagrant-parallels compatibility. ([@wizonesolutions][])
+* PR [#56][]: Add Rubocop support.
 
 BUG FIXES:
 
@@ -108,11 +119,14 @@ BUG FIXES:
 [#50]: https://github.com/schisamo/vagrant-omnibus/issues/50
 [#52]: https://github.com/schisamo/vagrant-omnibus/issues/52
 [#53]: https://github.com/schisamo/vagrant-omnibus/issues/53
+[#56]: https://github.com/schisamo/vagrant-omnibus/issues/56
+[#57]: https://github.com/schisamo/vagrant-omnibus/issues/57
 [@comutt]: https://github.com/comutt
 [@matsu911]: https://github.com/matsu911
 [@michfield]: https://github.com/michfield
 [@petecheslock]: https://github.com/petecheslock
 [@rjocoleman]: https://github.com/rjocoleman
+[@scalp42]: https://github.com/scalp42
 [@schisamo]: https://github.com/schisamo
 [@smdahlen]: https://github.com/smdahlen
 [@srenatus]: https://github.com/srenatus

data/lib/vagrant-omnibus/action/install_chef.rb

@@ -78,8 +78,11 @@ module VagrantPlugins
           version = nil
           command = 'echo $(chef-solo -v)'
           @machine.communicate.sudo(command) do |type, data|
-            v = data.chomp if [:stderr, :stdout].include?(type)
-            version ||= v.split[1] unless v.empty?
+            if [:stderr, :stdout].include?(type)
+              next if data =~ /stdin: is not a tty/
+              v = data.chomp
+              version ||= v.split[1] unless v.empty?
+            end
           end
           version
         end

data/lib/vagrant-omnibus/version.rb

@@ -17,6 +17,6 @@
 module VagrantPlugins
   #
   module Omnibus
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/test/acceptance/virtualbox/Vagrantfile

@@ -29,4 +29,16 @@ Vagrant.configure("2") do |config|
       chef.add_recipe "chef-inator"
     end
   end
+
+  config.vm.define :chef_already_installed do |installed_config|
+    installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
+    installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
+
+    installed_config.omnibus.chef_version = '11.4.4'
+
+    installed_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1025496382534469721
+      hash: -2839676175019097960
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1025496382534469721
+      hash: -2839676175019097960
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23