chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/lib/chef/knife/cookbook_site_share.rb

@@ -31,7 +31,7 @@ class Chef
         require 'chef/cookbook_site_streaming_uploader'
       end
 
-      banner "knife cookbook site share COOKBOOK CATEGORY (options)"
+      banner "knife cookbook site share COOKBOOK [CATEGORY] (options)"
       category "cookbook site"
 
       option :cookbook_path,
@@ -40,17 +40,28 @@ class Chef
         :description => "A colon-separated path to look for cookbooks in",
         :proc => lambda { |o| Chef::Config.cookbook_path = o.split(":") }
 
+      option :dry_run,
+        :long => '--dry-run',
+        :short => '-n',
+        :boolean => true,
+        :default => false,
+        :description => "Don't take action, only print what files will be upload to SuperMarket."
+
       def run
-        if @name_args.length < 2
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+        if @name_args.length < 1
           show_usage
-          ui.fatal("You must specify the cookbook name and the category you want to share this cookbook to.")
-          exit 1
+          ui.fatal("You must specify the cookbook name.")
+          exit(1)
+        elsif @name_args.length < 2
+          cookbook_name = @name_args[0]
+          category = get_category(cookbook_name)
+        else
+          cookbook_name = @name_args[0]
+          category = @name_args[1]
         end
 
-        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
-
-        cookbook_name = @name_args[0]
-        category = @name_args[1]
         cl = Chef::CookbookLoader.new(config[:cookbook_path])
         if cl.cookbook_exists?(cookbook_name)
           cookbook = cl[cookbook_name]
@@ -66,6 +77,14 @@ class Chef
             exit(1)
           end
 
+          if config[:dry_run]
+            ui.info("Not uploading #{cookbook_name}.tgz due to --dry-run flag.")
+            result = shell_out!("tar -tzf #{cookbook_name}.tgz", :cwd => tmp_cookbook_dir)
+            ui.info(result.stdout)
+            FileUtils.rm_rf tmp_cookbook_dir
+            return
+          end
+
           begin
             do_upload("#{tmp_cookbook_dir}/#{cookbook_name}.tgz", category, Chef::Config[:node_name], Chef::Config[:client_key])
             ui.info("Upload complete!")
@@ -84,6 +103,22 @@ class Chef
 
       end
 
+      def get_category(cookbook_name)
+        begin
+          data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
+          if !data["category"] && data["error_code"]
+            ui.fatal("Received an error from the Opscode Cookbook site: #{data["error_code"]}. On the first time you upload it, you are required to specify the category you want to share this cookbook to.")
+            exit(1)
+          else
+            data['category']
+          end
+        rescue => e
+          ui.fatal("Unable to reach Opscode Cookbook Site: #{e.message}. Increase log verbosity (-VV) for more information.")
+          Chef::Log.debug("\n#{e.backtrace.join("\n")}")
+          exit(1)
+        end
+      end
+
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
          uri = "https://supermarket.getchef.com/api/v1/cookbooks"
 

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

@@ -17,6 +17,8 @@
 #
 
 require 'chef/run_list'
+require 'chef/util/path_helper'
+
 class Chef
   class Knife
     module Core
@@ -28,10 +30,11 @@ class Chef
       #
       class BootstrapContext
 
-        def initialize(config, run_list, chef_config)
+        def initialize(config, run_list, chef_config, secret)
           @config       = config
           @run_list     = run_list
           @chef_config  = chef_config
+          @secret       = secret
         end
 
         def bootstrap_environment
@@ -43,15 +46,7 @@ class Chef
         end
 
         def encrypted_data_bag_secret
-          knife_config[:secret] || begin
-            secret_file_path = knife_config[:secret_file]
-            expanded_secret_file_path = File.expand_path(secret_file_path.to_s)
-            if secret_file_path && File.exist?(expanded_secret_file_path)
-              IO.read(expanded_secret_file_path)
-            else
-              nil
-            end
-          end
+          @secret
         end
 
         def trusted_certs
@@ -167,7 +162,7 @@ CONFIG
         def trusted_certs_content
           content = ""
           if @chef_config[:trusted_certs_dir]
-            Dir.glob(File.join(@chef_config[:trusted_certs_dir], "*.{crt,pem}")).each do |cert|
+            Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(@chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
               content << "cat > /etc/chef/trusted_certs/#{File.basename(cert)} <<'EOP'\n" +
                          IO.read(File.expand_path(cert)) + "\nEOP\n"
             end

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

@@ -17,6 +17,7 @@
 #
 
 require 'ffi_yajl'
+require 'chef/util/path_helper'
 
 class Chef
   class Knife
@@ -69,15 +70,15 @@ class Chef
         #
         # @api public
         def find_all_objects(path)
-          path = File.join(path, '*')
+          path = File.join(Chef::Util::PathHelper.escape_glob(File.expand_path(path)), '*')
           path << '.{json,rb}'
-          objects = Dir.glob(File.expand_path(path))
+          objects = Dir.glob(path)
           objects.map { |o| File.basename(o) }
         end
 
         def find_all_object_dirs(path)
-          path = File.join(path, '*')
-          objects = Dir.glob(File.expand_path(path))
+          path = File.join(Chef::Util::PathHelper.escape_glob(File.expand_path(path)), '*')
+          objects = Dir.glob(path)
           objects.delete_if { |o| !File.directory?(o) }
           objects.map { |o| File.basename(o) }
         end
@@ -111,4 +112,3 @@ class Chef
     end
   end
 end
-

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

@@ -0,0 +1,156 @@
+#
+# Author:: Nicolas DUPEUX (<nicolas.dupeux@arkea.com>)
+# Copyright:: Copyright (c) 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/core/text_formatter'
+require 'chef/knife/core/generic_presenter'
+
+class Chef
+  class Knife
+    module Core
+
+      # This module may be included into a knife subcommand class to automatically
+      # add configuration options used by the StatusPresenter
+      module StatusFormattingOptions
+        # :nodoc:
+        # Would prefer to do this in a rational way, but can't be done b/c of
+        # Mixlib::CLI's design :(
+        def self.included(includer)
+          includer.class_eval do
+            option :medium_output,
+              :short   => '-m',
+              :long    => '--medium',
+              :boolean => true,
+              :default => false,
+              :description => 'Include normal attributes in the output'
+
+            option :long_output,
+              :short   => '-l',
+              :long    => '--long',
+              :boolean => true,
+              :default => false,
+              :description => 'Include all attributes in the output'
+          end
+        end
+      end
+
+      #==Chef::Knife::Core::StatusPresenter
+      # A customized presenter for Chef::Node objects. Supports variable-length
+      # output formats for displaying node data
+      class StatusPresenter < GenericPresenter
+
+        def format(data)
+          if parse_format_option == :json
+            summarize_json(data)
+          else
+            super
+          end
+        end
+
+        def summarize_json(list)
+          result_list = []
+          list.each do |node|
+            result = {}
+
+            result["name"] = node.name
+            result["chef_environment"] = node.chef_environment
+            ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
+            fqdn = (node[:ec2] && node[:ec2][:public_hostname]) || node[:fqdn]
+            result["ip"] = ip if ip
+            result["fqdn"] = fqdn if fqdn
+            result["run_list"] = node.run_list if config[:run_list]
+            result["ohai_time"] = node[:ohai_time]
+            result["platform"] = node[:platform] if node[:platform]
+            result["platform_version"] = node[:platform_version] if node[:platform_version]
+
+            if config[:long_output]
+              result["default"]   = node.default_attrs
+              result["override"]  = node.override_attrs
+              result["automatic"] = node.automatic_attrs
+            end
+            result_list << result
+          end
+
+          Chef::JSONCompat.to_json_pretty(result_list)
+        end
+
+        # Converts a Chef::Node object to a string suitable for output to a
+        # terminal. If config[:medium_output] or config[:long_output] are set
+        # the volume of output is adjusted accordingly. Uses colors if enabled
+        # in the ui object.
+        def summarize(list)
+          summarized=''
+          list.each do |data|
+            node = data
+            # special case ec2 with their split horizon whatsis.
+            ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
+            fqdn = (node[:ec2] && node[:ec2][:public_hostname]) || node[:fqdn]
+
+            hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
+            hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
+            minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
+            run_list = "#{node.run_list}" if config[:run_list]
+            if hours > 24
+              color = :red
+              text = hours_text
+            elsif hours >= 1
+              color = :yellow
+              text = hours_text
+            else
+              color = :green
+              text = minutes_text
+            end
+
+            line_parts = Array.new
+            line_parts << @ui.color(text, color) + ' ago' << node.name
+            line_parts << fqdn if fqdn
+            line_parts << ip if ip
+            line_parts << run_list if run_list
+
+            if node['platform']
+              platform = node['platform']
+              if node['platform_version']
+                platform << " #{node['platform_version']}"
+              end
+              line_parts << platform
+            end
+
+            summarized=summarized + line_parts.join(', ') + ".\n"
+          end
+          summarized
+        end
+
+        def key(key_text)
+          ui.color(key_text, :cyan)
+        end
+
+        # :nodoc:
+        # TODO: this is duplicated from StatusHelper in the Webui. dedup.
+        def time_difference_in_hms(unix_time)
+          now = Time.now.to_i
+          difference = now - unix_time.to_i
+          hours = (difference / 3600).to_i
+          difference = difference % 3600
+          minutes = (difference / 60).to_i
+          seconds = (difference % 60)
+          return [hours, minutes, seconds]
+        end
+
+      end
+    end
+  end
+end

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

@@ -17,6 +17,7 @@
 #
 
 require 'chef/version'
+require 'chef/util/path_helper'
 class Chef
   class Knife
     class SubcommandLoader
@@ -41,11 +42,11 @@ class Chef
         user_specific_files = []
 
         if chef_config_dir
-          user_specific_files.concat Dir.glob(File.expand_path("plugins/knife/*.rb", chef_config_dir))
+          user_specific_files.concat Dir.glob(File.expand_path("plugins/knife/*.rb", Chef::Util::PathHelper.escape_glob(chef_config_dir)))
         end
 
         # finally search ~/.chef/plugins/knife/*.rb
-        user_specific_files.concat Dir.glob(File.join(env['HOME'], '.chef', 'plugins', 'knife', '*.rb')) if env['HOME']
+        user_specific_files.concat Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(env['HOME'], '.chef', 'plugins', 'knife'), '*.rb')) if env['HOME']
 
         user_specific_files
       end
@@ -107,7 +108,7 @@ class Chef
 
       def find_subcommands_via_dirglob
         # The "require paths" of the core knife subcommands bundled with chef
-        files = Dir[File.expand_path('../../../knife/*.rb', __FILE__)]
+        files = Dir[File.join(Chef::Util::PathHelper.escape_glob(File.expand_path('../../../knife', __FILE__)), '*.rb')]
         subcommand_files = {}
         files.each do |knife_file|
           rel_path = knife_file[/#{CHEF_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/,1]
@@ -146,7 +147,7 @@ class Chef
 
         if check_load_path
           files = $LOAD_PATH.map { |load_path|
-            Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
+            Dir["#{File.expand_path glob, Chef::Util::PathHelper.escape_glob(load_path)}#{Gem.suffix_pattern}"]
           }.flatten.select { |file| File.file? file.untaint }
         end
 
@@ -180,7 +181,7 @@ class Chef
           spec.require_paths.first
         end
 
-        glob = File.join("#{spec.full_gem_path}/#{dirs}", glob)
+        glob = File.join(Chef::Util::PathHelper.escape_glob(spec.full_gem_path, dirs), glob)
 
         Dir[glob].map { |f| f.untaint }
       end

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

@@ -113,7 +113,7 @@ class Chef
       # determined by the value of `config[:color]`. When output is not to a
       # terminal, colored output is never used
       def color?
-        Chef::Config[:color] && stdout.tty? && !Chef::Platform.windows?
+        Chef::Config[:color] && stdout.tty?
       end
 
       def ask(*args, &block)
@@ -209,11 +209,11 @@ class Chef
       def confirmation_instructions(default_choice)
         case default_choice
         when true
-          '? (Y/n)'
+          '? (Y/n) '
         when false
-          '? (y/N)'
+          '? (y/N) '
         else
-          '? (Y/N)'
+          '? (Y/N) '
         end
       end
 

data/lib/chef/knife/data_bag_create.rb

@@ -18,10 +18,12 @@
 #
 
 require 'chef/knife'
+require 'chef/knife/data_bag_secret_options'
 
 class Chef
   class Knife
     class DataBagCreate < Knife
+      include DataBagSecretOptions
 
       deps do
         require 'chef/data_bag'
@@ -31,33 +33,6 @@ class Chef
       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",
-        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
-
-      option :secret_file,
-        :long => "--secret-file SECRET_FILE",
-        :description => "A file containing the secret key to use to encrypt data bag item values",
-        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
-
-      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]
-          ui.fatal("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
 
@@ -87,11 +62,11 @@ class Chef
         if @data_bag_item_name
           create_object({ "id" => @data_bag_item_name }, "data_bag_item[#{@data_bag_item_name}]") do |output|
             item = Chef::DataBagItem.from_hash(
-                     if use_encryption
-                       Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
-                     else
-                       output
-                     end)
+              if encryption_secret_provided?
+                Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
+              else
+                output
+            end)
             item.data_bag(@data_bag_name)
             rest.post_rest("data/#{@data_bag_name}", item)
           end