microwave 0.1004.5 → 0.1004.6

data/lib/chef/mixin/shell_out.rb

@@ -23,6 +23,7 @@ class Chef
     module ShellOut
 
       def shell_out(*command_args)
+        Chef::Log.debug "Shelling out: #{command_args.join(" ")}"
         cmd = Chef::ShellOut.new(*command_args)
         if STDOUT.tty? && Chef::Log.debug?
           cmd.live_stream = STDOUT

data/lib/chef/node.rb

@@ -398,35 +398,6 @@ class Chef
       self
     end
 
-    # Create a Chef::Node from JSON
-    def self.json_create(o)
-      node = new
-      node.name(o["name"])
-      node.chef_environment(o["chef_environment"])
-      if o.has_key?("attributes")
-        node.normal_attrs = o["attributes"]
-      end
-      node.automatic_attrs = Mash.new(o["automatic"]) if o.has_key?("automatic")
-      node.normal_attrs = Mash.new(o["normal"]) if o.has_key?("normal")
-      node.default_attrs = Mash.new(o["default"]) if o.has_key?("default")
-      node.override_attrs = Mash.new(o["override"]) if o.has_key?("override")
-
-      if o.has_key?("run_list")
-        node.run_list.reset!(o["run_list"])
-      else
-        o["recipes"].each { |r| node.recipes << r }
-      end
-      node
-    end
-
-    def self.find_or_create(node_name)
-      load(node_name)
-    rescue Net::HTTPServerException => e
-      raise unless e.response.code == '404'
-      node = build(node_name)
-      node.create
-    end
-
     def self.build(node_name)
       node = new
       node.name(node_name)

data/lib/chef/provider/execute.rb

@@ -55,6 +55,7 @@ class Chef
           opts[:live_stream] = STDOUT
         end
 
+        Chef::Log.debug "Executing: #{@new_resource.command} #{$testrun}"
         result = $testrun || shell_out!(@new_resource.command, opts)
         @new_resource.updated_by_last_action(true)
         Chef::Log.info("#{@new_resource} ran successfully")

data/lib/chef/provider/file.rb

@@ -179,9 +179,7 @@ class Chef
         file ||= @new_resource.path
         if @new_resource.backup != false && @new_resource.backup > 0 && ::File.exist?(file)
           time = Time.now
-          savetime = time.strftime("%Y%m%d%H%M%S")
-          backup_filename = "#{@new_resource.path}.chef-#{savetime}"
-          backup_filename = backup_filename.sub(/^([A-Za-z]:)/, "") #strip drive letter on Windows
+          backup_filename = @new_resource.path
           # if :file_backup_path is nil, we fallback to the old behavior of
           # keeping the backup in the same directory. We also need to to_s it
           # so we don't get a type error around implicit to_str conversions.
@@ -190,17 +188,6 @@ class Chef
           FileUtils.mkdir_p(::File.dirname(backup_path)) if Chef::Config[:file_backup_path]
           FileUtils.cp(file, backup_path, :preserve => true)
           Chef::Log.info("#{@new_resource} backed up to #{backup_path}")
-
-          # Clean up after the number of backups
-          slice_number = @new_resource.backup
-          backup_files = Dir[::File.join(prefix, ".#{@new_resource.path}.chef-*")].sort { |a,b| b <=> a }
-          if backup_files.length >= @new_resource.backup
-            remainder = backup_files.slice(slice_number..-1)
-            remainder.each do |backup_to_delete|
-              FileUtils.rm(backup_to_delete)
-              Chef::Log.info("#{@new_resource} removed backup at #{backup_to_delete}")
-            end
-          end
         end
       end
 

data/lib/chef/resource.rb

@@ -405,7 +405,7 @@ F
     end
 
     def run_action(action)
-      Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
+      Chef::Log.debug("Processing #{self} action #{action} (#{defined_at})")
 
       # ensure that we don't leave @updated_by_last_action set to true
       # on accident

data/lib/chef/role.rb

@@ -140,63 +140,6 @@ class Chef
       self
     end
 
-    # Create a Chef::Role from JSON
-    def self.json_create(o)
-      role = new
-      role.name(o["name"])
-      role.description(o["description"])
-      role.default_attributes(o["default_attributes"])
-      role.override_attributes(o["override_attributes"])
-
-      # _default run_list is in 'run_list' for newer clients, and
-      # 'recipes' for older clients.
-      env_run_list_hash = {"_default" => (o.has_key?("run_list") ? o["run_list"] : o["recipes"])}
-
-      # Clients before 0.10 do not include env_run_lists, so only
-      # merge if it's there.
-      if o["env_run_lists"]
-        env_run_list_hash.merge!(o["env_run_lists"])
-      end
-      role.env_run_lists(env_run_list_hash)
-
-      role
-    end
-
-    # Load a role by name from the API
-    def self.load(name)
-      chef_server_rest.get_rest("roles/#{name}")
-    end
-
-    def environment(env_name)
-      chef_server_rest.get_rest("roles/#{@name}/environments/#{env_name}")
-    end
-
-    def environments
-      chef_server_rest.get_rest("roles/#{@name}/environments")
-    end
-
-    # Remove this role via the REST API
-    def destroy
-      chef_server_rest.delete_rest("roles/#{@name}")
-    end
-
-    # Save this role via the REST API
-    def save
-      begin
-        chef_server_rest.put_rest("roles/#{@name}", self)
-      rescue Net::HTTPServerException => e
-        raise e unless e.response.code == "404"
-        chef_server_rest.post_rest("roles", self)
-      end
-      self
-    end
-
-    # Create the role via the REST API
-    def create
-      chef_server_rest.post_rest("roles", self)
-      self
-    end
-
     # As a string
     def to_s
       "role[#{@name}]"
@@ -204,17 +147,19 @@ class Chef
 
     # Load a role from disk - prefers to load the JSON, but will happily load
     # the raw rb files as well.
-    def self.from_disk(name, force=nil)
-      js_file = File.join(Chef::Config[:role_path], "#{name}.json")
-      rb_file = File.join(Chef::Config[:role_path], "#{name}.rb")
-
-      if File.exists?(js_file) || force == "json"
-        # from_json returns object.class => json_class in the JSON.
-        Chef::JSONCompat.from_json(IO.read(js_file))
-      elsif File.exists?(rb_file) || force == "ruby"
-        role = Chef::Role.new
-        role.name(name)
-        role.from_file(rb_file)
+    def self.from_disk(name)
+      role = nil
+      Chef::Config[:role_path].each do |rp|
+        rb_file = File.join(rp, "#{name}.rb")
+
+        if File.exists?(rb_file) && role.nil?
+          role = Chef::Role.new
+          role.name(name)
+          role.from_file(rb_file)
+        end
+      end
+
+      if role
         role
       else
         raise Chef::Exceptions::RoleNotFound, "Role '#{name}' could not be loaded from disk"

data/lib/chef/run_context.rb

@@ -31,7 +31,7 @@ class Chef
     # Used to load the node's recipes after expanding its run list
     include Chef::Mixin::LanguageIncludeRecipe
 
-    attr_reader :node, :cookbook_collection, :definitions
+    attr_reader :node, :cookbook_collection
 
     # Needs to be settable so deploy can run a resource_collection independent
     # of any cookbooks.
@@ -46,7 +46,6 @@ class Chef
       @node = node
       @cookbook_collection = cookbook_collection
       @resource_collection = Chef::ResourceCollection.new
-      @definitions = Hash.new
 
       # TODO: 5/18/2010 cw/timh - See note on Chef::Node's
       # cookbook_collection attr_accessor
@@ -58,7 +57,6 @@ class Chef
       load_lwrp_providers
       load_lwrp_resources
       load_attributes
-      load_resource_definitions
 
       # Precendence rules state that roles' attributes come after
       # cookbooks. Now we've loaded attributes from cookbooks with
@@ -101,18 +99,6 @@ class Chef
       node.load_attributes
     end
 
-    def load_resource_definitions
-      foreach_cookbook_load_segment(:definitions) do |cookbook_name, filename|
-        Chef::Log.debug("Loading cookbook #{cookbook_name}'s definitions from #{filename}")
-        resourcelist = Chef::ResourceDefinitionList.new
-        resourcelist.from_file(filename)
-        definitions.merge!(resourcelist.defines) do |key, oldval, newval|
-          Chef::Log.info("Overriding duplicate definition #{key}, new definition found in #{filename}")
-          newval
-        end
-      end
-    end
-
     def foreach_cookbook_load_segment(segment, &block)
       cookbook_collection.each do |cookbook_name, cookbook|
         segment_filenames = cookbook.segment_filenames(segment)

data/lib/chef/tasks/chef_repo.rake

@@ -88,7 +88,6 @@ def create_cookbook(dir)
   puts "** Creating cookbook #{ENV["COOKBOOK"]}"
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "attributes")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" 

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.1004.5'
+  VERSION = '0.1004.6'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: microwave
 version: !ruby/object:Gem::Version 
-  hash: 4005
+  hash: 4003
   prerelease: 
   segments: 
   - 0
   - 1004
-  - 5
-  version: 0.1004.5
+  - 6
+  version: 0.1004.6
 platform: ruby
 authors: 
 - Tom Bombadil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -90,7 +90,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: hike
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -104,7 +104,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: moneta
+  name: erubis
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -118,7 +118,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: moneta
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -132,7 +132,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sdoc
+  name: uuidtools
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -146,7 +146,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: fast_xs
+  name: sdoc
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -160,7 +160,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: dep_selector
+  name: fast_xs
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -173,6 +173,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dep_selector
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure, forked from Opscode Chef
 email: amanibhavam@destructuring.org
 executables: 
@@ -236,7 +250,6 @@ files:
 - lib/chef/monkey_patches/numeric.rb
 - lib/chef/monkey_patches/object.rb
 - lib/chef/monkey_patches/regexp.rb
-- lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/tempfile.rb
 - lib/chef/nil_argument.rb
 - lib/chef/node/attribute.rb
@@ -264,8 +277,6 @@ files:
 - lib/chef/resource.rb
 - lib/chef/resource_collection/stepable_iterator.rb
 - lib/chef/resource_collection.rb
-- lib/chef/resource_definition.rb
-- lib/chef/resource_definition_list.rb
 - lib/chef/resources.rb
 - lib/chef/role.rb
 - lib/chef/run_context.rb
@@ -280,10 +291,6 @@ files:
 - lib/chef/shell_out.rb
 - lib/chef/tasks/chef_repo.rake
 - lib/chef/util/file_edit.rb
-- lib/chef/util/windows/net_group.rb
-- lib/chef/util/windows/net_use.rb
-- lib/chef/util/windows/net_user.rb
-- lib/chef/util/windows/volume.rb
 - lib/chef/util/windows.rb
 - lib/chef/version.rb
 - lib/chef/version_class.rb

data/lib/chef/monkey_patches/string.rb

@@ -1,49 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-# == String (Patch)
-# On ruby 1.9, Strings are aware of multibyte characters, so +size+ and +length+
-# give the actual number of characters. In Chef::REST, we need the bytesize
-# so we can correctly set the Content-Length headers, but ruby 1.8.6 and lower
-# don't define String#bytesize. Monkey patching time!
-
-begin
-  require 'enumerator'
-rescue LoadError
-end
-
-class String
-  unless method_defined?(:bytesize)
-    alias :bytesize :size
-  end
-
-  unless method_defined?(:lines)
-    def lines
-      enum_for(:each)
-    end
-  end
-end
-
-# <= 1.8.6 needs some ord! 
-class String
-  unless method_defined?(:ord)
-    def ord
-      self.unpack('c').first
-    end
-  end
-end

data/lib/chef/resource_definition.rb

@@ -1,67 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'chef/mixin/from_file'
-require 'chef/mixin/params_validate'
-
-class Chef
-  class ResourceDefinition
-    
-    include Chef::Mixin::FromFile
-    include Chef::Mixin::ParamsValidate
-    
-    attr_accessor :name, :params, :recipe, :node
-    
-    def initialize(node=nil)
-      @name = nil
-      @params = Hash.new
-      @recipe = nil
-      @node = node
-    end
-    
-    def define(resource_name, prototype_params=nil, &block)
-      unless resource_name.kind_of?(Symbol)
-        raise ArgumentError, "You must use a symbol when defining a new resource!"
-      end
-      @name = resource_name
-      if prototype_params
-        unless prototype_params.kind_of?(Hash)
-          raise ArgumentError, "You must pass a hash as the prototype parameters for a definition."
-        end
-        @params = prototype_params
-      end
-      if Kernel.block_given?
-        @recipe = block
-      else
-        raise ArgumentError, "You must pass a block to a definition."
-      end
-      true
-    end
-    
-    # When we do the resource definition, we're really just setting new values for
-    # the paramaters we prototyped at the top.  This method missing is as simple as
-    # it gets.
-    def method_missing(symbol, *args)
-      @params[symbol] = args.length == 1 ? args[0] : args
-    end
-    
-    def to_s
-      "#{name.to_s}"
-    end
-  end
-end