chef-provisioning 1.0.0.rc.1 → 1.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4ff4c1e7b202d3d951d428b277cda613e8bd50
-  data.tar.gz: 0255ba6125ea7556d4015c7ff3000e68c48923b5
+  metadata.gz: 55ad875ebe76a6ae2bc9a2ab836078862a05cc3a
+  data.tar.gz: 756479f750a3832e984a3602d2f5d4652d3e8070
 SHA512:
-  metadata.gz: dc259d4a30c72b04b97680a4674f6b7be82df86e4b9826457d26676ac8ba7b286a38bfc267caf768424566db4511060de540cc1b70d065c2dfec5972a848a0db
-  data.tar.gz: 0b19ad7b45837b10525c1f79ebddc90df67dd6c334be676017570b66fb37aa02c9c6411aada1cfda5f58b368c85a1ab696972e032eac6c5859dfab564c13f204
+  metadata.gz: 289db0906556b5a767a313ed2733f4becdf9c713387ca59fa33d5e250e423434bbb4065f824915bee252b818a84a58a89e7db248110287ba10837641a5fad068
+  data.tar.gz: ea91e7efa08311d988a38c9be1334c31e08b4f3d183c690f746ca9302ed8a63949ddce23e929f6ca8f32fd27803a877e1f31e83408f098c273deb805b46a2050

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Chef Provisioning Changelog
 
-## 1.0.rc.1 (3/31/2015)
+## 1.0.0.rc.2 (4/1/2015)
+
+- Fix an issue with vagrant second-converge failing
+
+## 1.0.0.rc.1 (3/31/2015)
 ## 0.20 (3/27/2015)
 
 - Marking machines `nil` in a load_balancer does not affect existing machines ([#299][])

data/lib/chef/provisioning/convergence_strategy/install_cached.rb

@@ -38,6 +38,8 @@ module Provisioning
 
       attr_reader :client_rb_path
       attr_reader :client_pem_path
+      attr_reader :chef_version
+      attr_reader :prerelease
 
       def setup_convergence(action_handler, machine)
         super

data/lib/chef/provisioning/convergence_strategy/install_msi.rb

@@ -5,15 +5,17 @@ class Chef
 module Provisioning
   class ConvergenceStrategy
     class InstallMsi < PrecreateChefObjects
-      @@install_msi_cache = {}
-
       def initialize(convergence_options, config)
         super
+        @chef_version ||= convergence_options[:chef_version]
+        @prerelease ||= convergence_options[:prerelease]
         @install_msi_url = convergence_options[:install_msi_url] || 'https://www.chef.io/chef/install.msi'
         @install_msi_path = convergence_options[:install_msi_path] || "$env:TEMP\\#{File.basename(@install_msi_url)}"
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 
+      attr_reader :chef_version
+      attr_reader :prerelease
       attr_reader :install_msi_url
       attr_reader :install_msi_path
 

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.0.0.rc.1'
+  VERSION = '1.0.0.rc.2'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -153,7 +153,6 @@ files:
 - lib/chef/provisioning/convergence_strategy/install_sh.rb
 - lib/chef/provisioning/convergence_strategy/no_converge.rb
 - lib/chef/provisioning/convergence_strategy/precreate_chef_objects.rb
-- lib/chef/provisioning/convergence_strategy/preinstalled.rb
 - lib/chef/provisioning/driver.rb
 - lib/chef/provisioning/load_balancer_spec.rb
 - lib/chef/provisioning/machine.rb
@@ -166,7 +165,6 @@ files:
 - lib/chef/provisioning/managed_entry_store.rb
 - lib/chef/provisioning/recipe_dsl.rb
 - lib/chef/provisioning/transport.rb
-- lib/chef/provisioning/transport/local.rb
 - lib/chef/provisioning/transport/ssh.rb
 - lib/chef/provisioning/transport/winrm.rb
 - lib/chef/provisioning/version.rb

data/lib/chef/provisioning/convergence_strategy/preinstalled.rb

@@ -1,10 +0,0 @@
-require 'chef/provisioning/convergence_strategy'
-
-class Chef
-  module Provisioning
-    class ConvergenceStrategy
-      class Preinstalled < PrecreateChefObjects
-      end
-    end
-  end
-end

data/lib/chef/provisioning/transport/local.rb

@@ -1,63 +0,0 @@
-require 'chef/provisioning/transport'
-require 'chef/mixin/shell_out'
-require 'chef/log'
-
-class Chef
-module Provisioning
-  class Transport
-    class Local < Chef::Provisioning::Transport
-      include Chef::Mixin::ShellOut
-
-      #
-      # Create a new local transport.
-      #
-      # == Arguments
-      #
-      # - options: a hash of options for the transport itself, including:
-      #   - :prefix: a prefix to send before each command (e.g. "sudo ")
-      # - global_config: an options hash that looks suspiciously similar to
-      #   Chef::Config, containing at least the key :log_level.
-      #
-      # The options are used in
-      #   Net::SSH.start(host, username, ssh_options)
-
-      def initialize(options, global_config)
-        @options = options
-        @config = global_config
-      end
-
-      attr_reader :options
-      attr_reader :config
-
-      def execute(command, execute_options = {})
-        Chef::Log.info("Executing #{options[:prefix]}#{command} locally")
-        result = shell_out!(command, execute_options)
-        Chef::Log.info("Completed #{command} on #{username}@#{host}: exit status #{exitstatus}")
-        Chef::Log.debug("Stdout was:\n#{stdout}") if stdout != '' && !options[:stream] && !options[:stream_stdout] && config[:log_level] != :debug
-        Chef::Log.info("Stderr was:\n#{stderr}") if stderr != '' && !options[:stream] && !options[:stream_stderr] && config[:log_level] != :debug
-        result
-      end
-
-      def read_file(path)
-        IO.read(path)
-      end
-
-      def write_file(path, content)
-        IO.write(path, content)
-      end
-
-      # TODO do we need to bind_to?  Probably.
-      def make_url_available_to_remote(local_url, **options)
-        local_url
-      end
-
-      def disconnect
-      end
-
-      def available?
-        true
-      end
-    end
-  end
-end
-end