chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/cookbook_delete.rb

@@ -6,9 +6,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.
@@ -21,7 +21,11 @@ require 'chef/knife'
 class Chef
   class Knife
     class CookbookDelete < Knife
-      
+
+      deps do
+        require 'chef/cookbook_version'
+      end
+
       option :all, :short => '-a', :long => '--all', :boolean => true, :description => 'delete all versions'
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
@@ -39,7 +43,7 @@ class Chef
           delete_without_explicit_version
         elsif @cookbook_name.nil?
           show_usage
-          Chef::Log.fatal("You must provide the name of the cookbook to delete")
+          ui.fatal("You must provide the name of the cookbook to delete")
           exit(1)
         end
       end
@@ -79,10 +83,12 @@ class Chef
       end
 
       def available_versions
-        @available_versions ||= rest.get_rest("cookbooks/#{@cookbook_name}").values.flatten
+        @available_versions ||= rest.get_rest("cookbooks/#{@cookbook_name}").map do |name, url_and_version|
+          url_and_version["versions"].map {|url_by_version| url_by_version["version"]}
+        end.flatten
       rescue Net::HTTPServerException => e
         if e.to_s =~ /^404/
-          Chef::Log.error("Cannot find a cookbook named #{@cookbook_name} to delete")
+          ui.error("Cannot find a cookbook named #{@cookbook_name} to delete")
           nil
         else
           raise
@@ -99,16 +105,16 @@ class Chef
         valid_responses[(available_versions.size + 1).to_s] = :all
         question << "#{available_versions.size + 1}. All versions\n\n"
         responses = ask_question(question).split(',').map { |response| response.strip }
-        
+
         if responses.empty?
-          Chef::Log.error("No versions specified, exiting")
+          ui.error("No versions specified, exiting")
           exit(1)
         end
         versions = responses.map do |response|
           if version = valid_responses[response]
             version
           else
-            Chef::Log.error("#{response} is not a valid choice, skipping it")
+            ui.error("#{response} is not a valid choice, skipping it")
           end
         end
         versions.compact
@@ -117,7 +123,7 @@ class Chef
       def delete_version_without_confirmation(version)
         object = delete_request("cookbooks/#{@cookbook_name}/#{version}")
         output(format_for_display(object)) if config[:print_after]
-        Chef::Log.info("Deleted cookbook[#{@cookbook_name}][#{version}]")
+        ui.info("Deleted cookbook[#{@cookbook_name}][#{version}]")
       end
 
       def delete_versions_without_confirmation(versions)
@@ -130,9 +136,9 @@ class Chef
           end
         end
       end
-      
+
       private
-      
+
       def delete_request(path)
         path += "?purge=true" if config[:purge]
         rest.delete_rest(path)

data/lib/chef/knife/cookbook_download.rb

@@ -23,6 +23,10 @@ class Chef
   class Knife
     class CookbookDownload < Knife
 
+      deps do
+        require 'chef/cookbook_version'
+      end
+
       banner "knife cookbook download COOKBOOK [VERSION] (options)"
 
       option :latest,
@@ -50,13 +54,13 @@ class Chef
 
         if @cookbook_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a cookbook name")
+          ui.fatal("You must specify a cookbook name")
           exit 1
         elsif @version.nil?
           determine_version
         end
           
-        Chef::Log.info("Downloading #{@cookbook_name} cookbook version #{@version}")
+        ui.info("Downloading #{@cookbook_name} cookbook version #{@version}")
         
         cookbook = rest.get_rest("cookbooks/#{@cookbook_name}/#{@version}")
         manifest = cookbook.manifest
@@ -67,14 +71,14 @@ class Chef
             Chef::Log.debug("Deleting #{basedir}")
             FileUtils.rm_rf(basedir)
           else
-            Chef::Log.fatal("Directory #{basedir} exists, use --force to overwrite")
+            ui.fatal("Directory #{basedir} exists, use --force to overwrite")
             exit
           end
         end
         
         Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segment|
           next unless manifest.has_key?(segment)
-          Chef::Log.info("Downloading #{segment}")
+          ui.info("Downloading #{segment}")
           manifest[segment].each do |segment_file|
             dest = File.join(basedir, segment_file['path'].gsub('/', File::SEPARATOR))
             Chef::Log.debug("Downloading #{segment_file['path']} to #{dest}")
@@ -84,7 +88,7 @@ class Chef
             FileUtils.mv(tempfile.path, dest)
           end
         end
-        Chef::Log.info("Cookbook downloaded to #{basedir}")
+        ui.info("Cookbook downloaded to #{basedir}")
       end
 
       def determine_version
@@ -120,7 +124,7 @@ class Chef
         response = ask_question(question).strip
 
         unless @version = valid_responses[response]
-          Chef::Log.error("'#{response}' is not a valid value.")
+          ui.error("'#{response}' is not a valid value.")
           exit(1)
         end
       end

data/lib/chef/knife/cookbook_list.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2009, 2010, 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.
@@ -17,7 +18,6 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
@@ -30,8 +30,17 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
-        output(format_list_for_display(rest.get_rest('cookbooks')))
+      option :all_versions,
+        :short => "-a",
+        :long => "--show-all-versions",
+        :description => "Show all available versions."
+
+      def run
+        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]
+        output(format_cookbook_list_for_display(rest.get_rest(api_endpoint)))
       end
     end
   end

data/lib/chef/knife/cookbook_metadata.rb

@@ -23,6 +23,10 @@ class Chef
   class Knife
     class CookbookMetadata < Knife
 
+      deps do
+        require 'chef/cookbook/metadata'
+      end
+
       banner "knife cookbook metadata COOKBOOK (options)"
 
       option :cookbook_path,
@@ -37,14 +41,10 @@ class Chef
         :description => "Generate metadata for all cookbooks, rather than just a single cookbook"
 
       def run
-        if config[:cookbook_path]
-          Chef::Config[:cookbook_path] = config[:cookbook_path]
-        else
-          config[:cookbook_path] = Chef::Config[:cookbook_path]
-        end
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
         if config[:all]
-          cl = Chef::CookbookLoader.new
+          cl = Chef::CookbookLoader.new(config[:cookbook_path])
           cl.each do |cname, cookbook|
             generate_metadata(cname.to_s)
           end
@@ -54,29 +54,49 @@ class Chef
       end
 
       def generate_metadata(cookbook)
-        Chef::Log.info("Generating Metadata")
+        ui.info("Generating Metadata")
         Array(config[:cookbook_path]).reverse.each do |path|
           file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
-          generate_metadata_from_file(cookbook, file)
+          if File.exists?(file)
+            generate_metadata_from_file(cookbook, file)
+          else
+            validate_metadata_json(path, cookbook)
+          end
         end
       end
 
       def generate_metadata_from_file(cookbook, file)
-        if File.exists?(file)
-          Chef::Log.debug("Generating metadata for #{cookbook} from #{file}")
-          md = Chef::Cookbook::Metadata.new
-          md.name(cookbook)
-          md.from_file(file)
-          json_file = File.join(File.dirname(file), 'metadata.json')
-          File.open(json_file, "w") do |f|
-            f.write(Chef::JSONCompat.to_json_pretty(md))
-          end
-          generated = true
-          Chef::Log.debug("Generated #{json_file}")
-        else
-          Chef::Log.debug("No #{file} found; skipping!")
+        Chef::Log.debug("Generating metadata for #{cookbook} from #{file}")
+        md = Chef::Cookbook::Metadata.new
+        md.name(cookbook)
+        md.from_file(file)
+        json_file = File.join(File.dirname(file), 'metadata.json')
+        File.open(json_file, "w") do |f|
+          f.write(Chef::JSONCompat.to_json_pretty(md))
         end
+        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
+        exit 1
       end
+
+      def validate_metadata_json(path, cookbook)
+        json_file = File.join(path, cookbook, 'metadata.json')
+        if File.exist?(json_file)
+          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
+        exit 1
+      end
+
     end
   end
 end

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -25,6 +25,10 @@ class Chef
   class Knife
     class CookbookMetadataFromFile < Knife
 
+      deps do
+        require 'chef/cookbook/metadata'
+      end
+
       banner "knife cookbook metadata from FILE (options)"
 
       def run

data/lib/chef/knife/cookbook_show.rb

@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
-require 'uri'
 
 class Chef
   class Knife
     class CookbookShow < Knife
 
+      deps do
+        require 'chef/json_compat'
+        require 'uri'
+      end
+
       banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
 
       option :fqdn,
@@ -41,6 +44,11 @@ class Chef
        :long => "--platform-version VERSION",
        :description => "The platform version to see the file for"
 
+      option :with_uri,
+        :short => "-w",
+        :long => "--with-uri",
+        :description => "Show corresponding URIs"
+
       def run 
         case @name_args.length
         when 4 # We are showing a specific file
@@ -73,11 +81,14 @@ class Chef
         when 2 # We are showing the whole cookbook data
           cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
           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 1 # We are showing the cookbook versions (all of them)
+          cookbook_name = @name_args[0]
+          env           = config[:environment]
+          api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook_name}" : "cookbooks/#{cookbook_name}"
+          output(format_cookbook_list_for_display(rest.get_rest(api_endpoint)))
         when 0
           show_usage
-          Chef::Log.fatal("You must specify a cookbook name")
+          ui.fatal("You must specify a cookbook name")
           exit 1
         end
       end

data/lib/chef/knife/cookbook_site_download.rb

@@ -41,14 +41,14 @@ class Chef
 
         @version = cookbook_data['version']
 
-        Chef::Log.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']}")
+        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']}")
         rest.sign_on_redirect = false
         tf = 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
         FileUtils.cp(tf.path, config[:file])
-        Chef::Log.info("Cookbook saved: #{config[:file]}")
+        ui.info("Cookbook saved: #{config[:file]}")
       end
 
     end

data/lib/chef/knife/cookbook_site_share.rb

@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/cookbook_uploader'
-require 'chef/cookbook_site_streaming_uploader'
 
 class Chef
   class Knife
     class CookbookSiteShare < Knife
 
+      deps do
+        require 'chef/cookbook_uploader'
+        require 'chef/cookbook_site_streaming_uploader'
+      end
+
       banner "knife cookbook site share COOKBOOK CATEGORY (options)"
       category "cookbook site"
 
@@ -36,40 +39,42 @@ class Chef
       def run
         if @name_args.length < 2
           show_usage
-          Chef::Log.fatal("You must specify the cookbook name and the category you want to share this cookbook to.")
+          ui.fatal("You must specify the cookbook name and the category you want to share this cookbook to.")
           exit 1
         end
 
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
         cookbook_name = @name_args[0]
         category = @name_args[1]
-        cl = Chef::CookbookLoader.new
+        cl = Chef::CookbookLoader.new(config[:cookbook_path])
         if cl.cookbook_exists?(cookbook_name)
           cookbook = cl[cookbook_name]
           Chef::CookbookUploader.validate_cookbook(cookbook)
           tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
           begin
             Chef::Log.debug("temp cookbook directory is #{tmp_cookbook_dir.inspect}")
-            Chef::Log.info("Making tarball #{cookbook_name}.tgz")
+            ui.info("Making tarball #{cookbook_name}.tgz")
             Chef::Mixin::Command.run_command(:command => "tar -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
           rescue => e
-            Chef::Log.error("Error making tarball #{cookbook_name}.tgz: #{e.message}. Set log level to debug (-l debug) for more information.")
+            ui.error("Error making tarball #{cookbook_name}.tgz: #{e.message}. Set log level to debug (-l debug) for more information.")
             Chef::Log.debug("\n#{e.backtrace.join("\n")}")
             exit(1)
           end
 
           begin
             do_upload("#{tmp_cookbook_dir}/#{cookbook_name}.tgz", category, Chef::Config[:node_name], Chef::Config[:client_key])
-            Chef::Log.info("Upload complete!")
+            ui.info("Upload complete!")
             Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
             FileUtils.rm_rf tmp_cookbook_dir
           rescue => e
-            Chef::Log.error("Error uploading cookbook #{cookbook_name} to the Opscode Cookbook Site: #{e.message}. Set log level to debug (-l debug) for more information.")
+            ui.error("Error uploading cookbook #{cookbook_name} to the Opscode Cookbook Site: #{e.message}. Set log level to debug (-l debug) for more information.")
             Chef::Log.debug("\n#{e.backtrace.join("\n")}")
             exit(1)
           end
 
         else
-          Chef::Log.error("Could not find cookbook #{cookbook_name} in your cookbook path.")
+          ui.error("Could not find cookbook #{cookbook_name} in your cookbook path.")
           exit(1)
         end
 
@@ -89,15 +94,15 @@ class Chef
          if http_resp.code.to_i != 201
            if res['error_messages']
              if res['error_messages'][0] =~ /Version already exists/
-               Chef::Log.error "The same version of this cookbook already exists on the Opscode Cookbook Site."
+               ui.error "The same version of this cookbook already exists on the Opscode Cookbook Site."
                exit(1)
              else
-               Chef::Log.error "#{res['error_messages'][0]}"
+               ui.error "#{res['error_messages'][0]}"
                exit(1)
              end
            else
-             Chef::Log.error "Unknown error while sharing cookbook"
-             Chef::Log.error "Server response: #{http_resp.body}"
+             ui.error "Unknown error while sharing cookbook"
+             ui.error "Server response: #{http_resp.body}"
              exit(1)
            end
          end