vagrant-puppet-install 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6599a8b58123a862cde897c4189ca047e5d52e35
-  data.tar.gz: 92e5b8fc21a96cbcb8141e0029954c5ac43119bb
+  metadata.gz: 961d7f1b5bfba02b4b6772c70386a62296fb8b92
+  data.tar.gz: bd66512f848d2c01eee2662dcc77f3857ef6bfc1
 SHA512:
-  metadata.gz: 2f87c1fef953092e28edc54baeeac965b01e1935e7dcb49457ea3d5a21ff59946ec089b8a66028ed54fa543ced95f18c14536b9fa498b52640d92940bf6f53a2
-  data.tar.gz: a37fdc2f455827840dcc4a20c150c51cd96b3f201d0968c7822905498ad5e88481619873ff5541c46bb08ebc63b66efb0f23efbc96f6ab0d3c09ebbcb9a0c857
+  metadata.gz: 275de845b16817fe0b5728dd07ad1146d5742c5191f763a1c54a11caaf89cfb7b13cf4f7b06a0b7ef48a0e98c0da3e6e8c731947f8e25e943cd2cb18183342c3
+  data.tar.gz: 9b89e687f0be7a89001d79c35e2c4600aa5f741639f626aad7c3209d3d677cae2b0c4636986f5aaaa0cb46acf3cfc3c0085d6241693cd4ab5db36feefae1717e

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.3.5"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 end
 
 group :acceptance do

data/lib/vagrant-puppet-install.rb

@@ -14,12 +14,18 @@
 # limitations under the License.
 #
 
-require "pathname"
-require "vagrant-puppet-install/plugin"
+require 'vagrant'
+require 'vagrant-puppet-install/plugin'
+require 'vagrant-puppet-install/config'
 
 module VagrantPlugins
+  #
   module PuppetInstall
-    autoload :Action, 'vagrant-puppet-install/action'
-    autoload :Config, 'vagrant-puppet-install/config'
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+
+    I18n.load_path << File.expand_path('locales/en.yml', source_root)
+    I18n.reload!
   end
 end

data/lib/vagrant-puppet-install/action/install_puppet.rb

@@ -42,8 +42,7 @@ module VagrantPlugins
           return unless @machine.communicate.ready? && provision_enabled?(env)
 
           desired_version = @machine.config.puppet_install.puppet_version
-
-           unless desired_version.nil?
+          unless desired_version.nil?
             if installed_version == desired_version
               env[:ui].info I18n.t(
                 'vagrant-puppet_install.action.installed',
@@ -59,8 +58,6 @@ module VagrantPlugins
               recover(env)
             end
           end
-
-          @app.call(env)
         end
 
         private
@@ -69,13 +66,19 @@ module VagrantPlugins
         def find_install_script
           if !ENV['PUPPET_INSTALL_URL'].nil?
             ENV['PUPPET_INSTALL_URL']
+          elsif windows_guest?
+            #
           else
             'https://raw2.github.com/petems/puppet-install-shell/master/install_puppet.sh'
           end
         end
 
         def install_script_name
-          'install.sh'
+          if windows_guest?
+            #
+          else
+            'install.sh'
+          end
         end
 
         def windows_guest?

data/lib/vagrant-puppet-install/config.rb

@@ -19,16 +19,17 @@ require 'rubygems/dependency_installer'
 require 'vagrant'
 
 module VagrantPlugins
+  #
   module PuppetInstall
     # @author Seth Chisamore <schisamo@opscode.com>
-    class Config < Vagrant.plugin("2", :config)
-
+    class Config < Vagrant.plugin('2', :config)
       # @return [String]
       #   The version of Puppet to install.
       attr_accessor :puppet_version
 
       def initialize
         @puppet_version = UNSET_VALUE
+        @logger = Log4r::Logger.new('vagrantplugins::puppet_install::config')
       end
 
       def finalize!
@@ -44,31 +45,36 @@ module VagrantPlugins
         errors = []
 
         unless valid_puppet_version?(puppet_version)
-          msg = "'#{puppet_version}' is not a valid version of Puppet."
-          msg << "\n\n A list of valid versions can be found at: http://docs.puppetlabs.com/release_notes/"
+          msg = <<-EOH
+'#{ puppet_version }' is not a valid version of Puppet.
+
+A list of valid versions can be found at: http://docs.puppetlabs.com/release_notes/
+          EOH
           errors << msg
         end
 
-        { "Puppet Install Plugin" => errors }
+        { 'Puppet Install Plugin' => errors }
       end
 
       private
 
       # Query RubyGems.org's Ruby API and retrive the latest version of Puppet.
       def retrieve_latest_puppet_version
-        available_gems = dependency_installer.find_gems_with_sources(puppet_gem_dependency)
-        spec, source = if available_gems.respond_to?(:last)
-                          # DependencyInstaller sorts the results such that the last one is
-                          # always the one it considers best.
-                          spec_with_source = available_gems.last
-                          spec_with_source
-                        else
-                          # Rubygems 2.0 returns a Gem::Available set, which is a
-                          # collection of AvailableSet::Tuple structs
-                          available_gems.pick_best!
-                          best_gem = available_gems.set.first
-                          best_gem && [best_gem.spec, best_gem.source]
-                        end
+        available_gems =
+          dependency_installer.find_gems_with_sources(puppet_gem_dependency)
+        spec, _source =
+        if available_gems.respond_to?(:last)
+          # DependencyInstaller sorts the results such that the last one is
+          # always the one it considers best.
+          spec_with_source = available_gems.last
+          spec_with_source
+        else
+          # Rubygems 2.0 returns a Gem::Available set, which is a
+          # collection of AvailableSet::Tuple structs
+          available_gems.pick_best!
+          best_gem = available_gems.set.first
+          best_gem && [best_gem.spec, best_gem.source]
+        end
 
         spec && spec.version.to_s
       end
@@ -78,9 +84,12 @@ module VagrantPlugins
       def valid_puppet_version?(version)
         is_valid = false
         begin
-          available = dependency_installer.find_gems_with_sources(puppet_gem_dependency(version))
+          available = dependency_installer.find_gems_with_sources(
+            puppet_gem_dependency(version)
+          )
           is_valid = true unless available.empty?
-        rescue
+        rescue ArgumentError => e
+          @logger.debug("#{version} is not a valid Puppet version: #{e}")
         end
         is_valid
       end
@@ -89,7 +98,7 @@ module VagrantPlugins
         @dependency_installer ||= Gem::DependencyInstaller.new
       end
 
-      def puppet_gem_dependency(version=nil)
+      def puppet_gem_dependency(version = nil)
         Gem::Dependency.new('puppet', version)
       end
     end

data/lib/vagrant-puppet-install/plugin.rb

@@ -14,65 +14,40 @@
 # limitations under the License.
 #
 
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The vagrant-puppet-install plugin must be run within Vagrant."
-end
-
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.1.0"
-  raise "The vagrant-puppet-install plugin is only compatible with Vagrant 1.1+"
-end
-
-if Vagrant::VERSION < "1.3.5"
-  raise "The vagrant-puppet-install plugin is only compatible with Vagrant 1.3.5 <= right now.\n See https://github.com/patcon/vagrant-puppet-install/issues/5 for details"
+if Vagrant::VERSION < '1.1.0'
+  fail 'The Vagrant Puppet Install plugin is only compatible with Vagrant 1.1+'
 end
 
 module VagrantPlugins
+  #
   module PuppetInstall
     # @author Seth Chisamore <schisamo@opscode.com>
-    class Plugin < Vagrant.plugin("2")
-      name "Puppet Install"
+    class Plugin < Vagrant.plugin('2')
+      name 'vagrant-puppet-install'
       description <<-DESC
       This plugin ensures the desired version of Puppet is installed
       via the Puppet Labs package repos.
       DESC
 
-      def self.provision(hook)
-
-        hook.after(Vagrant::Action::Builtin::Provision, Action.install_puppet)
+      action_hook(:install_pupet, Plugin::ALL_ACTIONS) do |hook|
+        require_relative 'action/install_puppet'
+        hook.after(Vagrant::Action::Builtin::Provision, Action::InstallPuppet)
 
-        # BEGIN workaround
+        # The AWS provider < v0.4.0 uses a non-standard Provision action
+        # on initial creation:
         #
-        # Currently hooks attached to {Vagrant::Action::Builtin::Provision} are
-        # not wired into the middleware return path. My current workaround is to
-        # fire after anything boot related which wedges in right before the
-        # actual real run of the provisioner.
-
-        hook.after(VagrantPlugins::ProviderVirtualBox::Action::Boot, Action.install_puppet)
-
-        if VagrantPlugins.const_defined?("AWS")
-          hook.after(VagrantPlugins::AWS::Action::RunInstance, Action.install_puppet)
-        end
-
-        if VagrantPlugins.const_defined?("Rackspace")
-          # The `VagrantPlugins::Rackspace` module is missing the autoload for
-          # `VagrantPlugins::Rackspace::Action` so we need to ensure it is
-          # loaded before accessing the module in the after hook below.
-          require 'vagrant-rackspace/action'
-          hook.after(VagrantPlugins::Rackspace::Action::CreateServer, Action.install_puppet)
+        # mitchellh/vagrant-aws/blob/v0.3.0/lib/vagrant-aws/action.rb#L105
+        #
+        if defined? VagrantPlugins::AWS::Action::TimedProvision
+          hook.after(VagrantPlugins::AWS::Action::TimedProvision,
+                     Action::InstallPuppet)
         end
-
-        # END workaround
       end
 
-      action_hook(:install_puppet, :machine_action_up, &method(:provision))
-      action_hook(:install_puppet, :machine_action_provision, &method(:provision))
-
       config(:puppet_install) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
     end

data/lib/vagrant-puppet-install/version.rb

@@ -16,6 +16,6 @@
 
 module VagrantPlugins
   module PuppetInstall
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

data/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  vagrant-puppet-install:
+    action:
+      installed: "Puppet %{version} package is already installed."
+      installing: "Installing Puppet %{version} 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-puppet-install
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,13 +89,11 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-puppet-install.rb
-- lib/vagrant-puppet-install/action.rb
 - lib/vagrant-puppet-install/action/install_puppet.rb
-- lib/vagrant-puppet-install/action/is_running_or_active.rb
-- lib/vagrant-puppet-install/action/read_puppet_version.rb
 - lib/vagrant-puppet-install/config.rb
 - lib/vagrant-puppet-install/plugin.rb
 - lib/vagrant-puppet-install/version.rb
+- locales/en.yml
 - test/acceptance/aws/Vagrantfile
 - test/acceptance/digital_ocean/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile

data/lib/vagrant-puppet-install/action.rb

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "vagrant/action/builder"
-
-module VagrantPlugins
-  module PuppetInstall
-    module Action
-      autoload :InstallPuppet, File.expand_path("../action/install_puppet", __FILE__)
-      autoload :IsRunningOrActive, File.expand_path("../action/is_running_or_active", __FILE__)
-      autoload :ReadPuppetVersion, File.expand_path("../action/read_puppet_version", __FILE__)
-
-      # Include the built-in modules so that we can use them as top-level
-      # things.
-      include Vagrant::Action::Builtin
-
-      # @return [::Vagrant::Action::Builder]
-      def self.install_puppet
-        @install_puppet ||= ::Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsRunningOrActive do |env1, b2|
-            if env1[:result]
-              b2.use ReadPuppetVersion
-              b2.use InstallPuppet
-              b2.use SSHRun
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-puppet-install/action/is_running_or_active.rb

@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module VagrantPlugins
-  module PuppetInstall
-    module Action
-      # @author Seth Chisamore <schisamo@opscode.com>
-      #
-      # This action checks if the machine is running (virtualbox) or active
-      # (aws, rackspace).
-      #
-      class IsRunningOrActive
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          # Set the result to be true if the machine is :running or :active.
-          if (env[:machine].state.id == :running) ||
-             (env[:machine].state.id == :active)
-
-            env[:result] = true
-          else
-            env[:result] = false
-          end
-
-          # Call the next if we have one (but we shouldn't, since this
-          # middleware is built to run with the Call-type middlewares)
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-puppet-install/action/read_puppet_version.rb

@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module VagrantPlugins
-  module PuppetInstall
-    module Action
-      # @author Seth Chisamore <schisamo@opscode.com>
-      #
-      # This action will extract the installed version of Puppet installed on the
-      # guest. The resulting version will exist in the `:installed_puppet_version`
-      # key in the environment.
-      class ReadPuppetVersion
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:installed_puppet_version] = nil
-          env[:machine].communicate.tap do |comm|
-            # Execute it with sudo
-            comm.sudo(puppet_version_command) do |type, data|
-              if [:stderr, :stdout].include?(type)
-                env[:installed_puppet_version] = data.chomp
-              end
-            end
-          end
-          @app.call(env)
-        end
-
-        private
-
-        def puppet_version_command
-          <<-PUPPET_VERSION
-echo $(puppet --version || "")
-          PUPPET_VERSION
-        end
-      end
-    end
-  end
-end