chef 0.10.0.beta.10 → 0.10.0.qs.0

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

@@ -8,13 +8,15 @@ if [ ! -f /usr/bin/chef-client ]; then
   cd rubygems-1.3.7
   ruby setup.rb --no-format-executable
 fi
-gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+
+gem install ohai --no-rdoc --no-ri --verbose
+gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
-<%= IO.read(Chef::Config[:validation_key]) %>
+<%= validation_key %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
@@ -22,18 +24,7 @@ rm /tmp/validation.pem
 
 (
 cat <<'EOP'
-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 %>
+<%= config_content %>
 EOP
 ) > /etc/chef/client.rb
 
@@ -43,4 +34,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-/usr/bin/chef-client -j /etc/chef/first-boot.json'
+<%= start_chef %>'

data/lib/chef/knife/cookbook_list.rb

@@ -39,7 +39,6 @@ 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/cookbook_site_download.rb

@@ -5,9 +5,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.
@@ -27,26 +27,38 @@ class Chef
       category "cookbook site"
 
       option :file,
-       :short => "-f FILE",
-       :long => "--file FILE",
-       :description => "The filename to write to"
+        :short => "-f FILE",
+        :long => "--file FILE",
+        :description => "The filename to write to"
+
+      option :force,
+        :long => "--force",
+        :description => "Force download deprecated version"
 
       def run
-        if @name_args.length == 1
-          current = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
-          cookbook_data = noauth_rest.get_rest(current["latest_version"])
-        else
-          cookbook_data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+        current = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
+        if current["deprecated"] == true
+          replacement = File.basename(current["replacement"])
+          ui.warn("DEPRECATION: This cookbook has been deprecated. It has been replaced by #{replacement}.")
+          unless config[:force]
+            ui.warn("Use --force to force download deprecated cookbook.")
+            return
+          end
         end
+        cookbook_data = if @name_args.length == 1
+                          noauth_rest.get_rest(current["latest_version"])
+                        else
+                          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+                        end
 
         @version = cookbook_data['version']
-
-        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']} to #{config[:file]}")
-        noauth_rest.sign_on_redirect = false
-        tf = noauth_rest.get_rest(cookbook_data["file"], true)
         unless config[:file]
           config[:file] = File.join(Dir.pwd, "#{@name_args[0]}-#{cookbook_data['version']}.tar.gz")
         end
+        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']} to #{config[:file]}")
+        noauth_rest.sign_on_redirect = false
+        tf = noauth_rest.get_rest(cookbook_data["file"], true)
+
         FileUtils.cp(tf.path, config[:file])
         ui.info("Cookbook saved: #{config[:file]}")
       end

data/lib/chef/knife/core/bootstrap_context.rb

@@ -0,0 +1,81 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2011 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/run_list'
+class Chef
+  class Knife
+    module Core
+      # Instances of BootstrapContext are the context objects (i.e., +self+) for
+      # bootstrap templates. For backwards compatability, they +must+ set the
+      # following instance variables:
+      # * @config   - a hash of knife's config values
+      # * @run_list - the run list for the node to boostrap
+      # 
+      class BootstrapContext
+
+        def initialize(config, run_list, chef_config)
+          @config       = config
+          @run_list     = run_list
+          @chef_config  = chef_config
+        end
+
+        def bootstrap_version_string
+          if @config[:prerelease]
+            "--prerelease"
+          else
+            version = knife_config[:bootstrap_version] || Chef::VERSION
+            "--version #{version}"
+          end
+        end
+
+        def bootstrap_environment
+          @chef_config[:environment] || '_default'
+        end
+
+        def validation_key
+          IO.read(@chef_config[:validation_key])
+        end
+
+        def config_content
+          client_rb = <<-CONFIG
+log_level        :info
+log_location     STDOUT
+chef_server_url  "#{@chef_config[:chef_server_url]}"
+validation_client_name "#{@chef_config[:validation_client_name]}"
+CONFIG
+          if @config[:chef_node_name]
+            client_rb << %Q{node_name "#{@config[:chef_node_name]}"\n}
+          else
+            client_rb << "# Using default node name (fqdn)\n"
+          end
+          client_rb
+        end
+
+        def start_chef
+          "/usr/bin/chef-client -j /etc/chef/first-boot.json -E #{bootstrap_environment}"
+        end
+
+        def knife_config
+          @chef_config.key?(:knife) ? @chef_config[:knife] : {}
+        end
+
+      end
+    end
+  end
+end
+

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,6 +25,7 @@ class Chef
 
       deps do
         require 'chef/data_bag'
+        require 'chef/encrypted_data_bag_item'
       end
 
       banner "knife data bag create BAG [ITEM] (options)"
@@ -36,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
@@ -49,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]
@@ -63,7 +64,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 })
@@ -72,16 +73,17 @@ 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 = if use_encryption
-                     Chef::EncryptedDataBagItem.encrypt_data_bag_item(output,
-                                                                      read_secret)
-                   else
-                     output
-                   end
+            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)
             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,6 +24,9 @@ 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,6 +27,7 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
         require 'chef/search/query'
+        require 'chef/mixin/command'
       end
 
       attr_writer :password
@@ -300,6 +301,7 @@ class Chef
       end
 
       def run
+        extend Chef::Mixin::Command
 
         @longest = 0
 

data/lib/chef/mixin/language.rb

@@ -19,6 +19,7 @@
 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/monkey_patches/object.rb

@@ -0,0 +1,9 @@
+class Object
+  unless new.respond_to?(:tap)
+    def tap
+      yield self
+      return self
+    end
+  end
+end
+

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])
+          r = Chef::Resource::GemPackage.new(g[:name], run_context)
           r.version g[:version]
           r.action :install
           r.source "http://gems.github.com"

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?(@new_resource.action.first)
+        unless [:export, :force_export].include?(Array(@new_resource.action).first)
           if current_revision = find_current_revision
             @current_resource.revision current_revision
           end

data/lib/chef/recipe.rb

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