chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/cookbook_site_unshare.rb

@@ -18,12 +18,15 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class CookbookSiteUnshare < Knife
 
+      deps do
+        require 'chef/json_compat'
+      end
+
       banner "knife cookbook site unshare COOKBOOK"
       category "cookbook site"
 
@@ -31,7 +34,7 @@ class Chef
         @cookbook_name = @name_args[0]
         if @cookbook_name.nil?
           show_usage
-          Chef::Log.fatal "You must provide the name of the cookbook to unshare"
+          ui.fatal "You must provide the name of the cookbook to unshare"
           exit 1
         end
 
@@ -41,11 +44,11 @@ class Chef
           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."
+          ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."
           exit 1
         end
 
-        Chef::Log.info "Unshared cookbook #{@cookbook_name}"
+        ui.info "Unshared cookbook #{@cookbook_name}"
       end
 
     end

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -17,12 +17,15 @@
 #
 
 require 'chef/knife'
-require 'chef/cookbook/metadata'
 
 class Chef
   class Knife
     class CookbookSiteVendor < Knife
 
+      deps do
+        require 'chef/cookbook/metadata'
+      end
+
       banner "knife cookbook site vendor COOKBOOK [VERSION] (options)"
       category "cookbook site"
 
@@ -53,7 +56,7 @@ class Chef
 
         # Check to ensure we have a valid source of cookbooks before continuing
         unless File.directory?(config[:cookbook_path].first)
-          Chef::Log.error( File.join(config[:cookbook_path].first, " doesn't exist!.  Make sure you have cookbook_path configured correctly"))
+          ui.error( File.join(config[:cookbook_path].first, " doesn't exist!.  Make sure you have cookbook_path configured correctly"))
           exit 1
         end
 
@@ -67,49 +70,49 @@ class Chef
         download.name_args = name_args
         download.run
 
-        Chef::Log.info("Checking out the #{config[:branch_default]} branch.")
+        ui.info("Checking out the #{config[:branch_default]} branch.")
         Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
-        Chef::Log.info("Checking the status of the vendor branch.")
+        ui.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 =~ /#{Regexp.escape(branch_name)}$/m
-          Chef::Log.info("Vendor branch found.")
+          ui.info("Vendor branch found.")
           Chef::Mixin::Command.run_command(:command => "git checkout #{branch_name}", :cwd => vendor_path)
         else
-          Chef::Log.info("Creating vendor branch.")
+          ui.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.")
+        ui.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}.")
+        ui.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.")
+        ui.info("Adding changes.")
         Chef::Mixin::Command.run_command(:command => "git add #{name_args[0]}", :cwd => vendor_path)
 
-        Chef::Log.info("Committing changes.")
+        ui.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 #{config[:branch_default]} branch.")
-          Chef::Log.warn("No changes from current vendor #{name_args[0]}")
+          ui.warn("Checking out the #{config[:branch_default]} branch.")
+          ui.warn("No changes from current vendor #{name_args[0]}")
           Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
           changes = false
         end
 
         if changes
-          Chef::Log.info("Creating tag chef-vendor-#{name_args[0]}-#{download.version}.")
+          ui.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 #{config[:branch_default]} branch.")
+          ui.info("Checking out the #{config[:branch_default]} branch.")
           Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
-          Chef::Log.info("Merging changes from #{name_args[0]} version #{download.version}.")
+          ui.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!")
+              ui.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)")
+              ui.error("You have merge conflicts - please resolve manually!")
+              ui.error("(Hint: cd #{vendor_path}; git status)")
               exit 1
             end
           end

data/lib/chef/knife/cookbook_test.rb

@@ -9,9 +9,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,12 +19,16 @@
 # limitations under the License.
 #
 require 'chef/knife'
-require 'chef/checksum_cache'
 
 class Chef
   class Knife
     class CookbookTest < Knife
 
+      deps do
+        require 'chef/checksum_cache'
+        require 'chef/cookbook/syntax_check'
+      end
+
       banner "knife cookbook test [COOKBOOKS...] (options)"
 
       option :cookbook_path,
@@ -38,15 +42,11 @@ class Chef
         :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
+      def run
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
         if config[:all]
-          cl = Chef::CookbookLoader.new
+          cl = Chef::CookbookLoader.new(config[:cookbook_path])
           cl.each do |key, cookbook|
             test_cookbook(key)
           end
@@ -58,7 +58,7 @@ class Chef
       end
 
       def test_cookbook(cookbook)
-        Chef::Log.info("Running syntax check on #{cookbook}")
+        ui.info("Running syntax check on #{cookbook}")
         Array(config[:cookbook_path]).reverse.each do |path|
           syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook, path)
           test_ruby(syntax_checker)
@@ -68,12 +68,12 @@ class Chef
 
 
       def test_ruby(syntax_checker)
-        Chef::Log.info("Validating ruby files")
+        ui.info("Validating ruby files")
         exit(1) unless syntax_checker.validate_ruby_files
       end
-      
+
       def test_templates(syntax_checker)
-        Chef::Log.info("Validating templates")
+        ui.info("Validating templates")
         exit(1) unless syntax_checker.validate_templates
       end
 

data/lib/chef/knife/cookbook_upload.rb

@@ -18,13 +18,16 @@
 #
 
 require 'chef/knife'
-require 'chef/cookbook_loader'
-require 'chef/cookbook_uploader'
 
 class Chef
   class Knife
     class CookbookUpload < Knife
-      include Chef::Mixin::ShellOut
+
+      deps do
+        require 'chef/exceptions'
+        require 'chef/cookbook_loader'
+        require 'chef/cookbook_uploader'
+      end
 
       banner "knife cookbook upload [COOKBOOKS...] (options)"
 
@@ -34,61 +37,109 @@ class Chef
         :description => "A colon-separated path to look for cookbooks in",
         :proc => lambda { |o| o.split(":") }
 
+      option :freeze,
+        :long => '--freeze',
+        :description => 'Freeze this version of the cookbook so that it cannot be overwritten',
+        :boolean => true
+
       option :all,
         :short => "-a",
         :long => "--all",
         :description => "Upload 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
+      option :force,
+        :long => '--force',
+        :boolean => true,
+        :description => "Update cookbook versions even if they have been frozen"
 
-        Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
+      option :environment,
+        :short => '-E',
+        :long  => '--environment ENVIRONMENT',
+        :description => "Set ENVIRONMENT's version dependency match the version you're uploading."
 
-        cl = Chef::CookbookLoader.new
+      def run
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
-        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
-            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
+        assert_environment_valid!
+        version_constraints_to_update = {}
+
+        if config[:all]
+          cookbook_repo.each do |cookbook_name, cookbook|
+            cookbook.freeze_version if config[:freeze]
+            upload(cookbook)
+            version_constraints_to_update[cookbook_name] = cookbook.version
+          end
+        else
+          if @name_args.empty?
+            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|
+            begin
+              cookbook = cookbook_repo[cookbook_name]
+              cookbook.freeze_version if config[:freeze]
+              upload(cookbook)
+              version_constraints_to_update[cookbook_name] = cookbook.version
+            rescue Exceptions::CookbookNotFoundInRepo => e
+              Log.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+              Log.debug(e)
             end
           end
         end
+
+        update_version_constraints(version_constraints_to_update) if config[:environment]
+      end
+
+      def cookbook_repo
+        @cookbook_loader ||= begin
+          Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, config[:cookbook_path]) }
+          Chef::CookbookLoader.new(config[:cookbook_path])
+        end
+      end
+
+      def update_version_constraints(new_version_constraints)
+        new_version_constraints.each do |cookbook_name, version|
+          environment.cookbook_versions[cookbook_name] = "= #{version}"
+        end
+        environment.save
+      end
+
+
+      def environment
+        @environment ||= Environment.load(config[:environment])
       end
 
       private
 
-      def humanize_auth_exceptions
-        begin
-          yield
-        rescue Net::HTTPServerException => e
-          case e.response.code
-          when "401"
-            Chef::Log.fatal "Request failed due to authentication (#{e}), check your client configuration (username, key)"
-            exit 18
-          else
-            raise
-          end
+      def assert_environment_valid!
+        environment
+      rescue Net::HTTPServerException => e
+        if e.response.code.to_s == "404"
+          Log.error "The environment #{config[:environment]} does not exist on the server"
+          Log.debug(e)
+          exit 1
+        else
+          raise
         end
       end
 
+      def upload(cookbook)
+        Chef::Log.info("** #{cookbook.name} **")
+        Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
+      rescue Net::HTTPServerException => e
+        case e.response.code
+        when "401"
+          Log.error "Request failed due to authentication (#{e}), check your client configuration (username, key)"
+          Log.debug(e)
+          exit 18
+        when "409"
+          Log.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Use --force to override."
+          Log.debug(e)
+        else
+          raise
+        end
+      end
 
     end
   end

data/lib/chef/knife/data_bag_create.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 2009-2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,37 +18,71 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag'
 
 class Chef
   class Knife
     class DataBagCreate < Knife
 
+      deps do
+        require 'chef/data_bag'
+      end
+
       banner "knife data bag create BAG [ITEM] (options)"
       category "data bag"
 
+      option :secret,
+      :short => "-s SECRET",
+      :long  => "--secret ",
+      :description => "The secret key to use to encrypt data bag item values"
+
+      option :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
+        if config[:secret]
+          config[:secret]
+        else
+          Chef::EncryptedDataBagItem.load_secret(config[:secret_file])
+        end
+      end
+
+      def use_encryption
+        if config[:secret] && config[:secret_file]
+          stdout.puts "please specify only one of --secret, --secret_file"
+          exit(1)
+        end
+        config[:secret] || config[:secret_file]
+      end
+
       def run
         @data_bag_name, @data_bag_item_name = @name_args
 
         if @data_bag_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a data bag name")
+          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 })
-          Chef::Log.info("Created data_bag[#{@data_bag_name}]")
+          ui.info("Created data_bag[#{@data_bag_name}]")
         rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^409/
-          Chef::Log.info("Data bag #{@data_bag_name} already exists")
+          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|
-            rest.post_rest("data/#{@data_bag_name}", output)
+            item = if use_encryption
+                     Chef::EncryptedDataBagItem.encrypt_data_bag_item(output,
+                                                                      read_secret)
+                   else
+                     output
+                   end
+            rest.post_rest("data/#{@data_bag_name}", item)
           end
         end
       end