vagrant-omnibus 1.3.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8be4ca912ba9d90fbbe4e72f2454a2c9fd0aad29
+  data.tar.gz: fa884a44397422a2c1e67613f3caffd51a6f58c7
+SHA512:
+  metadata.gz: 0ffbfba065f575bf06487a19fbb50571e396b1fae60291b1702ee6d527018d2b744de003152ffdf5035d4261243004406471becee1383538607bf6b79e91640f
+  data.tar.gz: af63c21ef54359d67e5245992812dc15619f581cbd5b41bf53deacc3752698bce7649e016ddc3270ee3634b1657b5c8503c14ccf2c176ee42f9dbbc457e32698

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p353

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.3.1 (March 12, 2014)
+
+IMPROVEMENTS:
+
+* PR [#66][]: Run install.sh with `sh` rather than `bash`. ([@tknerr][]) 
+
+BUG FIXES:
+
+* PR [#65][]: Make unlinking the install.sh reliably work on windows hosts. ([@tknerr][])
+* Issue [#69][]: Ensure all remote commands are executed with `sh`. ([@schisamo][])
+
 ## 1.3.0 (February 24, 2014)
 
 FEATURES:
@@ -141,6 +152,9 @@ BUG FIXES:
 [#59]: https://github.com/schisamo/vagrant-omnibus/issues/59
 [#60]: https://github.com/schisamo/vagrant-omnibus/issues/60
 [#61]: https://github.com/schisamo/vagrant-omnibus/issues/61
+[#65]: https://github.com/schisamo/vagrant-omnibus/issues/65
+[#66]: https://github.com/schisamo/vagrant-omnibus/issues/66
+[#69]: https://github.com/schisamo/vagrant-omnibus/issues/69
 [@ampedandwired]: https://github.com/ampedandwired
 [@comutt]: https://github.com/comutt
 [@jarig]: https://github.com/jarig
@@ -152,5 +166,6 @@ BUG FIXES:
 [@schisamo]: https://github.com/schisamo
 [@smdahlen]: https://github.com/smdahlen
 [@srenatus]: https://github.com/srenatus
+[@tknerr]: https://github.com/tknerr
 [@tmatilai]: https://github.com/tmatilai
 [@wizonesolutions]: https://github.com/wizonesolutions

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.3'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.5.0'
   gem 'vagrant-windows', '~> 1.5'
 end
 

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

@@ -91,12 +91,20 @@ module VagrantPlugins
           env.fetch(:provision_enabled, true)
         end
 
+        def communication_opts
+          if windows_guest?
+            { shell: 'cmd' }
+          else
+            { shell: 'sh' }
+          end
+        end
+
         def installed_version
           version = nil
-          opts = nil
+          opts = communication_opts
           if windows_guest?
             command = 'cmd.exe /c chef-solo -v 2>&0'
-            opts = { shell: :cmd, error_check: false }
+            opts[:error_check] = false
           else
             command = 'echo $(chef-solo -v)'
           end
@@ -121,11 +129,10 @@ module VagrantPlugins
             if windows_guest?
               install_cmd = "cmd.exe /c #{install_script_name} #{version}"
             else
-              # TODO: Execute with `sh` once install.sh removes it's bash-isms.
               install_cmd =
-                "bash #{install_script_name} -v #{shell_escaped_version} 2>&1"
+                "sh #{install_script_name} -v #{shell_escaped_version} 2>&1"
             end
-            comm.sudo(install_cmd) do |type, data|
+            comm.sudo(install_cmd, communication_opts) do |type, data|
               if [:stderr, :stdout].include?(type)
                 next if data =~ /stdin: is not a tty/
                 env[:ui].info(data)
@@ -194,7 +201,18 @@ module VagrantPlugins
 
         def recover(env)
           if @script_tmp_path && File.exist?(@script_tmp_path)
-            File.unlink(@script_tmp_path)
+            # Try extra hard to unlink the file so that it reliably works
+            # on Windows hosts as well, see:
+            # http://alx.github.io/2009/01/27/ruby-wundows-unlink.html
+            file_deleted = false
+            until file_deleted
+              begin
+                File.unlink(@script_tmp_path)
+                file_deleted = true
+              rescue Errno::EACCES
+                @logger.debug("failed to unlink #{@script_tmp_path}. retry...")
+              end
+            end
           end
         end
       end

data/lib/vagrant-omnibus/version.rb

@@ -17,6 +17,6 @@
 module VagrantPlugins
   #
   module Omnibus
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/test/acceptance/virtualbox/Vagrantfile

@@ -63,4 +63,33 @@ Vagrant.configure('2') do |config|
       chef.add_recipe 'chef-inator'
     end
   end
+
+  config.vm.define :no_bash_no_chef_run do |c|
+    c.vm.box = 'opscode-freebsd-9.2'
+    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
+    c.omnibus.chef_version = :latest
+
+    c.vm.network 'private_network', ip: '44.44.44.10'
+    c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
+  end
+
+  config.vm.define :no_bash do |c|
+    c.vm.box = 'opscode-freebsd-9.2'
+    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
+    c.omnibus.chef_version = :latest
+
+    c.vm.network 'private_network', ip: '44.44.44.10'
+    c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
+
+    # This forces all remote commands to execute under `sh`. If we don't
+    # add this config then all `chef` related commands will execute
+    # with `bash`.
+    c.ssh.shell = 'sh'
+
+    c.vm.provision :chef_solo do |chef|
+      chef.synced_folder_type = 'nfs'
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin that ensures the desired version of Chef is installed
@@ -86,6 +77,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .ruby-version
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -113,33 +105,26 @@ files:
 homepage: https://github.com/schisamo/vagrant-omnibus
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 128509343253395990
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 128509343253395990
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Vagrant plugin that ensures the desired version of Chef is installed via
   the platform-specific Omnibus packages.
 test_files: