chef 0.9.6 → 0.9.8.beta.1

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -0,0 +1,41 @@
+bash -c '
+rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-3.noarch.rpm
+rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
+
+yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
+
+gem update --system
+gem update
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= IO.read(Chef::Config[:validation_key]) %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name"
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %> 
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= { "run_list" => @run_list }.to_json %>
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -0,0 +1,38 @@
+bash -c '
+yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
+
+gem update --system
+gem update
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= IO.read(Chef::Config[:validation_key]) %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name"
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %> 
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= { "run_list" => @run_list }.to_json %>
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -0,0 +1,44 @@
+bash -c '
+if [ ! -f /usr/bin/chef-client ]; then
+  apt-get update
+  apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
+  cd /tmp
+  wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz
+  tar xvf rubygems-1.3.6.tgz
+  cd rubygems-1.3.6
+  ruby setup.rb
+  cp /usr/bin/gem1.8 /usr/bin/gem
+  gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+fi
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= IO.read(Chef::Config[:validation_key]) %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name"
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %> 
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= { "run_list" => @run_list }.to_json %>
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/client_bulk_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientBulkDelete < Knife
 
-      banner "Sub-Command: client bulk delete REGEX (options)"
+      banner "knife client bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1

data/lib/chef/knife/client_create.rb

@@ -35,7 +35,7 @@ class Chef
         :description => "Create the client as an admin",
         :boolean => true
 
-      banner "Sub-Command: client create CLIENT (options)"
+      banner "knife client create CLIENT (options)"
 
       def run
         @client_name = @name_args[0]

data/lib/chef/knife/client_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientDelete < Knife
 
-      banner "Sub-Command: client delete CLIENT (options)"
+      banner "knife client delete CLIENT (options)"
 
       def run 
         @client_name = @name_args[0]

data/lib/chef/knife/client_edit.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientEdit < Knife
 
-      banner "Sub-Command: client edit CLIENT (options)"
+      banner "knife client edit CLIENT (options)"
 
       def run
         @client_name = @name_args[0]

data/lib/chef/knife/client_list.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientList < Knife
 
-      banner "Sub-Command: client list (options)"
+      banner "knife client list (options)"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/client_reregister.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientReregister < Knife
 
-      banner "Sub-Command: client reregister CLIENT (options)"
+      banner "knife client reregister CLIENT (options)"
 
       option :file,
         :short => "-f FILE",

data/lib/chef/knife/client_show.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientShow < Knife
 
-      banner "Sub-Command: client show CLIENT (options)"
+      banner "knife client show CLIENT (options)"
 
       option :attribute,
         :short => "-a ATTR",

data/lib/chef/knife/configure.rb

@@ -24,7 +24,7 @@ class Chef
       attr_reader :chef_server, :new_client_name, :admin_client_name, :admin_client_key
       attr_reader :chef_repo, :new_client_key, :validation_client_name, :validation_key
 
-      banner "Sub-Command: configure (options)"
+      banner "knife configure (options)"
 
       option :repository,
         :short => "-r REPO",

data/lib/chef/knife/configure_client.rb

@@ -21,7 +21,7 @@ require 'chef/knife'
 class Chef
   class Knife
     class ConfigureClient < Knife
-      banner "Sub-Command: configure client DIRECTORY"
+      banner "knife configure client DIRECTORY"
 
       def run
         unless @config_dir = @name_args[0]

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -26,7 +26,7 @@ class Chef
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
       
-      banner "Sub-Command: cookbook bulk delete REGEX (options)"
+      banner "knife cookbook bulk delete REGEX (options)"
 
       def run
         unless regex_str = @name_args.first

data/lib/chef/knife/cookbook_create.rb

@@ -0,0 +1,159 @@
+#
+# Author:: Nuo Yan (<nuo@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'
+require 'json'
+require 'uri'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Knife
+    class CookbookCreate < Knife
+      include Chef::Mixin::ShellOut
+
+      banner "knife cookbook create COOKBOOK [COMPANY_NAME_FOR_COPYRIGHT] [EMAIL] [APACHE_LICENSE=false] (options)"
+
+      option :cookbook_path,
+        :short => "-o PATH",
+        :long => "--cookbook-path PATH",
+        :description => "The directory where the cookbook will be created"
+
+      def run
+         if @name_args.length < 1
+            show_usage
+            Chef::Log.fatal("You must specify a cookbook name")
+            exit 1
+        end
+
+        if default_cookbook_path_empty? && given_cookbook_path_empty?
+          raise ArgumentError, "Default cookbook_path is not specified in the knife.rb config file, and a value to -o is not provided. Nowhere to write the new cookbook to."
+        end
+
+        cookbook_path = given_cookbook_path_empty? ? Chef::Config[:cookbook_path].first : config[:cookbook_path]
+        cookbook_name = @name_args.first
+        company_name = @name_args[1].nil? || @name_args[1].empty? ? "YOUR_COMPANY_NAME" : @name_args[1]
+        email = @name_args[2].nil? || @name_args[2].empty? ? "YOUR_EMAIL" : @name_args[2]
+        license = (@name_args[3].nil? || @name_args[3].to_s.empty? || @name_args[3] == false || @name_args[3] == 'false') ? :none : :apachev2
+        create_cookbook(cookbook_path,cookbook_name, company_name, license)
+        create_readme(cookbook_path,cookbook_name)
+        create_metadata(cookbook_path,cookbook_name, company_name, email, license)
+    end
+
+    def create_cookbook(dir, cookbook_name, company_name, 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
+#
+# Cookbook Name:: #{cookbook_name}
+# Recipe:: default
+#
+# Copyright #{Time.now.year}, #{company_name}
+#
+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
+#
+#     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.
+#
+EOH
+          when :none
+            file.puts <<-EOH
+# All rights reserved - Do Not Redistribute
+#
+EOH
+          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.rdoc"))
+        open(File.join(dir, cookbook_name, "README.rdoc"), "w") do |file|
+          file.puts <<-EOH
+= DESCRIPTION:
+
+= REQUIREMENTS:
+
+= ATTRIBUTES:
+
+= USAGE:
+
+EOH
+        end
+      end
+    end
+
+    def create_metadata(dir, cookbook_name, company_name, email, license)
+      msg("** Creating metadata for cookbook: #{cookbook_name}")
+
+      license_name = case license
+                     when :apachev2
+                       "Apache 2.0"
+                     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.rdoc'))
+            long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))"
+          end
+          file.puts <<-EOH
+maintainer       "#{company_name}"
+maintainer_email "#{email}"
+license          "#{license_name}"
+description      "Installs/Configures #{cookbook_name}"
+#{long_description}
+version          "0.0.1"
+EOH
+        end
+      end
+    end
+
+    private
+    def default_cookbook_path_empty?
+      Chef::Config[:cookbook_path].nil? || Chef::Config[:cookbook_path].empty?
+    end
+
+    def given_cookbook_path_empty?
+      config[:cookbook_path].nil? || config[:cookbook_path].empty?
+    end
+
+    end
+  end
+end

data/lib/chef/knife/cookbook_delete.rb

@@ -26,7 +26,7 @@ class Chef
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
 
-      banner "Sub-Command: cookbook delete COOKBOOK VERSION (options)"
+      banner "knife cookbook delete COOKBOOK VERSION (options)"
 
       def run
         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 cookbook") if config[:purge]
@@ -46,7 +46,7 @@ class Chef
 
       def delete_explicit_version
         delete_object(Chef::CookbookVersion, "#{@cookbook_name} version #{@version}", "cookbook") do
-          delete_request("cookbooks/#{@cookbook_name}/#{@version}", config[:purge])
+          delete_request("cookbooks/#{@cookbook_name}/#{@version}")
         end
       end
 
@@ -115,7 +115,7 @@ class Chef
       end
 
       def delete_version_without_confirmation(version)
-        object = delete_request("cookbooks/#{@cookbook_name}/#{version}", config[:purge])
+        object = delete_request("cookbooks/#{@cookbook_name}/#{version}")
         output(format_for_display(object)) if config[:print_after]
         Chef::Log.info("Deleted cookbook[#{@cookbook_name}][#{version}]")
       end
@@ -133,9 +133,9 @@ class Chef
       
       private
       
-      def delete_request(path, purge)
-        url = "cookbooks/#{@cookbook_name}/#{@version}#{purge ? "?purge=true" : ""}"
-        rest.delete_rest(url)
+      def delete_request(path)
+        path += "?purge=true" if config[:purge]
+        rest.delete_rest(path)
       end
 
     end

data/lib/chef/knife/cookbook_download.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookDownload < Knife
 
-      banner "Sub-Command: cookbook download COOKBOOK [VERSION] (options)"
+      banner "knife cookbook download COOKBOOK [VERSION] (options)"
 
       option :latest,
        :short => "-N",

data/lib/chef/knife/cookbook_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookList < Knife
 
-      banner "Sub-Command: cookbook list (options)"
+      banner "knife cookbook list (options)"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/cookbook_metadata.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookMetadata < Knife
 
-      banner "Sub-Command: cookbook metadata COOKBOOK (options)"
+      banner "knife cookbook metadata COOKBOOK (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",