chef-provisioning 2.0.1 → 2.0.2

data/lib/chef/provisioning/machine/windows_machine.rb

@@ -1,108 +1,108 @@
-require 'chef/provisioning/machine/basic_machine'
-
-class Chef
-module Provisioning
-  class Machine
-    class WindowsMachine < BasicMachine
-      def initialize(machine_spec, transport, convergence_strategy)
-        super
-      end
-
-      # Options include:
-      #
-      # command_prefix - prefix to put in front of any command, e.g. sudo
-      attr_reader :options
-
-      # Delete file
-      def delete_file(action_handler, path)
-        if file_exists?(path)
-          action_handler.perform_action "delete file #{escape(path)} on #{machine_spec.name}" do
-            transport.execute("Remove-Item #{escape(path)}").error!
-          end
-        end
-      end
-
-      def is_directory?(path)
-        parse_boolean(transport.execute("Test-Path #{escape(path)} -pathtype container", :read_only => true).stdout)
-      end
-
-      # Return true or false depending on whether file exists
-      def file_exists?(path)
-        parse_boolean(transport.execute("Test-Path #{escape(path)}", :read_only => true).stdout)
-      end
-
-      def files_different?(path, local_path, content=nil)
-        if !file_exists?(path) || (local_path && !File.exists?(local_path))
-          return true
-        end
-
-        # Get remote checksum of file (from http://stackoverflow.com/a/13926809)
-        result = transport.execute(<<-EOM, :read_only => true)
-$md5 = [System.Security.Cryptography.MD5]::Create("MD5")
-$fd = [System.IO.File]::OpenRead(#{path.inspect})
-$buf = new-object byte[] (1024*1024*8) # 8mb buffer
-while (($read_len = $fd.Read($buf,0,$buf.length)) -eq $buf.length){
-    $total += $buf.length
-    $md5.TransformBlock($buf,$offset,$buf.length,$buf,$offset)
-}
-# finalize the last read
-$md5.TransformFinalBlock($buf,0,$read_len)
-$hash = $md5.Hash
-# convert hash bytes to hex formatted string
-$hash | foreach { $hash_txt += $_.ToString("x2") }
-$hash_txt
-EOM
-        result.error!
-        remote_sum = result.stdout.split(' ')[0]
-        digest = Digest::SHA256.new
-        if content
-          digest.update(content)
-        else
-          File.open(local_path, 'rb') do |io|
-            while (buf = io.read(4096)) && buf.length > 0
-              digest.update(buf)
-            end
-          end
-        end
-        remote_sum != digest.hexdigest
-      end
-
-      def create_dir(action_handler, path)
-        if !file_exists?(path)
-          action_handler.perform_action "create directory #{path} on #{machine_spec.name}" do
-            transport.execute("New-Item #{escape(path)} -Type directory")
-          end
-        end
-      end
-
-      def system_drive
-        transport.execute('$env:SystemDrive').stdout.strip
-      end
-
-      # Set file attributes { :owner, :group, :rights }
-#      def set_attributes(action_handler, path, attributes)
-#      end
-
-      # Get file attributes { :owner, :group, :rights }
-#      def get_attributes(path)
-#      end
-
-      def dirname_on_machine(path)
-        path.split(/[\\\/]/)[0..-2].join('\\')
-      end
-
-      def escape(string)
-        transport.escape(string)
-      end
-
-      def parse_boolean(string)
-        if string =~ /^\s*true\s*$/mi
-          true
-        else
-          false
-        end
-      end
-    end
-  end
-end
-end
+require 'chef/provisioning/machine/basic_machine'
+
+class Chef
+module Provisioning
+  class Machine
+    class WindowsMachine < BasicMachine
+      def initialize(machine_spec, transport, convergence_strategy)
+        super
+      end
+
+      # Options include:
+      #
+      # command_prefix - prefix to put in front of any command, e.g. sudo
+      attr_reader :options
+
+      # Delete file
+      def delete_file(action_handler, path)
+        if file_exists?(path)
+          action_handler.perform_action "delete file #{escape(path)} on #{machine_spec.name}" do
+            transport.execute("Remove-Item #{escape(path)}").error!
+          end
+        end
+      end
+
+      def is_directory?(path)
+        parse_boolean(transport.execute("Test-Path #{escape(path)} -pathtype container", :read_only => true).stdout)
+      end
+
+      # Return true or false depending on whether file exists
+      def file_exists?(path)
+        parse_boolean(transport.execute("Test-Path #{escape(path)}", :read_only => true).stdout)
+      end
+
+      def files_different?(path, local_path, content=nil)
+        if !file_exists?(path) || (local_path && !File.exists?(local_path))
+          return true
+        end
+
+        # Get remote checksum of file (from http://stackoverflow.com/a/13926809)
+        result = transport.execute(<<-EOM, :read_only => true)
+$md5 = [System.Security.Cryptography.MD5]::Create("MD5")
+$fd = [System.IO.File]::OpenRead(#{path.inspect})
+$buf = new-object byte[] (1024*1024*8) # 8mb buffer
+while (($read_len = $fd.Read($buf,0,$buf.length)) -eq $buf.length){
+    $total += $buf.length
+    $md5.TransformBlock($buf,$offset,$buf.length,$buf,$offset)
+}
+# finalize the last read
+$md5.TransformFinalBlock($buf,0,$read_len)
+$hash = $md5.Hash
+# convert hash bytes to hex formatted string
+$hash | foreach { $hash_txt += $_.ToString("x2") }
+$hash_txt
+EOM
+        result.error!
+        remote_sum = result.stdout.split(' ')[0]
+        digest = Digest::SHA256.new
+        if content
+          digest.update(content)
+        else
+          File.open(local_path, 'rb') do |io|
+            while (buf = io.read(4096)) && buf.length > 0
+              digest.update(buf)
+            end
+          end
+        end
+        remote_sum != digest.hexdigest
+      end
+
+      def create_dir(action_handler, path)
+        if !file_exists?(path)
+          action_handler.perform_action "create directory #{path} on #{machine_spec.name}" do
+            transport.execute("New-Item #{escape(path)} -Type directory")
+          end
+        end
+      end
+
+      def system_drive
+        transport.execute('$env:SystemDrive').stdout.strip
+      end
+
+      # Set file attributes { :owner, :group, :rights }
+#      def set_attributes(action_handler, path, attributes)
+#      end
+
+      # Get file attributes { :owner, :group, :rights }
+#      def get_attributes(path)
+#      end
+
+      def dirname_on_machine(path)
+        path.split(/[\\\/]/)[0..-2].join('\\')
+      end
+
+      def escape(string)
+        transport.escape(string)
+      end
+
+      def parse_boolean(string)
+        if string =~ /^\s*true\s*$/mi
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end
+end

data/lib/chef/provisioning/machine_image_spec.rb

@@ -1,34 +1,34 @@
-require 'chef/provisioning/managed_entry'
-
-class Chef
-module Provisioning
-  #
-  # Specification for a image. Sufficient information to find and contact it
-  # after it has been set up.
-  #
-  class MachineImageSpec < ManagedEntry
-    alias :location :reference
-    alias :location= :reference=
-
-    def from_image
-      data['from_image']
-    end
-    def from_image=(value)
-      data['from_image'] = value
-    end
-    def run_list
-      data['run_list']
-    end
-    def run_list=(value)
-      data['run_list'] = value
-    end
-    def machine_options
-      @machine_options
-    end
-    def machine_options=(value)
-      Chef::Log.warn("Machine options are no longer stored in machine_image_spec.  Drivers that store machine_options will stop working with Provisioning 1.0.")
-      @machine_options = value
-    end
-  end
-end
-end
+require 'chef/provisioning/managed_entry'
+
+class Chef
+module Provisioning
+  #
+  # Specification for a image. Sufficient information to find and contact it
+  # after it has been set up.
+  #
+  class MachineImageSpec < ManagedEntry
+    alias :location :reference
+    alias :location= :reference=
+
+    def from_image
+      data['from_image']
+    end
+    def from_image=(value)
+      data['from_image'] = value
+    end
+    def run_list
+      data['run_list']
+    end
+    def run_list=(value)
+      data['run_list'] = value
+    end
+    def machine_options
+      @machine_options
+    end
+    def machine_options=(value)
+      Chef::Log.warn("Machine options are no longer stored in machine_image_spec.  Drivers that store machine_options will stop working with Provisioning 1.0.")
+      @machine_options = value
+    end
+  end
+end
+end

data/lib/chef/provisioning/machine_spec.rb

@@ -1,58 +1,58 @@
-require 'chef/provisioning/managed_entry'
-
-class Chef
-module Provisioning
-  #
-  # Specification for a machine. Sufficient information to find and contact it
-  # after it has been set up.
-  #
-  class MachineSpec < ManagedEntry
-    def initialize(*args)
-      super
-      data['name'] ||= name
-      # Upgrade from metal to chef_provisioning ASAP.
-      if data['normal'] && !data['normal']['chef_provisioning'] && data['normal']['metal']
-        data['normal']['chef_provisioning'] = data['normal'].delete('metal')
-      end
-    end
-
-    alias :node :data
-
-    def attrs
-      data['normal'] ||= {}
-      data['normal']['chef_provisioning'] ||= {}
-    end
-
-    #
-    # Location of this machine. This should be a freeform hash, with enough
-    # information for the driver to look it up and create a Machine object to
-    # access it.
-    #
-    # This MUST include a 'driver_url' attribute with the driver's URL in it.
-    #
-    # chef-provisioning will do its darnedest to not lose this information.
-    #
-    def reference
-      attrs['reference'] || attrs['location']
-    end
-
-    #
-    # Set the location for this machine.
-    #
-    def reference=(value)
-      attrs.delete('location')
-      attrs['reference'] = value
-    end
-
-    alias :location :reference
-    alias :location= :reference=
-
-    def from_image
-      attrs['from_image']
-    end
-    def from_image=(value)
-      attrs['from_image'] = value
-    end
-  end
-end
-end
+require 'chef/provisioning/managed_entry'
+
+class Chef
+module Provisioning
+  #
+  # Specification for a machine. Sufficient information to find and contact it
+  # after it has been set up.
+  #
+  class MachineSpec < ManagedEntry
+    def initialize(*args)
+      super
+      data['name'] ||= name
+      # Upgrade from metal to chef_provisioning ASAP.
+      if data['normal'] && !data['normal']['chef_provisioning'] && data['normal']['metal']
+        data['normal']['chef_provisioning'] = data['normal'].delete('metal')
+      end
+    end
+
+    alias :node :data
+
+    def attrs
+      data['normal'] ||= {}
+      data['normal']['chef_provisioning'] ||= {}
+    end
+
+    #
+    # Location of this machine. This should be a freeform hash, with enough
+    # information for the driver to look it up and create a Machine object to
+    # access it.
+    #
+    # This MUST include a 'driver_url' attribute with the driver's URL in it.
+    #
+    # chef-provisioning will do its darnedest to not lose this information.
+    #
+    def reference
+      attrs['reference'] || attrs['location']
+    end
+
+    #
+    # Set the location for this machine.
+    #
+    def reference=(value)
+      attrs.delete('location')
+      attrs['reference'] = value
+    end
+
+    alias :location :reference
+    alias :location= :reference=
+
+    def from_image
+      attrs['from_image']
+    end
+    def from_image=(value)
+      attrs['from_image'] = value
+    end
+  end
+end
+end

data/lib/chef/provisioning/managed_entry.rb

@@ -1,121 +1,121 @@
-class Chef
-module Provisioning
-  #
-  # Specification for a managed thing.  Remembers where it was stored, and lets
-  # you stuff reference data in it.
-  #
-  class ManagedEntry
-    def initialize(managed_entry_store, resource_type, name, data=nil)
-      @managed_entry_store = managed_entry_store
-      @resource_type = resource_type
-      @name = name
-      @data = data || {}
-    end
-
-    attr_reader :managed_entry_store
-    attr_reader :resource_type
-    attr_reader :name
-    attr_reader :data
-
-    def attrs
-      data
-    end
-
-    #
-    # Globally unique identifier for this machine. Does not depend on the machine's
-    # reference or existence.
-    #
-    def id
-      managed_entry_store.identifier(resource_type, name)
-    end
-
-    #
-    # Reference to this managed thing.  This should be a freeform hash, with enough
-    # information for the driver to look it up and create a Machine object to
-    # access it.
-    #
-    # This MUST include a 'driver_url' attribute with the driver's URL in it.
-    #
-    # chef-provisioning will do its darnedest to not lose this information.
-    #
-    def reference
-      # Backcompat: old data bags didn't have the "reference" field.  If we have
-      # no reference field in the data, and the data bag is non-empty, return
-      # the root of the data bag.
-      attrs['reference'] || attrs['location'] || (attrs == {} ? nil : attrs)
-    end
-
-    #
-    # Set the reference for this machine.
-    #
-    def reference=(value)
-      self.attrs['reference'] = value
-    end
-
-    # URL to the driver.
-    def driver_url
-      attrs['driver_url'] || (reference ? reference['driver_url'] : nil)
-    end
-    def driver_url=(value)
-      attrs['driver_url'] = value
-    end
-
-    #
-    # Save this node to the server.  If you have significant information that
-    # could be lost, you should do this as quickly as possible.  Data will be
-    # saved automatically for you after allocate_machine and ready_machine.
-    #
-    def save(action_handler)
-      managed_entry_store.save_data(resource_type, name, data, action_handler)
-    end
-
-    def delete(action_handler)
-      managed_entry_store.delete_data(resource_type, name, action_handler)
-    end
-
-
-    #
-    # Subclass interface
-    #
-
-    #
-    # Get the given data
-    #
-    # @param resource_type [Symbol] The type of thing to retrieve (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
-    # @param name [String] The unique identifier of the thing to retrieve
-    #
-    # @return [Hash,Array] The data, or `nil` if the data does not exist.  Will be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
-    #
-    def get_data(resource_type, name)
-      raise NotImplementedError, :delete_data
-    end
-
-    #
-    # Save the given data
-    #
-    # @param resource_type [Symbol] The type of thing to save (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet ...)
-    # @param name [String] The unique identifier of the thing to save
-    # @param data [Hash,Array] The data to save.  Must be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
-    #
-    def save_data(resource_type, name, data, action_handler)
-      raise NotImplementedError, :delete_data
-    end
-
-    #
-    # Delete the given data
-    #
-    # @param resource_type [Symbol] The type of thing to delete (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
-    # @param name [String] The unique identifier of the thing to delete
-    #
-    # @return [Boolean] Whether anything was deleted or not.
-    #
-    def delete_data(resource_type, name, action_handler)
-      raise NotImplementedError, :delete_data
-    end
-
-    def identifier(resource_type, name)
-      raise NotImplementedError, :identifier
-    end
-  end
-end
-end
+class Chef
+module Provisioning
+  #
+  # Specification for a managed thing.  Remembers where it was stored, and lets
+  # you stuff reference data in it.
+  #
+  class ManagedEntry
+    def initialize(managed_entry_store, resource_type, name, data=nil)
+      @managed_entry_store = managed_entry_store
+      @resource_type = resource_type
+      @name = name
+      @data = data || {}
+    end
+
+    attr_reader :managed_entry_store
+    attr_reader :resource_type
+    attr_reader :name
+    attr_reader :data
+
+    def attrs
+      data
+    end
+
+    #
+    # Globally unique identifier for this machine. Does not depend on the machine's
+    # reference or existence.
+    #
+    def id
+      managed_entry_store.identifier(resource_type, name)
+    end
+
+    #
+    # Reference to this managed thing.  This should be a freeform hash, with enough
+    # information for the driver to look it up and create a Machine object to
+    # access it.
+    #
+    # This MUST include a 'driver_url' attribute with the driver's URL in it.
+    #
+    # chef-provisioning will do its darnedest to not lose this information.
+    #
+    def reference
+      # Backcompat: old data bags didn't have the "reference" field.  If we have
+      # no reference field in the data, and the data bag is non-empty, return
+      # the root of the data bag.
+      attrs['reference'] || attrs['location'] || (attrs == {} ? nil : attrs)
+    end
+
+    #
+    # Set the reference for this machine.
+    #
+    def reference=(value)
+      self.attrs['reference'] = value
+    end
+
+    # URL to the driver.
+    def driver_url
+      attrs['driver_url'] || (reference ? reference['driver_url'] : nil)
+    end
+    def driver_url=(value)
+      attrs['driver_url'] = value
+    end
+
+    #
+    # Save this node to the server.  If you have significant information that
+    # could be lost, you should do this as quickly as possible.  Data will be
+    # saved automatically for you after allocate_machine and ready_machine.
+    #
+    def save(action_handler)
+      managed_entry_store.save_data(resource_type, name, data, action_handler)
+    end
+
+    def delete(action_handler)
+      managed_entry_store.delete_data(resource_type, name, action_handler)
+    end
+
+
+    #
+    # Subclass interface
+    #
+
+    #
+    # Get the given data
+    #
+    # @param resource_type [Symbol] The type of thing to retrieve (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
+    # @param name [String] The unique identifier of the thing to retrieve
+    #
+    # @return [Hash,Array] The data, or `nil` if the data does not exist.  Will be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
+    #
+    def get_data(resource_type, name)
+      raise NotImplementedError, :delete_data
+    end
+
+    #
+    # Save the given data
+    #
+    # @param resource_type [Symbol] The type of thing to save (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet ...)
+    # @param name [String] The unique identifier of the thing to save
+    # @param data [Hash,Array] The data to save.  Must be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
+    #
+    def save_data(resource_type, name, data, action_handler)
+      raise NotImplementedError, :delete_data
+    end
+
+    #
+    # Delete the given data
+    #
+    # @param resource_type [Symbol] The type of thing to delete (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
+    # @param name [String] The unique identifier of the thing to delete
+    #
+    # @return [Boolean] Whether anything was deleted or not.
+    #
+    def delete_data(resource_type, name, action_handler)
+      raise NotImplementedError, :delete_data
+    end
+
+    def identifier(resource_type, name)
+      raise NotImplementedError, :identifier
+    end
+  end
+end
+end