chef 0.10.4 → 0.10.6.beta.1

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

@@ -18,6 +18,16 @@ EOP
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
 (
 cat <<'EOP'
 log_level        :info

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

@@ -4,9 +4,10 @@ bash -c '
 if [ ! -f /usr/bin/chef-client ]; then
   wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
   rpm -Uvh epel-release-5-4.noarch.rpm
-  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>-O /etc/yum.repos.d/aegis.repo http://rpm.aegisco.com/aegisco/el5/aegisco.repo
+  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://rpm.aegisco.com/aegisco/rhel/aegisco-rhel.rpm
+  rpm -Uvh aegisco-rhel.rpm
 
-  yum install -y ruby-1.8.7.334-2.el5 ruby-devel-1.8.7.334-2.el5 gcc gcc-c++ automake autoconf make
+  yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf make
 
   cd /tmp
   wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz
@@ -30,6 +31,16 @@ EOP
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -18,6 +18,16 @@ EOP
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -17,6 +17,16 @@ EOP
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
 <% unless @chef_config[:validation_client_name] == "chef-validator" -%>
 [  `grep -qx "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" >> /etc/chef/client.rb
 <% end -%>

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

@@ -25,6 +25,16 @@ EOP
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

data/lib/chef/knife/client_create.rb

@@ -55,16 +55,22 @@ class Chef
 
         output = edit_data(client)
 
-        key = output.save
+        # Chef::ApiClient.save will try to create a client and if it exists will update it instead silently
+        client = output.save
 
-        ui.info("Created #{output}")
-
-        if config[:file]
-          File.open(config[:file], "w") do |f|
-            f.print(key['private_key'])
+        # We only get a private_key on client creation, not on client update.
+        if client['private_key']
+          ui.info("Created #{output}")
+  
+          if config[:file]
+            File.open(config[:file], "w") do |f|
+              f.print(client['private_key'])
+            end
+          else
+            puts client['private_key']
           end
         else
-          puts key['private_key']
+          ui.error "Client '#{client['name']}' already exists"
         end
       end
     end

data/lib/chef/knife/client_delete.rb

@@ -44,5 +44,3 @@ class Chef
     end
   end
 end
-
-

data/lib/chef/knife/client_edit.rb

@@ -43,6 +43,3 @@ class Chef
     end
   end
 end
-
-
-

data/lib/chef/knife/client_list.rb

@@ -40,4 +40,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/client_reregister.rb

@@ -44,16 +44,15 @@ class Chef
         end
 
         client = Chef::ApiClient.load(@client_name)
-        key = client.save(true)
+        key = client.save(new_key=true)
         if config[:file]
           File.open(config[:file], "w") do |f|
             f.print(key['private_key'])
           end
         else
-          puts key['private_key']
+          ui.msg key['private_key']
         end
       end
     end
   end
 end
-

data/lib/chef/knife/client_show.rb

@@ -50,4 +50,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/configure.rb

@@ -69,7 +69,7 @@ cache_type               'BasicFile'
 cache_options( :path => '#{File.join(chef_config_path, "checksums")}' )
 EOH
           unless chef_repo.empty?
-            f.puts "cookbook_path [ '#{chef_repo}/cookbooks', '#{chef_repo}/site-cookbooks' ]"
+            f.puts "cookbook_path [ '#{chef_repo}/cookbooks' ]"
           end
         end
 

data/lib/chef/knife/configure_client.rb

@@ -48,5 +48,3 @@ class Chef
     end
   end
 end
-
-

data/lib/chef/knife/cookbook_create.rb

@@ -38,8 +38,7 @@ class Chef
       option :readme_format,
         :short => "-r FORMAT",
         :long => "--readme-format FORMAT",
-        :description => "Format of the README file, supported formats are 'md' (markdown) and 'rdoc' (rdoc)",
-        :default => "rdoc"
+        :description => "Format of the README file, supported formats are 'md' (markdown) and 'rdoc' (rdoc)"
 
       option :cookbook_license,
         :short => "-I LICENSE",
@@ -68,14 +67,15 @@ class Chef
           raise ArgumentError, "Default cookbook_path is not specified in the knife.rb config file, and a value to -o is not provided. Nowhere to write the new cookbook to."
         end
 
-        cookbook_path = Array(config[:cookbook_path]).first
+        cookbook_path = File.expand_path(Array(config[:cookbook_path]).first)
         cookbook_name = @name_args.first
         copyright = config[:cookbook_copyright] || "YOUR_COMPANY_NAME"
         email = config[:cookbook_email] || "YOUR_EMAIL"
         license = ((config[:cookbook_license] != "false") && config[:cookbook_license]) || "none"
+        readme_format = ((config[:readme_format] != "false") && config[:readme_format]) || "md"
         create_cookbook(cookbook_path,cookbook_name, copyright, license)
-        create_readme(cookbook_path,cookbook_name)
-        create_metadata(cookbook_path,cookbook_name, copyright, email, license)
+        create_readme(cookbook_path,cookbook_name,readme_format)
+        create_metadata(cookbook_path,cookbook_name, copyright, email, license,readme_format)
       end
 
       def create_cookbook(dir, cookbook_name, copyright, license)
@@ -179,11 +179,11 @@ EOH
         end
       end
 
-      def create_readme(dir, cookbook_name)
+      def create_readme(dir, cookbook_name,readme_format)
         msg("** Creating README for cookbook: #{cookbook_name}")
-        unless File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
-          open(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"), "w") do |file|
-            case config[:readme_format]
+        unless File.exists?(File.join(dir, cookbook_name, "README.#{readme_format}"))
+          open(File.join(dir, cookbook_name, "README.#{readme_format}"), "w") do |file|
+            case readme_format
             when "rdoc"
               file.puts <<-EOH
 = DESCRIPTION:
@@ -226,7 +226,7 @@ EOH
         end
       end
 
-      def create_metadata(dir, cookbook_name, copyright, email, license)
+      def create_metadata(dir, cookbook_name, copyright, email, license,readme_format)
         msg("** Creating metadata for cookbook: #{cookbook_name}")
 
         license_name = case license
@@ -244,8 +244,8 @@ EOH
 
         unless File.exists?(File.join(dir, cookbook_name, "metadata.rb"))
           open(File.join(dir, cookbook_name, "metadata.rb"), "w") do |file|
-            if File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
-              long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.#{config[:readme_format]}'))"
+            if File.exists?(File.join(dir, cookbook_name, "README.#{readme_format}"))
+              long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.#{readme_format}'))"
             end
             file.puts <<-EOH
 maintainer       "#{copyright}"

data/lib/chef/knife/cookbook_delete.rb

@@ -22,6 +22,8 @@ class Chef
   class Knife
     class CookbookDelete < Knife
 
+      attr_accessor :cookbook_name, :version
+
       deps do
         require 'chef/cookbook_version'
       end

data/lib/chef/knife/cookbook_download.rb

@@ -23,6 +23,9 @@ class Chef
   class Knife
     class CookbookDownload < Knife
 
+      attr_reader :version
+      attr_accessor :cookbook_name
+
       deps do
         require 'chef/cookbook_version'
       end
@@ -40,7 +43,7 @@ class Chef
        :long => "--dir DOWNLOAD_DIRECTORY",
        :description => "The directory to download the cookbook into",
        :default => Dir.pwd
-      
+
       option :force,
        :short => "-f",
        :long => "--force",
@@ -57,11 +60,11 @@ class Chef
           ui.fatal("You must specify a cookbook name")
           exit 1
         elsif @version.nil?
-          determine_version
+          @version = determine_version
         end
-          
+
         ui.info("Downloading #{@cookbook_name} cookbook version #{@version}")
-        
+
         cookbook = rest.get_rest("cookbooks/#{@cookbook_name}/#{@version}")
         manifest = cookbook.manifest
 
@@ -75,7 +78,7 @@ class Chef
             exit
           end
         end
-        
+
         Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segment|
           next unless manifest.has_key?(segment)
           ui.info("Downloading #{segment}")
@@ -109,7 +112,6 @@ class Chef
           versions.sort!
           versions
         end
-        #pp :available_versions => @available_versions
         @available_versions
       end
 
@@ -127,6 +129,7 @@ class Chef
           ui.error("'#{response}' is not a valid value.")
           exit(1)
         end
+        @version
       end
 
     end

data/lib/chef/knife/cookbook_list.rb

@@ -40,13 +40,8 @@ class Chef
         num_versions = config[:all_versions] ? "num_versions=all" : "num_versions=1"
         api_endpoint = env ? "/environments/#{env}/cookbooks?#{num_versions}" : "/cookbooks?#{num_versions}"
         cookbook_versions = rest.get_rest(api_endpoint)
-        format_cookbook_list_for_display(cookbook_versions).each do |line|
-          ui.msg(line)
-        end
+        ui.output(format_cookbook_list_for_display(cookbook_versions))
       end
     end
   end
 end
-
-
-

data/lib/chef/knife/cookbook_metadata.rb

@@ -82,10 +82,10 @@ class Chef
         generated = true
         Chef::Log.debug("Generated #{json_file}")
       rescue Exceptions::ObsoleteDependencySyntax, Exceptions::InvalidVersionConstraint => e
-        STDERR.puts "ERROR: The cookbook '#{cookbook}' contains invalid or obsolete metadata syntax."
-        STDERR.puts "in #{file}:"
-        STDERR.puts
-        STDERR.puts e.message
+        ui.stderr.puts "ERROR: The cookbook '#{cookbook}' contains invalid or obsolete metadata syntax."
+        ui.stderr.puts "in #{file}:"
+        ui.stderr.puts
+        ui.stderr.puts e.message
         exit 1
       end
 
@@ -95,10 +95,10 @@ class Chef
           Chef::Cookbook::Metadata.validate_json(IO.read(json_file))
         end
       rescue Exceptions::ObsoleteDependencySyntax, Exceptions::InvalidVersionConstraint => e
-        STDERR.puts "ERROR: The cookbook '#{cookbook}' contains invalid or obsolete metadata syntax."
-        STDERR.puts "in #{json_file}:"
-        STDERR.puts
-        STDERR.puts e.message
+        ui.stderr.puts "ERROR: The cookbook '#{cookbook}' contains invalid or obsolete metadata syntax."
+        ui.stderr.puts "in #{json_file}:"
+        ui.stderr.puts
+        ui.stderr.puts e.message
         exit 1
       end
 

data/lib/chef/knife/cookbook_site_list.rb

@@ -32,7 +32,9 @@ class Chef
 
       def run
         if config[:with_uri]
-          ui.msg(format_list_for_display(get_cookbook_list))
+          cookbooks = Hash.new
+          get_cookbook_list.each{ |k,v| cookbooks[k] = v['cookbook'] }
+          ui.output(format_for_display(cookbooks))
         else
           ui.msg(ui.list(get_cookbook_list.keys.sort, :columns_down))
         end
@@ -46,7 +48,7 @@ class Chef
         end
         new_start = start + cr["items"].length
         if new_start < cr["total"]
-          get_cookbook_list(items, new_start, cookbook_collection) 
+          get_cookbook_list(items, new_start, cookbook_collection)
         else
           cookbook_collection
         end

data/lib/chef/knife/cookbook_test.rb

@@ -53,7 +53,7 @@ class Chef
           end
         else
           @name_args.each do |cb|
-            puts "checking #{cb}"
+            ui.info "checking #{cb}"
             next unless cookbook_loader.cookbook_exists?(cb)
             checked_a_cookbook = true
             test_cookbook(cb)

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

@@ -50,6 +50,10 @@ class Chef
           IO.read(@chef_config[:validation_key])
         end
 
+        def encrypted_data_bag_secret
+          IO.read(@chef_config[:encrypted_data_bag_secret])
+        end
+
         def config_content
           client_rb = <<-CONFIG
 log_level        :info
@@ -67,6 +71,11 @@ CONFIG
             client_rb << %Q{http_proxy        "#{knife_config[:bootstrap_proxy]}"\n}
             client_rb << %Q{https_proxy       "#{knife_config[:bootstrap_proxy]}"\n}
           end
+
+          if @chef_config[:encrypted_data_bag_secret]
+            client_rb << %Q{encrypted_data_bag_secret "/etc/chef/encrypted_data_bag_secret"\n}
+          end
+
           client_rb
         end
 

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

@@ -67,6 +67,7 @@ class Chef
             require 'yaml'
             YAML::dump(data)
           when :pp
+            require 'stringio'
             # If you were looking for some attribute and there is only one match
             # just dump the attribute value
             if data.length == 1 and config[:attribute]
@@ -165,7 +166,13 @@ class Chef
 
         def format_cookbook_list_for_display(item)
           if config[:with_uri]
-            item
+            item.inject({}) do |collected, (cookbook, versions)|
+              collected[cookbook] = Hash.new
+              versions['versions'].each do |ver|
+                collected[cookbook][ver['version']] = ver['url']
+              end
+              collected
+            end
           else
             versions_by_cookbook = item.inject({}) do |collected, ( cookbook, versions )|
               collected[cookbook] = versions["versions"].map {|v| v['version']}