chef 0.8.10 → 0.8.14

data/lib/chef/knife/cookbook_site_list.rb

@@ -0,0 +1,55 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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 CookbookSiteList < Knife
+
+      banner "Sub-Command: cookbook site list (options)"
+
+      option :with_uri,
+        :short => "-w",
+        :long => "--with-uri",
+        :description => "Show corresponding URIs"
+
+      def run
+        output(format_list_for_display(get_cookbook_list))
+      end
+
+      def get_cookbook_list(items=10, start=0, cookbook_collection={})
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cr = rest.get_rest(cookbooks_url)
+        cr["items"].each do |cookbook|
+          cookbook_collection[cookbook["cookbook_name"]] = cookbook
+        end
+        new_start = start + cr["items"].length
+        if new_start < cr["total"]
+          get_cookbook_list(items, new_start, cookbook_collection) 
+        else
+          cookbook_collection
+        end
+      end
+    end
+  end
+end
+
+
+
+

data/lib/chef/knife/cookbook_site_search.rb

@@ -0,0 +1,50 @@
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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 CookbookSiteSearch < Knife
+
+      banner "Sub-Command: cookbook site search QUERY (options)"
+
+      def run
+        output(search_cookbook(name_args[0]))
+      end
+
+      def search_cookbook(query, items=10, start=0, cookbook_collection={})
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
+        cr = rest.get_rest(cookbooks_url)
+        cr["items"].each do |cookbook|
+          cookbook_collection[cookbook["cookbook_name"]] = cookbook
+        end
+        new_start = start + cr["items"].length
+        if new_start < cr["total"]
+          search_cookbook(query, items, new_start, cookbook_collection) 
+        else
+          cookbook_collection
+        end
+      end
+    end
+  end
+end
+
+
+
+
+

data/lib/chef/knife/cookbook_site_show.rb

@@ -0,0 +1,56 @@
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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 CookbookSiteShow < Knife
+
+      banner "Sub-Command: cookbook site show COOKBOOK [VERSION] (options)"
+
+      def run
+        case @name_args.length
+        when 1 
+          cookbook_data = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
+        when 2
+          cookbook_data = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+        end
+        output(format_for_display(cookbook_data))
+      end
+
+      def get_cookbook_list(items=10, start=0, cookbook_collection={})
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cr = rest.get_rest(cookbooks_url)
+        cr["items"].each do |cookbook|
+          cookbook_collection[cookbook["cookbook_name"]] = cookbook
+        end
+        new_start = start + cr["items"].length
+        if new_start < cr["total"]
+          get_cookbook_list(items, new_start, cookbook_collection) 
+        else
+          cookbook_collection
+        end
+      end
+    end
+  end
+end
+
+
+
+
+

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -0,0 +1,114 @@
+#
+# Author:: Adam Jacob (<adam@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/metadata'
+
+class Chef
+  class Knife
+    class CookbookSiteVendor < Knife
+
+      banner "Sub-Command: cookbook site vendor COOKBOOK [VERSION] (options)"
+
+      option :deps,
+       :short => "-d",
+       :long => "--dependencies",
+       :boolean => true,
+       :description => "Grab dependencies automatically"
+
+      def run
+        vendor_path = File.join(Chef::Config[:cookbook_path].first)
+        cookbook_path = File.join(vendor_path, name_args[0])
+        upstream_file = File.join(vendor_path, "#{name_args[0]}.tar.gz")
+        branch_name = "chef-vendor-#{name_args[0]}"
+
+        download = Chef::Knife::CookbookSiteDownload.new
+        download.config[:file] = upstream_file 
+        download.name_args = name_args
+        download.run
+
+        Chef::Log.info("Checking out the master branch.")
+        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
+          Chef::Log.info("Vendor branch found.")
+          Chef::Mixin::Command.run_command(:command => "git checkout #{branch_name}", :cwd => vendor_path)
+        else
+          Chef::Log.info("Creating vendor branch.")
+          Chef::Mixin::Command.run_command(:command => "git checkout -b #{branch_name}", :cwd => vendor_path)
+        end
+        Chef::Log.info("Removing pre-existing version.")
+        Chef::Mixin::Command.run_command(:command => "rm -r #{cookbook_path}", :cwd => vendor_path) if File.directory?(cookbook_path)
+        Chef::Log.info("Uncompressing #{name_args[0]} version #{download.version}.")
+        Chef::Mixin::Command.run_command(:command => "tar zxvf #{upstream_file}", :cwd => vendor_path)
+        Chef::Mixin::Command.run_command(:command => "rm #{upstream_file}", :cwd => vendor_path)
+        Chef::Log.info("Adding changes.")
+        Chef::Mixin::Command.run_command(:command => "git add #{name_args[0]}", :cwd => vendor_path)
+
+        Chef::Log.info("Committing changes.")
+        changes = true
+        begin
+          Chef::Mixin::Command.run_command(:command => "git commit -a -m 'Import #{name_args[0]} version #{download.version}'", :cwd => vendor_path)
+        rescue Chef::Exceptions::Exec => e
+          Chef::Log.warn("Checking out the master branch.")
+          Chef::Log.warn("No changes from current vendor #{name_args[0]}")
+          Chef::Mixin::Command.run_command(:command => "git checkout master", :cwd => vendor_path) 
+          changes = false
+        end
+
+        if changes
+          Chef::Log.info("Creating tag chef-vendor-#{name_args[0]}-#{download.version}.")
+          Chef::Mixin::Command.run_command(:command => "git tag -f chef-vendor-#{name_args[0]}-#{download.version}", :cwd => vendor_path)
+          Chef::Log.info("Checking out the master branch.")
+          Chef::Mixin::Command.run_command(:command => "git checkout master", :cwd => vendor_path)
+          Chef::Log.info("Merging changes from #{name_args[0]} version #{download.version}.")
+
+          Dir.chdir(vendor_path) do
+            if system("git merge #{branch_name}")
+              Chef::Log.info("Cookbook #{name_args[0]} version #{download.version} successfully vendored!")
+            else
+              Chef::Log.error("You have merge conflicts - please resolve manually!")
+              Chef::Log.error("(Hint: cd #{vendor_path}; git status)") 
+              exit 1
+            end
+          end
+        end
+
+        if config[:deps]
+          md = Chef::Cookbook::Metadata.new
+          md.from_file(File.join(cookbook_path, "metadata.rb"))
+          md.dependencies.each do |cookbook, version_list|
+            # Doesn't do versions.. yet
+            nv = Chef::Knife::CookbookSiteVendor.new
+            nv.config = config
+            nv.name_args = [ cookbook ]
+            nv.run
+          end
+        end
+      end
+
+    end
+  end
+end
+
+
+
+
+
+

data/lib/chef/knife/cookbook_test.rb

@@ -0,0 +1,103 @@
+#
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Matthew Kent (<mkent@magoazul.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2010 Matthew Kent
+# 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/cache/checksum'
+
+class Chef
+  class Knife
+    class CookbookTest < Knife
+
+      banner "Sub-Command: cookbook test [COOKBOOKS...] (options)"
+
+      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| o.split(":") }
+
+      option :all,
+        :short => "-a",
+        :long => "--all",
+        :description => "Test 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
+
+        if config[:all] 
+          cl = Chef::CookbookLoader.new
+          cl.each do |cookbook|
+            test_cookbook(cookbook.name.to_s)
+          end
+        else
+          @name_args.each do |cb|
+            test_cookbook(cb)
+          end
+        end
+      end
+
+      def test_cookbook(cookbook)
+        Chef::Log.info("Running syntax check on #{cookbook}")
+        Array(config[:cookbook_path]).reverse.each do |path|
+          cookbook_dir = File.expand_path(File.join(path, cookbook))
+          test_ruby(cookbook_dir)
+          test_templates(cookbook_dir)
+        end
+      end
+
+      def test_ruby(cookbook_dir)
+        cache = Chef::Cache::Checksum.instance
+        Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
+          key = cache.generate_key(ruby_file, "chef-test")
+          fstat = File.stat(ruby_file)
+
+          if cache.lookup_checksum(key, fstat) 
+            Chef::Log.info("No change in checksum of #{ruby_file}")
+          else
+            Chef::Log.info("Testing #{ruby_file} for syntax errors...")
+            Chef::Mixin::Command.run_command(:command => "ruby -c #{ruby_file}", :output_on_failure => true)
+            cache.generate_checksum(key, ruby_file, fstat)
+          end
+        end
+      end
+
+      def test_templates(cookbook_dir)
+        cache = Chef::Cache::Checksum.instance
+        Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
+          key = cache.generate_key(erb_file, "chef-test")
+          fstat = File.stat(erb_file)
+
+          if cache.lookup_checksum(key, fstat) 
+            Chef::Log.info("No change in checksum of #{erb_file}")
+          else
+            Chef::Log.info("Testing template #{erb_file} for syntax errors...")
+            Chef::Mixin::Command.run_command(:command => "sh -c 'erubis -x #{erb_file} | ruby -c'", :output_on_failure => true)
+            cache.generate_checksum(key, erb_file, fstat)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/cookbook_upload.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.
@@ -19,7 +19,6 @@
 
 require 'chef/knife'
 require 'chef/streaming_cookbook_uploader'
-require 'chef/cache/checksum'
 
 class Chef
   class Knife
@@ -38,14 +37,16 @@ class Chef
         :long => "--all",
         :description => "Upload all cookbooks, rather than just a single cookbook"
 
-      def run 
+      def run
+        Chef::Log.debug "Uploading cookbooks from #{config[:cookbook_path]}"
+
         if config[:cookbook_path]
           Chef::Config[:cookbook_path] = config[:cookbook_path]
         else
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
 
-        if config[:all] 
+        if config[:all]
           cl = Chef::CookbookLoader.new
           cl.each do |cookbook|
             Chef::Log.info("** #{cookbook.name.to_s} **")
@@ -58,28 +59,21 @@ class Chef
           end
         end
       end
-      
-      def test_ruby(cookbook_dir)
-        Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
-          Chef::Log.info("Testing #{ruby_file} for syntax errors...")
-          Chef::Mixin::Command.run_command(:command => "ruby -c #{ruby_file}")
-        end
-      end
-      
-      def test_templates(cookbook_dir)
-        Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
-          Chef::Log.info("Testing template #{erb_file} for syntax errors...")
-          Chef::Mixin::Command.run_command(:command => "sh -c 'erubis -x #{erb_file} | ruby -c'")
-        end
-      end
 
       def upload_cookbook(cookbook_name)
+        # Syntax check all cookbook paths rather than tmp_cookbook_dir as to
+        # take advantage of the existing cache used/generated by knife cookbook
+        # test.
+        check = Chef::Knife::CookbookTest.new
+        check.config[:cookbook_path] = config[:cookbook_path]
+        check.name_args = [ cookbook_name ]
+        check.run
 
         if cookbook_name =~ /^#{File::SEPARATOR}/
-          child_folders = cookbook_name 
+          child_folders = cookbook_name
           cookbook_name = File.basename(cookbook_name)
         else
-          child_folders = config[:cookbook_path].inject([]) do |r, e| 
+          child_folders = config[:cookbook_path].inject([]) do |r, e|
             r << File.join(e, cookbook_name)
             r
           end
@@ -98,26 +92,23 @@ class Chef
 
         Chef::Log.debug("Staging at #{tmp_cookbook_dir}")
 
-        found_cookbook = false 
+        found_cookbook = false
 
         child_folders.each do |file_path|
           if File.directory?(file_path)
-            found_cookbook = true 
+            found_cookbook = true
             Chef::Log.info("Copying from #{file_path} to #{tmp_cookbook_dir}")
-            FileUtils.cp_r(file_path, tmp_cookbook_dir, :remove_destination => true)
+            FileUtils.cp_r(file_path, tmp_cookbook_dir, :remove_destination => true, :preserve => true)
           else
             Chef::Log.info("Nothing to copy from #{file_path}")
           end
-        end 
+        end
 
         unless found_cookbook
           Chef::Log.fatal("Could not find cookbook #{cookbook_name}!")
           exit 17
         end
 
-        test_ruby(tmp_cookbook_dir)
-        test_templates(tmp_cookbook_dir)
-
         # First, generate metadata
         kcm = Chef::Knife::CookbookMetadata.new
         kcm.config[:cookbook_path] = [ tmp_cookbook_dir ]
@@ -144,32 +135,32 @@ class Chef
 
         if cookbook_uploaded
           Chef::StreamingCookbookUploader.put(
-            "#{Chef::Config[:chef_server_url]}/cookbooks/#{cookbook_name}/_content", 
-            Chef::Config[:node_name], 
-            Chef::Config[:client_key], 
+            "#{Chef::Config[:chef_server_url]}/cookbooks/#{cookbook_name}/_content",
+            Chef::Config[:node_name],
+            Chef::Config[:client_key],
             {
-              :file => File.new(tarball_name), 
+              :file => File.new(tarball_name),
               :name => cookbook_name
             }
           )
         else
           Chef::StreamingCookbookUploader.post(
-            "#{Chef::Config[:chef_server_url]}/cookbooks", 
-            Chef::Config[:node_name], 
-            Chef::Config[:client_key], 
+            "#{Chef::Config[:chef_server_url]}/cookbooks",
+            Chef::Config[:node_name],
+            Chef::Config[:client_key],
             {
-              :file => File.new(tarball_name), 
+              :file => File.new(tarball_name),
               :name => cookbook_name
             }
           )
         end
         Chef::Log.info("Upload complete!")
         Chef::Log.debug("Removing local tarball at #{tarball_name}")
-        FileUtils.rm_rf tarball_name 
+        FileUtils.rm_rf tarball_name
         Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
         FileUtils.rm_rf tmp_cookbook_dir
       end
-      
+
     end
   end
 end