chef 11.6.2 → 11.8.0.rc.1

data/lib/chef/knife/bootstrap/chef-full.erb

@@ -1,5 +1,14 @@
 bash -c '
-<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+<%= "export https_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
+distro=`uname -s`
+
+if test "x$distro" = "xSunOS"; then
+  if test -d "/usr/sfw/bin"; then
+    PATH=/usr/sfw/bin:$PATH
+    export PATH
+  fi
+fi
 
 exists() {
   if command -v $1 &>/dev/null

data/lib/chef/knife/client_create.rb

@@ -61,7 +61,7 @@ class Chef
         # We only get a private_key on client creation, not on client update.
         if client['private_key']
           ui.info("Created #{output}")
-  
+
           if config[:file]
             File.open(config[:file], "w") do |f|
               f.print(client['private_key'])

data/lib/chef/knife/configure.rb

@@ -57,7 +57,7 @@ class Chef
 
       option :validation_key,
         :long => "--validation-key PATH",
-        :description => "The location of the location of the validation key (usually a file named validation.pem)"
+        :description => "The location of the validation key (usually a file named validation.pem)"
 
       def configure_chef
         # We are just faking out the system so that you can do this without a key specified

data/lib/chef/knife/cookbook_create.rb

@@ -214,7 +214,7 @@ EOH
 TODO: Enter the cookbook description here.
 
 e.g.
-This cookbook makes your favorite breakfast sandwhich.
+This cookbook makes your favorite breakfast sandwich.
 
 == Requirements
 TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
@@ -224,7 +224,7 @@ e.g.
 - +toaster+ - #{cookbook_name} needs toaster to brown your bagel.
 
 == Attributes
-TODO: List you cookbook attributes here.
+TODO: List your cookbook attributes here.
 
 e.g.
 ==== #{cookbook_name}::default
@@ -263,7 +263,7 @@ TODO: (optional) If this is a public cookbook, detail the process for contributi
 e.g.
 1. Fork the repository on Github
 2. Create a named feature branch (like `add_component_x`)
-3. Write you change
+3. Write your change
 4. Write tests for your change (if applicable)
 5. Run the tests, ensuring they all pass
 6. Submit a Pull Request using Github
@@ -278,7 +278,7 @@ EOH
 TODO: Enter the cookbook description here.
 
 e.g.
-This cookbook makes your favorite breakfast sandwhich.
+This cookbook makes your favorite breakfast sandwich.
 
 Requirements
 ------------
@@ -333,7 +333,7 @@ TODO: (optional) If this is a public cookbook, detail the process for contributi
 e.g.
 1. Fork the repository on Github
 2. Create a named feature branch (like `add_component_x`)
-3. Write you change
+3. Write your change
 4. Write tests for your change (if applicable)
 5. Run the tests, ensuring they all pass
 6. Submit a Pull Request using Github
@@ -349,7 +349,7 @@ EOH
   TODO: Enter the cookbook description here.
 
   e.g.
-  This cookbook makes your favorite breakfast sandwhich.
+  This cookbook makes your favorite breakfast sandwich.
 
 Requirements
   TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
@@ -386,7 +386,7 @@ Contributing
   e.g.
   1. Fork the repository on Github
   2. Create a named feature branch (like `add_component_x`)
-  3. Write you change
+  3. Write your change
   4. Write tests for your change (if applicable)
   5. Run the tests, ensuring they all pass
   6. Submit a Pull Request using Github

data/lib/chef/knife/cookbook_download.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.

data/lib/chef/knife/cookbook_metadata_from_file.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.

data/lib/chef/knife/cookbook_show.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.
@@ -50,7 +50,7 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
+      def run
         case @name_args.length
         when 4 # We are showing a specific file
           node = Hash.new

data/lib/chef/knife/cookbook_site_install.rb

@@ -151,11 +151,11 @@ class Chef
         ui.info("Removing pre-existing version.")
         FileUtils.rmtree(cookbook_path) if File.directory?(cookbook_path)
       end
-      
+
       def convert_path(upstream_file)
       	if ENV['MSYSTEM'] == 'MINGW32'
       	  return upstream_file.sub(/^([[:alpha:]]):/, '/\1')
-      	else 
+	      else
       	  return Shellwords.escape upstream_file
       	end
       end

data/lib/chef/knife/cookbook_site_list.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.

data/lib/chef/knife/cookbook_site_search.rb

@@ -5,9 +5,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.
@@ -36,7 +36,7 @@ class Chef
         end
         new_start = start + cr["items"].length
         if new_start < cr["total"]
-          search_cookbook(query, items, new_start, cookbook_collection) 
+          search_cookbook(query, items, new_start, cookbook_collection)
         else
           cookbook_collection
         end

data/lib/chef/knife/cookbook_site_show.rb

@@ -5,9 +5,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.
@@ -27,10 +27,10 @@ class Chef
       def run
         output(format_for_display(get_cookbook_data))
       end
-      
+
       def get_cookbook_data
         case @name_args.length
-        when 1 
+        when 1
           noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
         when 2
           noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
@@ -45,7 +45,7 @@ class Chef
         end
         new_start = start + cr["items"].length
         if new_start < cr["total"]
-          get_cookbook_list(items, new_start, cookbook_collection) 
+          get_cookbook_list(items, new_start, cookbook_collection)
         else
           cookbook_collection
         end

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

@@ -51,9 +51,9 @@ class Chef
         end
 
         def encrypted_data_bag_secret
-          @config[:secret] || begin
-            if @config[:secret_file] && File.exist?(@config[:secret_file])
-              IO.read(File.expand_path(@config[:secret_file]))
+          knife_config[:secret] || begin
+            if knife_config[:secret_file] && File.exist?(knife_config[:secret_file])
+              IO.read(File.expand_path(knife_config[:secret_file]))
             elsif @chef_config[:encrypted_data_bag_secret] && File.exist?(@chef_config[:encrypted_data_bag_secret])
               IO.read(File.expand_path(@chef_config[:encrypted_data_bag_secret]))
             end
@@ -78,6 +78,10 @@ CONFIG
             client_rb << %Q{https_proxy       "#{knife_config[:bootstrap_proxy]}"\n}
           end
 
+          if knife_config[:bootstrap_no_proxy]
+            client_rb << %Q{no_proxy       "#{knife_config[:bootstrap_no_proxy]}"\n}
+          end
+
           if encrypted_data_bag_secret
             client_rb << %Q{encrypted_data_bag_secret "/etc/chef/encrypted_data_bag_secret"\n}
           end

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

@@ -18,6 +18,7 @@
 
 require 'chef/json_compat'
 require 'chef/node'
+require 'tempfile'
 
 class Chef
   class Knife
@@ -35,11 +36,24 @@ class Chef
         abort "You specified the --disable_editing option, nothing to edit" if config[:disable_editing]
         assert_editor_set!
 
-        updated_node_data = edit_data(view)
+        updated_node_data = @ui.edit_data(view)
         apply_updates(updated_node_data)
         @updated_node
       end
 
+      def updated?
+        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
+        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
+        unless pristine_copy == updated_copy
+          updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
+             pristine_copy[key] == updated_copy[key]
+          end
+        end
+        ( pristine_copy != updated_copy ) && updated_properties
+      end
+
+      private
+
       def view
         result = {}
         result["name"] = node.name
@@ -52,12 +66,7 @@ class Chef
           result["override"]  = node.override_attrs
           result["automatic"] = node.automatic_attrs
         end
-        Chef::JSONCompat.to_json_pretty(result)
-      end
-
-      def edit_data(text)
-        edited_data = tempfile_for(text) {|filename| system("#{config[:editor]} #{filename}")}
-        Chef::JSONCompat.from_json(edited_data)
+        result
       end
 
       def apply_updates(updated_data)
@@ -84,19 +93,6 @@ class Chef
         end
       end
 
-      def updated?
-        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
-        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
-        unless pristine_copy == updated_copy
-          updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
-             pristine_copy[key] == updated_copy[key]
-          end
-        end
-        ( pristine_copy != updated_copy ) && updated_properties
-      end
-
-      private
-
       def abort(message)
         ui.error(message)
         exit 1
@@ -108,22 +104,6 @@ class Chef
         end
       end
 
-      def tempfile_for(data)
-        # TODO: include useful info like the node name in the temp file
-        # name
-        basename = "knife-edit-" << rand(1_000_000_000_000_000).to_s.rjust(15, '0') << '.json'
-        filename = File.join(Dir.tmpdir, basename)
-        File.open(filename, "w+") do |f|
-          f.sync = true
-          f.puts data
-        end
-
-        yield filename
-
-        IO.read(filename)
-      ensure
-        File.unlink(filename)
-      end
     end
   end
 end

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

@@ -86,7 +86,7 @@ class Chef
         # 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 the ui object.
+        # in the ui object.
         def summarize(data)
           if data.kind_of?(Chef::Node)
             node = data

data/lib/chef/knife/core/subcommand_loader.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.
@@ -112,7 +112,7 @@ class Chef
             check_spec_for_glob(spec, glob)
           end
         end.flatten
-        
+
         files.concat gem_files
         files.uniq! if check_load_path
 
@@ -133,9 +133,9 @@ class Chef
         else
           spec.require_paths.first
         end
-      
+
         glob = File.join("#{spec.full_gem_path}/#{dirs}", glob)
- 
+
         Dir[glob].map { |f| f.untaint }
       end
     end

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

@@ -21,6 +21,7 @@
 require 'forwardable'
 require 'chef/platform/query_helpers'
 require 'chef/knife/core/generic_presenter'
+require 'tempfile'
 
 class Chef
   class Knife
@@ -165,19 +166,14 @@ class Chef
         output = Chef::JSONCompat.to_json_pretty(data)
 
         if (!config[:disable_editing])
-          filename = "knife-edit-"
-          0.upto(20) { filename += rand(9).to_s }
-          filename << ".js"
-          filename = File.join(Dir.tmpdir, filename)
-          tf = File.open(filename, "w")
-          tf.sync = true
-          tf.puts output
-          tf.close
-          raise "Please set EDITOR environment variable" unless system("#{config[:editor]} #{tf.path}")
-          tf = File.open(filename, "r")
-          output = tf.gets(nil)
-          tf.close
-          File.unlink(filename)
+          Tempfile.open([ 'knife-edit-', '.json' ]) do |tf|
+            tf.sync = true
+            tf.puts output
+            tf.close
+            raise "Please set EDITOR environment variable" unless system("#{config[:editor]} #{tf.path}")
+
+            output = IO.read(tf.path)
+          end
         end
 
         parse_output ? Chef::JSONCompat.from_json(output) : output

data/lib/chef/knife/data_bag_create.rb

@@ -32,13 +32,15 @@ class Chef
       category "data bag"
 
       option :secret,
-      :short => "-s SECRET",
-      :long  => "--secret ",
-      :description => "The secret key to use to encrypt data bag item values"
+        :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"
+        :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]

data/lib/chef/knife/data_bag_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.
@@ -29,7 +29,7 @@ class Chef
       banner "knife data bag delete BAG [ITEM] (options)"
       category "data bag"
 
-      def run 
+      def run
         if @name_args.length == 2
           delete_object(Chef::DataBagItem, @name_args[1], "data_bag_item") do
             rest.delete_rest("data/#{@name_args[0]}/#{@name_args[1]}")