chef-provisioning 0.19 → 0.20

data/lib/chef/provisioning/recipe_dsl.rb

@@ -19,10 +19,6 @@ class Chef
   module DSL
     module Recipe
 
-      def with_data_center(data_center, &block)
-        run_context.chef_metal.with_data_center(data_center, &block)
-      end
-
       def with_driver(driver, options = nil, &block)
         run_context.chef_provisioning.with_driver(driver, options, &block)
       end

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '0.19'
+  VERSION = '0.20'
 end
 end

data/lib/chef/resource/chef_data_bag_resource.rb

@@ -10,8 +10,6 @@ class Chef::Resource::ChefDataBagResource < Chef::Resource::LWRPBase
   class << self
     # The name of the databag to store the item in.
     attr_reader :databag_name
-    # A list of attributes to be persisted into the databag.
-    attr_reader :stored_attributes
   end
 
   def initialize(name, run_context=nil)
@@ -20,6 +18,7 @@ class Chef::Resource::ChefDataBagResource < Chef::Resource::LWRPBase
     self.hydrate
   end
 
+  # A list of attributes to be persisted into the databag.
   # @return [Array] List of attributes that are stored in the databag
   def self.stored_attributes
     @stored_attributes || []

data/lib/chef/resource/load_balancer.rb

@@ -22,6 +22,7 @@ class Chef
 
       # Driver attributes
       attribute :driver
+      attribute :chef_server
       attribute :load_balancer_options
       attribute :name, :kind_of => String, :name_attribute => true
       attribute :machines

data/lib/chef/resource/machine.rb

@@ -48,7 +48,7 @@ class Machine < Chef::Resource::LWRPBase
   attribute :validator, :kind_of => [TrueClass, FalseClass]
 
   # Client Ohai hints, allows machine to enable hints
-  # e.g. ohai_hint 'ec2' => { 'a' => 'b' } creates file ec2.json with json contents { 'a': 'b' }
+  # e.g. ohai_hints 'ec2' => { 'a' => 'b' } creates file ec2.json with json contents { 'a': 'b' }
   attribute :ohai_hints, :kind_of => Hash
 
   # A string containing extra configuration for the machine

data/lib/chef/resource/machine_batch.rb

@@ -22,7 +22,7 @@ class MachineBatch < Chef::Resource::LWRPBase
   attribute :max_simultaneous, :kind_of => [ Integer ]
   attribute :from_recipe
 
-  # These four attributes are for when you pass names or MachineSpecs to
+  # These four attributes are for when you pass names or ManagedEntrys to
   # "machines".  Not used for auto-batch or explicit inline machine declarations.
   attribute :driver
   attribute :chef_server
@@ -58,7 +58,7 @@ class MachineBatch < Chef::Resource::LWRPBase
       end
     end
     machine_names = @machines.map do |m|
-      if m.is_a?(Chef::Provisioning::MachineSpec)
+      if m.is_a?(Chef::Provisioning::ManagedEntry)
         m.name
       elsif m.is_a?(Chef::Resource::Machine)
         m.name

data/lib/chef/resource/machine_execute.rb

@@ -19,10 +19,11 @@ class MachineExecute < Chef::Resource::LWRPBase
 
   attribute :command, :kind_of => String, :name_attribute => true
   attribute :machine, :kind_of => String
+  attribute :live_stream, :kind_of => [TrueClass,FalseClass], :default => false
 
   attribute :chef_server, :kind_of => Hash
   attribute :driver, :kind_of => Chef::Provisioning::Driver
 
 end
 end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -144,9 +144,7 @@ files:
 - lib/chef/provisioning.rb
 - lib/chef/provisioning/action_handler.rb
 - lib/chef/provisioning/add_prefix_action_handler.rb
-- lib/chef/provisioning/chef_image_spec.rb
-- lib/chef/provisioning/chef_load_balancer_spec.rb
-- lib/chef/provisioning/chef_machine_spec.rb
+- lib/chef/provisioning/chef_managed_entry_store.rb
 - lib/chef/provisioning/chef_provider_action_handler.rb
 - lib/chef/provisioning/chef_run_data.rb
 - lib/chef/provisioning/convergence_strategy.rb
@@ -156,13 +154,15 @@ files:
 - lib/chef/provisioning/convergence_strategy/no_converge.rb
 - lib/chef/provisioning/convergence_strategy/precreate_chef_objects.rb
 - lib/chef/provisioning/driver.rb
-- lib/chef/provisioning/image_spec.rb
 - lib/chef/provisioning/load_balancer_spec.rb
 - lib/chef/provisioning/machine.rb
 - lib/chef/provisioning/machine/basic_machine.rb
 - lib/chef/provisioning/machine/unix_machine.rb
 - lib/chef/provisioning/machine/windows_machine.rb
+- lib/chef/provisioning/machine_image_spec.rb
 - lib/chef/provisioning/machine_spec.rb
+- lib/chef/provisioning/managed_entry.rb
+- lib/chef/provisioning/managed_entry_store.rb
 - lib/chef/provisioning/recipe_dsl.rb
 - lib/chef/provisioning/transport.rb
 - lib/chef/provisioning/transport/ssh.rb
@@ -195,9 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.
 test_files: []
-has_rdoc: 

data/lib/chef/provisioning/chef_image_spec.rb

@@ -1,111 +0,0 @@
-require 'chef/provisioning'
-require 'cheffish'
-require 'chef/provisioning/image_spec'
-
-class Chef
-module Provisioning
-  #
-  # Specification for a image. Sufficient information to find and contact it
-  # after it has been set up.
-  #
-  class ChefImageSpec < ImageSpec
-    def initialize(node, chef_server)
-      super(node)
-      @chef_server = chef_server
-    end
-
-    #
-    # Get a ImageSpec from the chef server.  If the image does not exist on the
-    # server, it returns nil.
-    #
-    def self.get(name, chef_server = Cheffish.default_chef_server)
-      chef_api = Cheffish.chef_server_api(chef_server)
-      begin
-        data = chef_api.get("/data/images/#{name}")
-        data['machine_options'] = strings_to_symbols(data['machine_options'])
-        ChefImageSpec.new(data, chef_server)
-      rescue Net::HTTPServerException => e
-        if e.response.code == '404'
-          nil
-        else
-          raise
-        end
-      end
-    end
-
-    # Creates a new empty ImageSpec with the given name.
-    def self.empty(id, chef_server = Cheffish.default_chef_server)
-      ChefImageSpec.new({ 'id' => id }, chef_server)
-    end
-
-    #
-    # Globally unique identifier for this image. Does not depend on the image's
-    # location or existence.
-    #
-    def id
-      ChefImageSpec.id_from(chef_server, name)
-    end
-
-    def self.id_from(chef_server, name)
-      "#{chef_server[:chef_server_url]}/data/images/#{name}"
-    end
-
-    #
-    # Save this image 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_image and ready_image.
-    #
-    def save(action_handler)
-      # Save the image to the server.
-      _self = self
-      _chef_server = _self.chef_server
-      Chef::Provisioning.inline_resource(action_handler) do
-        # Create the data bag if needed
-        chef_data_bag 'images'
-        # Save the image
-        chef_data_bag_item _self.name do
-          data_bag 'images'
-          chef_server _chef_server
-          raw_data _self.image_data
-        end
-      end
-    end
-
-    def delete(action_handler)
-      # Delete the image from the server.
-      _self = self
-      _chef_server = _self.chef_server
-      Chef::Provisioning.inline_resource(action_handler) do
-        chef_data_bag_item _self.name do
-          data_bag 'images'
-          chef_server _chef_server
-          action :delete
-        end
-      end
-    end
-
-    protected
-
-    attr_reader :chef_server
-
-    #
-    # Chef API object for the given Chef server
-    #
-    def chef_api
-      Cheffish.server_api_for(chef_server)
-    end
-
-    def self.strings_to_symbols(data)
-      if data.is_a?(Hash)
-        result = {}
-        data.each_pair do |key, value|
-          result[key.to_sym] = strings_to_symbols(value)
-        end
-        result
-      else
-        data
-      end
-    end
-  end
-end
-end

data/lib/chef/provisioning/chef_load_balancer_spec.rb

@@ -1,108 +0,0 @@
-require 'chef/provisioning'
-require 'cheffish'
-require 'chef/provisioning/load_balancer_spec'
-
-class Chef
-module Provisioning
-  #
-  # Specification for a image. Sufficient information to find and contact it
-  # after it has been set up.
-  #
-  class ChefLoadBalancerSpec < LoadBalancerSpec
-    def initialize(node, chef_server)
-      super(node)
-      @chef_server = chef_server
-    end
-
-    #
-    # Get a ImageSpec from the chef server.  If the node does not exist on the
-    # server, it returns nil.
-    #
-    def self.get(name, chef_server = Cheffish.default_chef_server)
-      chef_api = Cheffish.chef_server_api(chef_server)
-      begin
-        data = chef_api.get("/data/loadbalancers/#{name}")
-        ChefLoadBalancerSpec.new(data, chef_server)
-      rescue Net::HTTPServerException => e
-        if e.response.code == '404'
-          nil
-        else
-          raise
-        end
-      end
-    end
-
-    # Creates a new empty ImageSpec with the given name.
-    def self.empty(id, chef_server = Cheffish.default_chef_server)
-      ChefLoadBalancerSpec.new({ 'id' => id }, chef_server)
-    end
-
-    #
-    # Globally unique identifier for this image. Does not depend on the image's
-    # location or existence.
-    #
-    def id
-      ChefLoadBalancerSpec.id_from(chef_server, name)
-    end
-
-    def self.id_from(chef_server, name)
-      "#{chef_server[:chef_server_url]}/data/loadbalancers/#{name}"
-    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_image and ready_image.
-    #
-    def save(action_handler)
-      # Save the node to the server.
-      _self = self
-      _chef_server = _self.chef_server
-      Chef::Provisioning.inline_resource(action_handler) do
-        chef_data_bag 'loadbalancers'
-        chef_data_bag_item _self.name do
-          data_bag 'loadbalancers'
-          chef_server _chef_server
-          raw_data _self.load_balancer_data
-        end
-      end
-    end
-
-    def delete(action_handler)
-      # Save the node to the server.
-      _self = self
-      _chef_server = _self.chef_server
-      Chef::Provisioning.inline_resource(action_handler) do
-        chef_data_bag_item _self.name do
-          data_bag 'loadbalancers'
-          chef_server _chef_server
-          action :delete
-        end
-      end
-    end
-
-    protected
-
-    attr_reader :chef_server
-
-    #
-    # Chef API object for the given Chef server
-    #
-    def chef_api
-      Cheffish.server_api_for(chef_server)
-    end
-
-    def self.strings_to_symbols(data)
-      if data.is_a?(Hash)
-        result = {}
-        data.each_pair do |key, value|
-          result[key.to_sym] = strings_to_symbols(value)
-        end
-        result
-      else
-        data
-      end
-    end
-  end
-end
-end

data/lib/chef/provisioning/chef_machine_spec.rb

@@ -1,83 +0,0 @@
-require 'chef/provisioning'
-require 'cheffish'
-require 'chef/provisioning/machine_spec'
-
-class Chef
-module Provisioning
-  #
-  # Specification for a machine. Sufficient information to find and contact it
-  # after it has been set up.
-  #
-  class ChefMachineSpec < MachineSpec
-    def initialize(node, chef_server)
-      super(node)
-      @chef_server = chef_server
-    end
-
-    #
-    # Get a MachineSpec from the chef server.  If the node does not exist on the
-    # server, it returns nil.
-    #
-    def self.get(name, chef_server = Cheffish.default_chef_server)
-      chef_api = Cheffish.chef_server_api(chef_server)
-      begin
-        ChefMachineSpec.new(chef_api.get("/nodes/#{name}"), chef_server)
-      rescue Net::HTTPServerException => e
-        if e.response.code == '404'
-          nil
-        else
-          raise
-        end
-      end
-    end
-
-    # Creates a new empty MachineSpec with the given name.
-    def self.empty(name, chef_server = Cheffish.default_chef_server)
-      ChefMachineSpec.new({ 'name' => name, 'normal' => {} }, chef_server)
-    end
-
-    #
-    # Globally unique identifier for this machine. Does not depend on the machine's
-    # location or existence.
-    #
-    def id
-      ChefMachineSpec.id_from(chef_server, name)
-    end
-
-    def self.id_from(chef_server, name)
-      "#{chef_server[:chef_server_url]}/nodes/#{name}"
-    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)
-      if location && (!location.is_a?(Hash) || !location['driver_url'])
-        raise "Drivers must specify a canonical driver_url in machine_spec.location.  Contact your driver's author."
-      end
-      # Save the node to the server.
-      _self = self
-      _chef_server = _self.chef_server
-      Chef::Provisioning.inline_resource(action_handler) do
-        chef_node _self.name do
-          chef_server _chef_server
-          raw_json _self.node
-        end
-      end
-    end
-
-    protected
-
-    attr_reader :chef_server
-
-    #
-    # Chef API object for the given Chef server
-    #
-    def chef_api
-      Cheffish.server_api_for(chef_server)
-    end
-  end
-end
-end