chef 0.10.0.qs.1 → 0.10.0.rc.0

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -4,13 +4,13 @@ yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
 gem update --system
 gem update
 gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
 
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
-<%= validation_key %>
+<%= IO.read(Chef::Config[:validation_key]) %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
@@ -18,7 +18,15 @@ rm /tmp/validation.pem
 
 (
 cat <<'EOP'
-<%= config_content %>
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name"
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
@@ -28,4 +36,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-<%= start_chef %>'
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -10,13 +10,13 @@ if [ ! -f /usr/bin/chef-client ]; then
 fi
 
 gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
 
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
-<%= validation_key %>
+<%= IO.read(Chef::Config[:validation_key]) %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
@@ -24,7 +24,18 @@ rm /tmp/validation.pem
 
 (
 cat <<'EOP'
-<%= config_content %>
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name (fqdn)
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %>
+<% if Chef::Config[:environment] != nil %>
+environment "<%= Chef::Config[:environment]%>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
@@ -34,4 +45,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-<%= start_chef %>'
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/cookbook_list.rb

@@ -39,6 +39,7 @@ class Chef
         env          = config[:environment]
         num_versions = config[:all_versions] ? "num_versions=all" : "num_versions=1"
         api_endpoint = env ? "/environments/#{env}/cookbooks?#{num_versions}" : "/cookbooks?#{num_versions}"
+        ui.info("Showing latest versions. Use --show-all to list all available versions.") unless config[:all_versions]
         cookbook_versions = rest.get_rest(api_endpoint)
         format_cookbook_list_for_display(cookbook_versions).each do |line|
           ui.msg(line)

data/lib/chef/knife/data_bag_create.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -25,7 +25,6 @@ class Chef
 
       deps do
         require 'chef/data_bag'
-        require 'chef/encrypted_data_bag_item'
       end
 
       banner "knife data bag create BAG [ITEM] (options)"
@@ -37,7 +36,7 @@ class Chef
       :description => "The secret key to use to encrypt data bag item values"
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
+      :long => "--secret_file SECRET_FILE",
       :description => "A file containing the secret key to use to encrypt data bag item values"
 
       def read_secret
@@ -50,7 +49,7 @@ class Chef
 
       def use_encryption
         if config[:secret] && config[:secret_file]
-          stdout.puts "please specify only one of --secret, --secret-file"
+          stdout.puts "please specify only one of --secret, --secret_file"
           exit(1)
         end
         config[:secret] || config[:secret_file]
@@ -64,7 +63,7 @@ class Chef
           stdout.puts("You must specify a data bag name")
           exit 1
         end
-
+        
         # create the data bag
         begin
           rest.post_rest("data", { "name" => @data_bag_name })
@@ -73,17 +72,16 @@ class Chef
           raise unless e.to_s =~ /^409/
           ui.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|
-            item = Chef::DataBagItem.from_hash(
-                     if use_encryption
-                       Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
-                     else
-                       output
-                     end)
-            item.data_bag(@data_bag_name)
+            item = if use_encryption
+                     Chef::EncryptedDataBagItem.encrypt_data_bag_item(output,
+                                                                      read_secret)
+                   else
+                     output
+                   end
             rest.post_rest("data/#{@data_bag_name}", item)
           end
         end

data/lib/chef/knife/data_bag_edit.rb

@@ -37,7 +37,7 @@ class Chef
       :description => "The secret key to use to encrypt data bag item values"
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
+      :long => "--secret_file SECRET_FILE",
       :description => "A file containing the secret key to use to encrypt data bag item values"
 
       def read_secret
@@ -50,7 +50,7 @@ class Chef
 
       def use_encryption
         if config[:secret] && config[:secret_file]
-          stdout.puts "please specify only one of --secret, --secret-file"
+          stdout.puts "please specify only one of --secret, --secret_file"
           exit(1)
         end
         config[:secret] || config[:secret_file]

data/lib/chef/knife/data_bag_from_file.rb

@@ -40,7 +40,7 @@ class Chef
       :description => "The secret key to use to encrypt data bag item values"
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
+      :long => "--secret_file SECRET_FILE",
       :description => "A file containing the secret key to use to encrypt data bag item values"
 
       def read_secret
@@ -53,7 +53,7 @@ class Chef
 
       def use_encryption
         if config[:secret] && config[:secret_file]
-          stdout.puts "please specify only one of --secret, --secret-file"
+          stdout.puts "please specify only one of --secret, --secret_file"
           exit(1)
         end
         config[:secret] || config[:secret_file]

data/lib/chef/knife/data_bag_show.rb

@@ -37,7 +37,7 @@ class Chef
       :description => "The secret key to use to decrypt data bag item values"
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
+      :long => "--secret_file SECRET_FILE",
       :description => "A file containing the secret key to use to decrypt data bag item values"
 
       def read_secret
@@ -50,7 +50,7 @@ class Chef
 
       def use_encryption
         if config[:secret] && config[:secret_file]
-          stdout.puts "please specify only one of --secret, --secret-file"
+          stdout.puts "please specify only one of --secret, --secret_file"
           exit(1)
         end
         config[:secret] || config[:secret_file]

data/lib/chef/knife/search.rb

@@ -24,9 +24,6 @@ class Chef
     class Search < Knife
 
       deps do
-        require 'chef/node'
-        require 'chef/environment'
-        require 'chef/api_client'
         require 'chef/search/query'
       end
 

data/lib/chef/knife/ssh.rb

@@ -27,7 +27,6 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
         require 'chef/search/query'
-        require 'chef/mixin/command'
       end
 
       attr_writer :password
@@ -301,7 +300,6 @@ class Chef
       end
 
       def run
-        extend Chef::Mixin::Command
 
         @longest = 0
 

data/lib/chef/mixin/language.rb

@@ -19,7 +19,6 @@
 require 'chef/search/query'
 require 'chef/data_bag'
 require 'chef/data_bag_item'
-require 'chef/encrypted_data_bag_item'
 
 class Chef
   module Mixin

data/lib/chef/provider/deploy.rb

@@ -307,7 +307,7 @@ class Chef
         gems = YAML.load(IO.read("#{release_path}/gems.yml"))
 
         gems.map do |g|
-          r = Chef::Resource::GemPackage.new(g[:name], run_context)
+          r = Chef::Resource::GemPackage.new(g[:name])
           r.version g[:version]
           r.action :install
           r.source "http://gems.github.com"

data/lib/chef/provider/git.rb

@@ -108,9 +108,7 @@ class Chef
         Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
         clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
-        retry_git(3) do
-          shell_out!(clone_cmd, run_options(:command_log_level => :info))
-        end
+        shell_out!(clone_cmd, run_options(:command_log_level => :info))
       end
 
       def checkout
@@ -134,9 +132,7 @@ class Chef
         # since we're in a local branch already, just reset to specified revision rather than merge
         fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
         Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revison #{target_revision}"
-        retry_git(3) do
-          shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
-        end
+        shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
       end
 
       # Use git-config to setup a remote tracking branches. Could use
@@ -177,9 +173,7 @@ class Chef
       def remote_resolve_reference
         Chef::Log.debug("#{@new_resource} resolving remote reference")
         command = git('ls-remote', @new_resource.repository, @new_resource.revision)
-        retry_git(3) do
-          shell_out!(command, run_options).stdout
-        end
+        shell_out!(command, run_options).stdout
       end
 
       private
@@ -231,23 +225,6 @@ class Chef
         $1
       end
 
-      def retry_git(max_retries)
-        attempts = 0
-        begin
-          yield()
-        rescue Chef::Exceptions::ShellCommandFailed => e
-          attempts += 1
-          if attempts > max_retries
-            raise e
-          else
-            wait_for = 2 ** attempts
-            Chef::Log.warn("#{e.class.name}: #{new_resource} had an error: #{e.message}: retrying #{attempts}/#{max_retries}, waiting #{wait_for} seconds")
-            sleep wait_for
-            retry
-          end
-        end
-      end
-
     end
   end
 end

data/lib/chef/provider/subversion.rb

@@ -31,7 +31,7 @@ class Chef
       def load_current_resource
         @current_resource = Chef::Resource::Subversion.new(@new_resource.name)
 
-        unless [:export, :force_export].include?(Array(@new_resource.action).first)
+        unless [:export, :force_export].include?(@new_resource.action.first)
           if current_revision = find_current_revision
             @current_resource.revision current_revision
           end

data/lib/chef/recipe.rb

@@ -88,7 +88,6 @@ class Chef
     def tag(*tags)
       if tags.length > 0
         tags.each do |tag|
-          tag = tag.to_s
           run_context.node[:tags] << tag unless run_context.node[:tags].include?(tag)
         end
         run_context.node[:tags]

data/lib/chef/resource.rb

@@ -70,7 +70,6 @@ F
 
     end
 
-    FORBIDDEN_IVARS = [:@run_context, :@node]
     HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node]
 
     include Chef::Mixin::CheckHelper
@@ -321,7 +320,7 @@ F
     end
 
     def inspect
-      ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
+      ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
       ivars.inject("<#{to_s}") do |str, ivar|
         str << " #{ivar}: #{instance_variable_get(ivar).inspect}"
       end << ">"
@@ -329,10 +328,11 @@ F
 
     # Serialize this object as a hash
     def to_json(*a)
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
       instance_vars = Hash.new
-      safe_ivars.each do |iv|
-        instance_vars[iv.to_s.sub(/^@/, '')] = instance_variable_get(iv)
+      self.instance_variables.each do |iv|
+        unless iv == "@run_context"
+          instance_vars[iv] = self.instance_variable_get(iv)
+        end
       end
       results = {
         'json_class' => self.class.name,
@@ -342,11 +342,10 @@ F
     end
 
     def to_hash
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
       instance_vars = Hash.new
-      safe_ivars.each do |iv|
+      self.instance_variables.each do |iv|
         key = iv.to_s.sub(/^@/,'').to_sym
-        instance_vars[key] = instance_variable_get(iv)
+        instance_vars[key] = self.instance_variable_get(iv) unless (key == :run_context) || (key == :node)
       end
       instance_vars
     end
@@ -445,7 +444,7 @@ F
       def json_create(o)
         resource = self.new(o["instance_vars"]["@name"])
         o["instance_vars"].each do |k,v|
-          resource.instance_variable_set("@#{k}".to_sym, v)
+          resource.instance_variable_set(k.to_sym, v)
         end
         resource
       end

data/lib/chef/rest.rb

@@ -304,17 +304,13 @@ class Chef
           retry
         end
         raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
-      rescue Net::HTTPFatalError, Net::HTTPServerException => e
-        if (e.kind_of?(Net::HTTPFatalError)) || (e.kind_of?(Net::HTTPServerException) && e.response.code == "403")
-          if http_retry_count - http_attempts + 1 > 0
-            sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
-            Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
-            sleep(sleep_time)
-            retry
-          end
+      rescue Net::HTTPFatalError => e
+        if http_retry_count - http_attempts + 1 > 0
+          sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
+          Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
+          sleep(sleep_time)
+          retry
         end
-        # mutate the error message so it contains useful info
-        e.message << " url: #{url}"
         raise
       end
     end

data/lib/chef/shell_out.rb

@@ -40,7 +40,7 @@ class Chef
   class ShellOut
     READ_WAIT_TIME = 0.01
     READ_SIZE = 4096
-    DEFAULT_READ_TIMEOUT = 600
+    DEFAULT_READ_TIMEOUT = 60
     DEFAULT_ENVIRONMENT = {'LC_ALL' => 'C'}
 
     if RUBY_PLATFORM =~ /mswin|mingw32|windows/

data/lib/chef/solr_query.rb

@@ -152,7 +152,7 @@ class Chef
       delete_database(db)
 
       results = {}
-      [Chef::ApiClient, Chef::Node, Chef::Role, Chef::Environment].each do |klass|
+      [Chef::ApiClient, Chef::Node, Chef::Role].each do |klass|
         results[klass.name] = reindex_all(klass) ? "success" : "failed"
       end
       databags = Chef::DataBag.cdb_list(true)

data/lib/chef/version.rb

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

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 15288919
   prerelease: 7
-  segments: 
-  - 0
-  - 10
-  - 0
-  - qs
-  - 1
-  version: 0.10.0.qs.1
+  version: 0.10.0.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id001
@@ -44,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id002
@@ -60,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id003
@@ -76,11 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id004
@@ -92,11 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id005
@@ -108,19 +76,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
         version: 1.0.4
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
         version: 1.7.0
   type: :runtime
   version_requirements: *id006
@@ -132,11 +90,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id007
@@ -148,19 +101,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :runtime
   version_requirements: *id008
@@ -172,11 +115,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 4
-        - 9
         version: 1.4.9
   type: :runtime
   version_requirements: *id009
@@ -188,11 +126,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 1
-        - 3
         version: 2.1.3
   type: :runtime
   version_requirements: *id010
@@ -204,11 +137,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id011
@@ -220,9 +148,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id012
@@ -234,9 +159,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id013
@@ -248,9 +170,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id014
@@ -262,9 +181,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id015
@@ -294,7 +210,7 @@ files:
 - distro/arch/etc/rc.d/chef-server-webui
 - distro/arch/etc/rc.d/chef-solr
 - distro/common/html/chef-client.8.html
-- distro/common/html/chef-expander.8.html
+- distro/common/html/chef-expander-cluster.8.html
 - distro/common/html/chef-expanderctl.8.html
 - distro/common/html/chef-server-webui.8.html
 - distro/common/html/chef-server.8.html
@@ -336,7 +252,7 @@ files:
 - distro/common/man/man1/knife.1
 - distro/common/man/man1/shef.1
 - distro/common/man/man8/chef-client.8
-- distro/common/man/man8/chef-expander.8
+- distro/common/man/man8/chef-expander-cluster.8
 - distro/common/man/man8/chef-expanderctl.8
 - distro/common/man/man8/chef-server-webui.8
 - distro/common/man/man8/chef-server.8
@@ -360,7 +276,7 @@ files:
 - distro/common/markdown/man1/knife.mkd
 - distro/common/markdown/man1/shef.mkd
 - distro/common/markdown/man8/chef-client.mkd
-- distro/common/markdown/man8/chef-expander.mkd
+- distro/common/markdown/man8/chef-expander-cluster.mkd
 - distro/common/markdown/man8/chef-expanderctl.mkd
 - distro/common/markdown/man8/chef-server-webui.mkd
 - distro/common/markdown/man8/chef-server.mkd
@@ -473,7 +389,6 @@ files:
 - lib/chef/knife/cookbook_site_vendor.rb
 - lib/chef/knife/cookbook_test.rb
 - lib/chef/knife/cookbook_upload.rb
-- lib/chef/knife/core/bootstrap_context.rb
 - lib/chef/knife/core/cookbook_scm_repo.rb
 - lib/chef/knife/core/generic_presenter.rb
 - lib/chef/knife/core/node_editor.rb
@@ -736,20 +651,12 @@ 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: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []