chef 0.9.6 → 0.9.8.beta.1

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -25,7 +25,7 @@ class Chef
   class Knife
     class CookbookMetadataFromFile < Knife
 
-      banner "Sub-Command: cookbook metadata from FILE (options)"
+      banner "knife cookbook metadata from FILE (options)"
 
       def run
         file = @name_args[0]

data/lib/chef/knife/cookbook_show.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class CookbookShow < Knife
 
-      banner "Sub-Command: cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
+      banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
 
       option :fqdn,
        :short => "-f FQDN",

data/lib/chef/knife/cookbook_site_download.rb

@@ -23,7 +23,8 @@ class Chef
 
       attr_reader :version
 
-      banner "Sub-Command: cookbook site download COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site download COOKBOOK [VERSION] (options)"
+      category "cookbook site"
 
       option :file,
        :short => "-f FILE",

data/lib/chef/knife/cookbook_site_list.rb

@@ -22,7 +22,8 @@ class Chef
   class Knife
     class CookbookSiteList < Knife
 
-      banner "Sub-Command: cookbook site list (options)"
+      banner "knife cookbook site list (options)"
+      category "cookbook site"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/cookbook_site_search.rb

@@ -21,7 +21,8 @@ class Chef
   class Knife
     class CookbookSiteSearch < Knife
 
-      banner "Sub-Command: cookbook site search QUERY (options)"
+      banner "knife cookbook site search QUERY (options)"
+      category "cookbook site"
 
       def run
         output(search_cookbook(name_args[0]))

data/lib/chef/knife/cookbook_site_share.rb

@@ -0,0 +1,108 @@
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2010 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'
+require 'chef/cookbook_uploader'
+require 'chef/cookbook_site_streaming_uploader'
+
+class Chef
+  class Knife
+    class CookbookSiteShare < Knife
+
+      banner "knife cookbook site share COOKBOOK CATEGORY (options)"
+      category "cookbook site"
+
+      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| Chef::Config.cookbook_path = o.split(":") }
+
+      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.")
+          exit 1
+        end
+
+        cookbook_name = @name_args[0]
+        category = @name_args[1]
+        cl = Chef::CookbookLoader.new
+        if cl.cookbook_exists?(cookbook_name)
+          cookbook = cl[cookbook_name]
+          Chef::CookbookUploader.validate_cookbook(cookbook)
+          tmp_cookbook_dir = Chef::CookbookUploader.create_build_dir(cookbook)
+          begin
+            Chef::Log.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.")
+            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!")
+            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.")
+            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.")
+          exit(1)
+        end
+
+      end
+
+      def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
+         uri = "http://cookbooks.opscode.com/api/v1/cookbooks"
+
+         category_string = { 'category'=>cookbook_category }.to_json
+
+         http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
+           :tarball => File.open(cookbook_filename),
+           :cookbook => category_string
+         })
+
+         res = JSON.parse(http_resp.body)
+         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."
+               exit(1)
+             else
+               Chef::Log.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}"
+             exit(1)
+           end
+         end
+         res
+       end
+    end
+
+  end
+end

data/lib/chef/knife/cookbook_site_show.rb

@@ -21,7 +21,8 @@ class Chef
   class Knife
     class CookbookSiteShow < Knife
 
-      banner "Sub-Command: cookbook site show COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site show COOKBOOK [VERSION] (options)"
+      category "cookbook site"
 
       def run
         case @name_args.length

data/lib/chef/knife/cookbook_site_unshare.rb

@@ -0,0 +1,52 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 CookbookSiteUnshare < Knife
+
+      banner "knife cookbook site unshare COOKBOOK"
+      category "cookbook site"
+
+      def run
+        @cookbook_name = @name_args[0]
+        if @cookbook_name.nil?
+          show_usage
+          Chef::Log.fatal "You must provide the name of the cookbook to unshare"
+          exit 1
+        end
+
+        confirm "Do you really want to unshare the cookbook #{@cookbook_name}"
+
+        begin
+          rest.delete_rest "http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}"
+        rescue Net::HTTPServerException => e
+          raise e unless e.message =~ /Forbidden/
+          Chef::Log.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."
+          exit 1
+        end
+
+        Chef::Log.info "Unshared cookbook #{@cookbook_name}"
+      end
+
+    end
+  end
+end

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class CookbookSiteVendor < Knife
 
-      banner "Sub-Command: cookbook site vendor COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site vendor COOKBOOK [VERSION] (options)"
+      category "cookbook site"
 
       option :deps,
        :short => "-d",
@@ -58,7 +59,7 @@ class Chef
         Chef::Mixin::Command.run_command(:command => "git checkout master", :cwd => vendor_path) 
         Chef::Log.info("Checking the status of the vendor branch.")
         status, branch_output, branch_error = Chef::Mixin::Command.output_of_command("git branch --no-color | grep #{branch_name}", :cwd => vendor_path) 
-        if branch_output =~ /#{branch_name}$/m
+        if branch_output =~ /#{Regexp.escape(branch_name)}$/m
           Chef::Log.info("Vendor branch found.")
           Chef::Mixin::Command.run_command(:command => "git checkout #{branch_name}", :cwd => vendor_path)
         else

data/lib/chef/knife/cookbook_test.rb

@@ -25,7 +25,7 @@ class Chef
   class Knife
     class CookbookTest < Knife
 
-      banner "Sub-Command: cookbook test [COOKBOOKS...] (options)"
+      banner "knife cookbook test [COOKBOOKS...] (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",

data/lib/chef/knife/cookbook_upload.rb

@@ -17,22 +17,16 @@
 # limitations under the License.
 #
 
-require 'rest_client'
-
 require 'chef/knife'
 require 'chef/cookbook_loader'
-require 'chef/cache/checksum'
-require 'chef/sandbox'
-require 'chef/cookbook_version'
-require 'chef/cookbook/syntax_check'
-require 'chef/cookbook/file_system_file_vendor'
+require 'chef/cookbook_uploader'
 
 class Chef
   class Knife
     class CookbookUpload < Knife
       include Chef::Mixin::ShellOut
 
-      banner "Sub-Command: cookbook upload [COOKBOOKS...] (options)"
+      banner "knife cookbook upload [COOKBOOKS...] (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
@@ -51,148 +45,37 @@ class Chef
         else
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
-        # Ugh, manipulating globals causes bugs.
-        @user_cookbook_path = config[:cookbook_path]
 
         Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
 
         cl = Chef::CookbookLoader.new
-        if config[:all]
-          cl.each do |cookbook_name, cookbook|
-            Chef::Log.info("** #{cookbook.name.to_s} **")
-            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])
-            else
-              Chef::Log.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
-            end
-          end
-        end
-      end
-      
-      def upload_cookbook(cookbook)
-        Chef::Log.info("Saving #{cookbook.name}")
-        
-        # Validate the cookbook before staging it or else the syntax checker's
-        # cache will not be helpful.
-        validate_cookbook(cookbook)
-        # create build directory
-        tmp_cookbook_dir = create_build_dir(cookbook)
-
-        # create a CookbookLoader that loads a Cookbook from the build directory
-        orig_cookbook_path = nil
-        build_dir_cookbook = nil
-        begin
-          orig_cookbook_path = Chef::Config.cookbook_path
-          Chef::Config.cookbook_path = tmp_cookbook_dir
-          build_dir_cookbook = Chef::CookbookLoader.new[cookbook.name]
-          Chef::Log.debug("Staged cookbook manifest:\n#{JSON.pretty_generate(build_dir_cookbook)}")
-        ensure
-          Chef::Config.cookbook_path = orig_cookbook_path
-        end
 
-        # generate checksums of cookbook files and create a sandbox
-        checksum_files = build_dir_cookbook.checksums
-        checksums = checksum_files.inject({}){|memo,elt| memo[elt.first]=nil ; memo}
-        new_sandbox = catch_auth_exceptions{ rest.post_rest("/sandboxes", { :checksums => checksums }) }
-     
-        Chef::Log.info("Uploading files")
-        # upload the new checksums and commit the sandbox
-        new_sandbox['checksums'].each do |checksum, info|
-          if info['needs_upload'] == true
-            Chef::Log.info("Uploading #{checksum_files[checksum]} (checksum hex = #{checksum}) to #{info['url']}")
-            
-            # Checksum is the hexadecimal representation of the md5,
-            # but we need the base64 encoding for the content-md5
-            # header
-            checksum64 = Base64.encode64([checksum].pack("H*")).strip
-            timestamp = Time.now.utc.iso8601
-            file_contents = File.read(checksum_files[checksum])
-            # TODO - 5/28/2010, cw: make signing and sending the request streaming
-            sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
-                                                                               :http_method => :put,
-                                                                               :path        => URI.parse(info['url']).path,
-                                                                               :body        => file_contents,
-                                                                               :timestamp   => timestamp,
-                                                                               :user_id     => rest.client_name
-                                                                               )
-            headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, :accept => 'application/json' }
-            headers.merge!(sign_obj.sign(OpenSSL::PKey::RSA.new(rest.signing_key)))
-            begin
-              RestClient::Request.execute(:method => :put, :url => info['url'], :headers => headers, :payload => file_contents)
-            rescue RestClient::RequestFailed => e
-              Chef::Log.error("Upload failed: #{e.message}\n#{e.response.body}")
-              raise
+        humanize_auth_exceptions do
+          if config[:all]
+            cl.each do |cookbook_name, cookbook|
+              Chef::Log.info("** #{cookbook.name.to_s} **")
+              Chef::CookbookUploader.upload_cookbook(cookbook)
             end
           else
-            Chef::Log.debug("#{checksum_files[checksum]} has not changed")
-          end
-        end
-        sandbox_url = new_sandbox['uri']
-        Chef::Log.debug("Committing sandbox")
-        # 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.message =~ /^400/ && (retries += 1) <= 5
-            sleep 2
-            retry
-          else
-            raise
+            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)
+                Chef::CookbookUploader.upload_cookbook(cl[cookbook_name])
+              else
+                Chef::Log.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+              end
+            end
           end
         end
-
-        # files are uploaded, so save the manifest
-        catch_auth_exceptions{ build_dir_cookbook.save }
-        
-        Chef::Log.info("Upload complete!")
-        Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
-        FileUtils.rm_rf tmp_cookbook_dir
       end
 
-      def create_build_dir(cookbook)
-        tmp_cookbook_path = Tempfile.new("chef-#{cookbook.name}-build")
-        tmp_cookbook_path.close
-        tmp_cookbook_dir = tmp_cookbook_path.path
-        File.unlink(tmp_cookbook_dir)
-        FileUtils.mkdir_p(tmp_cookbook_dir)
-        
-        Chef::Log.debug("Staging at #{tmp_cookbook_dir}")
-
-        checksums_to_on_disk_paths = cookbook.checksums
+      private
 
-        Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segment|
-          cookbook.manifest[segment].each do |manifest_record|
-            path_in_cookbook = manifest_record[:path]
-            on_disk_path = checksums_to_on_disk_paths[manifest_record[:checksum]]
-            dest = File.join(tmp_cookbook_dir, cookbook.name.to_s, path_in_cookbook)
-            FileUtils.mkdir_p(File.dirname(dest))
-            Chef::Log.debug("Staging #{on_disk_path} to #{dest}")
-            FileUtils.cp(on_disk_path, dest)
-          end
-        end
-        
-        # First, generate metadata
-        Chef::Log.debug("Generating metadata")
-        kcm = Chef::Knife::CookbookMetadata.new
-        kcm.config[:cookbook_path] = [ tmp_cookbook_dir ]
-        kcm.name_args = [ cookbook.name.to_s ]
-        kcm.run
-
-        tmp_cookbook_dir
-      end
-
-      def catch_auth_exceptions
+      def humanize_auth_exceptions
         begin
           yield
         rescue Net::HTTPServerException => e
@@ -200,29 +83,13 @@ class Chef
           when "401"
             Chef::Log.fatal "Request failed due to authentication (#{e}), check your client configuration (username, key)"
             exit 18
-          else 
+          else
             raise
           end
         end
       end
 
-      def validate_cookbook(cookbook)
-        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook.name, @user_cookbook_path)
-        Chef::Log.info("Validating ruby files")
-        exit(1) unless syntax_checker.validate_ruby_files
-        Chef::Log.info("Validating templates")
-        exit(1) unless syntax_checker.validate_templates
-        Chef::Log.info("Syntax OK")
-        true
-      end
 
     end
   end
 end
-
-
-
-
-
-
-