vagrant-omnibus 1.1.1 → 1.1.2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+bundler_args: --without=acceptance
 rvm:
   - 1.9.3
 script: rake test:unit

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.1.2 (October 17, 2013)
+
+IMPROVEMENTS:
+
+* PR [#41][]: Add vagrant-digitalocean to the list of supported providers. ([@tmatilai][])
+* PR [#45][]: Compatibility with vagrant-aws v0.4.0 ([@tmatilai][])
+* Use Vagrant's built in `Vagrant::Util::Downloader` class; removes requirement of the
+  guest OS having `wget` or `curl` installed. ([@schisamo][])
+
+BUG FIXES:
+
+* PR [#43][]: Fix development dependencies and Travis tests. ([@tmatilai][])
+* Issue [#33][] Split fetching of `install.sh` from the actual execution ([@schisamo][])
+
 ## 1.1.1 (September 4, 2013)
 
 BUG FIXES:
@@ -66,8 +80,12 @@ BUG FIXES:
 [#28]: https://github.com/schisamo/vagrant-omnibus/issues/28
 [#31]: https://github.com/schisamo/vagrant-omnibus/issues/31
 [#32]: https://github.com/schisamo/vagrant-omnibus/issues/32
+[#33]: https://github.com/schisamo/vagrant-omnibus/issues/33
 [#37]: https://github.com/schisamo/vagrant-omnibus/issues/37
 [#38]: https://github.com/schisamo/vagrant-omnibus/issues/38
+[#41]: https://github.com/schisamo/vagrant-omnibus/issues/41
+[#43]: https://github.com/schisamo/vagrant-omnibus/issues/43
+[#45]: https://github.com/schisamo/vagrant-omnibus/issues/45
 [@matsu911]: https://github.com/matsu911
 [@michfield]: https://github.com/michfield
 [@petecheslock]: https://github.com/petecheslock

data/Gemfile

@@ -6,13 +6,13 @@ 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.2.7"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.3.5"
 end
 
-group :test do
-  gem "vagrant-digitalocean", "~> 0.3.0"
-  gem "vagrant-aws", "~> 0.3.0"
-  gem "vagrant-rackspace", "~> 0.1.2"
+group :acceptance do
+  gem "vagrant-digitalocean", "~> 0.4.0"
+  gem "vagrant-aws", "~> 0.4.0"
+  gem "vagrant-rackspace", "~> 0.1.4"
 end
 
 group :docs do

data/README.md

@@ -21,6 +21,7 @@ known to work with the following
 * VMWare Fusion (can be [purchased from Hashicorp](http://www.vagrantup.com/vmware))
 * LXC (ships in [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc))
 * OpenStack (ships in [vagrant-openstack-plugin](https://github.com/cloudbau/vagrant-openstack-plugin))
+* Digital Ocean (ships in [vagrant-digitalocean](https://github.com/smdahlen/vagrant-digitalocean))
 
 ## Installation
 

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

@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
+require "log4r"
 require 'shellwords'
 
+require "vagrant/util/downloader"
+
 module VagrantPlugins
   module Omnibus
     module Action
@@ -28,6 +31,7 @@ module VagrantPlugins
 
         def initialize(app, env)
           @app = app
+          @logger = Log4r::Logger.new("vagrantplugins::omnibus::action::installchef")
           @machine = env[:machine]
           # Config#finalize! SHOULD be called automatically
           @machine.config.omnibus.finalize!
@@ -45,10 +49,12 @@ module VagrantPlugins
                 :version => desired_version
               })
             else
+              fetch_install_sh(env)
               env[:ui].info I18n.t('vagrant-omnibus.action.installing', {
                 :version => desired_version
               })
-              install(desired_version)
+              install(desired_version, env)
+              recover(env)
             end
           end
         end
@@ -64,19 +70,65 @@ module VagrantPlugins
           version
         end
 
-        def install(version)
+        # Uploads install.sh from Host's Vagrant TMP directory to guest
+        # and executes.
+        def install(version, env)
           shell_escaped_version = Shellwords.escape(version)
-          command = <<-INSTALL_OMNIBUS
-            if command -v wget &>/dev/null; then
-              wget -qO- #{INSTALL_SH} | bash -s -- -v #{shell_escaped_version}
-            elif command -v curl &>/dev/null; then
-              curl -L #{INSTALL_SH} | bash -s -- -v #{shell_escaped_version}
-            else
-              echo "Neither wget nor curl found. Please install one." >&2
-              exit 1
-            fi
-          INSTALL_OMNIBUS
-          @machine.communicate.sudo(command)
+
+          @machine.communicate.tap do |comm|
+            comm.upload(@install_sh_temp_path, "install.sh")
+            # TODO - Execute with `sh` once install.sh removes it's bash-isms.
+            comm.sudo("bash install.sh -v #{shell_escaped_version} 2>&1") do |type, data|
+              if [:stderr, :stdout].include?(type)
+                next if data =~ /stdin: is not a tty/
+                env[:ui].info(data)
+              end
+            end
+          end
+        end
+
+        # Fetches install.sh file to the Host's Vagrant TMP directory.
+        #
+        # Mostly lifted from:
+        #
+        #   https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/box_add.rb
+        #
+        def fetch_install_sh(env)
+          @install_sh_temp_path = env[:tmp_path].join(Time.now.to_i.to_s + "-install.sh")
+          @logger.info("Downloading install.sh to: #{@install_sh_temp_path}")
+
+          url = INSTALL_SH
+          if File.file?(url) || url !~ /^[a-z0-9]+:.*$/i
+            @logger.info("URL is a file or protocol not found and assuming file.")
+            file_path = File.expand_path(url)
+            file_path = Vagrant::Util::Platform.cygwin_windows_path(file_path)
+            url = "file:#{file_path}"
+          end
+
+          downloader_options = {}
+          # downloader_options[:insecure] = env[:box_download_insecure]
+          # downloader_options[:ui] = env[:ui]
+
+          # Download the install.sh file to a temporary path. We store
+          # the temporary path as an instance variable so that the
+          # `#recover` method can access it.
+          begin
+            downloader = Vagrant::Util::Downloader.new(url,
+                                                       @install_sh_temp_path,
+                                                       downloader_options)
+            downloader.download!
+          rescue Vagrant::Errors::DownloaderInterrupted
+            # The downloader was interrupted, so just return, because that
+            # means we were interrupted as well.
+            env[:ui].info(I18n.t("vagrant-omnibus.download.interrupted"))
+            return
+          end
+        end
+
+        def recover(env)
+          if @install_sh_temp_path && File.exist?(@install_sh_temp_path)
+            File.unlink(@install_sh_temp_path)
+          end
         end
       end
     end

data/lib/vagrant-omnibus/plugin.rb

@@ -34,12 +34,12 @@ module VagrantPlugins
         require_relative "action/install_chef"
         hook.after(Vagrant::Action::Builtin::Provision, Action::InstallChef)
 
-        # The AWS provider uses a non-standard Provision action on initial
+        # The AWS provider < v0.4.0 uses a non-standard Provision action on initial
         # creation:
         #
-        # https://github.com/mitchellh/vagrant-aws/blob/master/lib/vagrant-aws/action.rb#L105
+        # https://github.com/mitchellh/vagrant-aws/blob/v0.3.0/lib/vagrant-aws/action.rb#L105
         #
-        if VagrantPlugins.const_defined?("AWS")
+        if defined? VagrantPlugins::AWS::Action::TimedProvision
           hook.after(VagrantPlugins::AWS::Action::TimedProvision, Action::InstallChef)
         end
       end

data/lib/vagrant-omnibus/version.rb

@@ -16,6 +16,6 @@
 
 module VagrantPlugins
   module Omnibus
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/locales/en.yml

@@ -3,3 +3,6 @@ en:
     action:
       installed: "Chef %{version} Omnibus package is already installed."
       installing: "Installing Chef %{version} Omnibus package..."
+    download:
+      downloading: "Downloading or copying install.sh..."
+      interrupted: "Install.sh download was interrupted. Exiting."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1765446916124495526
+      hash: -3817557058599650856
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1765446916124495526
+      hash: -3817557058599650856
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23