chef 0.9.0.rc02 → 0.9.0

data/lib/chef/handler.rb

@@ -36,6 +36,12 @@ class Chef
     # The time the chef run ended
     def_delegator :@run_status, :end_time
 
+    ##
+    # :method: elapsed_time
+    #
+    # The time elapsed between the start and finish of the chef run
+    def_delegator :@run_status, :elapsed_time
+
     ##
     # :method: run_context
     #

data/lib/chef/knife.rb

@@ -195,7 +195,9 @@ class Chef
         config[:attribute].split(".").each do |attr|
           if data.respond_to?(:[])
             data = data[attr]
-          else
+          elsif data.nil?
+            nil # don't get no method error on nil
+          else data.respond_to?(attr.to_sym)
             data = data.send(attr.to_sym)
           end
         end

data/lib/chef/knife/client_create.rb

@@ -37,9 +37,17 @@ class Chef
 
       banner "Sub-Command: client create CLIENT (options)"
 
-      def run 
+      def run
+        @client_name = @name_args[0]
+
+        if @client_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a client name")
+          exit 1
+        end
+        
         client = Chef::ApiClient.new
-        client.name(@name_args[0])
+        client.name(@client_name)
         client.admin(config[:admin])
         
         output = edit_data(client)

data/lib/chef/knife/client_delete.rb

@@ -27,7 +27,15 @@ class Chef
       banner "Sub-Command: client delete CLIENT (options)"
 
       def run 
-        delete_object(Chef::ApiClient, @name_args[0])
+        @client_name = @name_args[0]
+
+        if @client_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a client name")
+          exit 1
+        end
+        
+        delete_object(Chef::ApiClient, @client_name)
       end
 
     end

data/lib/chef/knife/client_edit.rb

@@ -26,8 +26,16 @@ class Chef
 
       banner "Sub-Command: client edit CLIENT (options)"
 
-      def run 
-        edit_object(Chef::ApiClient, @name_args[0])
+      def run
+        @client_name = @name_args[0]
+
+        if @client_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a client name")
+          exit 1
+        end
+        
+        edit_object(Chef::ApiClient, @client_name)
       end
     end
   end

data/lib/chef/knife/client_reregister.rb

@@ -31,8 +31,16 @@ class Chef
         :long  => "--file FILE",
         :description => "Write the key to a file"
 
-      def run 
-        client = Chef::ApiClient.load(@name_args[0])
+      def run
+        @client_name = @name_args[0]
+
+        if @client_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a client name")
+          exit 1
+        end
+        
+        client = Chef::ApiClient.load(@client_name)
         key = client.save(true)
         if config[:file]
           File.open(config[:file], "w") do |f|

data/lib/chef/knife/client_show.rb

@@ -31,8 +31,16 @@ class Chef
         :long => "--attribute ATTR",
         :description => "Show only one attribute"
 
-      def run 
-        client = Chef::ApiClient.load(@name_args[0])
+      def run
+        @client_name = @name_args[0]
+
+        if @client_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a client name")
+          exit 1
+        end
+        
+        client = Chef::ApiClient.load(@client_name)
         output(format_for_display(client))
       end
 

data/lib/chef/knife/configure_client.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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/knife'
+
+class Chef
+  class Knife
+    class ConfigureClient < Knife
+      banner "Sub-Command: configure client DIRECTORY"
+
+      def run
+        unless @config_dir = @name_args[0]
+          Chef::Log.fatal "You must provide the directory to put the files in"
+          show_usage
+          exit(1)
+        end
+
+        Chef::Log.info("Creating client configuration")
+        system("mkdir -p #{@config_dir}")
+        Chef::Log.info("Writing client.rb")
+        File.open(File.join(@config_dir, "client.rb"), "w") do |file|
+          file.puts('log_level        :info')
+          file.puts('log_location     STDOUT')
+          file.puts("chef_server_url  '#{Chef::Config[:chef_server_url]}'")
+          file.puts("validation_client_name '#{Chef::Config[:validation_client_name]}'")
+        end
+        Chef::Log.info("Writing validation.pem")
+        system("cp #{Chef::Config[:validation_key]} #{File.join(@config_dir, 'validation.pem')}")
+      end
+
+    end
+  end
+end
+
+

data/lib/chef/knife/cookbook_show.rb

@@ -74,6 +74,10 @@ class Chef
           output(rest.get_rest("cookbooks/#{@name_args[0]}/#{cookbook_version}"))
         when 1 # We are showing the cookbook versions 
           output(rest.get_rest("cookbooks/#{@name_args[0]}"))
+        when 0
+          show_usage
+          Chef::Log.fatal("You must specify a cookbook name")
+          exit 1
         end
       end
 

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -31,13 +31,20 @@ class Chef
        :boolean => true,
        :description => "Grab dependencies automatically"
 
+      option :cookbook_path,
+        :short => "-o PATH:PATH",
+        :long => "--cookbook-path PATH:PATH",
+        :description => "A colon-separated path to look for cookbooks in",
+        :proc => lambda { |o| o.split(":") }
+
       def run
         if config[:cookbook_path]
-          vendor_path = File.expand_path(File.join(config[:cookbook_path].first))
+          Chef::Config[:cookbook_path] = config[:cookbook_path]
         else
-          Chef::Log.warn("cookbook path is not configured in your knife.rb, using the current directory for the cookbook repo")
-          vendor_path = Dir.pwd
+          config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
+
+        vendor_path = File.expand_path(File.join(config[:cookbook_path].first))
         cookbook_path = File.join(vendor_path, name_args[0])
         upstream_file = File.join(vendor_path, "#{name_args[0]}.tar.gz")
         branch_name = "chef-vendor-#{name_args[0]}"

data/lib/chef/knife/cookbook_test.rb

@@ -45,10 +45,10 @@ class Chef
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
 
-        if config[:all] 
+        if config[:all]
           cl = Chef::CookbookLoader.new
-          cl.each do |cookbook|
-            test_cookbook(cookbook.name.to_s)
+          cl.each do |key, cookbook|
+            test_cookbook(key)
           end
         else
           @name_args.each do |cb|
@@ -60,42 +60,21 @@ class Chef
       def test_cookbook(cookbook)
         Chef::Log.info("Running syntax check on #{cookbook}")
         Array(config[:cookbook_path]).reverse.each do |path|
-          cookbook_dir = File.expand_path(File.join(path, cookbook))
-          test_ruby(cookbook_dir)
-          test_templates(cookbook_dir)
+          syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook, path)
+          test_ruby(syntax_checker)
+          test_templates(syntax_checker)
         end
       end
 
-      def test_ruby(cookbook_dir)
-        cache = Chef::Cache::Checksum.instance
-        Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
-          key = cache.generate_key(ruby_file, "chef-test")
-          fstat = File.stat(ruby_file)
 
-          if cache.lookup_checksum(key, fstat) 
-            Chef::Log.info("No change in checksum of #{ruby_file}")
-          else
-            Chef::Log.info("Testing #{ruby_file} for syntax errors...")
-            Chef::Mixin::Command.run_command(:command => "ruby -c #{ruby_file}", :output_on_failure => true)
-            cache.generate_checksum(key, ruby_file, fstat)
-          end
-        end
+      def test_ruby(syntax_checker)
+        Chef::Log.info("Validating ruby files")
+        exit(1) unless syntax_checker.validate_ruby_files
       end
-
-      def test_templates(cookbook_dir)
-        cache = Chef::Cache::Checksum.instance
-        Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
-          key = cache.generate_key(erb_file, "chef-test")
-          fstat = File.stat(erb_file)
-
-          if cache.lookup_checksum(key, fstat) 
-            Chef::Log.info("No change in checksum of #{erb_file}")
-          else
-            Chef::Log.info("Testing template #{erb_file} for syntax errors...")
-            Chef::Mixin::Command.run_command(:command => "sh -c 'erubis -x #{erb_file} | ruby -c'", :output_on_failure => true)
-            cache.generate_checksum(key, erb_file, fstat)
-          end
-        end
+      
+      def test_templates(syntax_checker)
+        Chef::Log.info("Validating templates")
+        exit(1) unless syntax_checker.validate_templates
       end
 
     end

data/lib/chef/knife/cookbook_upload.rb

@@ -63,6 +63,11 @@ class Chef
             upload_cookbook(cookbook)
           end
         else
+          if @name_args.length < 1
+            show_usage
+            Chef::Log.fatal("You must specify the --all flag or at least one cookbook name")
+            exit 1
+          end
           @name_args.each do |cookbook_name|
             if cl.cookbook_exists?(cookbook_name)
               upload_cookbook(cl[cookbook_name])
@@ -133,7 +138,19 @@ class Chef
         end
         sandbox_url = new_sandbox['uri']
         Chef::Log.debug("Committing sandbox")
-        catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
+        # Retry if S3 is claims a checksum doesn't exist (the eventual
+        # in eventual consistency)
+        retries = 0
+        begin
+          catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
+        rescue Net::HTTPServerException => e
+          if e.to_s =~ /400 "Bad Request"/ && retries += 1 <= 1
+            sleep 2
+            retry
+          else
+            raise
+          end
+        end
 
         # files are uploaded, so save the manifest
         catch_auth_exceptions{ build_dir_cookbook.save }

data/lib/chef/knife/data_bag_create.rb

@@ -25,14 +25,29 @@ class Chef
 
       banner "Sub-Command: data bag create BAG [ITEM] (options)"
 
-      def run 
-        if @name_args.length == 2
-          create_object({ "id" => @name_args[1] }, "data_bag_item[#{@name_args[1]}]") do |output|
-            rest.post_rest("data/#{@name_args[0]}", output)
+      def run
+        @data_bag_name, @data_bag_item_name = @name_args
+
+        if @data_bag_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a data bag name")
+          exit 1
+        end
+        
+        # create the data bag
+        begin
+          rest.post_rest("data", { "name" => @data_bag_name })
+          Chef::Log.info("Created data_bag[#{@data_bag_name}]")
+        rescue Net::HTTPServerException => e
+          raise unless e.to_s =~ /^409/
+          Chef::Log.info("Data bag #{@data_bag_name} already exists")
+        end
+        
+        # if an item is specified, create it, as well
+        if @data_bag_item_name
+          create_object({ "id" => @data_bag_item_name }, "data_bag_item[#{@data_bag_item_name}]") do |output|
+            rest.post_rest("data/#{@data_bag_name}", output)
           end
-        else
-          rest.post_rest("data", { "name" => @name_args[0] })
-          Chef::Log.info("Created data_bag[#{@name_args[0]}]")
         end
       end
     end

data/lib/chef/knife/data_bag_delete.rb

@@ -30,10 +30,14 @@ class Chef
           delete_object(Chef::DataBagItem, @name_args[1], "data_bag_item") do
             rest.delete_rest("data/#{@name_args[0]}/#{@name_args[1]}")
           end
-        else
+        elsif @name_args.length == 1
           delete_object(Chef::DataBag, @name_args[0], "data_bag") do
             rest.delete_rest("data/#{@name_args[0]}")
           end
+        else
+          show_usage
+          Chef::Log.fatal("You must specify at least a data bag name")
+          exit 1
         end
       end
     end

data/lib/chef/knife/node_create.rb

@@ -26,9 +26,17 @@ class Chef
 
       banner "Sub-Command: node create NODE (options)"
 
-      def run 
+      def run
+        @node_name = @name_args[0]
+
+        if @node_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a node name")
+          exit 1
+        end
+        
         node = Chef::Node.new
-        node.name(@name_args[0])
+        node.name(@node_name)
         create_object(node)
       end
     end

data/lib/chef/knife/node_delete.rb

@@ -27,7 +27,15 @@ class Chef
       banner "Sub-Command: node delete NODE (options)"
 
       def run 
-        delete_object(Chef::Node, @name_args[0])
+        @node_name = @name_args[0]
+
+        if @node_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a node name")
+          exit 1
+        end
+        
+        delete_object(Chef::Node, @node_name)
       end
 
     end

data/lib/chef/knife/node_edit.rb

@@ -27,7 +27,15 @@ class Chef
       banner "Sub-Command: node edit NODE (options)"
 
       def run 
-        edit_object(Chef::Node, @name_args[0])
+        @node_name = @name_args[0]
+
+        if @node_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a node name")
+          exit 1
+        end
+        
+        edit_object(Chef::Node, @node_name)
       end
     end
   end

data/lib/chef/knife/node_show.rb

@@ -37,7 +37,15 @@ class Chef
         :description => "Show only the run list"
 
       def run 
-        node = Chef::Node.load(@name_args[0])
+        @node_name = @name_args[0]
+
+        if @node_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a node name")
+          exit 1
+        end
+        
+        node = Chef::Node.load(@node_name)
         output(format_for_display(node))
       end
     end

data/lib/chef/knife/role_create.rb

@@ -31,9 +31,17 @@ class Chef
         :long => "--description",
         :description => "The role description"
 
-      def run 
+      def run
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a role name")
+          exit 1
+        end
+        
         role = Chef::Role.new
-        role.name(@name_args[0])
+        role.name(@role_name)
         role.description(config[:description]) if config[:description]
         create_object(role)
       end

data/lib/chef/knife/role_delete.rb

@@ -27,7 +27,15 @@ class Chef
       banner "Sub-Command: role delete ROLE (options)"
 
       def run 
-        delete_object(Chef::Role, @name_args[0])
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a role name")
+          exit 1
+        end
+        
+        delete_object(Chef::Role, @role_name)
       end
 
     end

data/lib/chef/knife/role_edit.rb

@@ -27,7 +27,15 @@ class Chef
       banner "Sub-Command: role edit ROLE (options)"
 
       def run 
-        edit_object(Chef::Role, @name_args[0])
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a role name")
+          exit 1
+        end
+        
+        edit_object(Chef::Role, @role_name)
       end
     end
   end

data/lib/chef/knife/role_show.rb

@@ -32,7 +32,15 @@ class Chef
         :description => "Show only one attribute"
 
       def run 
-        role = Chef::Role.load(@name_args[0])
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a role name")
+          exit 1
+        end
+        
+        role = Chef::Role.load(@role_name)
         output(format_for_display(role))
       end
 

data/lib/chef/mixin/recipe_definition_dsl_core.rb

@@ -65,6 +65,7 @@ class Chef
           # Chef::Provider.
 #          resource.recipe_name = @recipe_name
           resource.params = @params
+          resource.source_line = caller[0]
           # Determine whether this resource is being created in the context of an enclosing Provider
           resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
           resource.instance_eval(&block) if block

data/lib/chef/resource.rb

@@ -26,6 +26,7 @@ require 'chef/node'
 
 class Chef
   class Resource
+    HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name]
         
     include Chef::Mixin::CheckHelper
     include Chef::Mixin::ParamsValidate
@@ -33,7 +34,8 @@ class Chef
     include Chef::Mixin::ConvertToClassName
     
     attr_accessor :params, :provider, :updated, :allowed_actions, :run_context, :cookbook_name, :recipe_name, :enclosing_provider
-    attr_reader :resource_name, :source_line, :not_if_args, :only_if_args
+    attr_accessor :source_line
+    attr_reader :resource_name, :not_if_args, :only_if_args
 
     # Each notify entry is a resource/action pair, modeled as an
     # OpenStruct with a .resource and .action member
@@ -57,11 +59,7 @@ class Chef
       @only_if_args = {}
       @notifies_immediate = Array.new
       @notifies_delayed = Array.new
-      sline = caller(4).shift
-      if sline
-        @source_line = sline.gsub!(/^(.+):(.+):.+$/, '\1 line \2')
-        @source_line = ::File.expand_path(@source_line) if @source_line
-      end
+      @source_line = nil
     end
     
     def node
@@ -206,6 +204,20 @@ class Chef
     def to_s
       "#{@resource_name}[#{@name}]"
     end
+
+    def to_text
+      skip = 
+      ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
+      text = "# Declared in #{@source_line}\n"
+      text << convert_to_snake_case(self.class.name, 'Chef::Resource') + "(#{name}) do\n"
+      ivars.each do |ivar|
+        #next if skip.include?(ivar)
+        if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
+          text << "  #{ivar.to_s.sub(/^@/,'')}(#{value.inspect})\n"
+        end
+      end
+      text << "end\n"
+    end
     
     # Serialize this object as a hash 
     def to_json(*a)

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0.rc02'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 59
+  prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - rc02
-  version: 0.9.0.rc02
+  version: 0.9.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -07:00
+date: 2010-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -41,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -56,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -71,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -86,6 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -101,6 +106,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -108,6 +114,7 @@ dependencies:
         version: 1.0.4
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -123,6 +130,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -138,6 +146,7 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -153,6 +162,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -166,6 +176,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -179,6 +190,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -192,6 +204,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -205,6 +218,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -308,6 +322,7 @@ files:
 - lib/chef/knife/client_reregister.rb
 - lib/chef/knife/client_show.rb
 - lib/chef/knife/configure.rb
+- lib/chef/knife/configure_client.rb
 - lib/chef/knife/cookbook_bulk_delete.rb
 - lib/chef/knife/cookbook_delete.rb
 - lib/chef/knife/cookbook_download.rb
@@ -546,19 +561,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: