chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/client_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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientList < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client list (options)"
 
       option :with_uri,
@@ -31,7 +34,7 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
+      def run
         output(format_list_for_display(Chef::ApiClient.list))
       end
     end

data/lib/chef/knife/client_reregister.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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientReregister < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client reregister CLIENT (options)"
 
       option :file,
@@ -36,10 +39,10 @@ class Chef
 
         if @client_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a client name")
+          ui.fatal("You must specify a client name")
           exit 1
         end
-        
+
         client = Chef::ApiClient.load(@client_name)
         key = client.save(true)
         if config[:file]

data/lib/chef/knife/client_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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/api_client'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class ClientShow < Knife
 
+      deps do
+        require 'chef/api_client'
+        require 'chef/json_compat'
+      end
+
       banner "knife client show CLIENT (options)"
 
       option :attribute,
@@ -36,10 +39,10 @@ class Chef
 
         if @client_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a client name")
+          ui.fatal("You must specify a client name")
           exit 1
         end
-        
+
         client = Chef::ApiClient.load(@client_name)
         output(format_for_display(client))
       end

data/lib/chef/knife/configure.rb

@@ -47,10 +47,6 @@ class Chef
       def run
         ask_user_for_config_path
 
-        Mixlib::Log::Formatter.show_time = false
-        Chef::Log.init(STDOUT)
-        Chef::Log.level(:info)
-
         FileUtils.mkdir_p(chef_config_path)
 
         ask_user_for_config
@@ -73,7 +69,7 @@ EOH
         end
 
         if config[:initial]
-          Chef::Log.warn("Creating initial API user...")
+          ui.msg("Creating initial API user...")
           Chef::Config[:chef_server_url] = chef_server
           Chef::Config[:node_name] = admin_client_name
           Chef::Config[:client_key] = admin_client_key
@@ -85,22 +81,22 @@ EOH
           client_create.config[:no_editor] = true
           client_create.run
         else
-          Chef::Log.warn("*****")
-          Chef::Log.warn("")
-          Chef::Log.warn("You must place your client key in:")
-          Chef::Log.warn("  #{new_client_key}")
-          Chef::Log.warn("Before running commands with Knife!")
-          Chef::Log.warn("")
-          Chef::Log.warn("*****")
-          Chef::Log.warn("")
-          Chef::Log.warn("You must place your validation key in:")
-          Chef::Log.warn("  #{validation_key}")
-          Chef::Log.warn("Before generating instance data with Knife!")
-          Chef::Log.warn("")
-          Chef::Log.warn("*****")
+          ui.msg("*****")
+          ui.msg("")
+          ui.msg("You must place your client key in:")
+          ui.msg("  #{new_client_key}")
+          ui.msg("Before running commands with Knife!")
+          ui.msg("")
+          ui.msg("*****")
+          ui.msg("")
+          ui.msg("You must place your validation key in:")
+          ui.msg("  #{validation_key}")
+          ui.msg("Before generating instance data with Knife!")
+          ui.msg("")
+          ui.msg("*****")
         end
 
-        Chef::Log.warn("Configuration file written to #{config[:config_file]}")
+        ui.msg("Configuration file written to #{config[:config_file]}")
       end
 
       def ask_user_for_config_path

data/lib/chef/knife/configure_client.rb

@@ -25,21 +25,21 @@ class Chef
 
       def run
         unless @config_dir = @name_args[0]
-          Chef::Log.fatal "You must provide the directory to put the files in"
+          ui.fatal "You must provide the directory to put the files in"
           show_usage
           exit(1)
         end
 
-        Chef::Log.info("Creating client configuration")
+        ui.info("Creating client configuration")
         FileUtils.mkdir_p(@config_dir)
-        Chef::Log.info("Writing client.rb")
+        ui.info("Writing client.rb")
         File.open(File.join(@config_dir, "client.rb"), "w") do |file|
           file.puts('log_level        :info')
           file.puts('log_location     STDOUT')
           file.puts("chef_server_url  '#{Chef::Config[:chef_server_url]}'")
           file.puts("validation_client_name '#{Chef::Config[:validation_client_name]}'")
         end
-        Chef::Log.info("Writing validation.pem")
+        ui.info("Writing validation.pem")
         File.open(File.join(@config_dir, 'validation.pem'), "w") do |validation|
           validation.puts(IO.read(Chef::Config[:validation_key]))
         end

data/lib/chef/knife/cookbook_bulk_delete.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.
@@ -18,19 +18,22 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/cookbook_delete'
 
 class Chef
   class Knife
     class CookbookBulkDelete < Knife
 
+      deps do
+        require 'chef/knife/cookbook_delete'
+      end
+
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
-      
+
       banner "knife cookbook bulk delete REGEX (options)"
 
       def run
         unless regex_str = @name_args.first
-          Chef::Log.fatal("You must supply a regular expression to match the results against")
+          ui.fatal("You must supply a regular expression to match the results against")
           exit 42
         end
 
@@ -42,14 +45,14 @@ class Chef
         output(format_list_for_display(cookbooks_to_delete))
 
         confirm("Do you really want to delete these cookbooks? All versions will be deleted. (Y/N) ", false)
-        
+
         confirm("Files that are common to multiple cookbooks are shared, so purging the files may disable other cookbooks. Are you sure you want to purge files instead of just deleting the cookbooks") if config[:purge]
-        
+
         cookbooks_names.each do |cookbook_name|
           versions = rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
           versions.each do |version|
             object = rest.delete_rest("cookbooks/#{cookbook_name}/#{version}#{config[:purge] ? "?purge=true" : ""}")
-            Chef::Log.info("Deleted cookbook  #{cookbook_name.ljust(25)} [#{version}]")
+            ui.info("Deleted cookbook  #{cookbook_name.ljust(25)} [#{version}]")
           end
         end
       end

data/lib/chef/knife/cookbook_create.rb

@@ -17,14 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
-require 'uri'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Knife
     class CookbookCreate < Knife
-      include Chef::Mixin::ShellOut
+
+      deps do
+        require 'chef/json_compat'
+        require 'uri'
+        require 'fileutils'
+      end
 
       banner "knife cookbook create COOKBOOK (options)"
 
@@ -42,7 +44,7 @@ class Chef
       option :cookbook_license,
         :short => "-I LICENSE",
         :long => "--license LICENSE",
-        :description => "License for cookbook, apachev2 or none"
+        :description => "License for cookbook, apachev2, gplv2, gplv3, mit or none"
 
       option :cookbook_copyright,
         :short => "-C COPYRIGHT",
@@ -50,7 +52,7 @@ class Chef
         :description => "Name of Copyright holder"
 
       option :cookbook_email,
-        :short => "-E EMAIL",
+        :short => "-m EMAIL",
         :long => "--email EMAIL",
         :description => "Email address of cookbook maintainer"
 
@@ -58,7 +60,7 @@ class Chef
         self.config = Chef::Config.merge!(config)
         if @name_args.length < 1
           show_usage
-          Chef::Log.fatal("You must specify a cookbook name")
+          ui.fatal("You must specify a cookbook name")
           exit 1
         end
 
@@ -74,21 +76,21 @@ class Chef
         create_cookbook(cookbook_path,cookbook_name, copyright, license)
         create_readme(cookbook_path,cookbook_name)
         create_metadata(cookbook_path,cookbook_name, copyright, email, license)
-    end
+      end
 
-    def create_cookbook(dir, cookbook_name, copyright, license)
-      msg("** Creating cookbook #{cookbook_name}")
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "attributes")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "recipes")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "definitions")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "libraries")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "resources")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "providers")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "files", "default")}"
-      shell_out "mkdir -p #{File.join(dir, cookbook_name, "templates", "default")}"
-      unless File.exists?(File.join(dir, cookbook_name, "recipes", "default.rb"))
-        open(File.join(dir, cookbook_name, "recipes", "default.rb"), "w") do |file|
-          file.puts <<-EOH
+      def create_cookbook(dir, cookbook_name, copyright, license)
+        msg("** Creating cookbook #{cookbook_name}")
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "attributes")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "recipes")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "definitions")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "libraries")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "resources")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "providers")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "files", "default")}"
+        FileUtils.mkdir_p "#{File.join(dir, cookbook_name, "templates", "default")}"
+        unless File.exists?(File.join(dir, cookbook_name, "recipes", "default.rb"))
+          open(File.join(dir, cookbook_name, "recipes", "default.rb"), "w") do |file|
+            file.puts <<-EOH
 #
 # Cookbook Name:: #{cookbook_name}
 # Recipe:: default
@@ -96,9 +98,9 @@ class Chef
 # Copyright #{Time.now.year}, #{copyright}
 #
 EOH
-          case license
-          when "apachev2"
-            file.puts <<-EOH
+            case license
+            when "apachev2"
+              file.puts <<-EOH
 # 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
@@ -112,23 +114,78 @@ EOH
 # limitations under the License.
 #
 EOH
-          when "none"
-            file.puts <<-EOH
+            when "gplv2"
+              file.puts <<-EOH
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+EOH
+            when "gplv3"
+              file.puts <<-EOH
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+EOH
+            when "mit"
+              file.puts <<-EOH
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+EOH
+            when "none"
+              file.puts <<-EOH
 # All rights reserved - Do Not Redistribute
 #
 EOH
+            end
           end
         end
       end
-    end
 
-    def create_readme(dir, cookbook_name)
-      msg("** Creating README for cookbook: #{cookbook_name}")
-      unless File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
-        open(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"), "w") do |file|
-          case config[:readme_format]
-          when "rdoc"
-            file.puts <<-EOH
+      def create_readme(dir, cookbook_name)
+        msg("** Creating README for cookbook: #{cookbook_name}")
+        unless File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
+          open(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"), "w") do |file|
+            case config[:readme_format]
+            when "rdoc"
+              file.puts <<-EOH
 = DESCRIPTION:
 
 = REQUIREMENTS:
@@ -138,8 +195,8 @@ EOH
 = USAGE:
 
 EOH
-          when "md","mkd","txt"
-            file.puts <<-EOH
+            when "md","mkd","txt"
+              file.puts <<-EOH
 Description
 ===========
 
@@ -153,8 +210,8 @@ Usage
 =====
 
 EOH
-          else
-            file.puts <<-EOH
+            else
+              file.puts <<-EOH
 Description
 
 Requirements
@@ -164,27 +221,33 @@ Attributes
 Usage
 
 EOH
+            end
           end
         end
       end
-    end
 
-    def create_metadata(dir, cookbook_name, copyright, email, license)
-      msg("** Creating metadata for cookbook: #{cookbook_name}")
+      def create_metadata(dir, cookbook_name, copyright, email, license)
+        msg("** Creating metadata for cookbook: #{cookbook_name}")
 
-      license_name = case license
-                     when "apachev2"
-                       "Apache 2.0"
-                     when "none"
-                       "All rights reserved"
-                     end
+        license_name = case license
+                       when "apachev2"
+                         "Apache 2.0"
+                       when "gplv2"
+                         "GNU Public License 2.0"
+                       when "gplv3"
+                         "GNU Public License 3.0"
+                       when "mit"
+                         "MIT"
+                       when "none"
+                         "All rights reserved"
+                       end
 
-      unless File.exists?(File.join(dir, cookbook_name, "metadata.rb"))
-        open(File.join(dir, cookbook_name, "metadata.rb"), "w") do |file|
-          if File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
-            long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.#{config[:readme_format]}'))"
-          end
-          file.puts <<-EOH
+        unless File.exists?(File.join(dir, cookbook_name, "metadata.rb"))
+          open(File.join(dir, cookbook_name, "metadata.rb"), "w") do |file|
+            if File.exists?(File.join(dir, cookbook_name, "README.#{config[:readme_format]}"))
+              long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.#{config[:readme_format]}'))"
+            end
+            file.puts <<-EOH
 maintainer       "#{copyright}"
 maintainer_email "#{email}"
 license          "#{license_name}"
@@ -192,11 +255,12 @@ description      "Installs/Configures #{cookbook_name}"
 #{long_description}
 version          "0.0.1"
 EOH
+          end
         end
       end
-    end
 
-    private
+      private
+
       def default_cookbook_path_empty?
         Chef::Config[:cookbook_path].nil? || Chef::Config[:cookbook_path].empty?
       end
@@ -204,6 +268,7 @@ EOH
       def parameter_empty?(parameter)
         parameter.nil? || parameter.empty?
       end
+
     end
   end
 end