From 75985e72faa2760593267b94a673ed442bd72f57 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Tue, 26 Jun 2012 22:48:34 -0700
Subject: [PATCH 1/9] Bare repo creation class and spec

---
 chef/lib/chef/knife/repo_create.rb       | 9 +++++++++
 chef/spec/unit/knife/repo_create_spec.rb | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 chef/lib/chef/knife/repo_create.rb
 create mode 100644 chef/spec/unit/knife/repo_create_spec.rb

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
new file mode 100644
index 00000000000..5f562109853
--- /dev/null
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -0,0 +1,9 @@
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class RepoCreate < Knife
+
+    end
+  end
+end
diff --git a/chef/spec/unit/knife/repo_create_spec.rb b/chef/spec/unit/knife/repo_create_spec.rb
new file mode 100644
index 00000000000..a2aa4f4b525
--- /dev/null
+++ b/chef/spec/unit/knife/repo_create_spec.rb
@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'tmpdir'
+
+describe Chef::Knife::RepoCreate do
+
+end

From 141e213b680fd0185e39802e747e92b5732a1890 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Wed, 27 Jun 2012 11:09:23 -0700
Subject: [PATCH 2/9] Create directory structure

---
 chef/lib/chef/knife/repo_create.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index 5f562109853..17985527c0b 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -1,9 +1,33 @@
 require 'chef/knife'
+require 'fileutils'
 
 class Chef
   class Knife
     class RepoCreate < Knife
 
+      banner "knife repo create REPO"
+
+      def run
+        self.config = Chef::Config.merge! config
+
+        if @name_args.length < 1
+          show_usage
+          ui.fatal "You must specify a repo name"
+          exit 1
+        end
+
+        repo_name = @name_args.first
+        create_repo repo_name
+      end
+
+      def create_repo(repo_name)
+        msg "** Creating repo #{repo_name}"
+        FileUtils.mkdir_p "#{repo_name}"
+
+        %w[ certificates config cookbooks data_bags environments roles ].each do |dir|
+          FileUtils.mkdir_p "#{File.join repo_name, dir}"
+        end
+      end
     end
   end
 end

From ecf53ecb5884031b68d08b5cf96b90290976694e Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Wed, 27 Jun 2012 14:52:24 -0700
Subject: [PATCH 3/9] Create all required directories and files

---
 chef/lib/chef/knife/repo_create.rb | 464 ++++++++++++++++++++++++++++-
 1 file changed, 462 insertions(+), 2 deletions(-)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index 17985527c0b..f83fcfa97be 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -7,6 +7,11 @@ class RepoCreate < Knife
 
       banner "knife repo create REPO"
 
+      option :repo_path,
+        :short       => "-p PATH",
+        :long        => "--repo-path PATH",
+        :description => "The directory where the repo will be created"
+
       def run
         self.config = Chef::Config.merge! config
 
@@ -24,10 +29,465 @@ def create_repo(repo_name)
         msg "** Creating repo #{repo_name}"
         FileUtils.mkdir_p "#{repo_name}"
 
-        %w[ certificates config cookbooks data_bags environments roles ].each do |dir|
-          FileUtils.mkdir_p "#{File.join repo_name, dir}"
+        create_certificates repo_name
+        create_config repo_name
+        create_cookbooks repo_name
+        create_data_bags repo_name
+        create_environments repo_name
+        create_roles repo_name
+
+        create_gitignore repo_name
+        create_root_readme repo_name
+        create_rakefile repo_name
+        create_chefignore repo_name
+      end
+
+      private
+
+      def create_dir(repo_name, dir)
+        FileUtils.mkdir_p "#{File.join repo_name, dir}"
+      end
+
+      def create_file(repo_name, dir, filename, body)
+        unless File.exists?(File.join repo_name, dir, filename)
+          open(File.join(repo_name, dir, filename), "w") do |file|
+            file.puts body
+          end
         end
       end
+
+      def create_certificates(repo_name)
+        dir = "certificates"
+        create_dir repo_name, dir
+
+        readme_body = <<EOH
+Creating SSL certificates is a common task done in web application infrastructures, so a rake task is provided to generate certificates.  These certificates are stored here by the ssl_cert task.  
+
+Configure the values used in the SSL certificate by modifying `config/rake.rb`.
+
+To generate a certificate set for a new monitoring server, for example:
+
+    rake ssl_cert FQDN=monitoring.example.com
+
+Once the certificates are generated, copy them into the cookbook(s) where you want to use them.
+
+    cp certificates/monitoring.example.com.* cookbooks/COOKBOOK/files/default
+
+In the recipe for that cookbook, create a `cookbook_file` resource to configure a resource that puts them in place on the destination server.
+
+    cookbook_file '/etc/apache2/ssl/monitoring.example.com.pem'
+      owner 'root'
+      group 'root'
+      mode 0600
+    end
+EOH
+
+        create_file repo_name, dir, "README.md", readme_body
+      end
+
+      def create_config(repo_name)
+        dir = "config"
+        create_dir repo_name, dir
+
+        rake_body = <<EOH
+# Configure the Rakefile's tasks.
+
+###
+# Company and SSL Details
+# Used with the ssl_cert task.
+###
+
+# The company name - used for SSL certificates, and in srvious other
+places
+COMPANY_NAME = "Example Com"
+
+# The Country Name to use for SSL Certificates
+SSL_COUNTRY_NAME = "US"
+
+# The State Name to use for SSL Certificates
+SSL_STATE_NAME = "Several"
+
+# The Locality Name for SSL - typically, the city
+SSL_LOCALITY_NAME = "Locality"
+
+# What department?
+SSL_ORGANIZATIONAL_UNIT_NAME = "Operations"
+
+# The SSL contact email address
+SSL_EMAIL_ADDRESS = "ops@example.com"
+
+# License for new Cookbooks
+# Can be :apachev2 or :none
+NEW_COOKBOOK_LICENSE = :apachev2
+
+###
+# Useful Extras (which you probably don't need to change)
+###
+
+# The top of the repository checkout
+TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+# Where to store certificates generated with ssl_cert
+CADIR = File.expand_path(File.join(TOPDIR, "certificates"))
+EOH
+
+        create_file repo_name, dir, "rake.rb", rake_body 
+      end
+
+      def create_cookbooks(repo_name)
+        dir = "cookbooks"
+        create_dir repo_name, dir
+
+        readme_body = <<EOH
+This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
+
+Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
+
+    cookbook_path ["./cookbooks"]
+
+This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used:
+
+    current_dir = File.dirname(__FILE__)
+    cookbook_path ["\#{current_dir}/../cookbooks"]
+
+Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`).
+
+Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`.
+
+    cookbook_copyright "Example, Com."
+    cookbook_email     "cookbooks@example.com"
+    cookbook_license   "apachev2"
+
+Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3",  or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
+
+Create new cookbooks in this directory with Knife.
+
+    knife cookbook create COOKBOOK
+
+This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe.
+
+You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is.
+
+The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife.
+
+    knife cookbook site install COOKBOOK
+
+This will:
+
+* Download the cookbook tarball from cookbooks.opscode.com.
+* Ensure its on the git master branch.
+* Checks for an existing vendor branch, and creates if it doesn't.
+* Checks out the vendor branch (chef-vendor-COOKBOOK).
+* Removes the existing (old) version.
+* Untars the cookbook tarball it downloaded in the first step.
+* Adds the cookbook files to the git index and commits.
+* Creates a tag for the version downloaded.
+* Checks out the master branch again.
+* Merges the cookbook into master.
+* Repeats the above for all the cookbooks dependencies, downloading them from the community site
+
+The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates.
+
+If you're not using Git, use the site download subcommand to download the tarball.
+
+    knife cookbook site download COOKBOOK
+
+This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
+EOH
+
+        create_file repo_name, dir, "README.md", readme_body
+      end
+
+      def create_data_bags(repo_name)
+        dir = "data_bags"
+        create_dir repo_name, dir
+
+        readme_body = <<EOH
+Data Bags
+---------
+
+This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
+
+First, create a directory for the data bag.
+
+    mkdir data_bags/BAG
+
+Then create the JSON files for items that will go into that bag.
+
+    $EDITOR data_bags/BAG/ITEM.json
+
+The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example,
+
+    {
+      "id": "foo"
+    }
+
+Next, create the data bag on the Chef Server.
+
+    knife data bag create BAG
+
+Then upload the items in the data bag's directory to the Chef Server.
+
+    knife data bag from file BAG ITEM.json
+
+
+Encrypted Data Bags
+-------------------
+
+Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
+
+    openssl rand -base64 512 > secret_key
+
+You may use this secret_key to add items to a data bag during a create.
+
+    knife data bag create --secret-file secret_key passwords mysql
+
+You may also use it when adding ITEMs from files,
+
+    knife data bag create passwords
+    knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
+
+The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example,
+
+    {
+      "id": "mysql",
+      "password": "abc123"
+    }
+
+Without the secret_key, the contents are encrypted.
+
+    knife data bag show passwords mysql
+    id:        mysql
+    password:  2I0XUUve1TXEojEyeGsjhw==
+
+Use the secret_key to view the contents.
+
+    knife data bag show passwords mysql --secret-file secret_key
+    id:        mysql
+    password:  abc123
+EOH
+
+        create_file repo_name, dir, "README.md", readme_body
+      end
+
+      def create_environments(repo_name)
+        dir = "environments"
+        create_dir repo_name, dir
+
+        readme_body = <<EOH
+Requires Chef 0.10.0+.
+
+This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page:
+
+http://wiki.opscode.com/display/chef/Environments
+EOH
+        create_file repo_name, dir, "README.md", readme_body
+      end
+
+      def create_roles(repo_name)
+        dir = "roles"
+        create_dir repo_name, dir
+
+        readme_body = <<EOH
+Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
+
+For example, create `roles/base_example.rb`:
+
+    name "base_example"
+    description "Example base role applied to all nodes."
+    # List of recipes and roles to apply. Requires Chef 0.8, earlier
+    # versions use 'recipes()'.
+    #run_list()
+    # Attributes applied if the node doesn't have it set already.
+    #default_attributes()
+    # Attributes applied no matter what the node has set
+    already.
+    #override_attributes()
+
+Then upload it to the Chef Server:
+
+    knife role from file roles/base_example.rb
+EOH
+        create_file repo_name, dir, "README.md", readme_body
+      end
+
+      def create_gitignore(repo_name)
+        dir = ""
+
+        body = <<EOH
+.rake_test_cache
+EOH
+        create_file repo_name, dir, ".gitignore", body
+      end
+
+      def create_root_readme(repo_name)
+        dir = ""
+
+        body = <<EOH
+Overview
+========
+
+Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code.
+
+While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code.
+
+Repository Directories
+======================
+
+This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef.
+
+* `certificates/` - SSL certificates generated by `rake ssl_cert` live here.
+* `config/` - Contains the Rake configuration file, `rake.rb`.
+* `cookbooks/` - Cookbooks you download or create.
+* `data_bags/` - Store data bags and items in .json in the repository.
+* `roles/` - Store roles in .rb or .json in the repository.
+
+Rake Tasks
+==========
+
+The repository contains a `Rakefile` that includes tasks that are installed with the Chef libraries. To view the tasks available with in the repository with a brief description, run `rake -T`.
+
+The default task (`default`) is run when executing `rake` with no arguments. It will call the task `test_cookbooks`.
+
+The following tasks are not directly replaced by knife sub-commands.
+
+* `bundle_cookbook[cookbook]` - Creates cookbook tarballs in the `pkgs/` dir.
+* `install` - Calls `update`, `roles` and `upload_cookbooks` Rake tasks.
+* `ssl_cert` - Create self-signed SSL certificates in `certificates/` dir.
+* `update` - Update the repository from source control server, understands git and svn.
+
+The following tasks duplicate functionality from knife and may be removed in a future version of Chef.
+
+* `metadata` - replaced by `knife cookbook metadata -a`.
+* `new_cookbook` - replaced by `knife cookbook create`.
+* `role[role_name]` - replaced by `knife role from file`.
+* `roles` - iterates over the roles and uploads with `knife role from file`.
+* `test_cookbooks` - replaced by `knife cookbook test -a`.
+* `test_cookbook[cookbook]` - replaced by `knife cookbook test COOKBOOK`.
+* `upload_cookbooks` - replaced by `knife cookbook upload -a`.
+* `upload_cookbook[cookbook]` - replaced by `knife cookbook upload COOKBOOK`.
+
+Configuration
+=============
+
+The repository uses two configuration files.
+
+* config/rake.rb
+* .chef/knife.rb
+
+The first, `config/rake.rb` configures the Rakefile in two sections.
+
+* Constants used in the `ssl_cert` task for creating the certificates.
+* Constants that set the directory locations used in various tasks.
+
+If you use the `ssl_cert` task, change the values in the `config/rake.rb` file appropriately. These values were also used in the `new_cookbook` task, but that task is replaced by the `knife cookbook create` command which can be configured below.
+
+The second config file, `.chef/knife.rb` is a repository specific configuration file for knife. If you're using the Opscode Platform, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation.
+
+http://help.opscode.com/faqs/chefbasics/knife
+
+Next Steps
+==========
+
+Read the README file in each of the subdirectories for more information about what goes in those directories.
+EOH
+        create_file repo_name, dir, "README.md", body
+      end
+
+      def create_rakefile(repo_name)
+        dir = ""
+
+        body = <<EOH
+#
+# Rakefile for Chef Server Repository
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 'rubygems'
+require 'chef'
+require 'json'
+
+# Load constants from rake config file.
+require File.join(File.dirname(__FILE__), 'config', 'rake')
+
+# Detect the version control system and assign to $vcs. Used by the update
+# task in chef_repo.rake (below). The install task calls update, so this
+# is run whenever the repo is installed.
+#
+# Comment out these lines to skip the update.
+
+if File.directory?(File.join(TOPDIR, ".svn"))
+  $vcs = :svn
+elsif File.directory?(File.join(TOPDIR, ".git"))
+  $vcs = :git
+end
+
+# Load common, useful tasks from Chef.
+# rake -T to see the tasks this loads.
+
+load 'chef/tasks/chef_repo.rake'
+
+desc "Bundle a single cookbook for distribution"
+task :bundle_cookbook => [ :metadata ]
+task :bundle_cookbook, :cookbook do |t, args|
+  tarball_name = "\#{args.cookbook}.tar.gz"
+  temp_dir = File.join(Dir.tmpdir, "chef-upload-cookbooks")
+  temp_cookbook_dir = File.join(temp_dir, args.cookbook)
+  tarball_dir = File.join(TOPDIR, "pkgs")
+  FileUtils.mkdir_p(tarball_dir)
+  FileUtils.mkdir(temp_dir)
+  FileUtils.mkdir(temp_cookbook_dir)
+
+  child_folders = [ "cookbooks/\#{args.cookbook}", "site-cookbooks/\#{args.cookbook}" ]
+  child_folders.each do |folder|
+    file_path = File.join(TOPDIR, folder, ".")
+    FileUtils.cp_r(file_path,
+    temp_cookbook_dir) if
+
+    File.directory?(file_path)
+  end
+
+  system("tar", "-C", temp_dir, "-cvzf", File.join(tarball_dir, tarball_name), "./\#{args.cookbook}")
+
+  FileUtils.rm_rf temp_dir
+end
+EOH
+        create_file repo_name, dir, "Rakefile", body
+      end
+
+      def create_chefignore(repo_name)
+        dir = ""
+
+        body = <<EOH
+# Put files/directories that should be ignored in this file.
+# # Lines that start with '# ' are comments.
+
+# emacs
+*~
+
+# vim
+*.sw[a-z]
+
+# subversion
+*/.svn/*
+EOH
+        create_file repo_name, dir, "chefignore", body
+      end
     end
   end
 end

From 3157b3ad2f2aa8a22d184d121988558a37f1f104 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Wed, 27 Jun 2012 17:01:24 -0700
Subject: [PATCH 4/9] Support user defined path

---
 chef/lib/chef/knife/repo_create.rb | 106 +++++++++++++++--------------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index f83fcfa97be..3e44090c410 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -5,60 +5,66 @@ class Chef
   class Knife
     class RepoCreate < Knife
 
-      banner "knife repo create REPO"
+      banner "knife repo create REPO (options)"
 
       option :repo_path,
         :short       => "-p PATH",
-        :long        => "--repo-path PATH",
-        :description => "The directory where the repo will be created"
+        :long        => "--repository-path PATH",
+        :description => "The directory where the repository will be created"
 
       def run
         self.config = Chef::Config.merge! config
 
         if @name_args.length < 1
           show_usage
-          ui.fatal "You must specify a repo name"
+          ui.fatal "You must specify a repository name"
           exit 1
         end
 
         repo_name = @name_args.first
-        create_repo repo_name
+
+        path = config[:repo_path] || ''
+        path = File.expand_path(path)
+
+        create_repo repo_name, path
       end
 
-      def create_repo(repo_name)
+      def create_repo(repo_name, path)
         msg "** Creating repo #{repo_name}"
-        FileUtils.mkdir_p "#{repo_name}"
-
-        create_certificates repo_name
-        create_config repo_name
-        create_cookbooks repo_name
-        create_data_bags repo_name
-        create_environments repo_name
-        create_roles repo_name
-
-        create_gitignore repo_name
-        create_root_readme repo_name
-        create_rakefile repo_name
-        create_chefignore repo_name
+
+        repo_path = File.join path, repo_name
+        FileUtils.mkdir_p repo_path
+
+        create_certificates repo_path
+        create_config repo_path
+        create_cookbooks repo_path
+        create_data_bags repo_path
+        create_environments repo_path
+        create_roles repo_path
+
+        create_gitignore repo_path
+        create_root_readme repo_path
+        create_rakefile repo_path
+        create_chefignore repo_path
       end
 
       private
 
-      def create_dir(repo_name, dir)
-        FileUtils.mkdir_p "#{File.join repo_name, dir}"
+      def create_dir(repo_path, dir)
+        FileUtils.mkdir_p "#{File.join repo_path, dir}"
       end
 
-      def create_file(repo_name, dir, filename, body)
-        unless File.exists?(File.join repo_name, dir, filename)
-          open(File.join(repo_name, dir, filename), "w") do |file|
+      def create_file(repo_path, dir, filename, body)
+        unless File.exists?(File.join repo_path, dir, filename)
+          open(File.join(repo_path, dir, filename), "w") do |file|
             file.puts body
           end
         end
       end
 
-      def create_certificates(repo_name)
+      def create_certificates(repo_path)
         dir = "certificates"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         readme_body = <<EOH
 Creating SSL certificates is a common task done in web application infrastructures, so a rake task is provided to generate certificates.  These certificates are stored here by the ssl_cert task.  
@@ -82,12 +88,12 @@ def create_certificates(repo_name)
     end
 EOH
 
-        create_file repo_name, dir, "README.md", readme_body
+        create_file repo_path, dir, "README.md", readme_body
       end
 
-      def create_config(repo_name)
+      def create_config(repo_path)
         dir = "config"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         rake_body = <<EOH
 # Configure the Rakefile's tasks.
@@ -131,12 +137,12 @@ def create_config(repo_name)
 CADIR = File.expand_path(File.join(TOPDIR, "certificates"))
 EOH
 
-        create_file repo_name, dir, "rake.rb", rake_body 
+        create_file repo_path, dir, "rake.rb", rake_body 
       end
 
-      def create_cookbooks(repo_name)
+      def create_cookbooks(repo_path)
         dir = "cookbooks"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         readme_body = <<EOH
 This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
@@ -195,12 +201,12 @@ def create_cookbooks(repo_name)
 This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
 EOH
 
-        create_file repo_name, dir, "README.md", readme_body
+        create_file repo_path, dir, "README.md", readme_body
       end
 
-      def create_data_bags(repo_name)
+      def create_data_bags(repo_path)
         dir = "data_bags"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         readme_body = <<EOH
 Data Bags
@@ -267,12 +273,12 @@ def create_data_bags(repo_name)
     password:  abc123
 EOH
 
-        create_file repo_name, dir, "README.md", readme_body
+        create_file repo_path, dir, "README.md", readme_body
       end
 
-      def create_environments(repo_name)
+      def create_environments(repo_path)
         dir = "environments"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         readme_body = <<EOH
 Requires Chef 0.10.0+.
@@ -281,12 +287,12 @@ def create_environments(repo_name)
 
 http://wiki.opscode.com/display/chef/Environments
 EOH
-        create_file repo_name, dir, "README.md", readme_body
+        create_file repo_path, dir, "README.md", readme_body
       end
 
-      def create_roles(repo_name)
+      def create_roles(repo_path)
         dir = "roles"
-        create_dir repo_name, dir
+        create_dir repo_path, dir
 
         readme_body = <<EOH
 Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
@@ -308,19 +314,19 @@ def create_roles(repo_name)
 
     knife role from file roles/base_example.rb
 EOH
-        create_file repo_name, dir, "README.md", readme_body
+        create_file repo_path, dir, "README.md", readme_body
       end
 
-      def create_gitignore(repo_name)
+      def create_gitignore(repo_path)
         dir = ""
 
         body = <<EOH
 .rake_test_cache
 EOH
-        create_file repo_name, dir, ".gitignore", body
+        create_file repo_path, dir, ".gitignore", body
       end
 
-      def create_root_readme(repo_name)
+      def create_root_readme(repo_path)
         dir = ""
 
         body = <<EOH
@@ -391,10 +397,10 @@ def create_root_readme(repo_name)
 
 Read the README file in each of the subdirectories for more information about what goes in those directories.
 EOH
-        create_file repo_name, dir, "README.md", body
+        create_file repo_path, dir, "README.md", body
       end
 
-      def create_rakefile(repo_name)
+      def create_rakefile(repo_path)
         dir = ""
 
         body = <<EOH
@@ -467,10 +473,10 @@ def create_rakefile(repo_name)
   FileUtils.rm_rf temp_dir
 end
 EOH
-        create_file repo_name, dir, "Rakefile", body
+        create_file repo_path, dir, "Rakefile", body
       end
 
-      def create_chefignore(repo_name)
+      def create_chefignore(repo_path)
         dir = ""
 
         body = <<EOH
@@ -486,7 +492,7 @@ def create_chefignore(repo_name)
 # subversion
 */.svn/*
 EOH
-        create_file repo_name, dir, "chefignore", body
+        create_file repo_path, dir, "chefignore", body
       end
     end
   end

From ea8f24baab42792b352ccc53698a7558904be8c7 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Thu, 28 Jun 2012 09:39:51 -0700
Subject: [PATCH 5/9] Init the new repo

---
 chef/lib/chef/knife/repo_create.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index 3e44090c410..88a732d68b8 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -46,6 +46,8 @@ def create_repo(repo_name, path)
         create_root_readme repo_path
         create_rakefile repo_path
         create_chefignore repo_path
+
+        init_repo repo_path
       end
 
       private
@@ -62,6 +64,10 @@ def create_file(repo_path, dir, filename, body)
         end
       end
 
+      def init_repo(repo_path)
+        exec "git init #{repo_path}"
+      end
+
       def create_certificates(repo_path)
         dir = "certificates"
         create_dir repo_path, dir

From 2840edc3c9390b9040f6bb1d2b97b7f6dcccc0ee Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Thu, 28 Jun 2012 12:55:00 -0700
Subject: [PATCH 6/9] Catch exception if git is not present and print message

---
 chef/lib/chef/knife/repo_create.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index 88a732d68b8..804889d09a9 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -65,7 +65,12 @@ def create_file(repo_path, dir, filename, body)
       end
 
       def init_repo(repo_path)
-        exec "git init #{repo_path}"
+        begin
+          exec "git init #{repo_path}"
+        rescue Errno::ENOENT
+          # Skip init if git is not found
+          msg("** git not found: Could not initialize repository")
+        end
       end
 
       def create_certificates(repo_path)

From bb08a70ea8a1e241feac4ad45578cfa8e417b6c4 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Thu, 28 Jun 2012 13:11:24 -0700
Subject: [PATCH 7/9] Clean up create_file method to just take the path,
 filename and content

---
 chef/lib/chef/knife/repo_create.rb | 55 +++++++++++-------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index 804889d09a9..c87b94983b7 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -56,9 +56,9 @@ def create_dir(repo_path, dir)
         FileUtils.mkdir_p "#{File.join repo_path, dir}"
       end
 
-      def create_file(repo_path, dir, filename, body)
-        unless File.exists?(File.join repo_path, dir, filename)
-          open(File.join(repo_path, dir, filename), "w") do |file|
+      def create_file(directory, filename, body)
+        unless File.exists?(File.join directory, filename)
+          open(File.join(directory, filename), "w") do |file|
             file.puts body
           end
         end
@@ -74,8 +74,7 @@ def init_repo(repo_path)
       end
 
       def create_certificates(repo_path)
-        dir = "certificates"
-        create_dir repo_path, dir
+        create_dir repo_path, "certificates"
 
         readme_body = <<EOH
 Creating SSL certificates is a common task done in web application infrastructures, so a rake task is provided to generate certificates.  These certificates are stored here by the ssl_cert task.  
@@ -99,12 +98,11 @@ def create_certificates(repo_path)
     end
 EOH
 
-        create_file repo_path, dir, "README.md", readme_body
+        create_file "#{repo_path}/certificates", "README.md", readme_body
       end
 
       def create_config(repo_path)
-        dir = "config"
-        create_dir repo_path, dir
+        create_dir repo_path, "config"
 
         rake_body = <<EOH
 # Configure the Rakefile's tasks.
@@ -148,12 +146,11 @@ def create_config(repo_path)
 CADIR = File.expand_path(File.join(TOPDIR, "certificates"))
 EOH
 
-        create_file repo_path, dir, "rake.rb", rake_body 
+        create_file "#{repo_path}/config", "rake.rb", rake_body 
       end
 
       def create_cookbooks(repo_path)
-        dir = "cookbooks"
-        create_dir repo_path, dir
+        create_dir repo_path, "cookbooks"
 
         readme_body = <<EOH
 This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
@@ -212,12 +209,11 @@ def create_cookbooks(repo_path)
 This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
 EOH
 
-        create_file repo_path, dir, "README.md", readme_body
+        create_file "#{repo_path}/cookbooks", "README.md", readme_body
       end
 
       def create_data_bags(repo_path)
-        dir = "data_bags"
-        create_dir repo_path, dir
+        create_dir repo_path, "data_bags"
 
         readme_body = <<EOH
 Data Bags
@@ -284,12 +280,11 @@ def create_data_bags(repo_path)
     password:  abc123
 EOH
 
-        create_file repo_path, dir, "README.md", readme_body
+        create_file "#{repo_path}/data_bags", "README.md", readme_body
       end
 
       def create_environments(repo_path)
-        dir = "environments"
-        create_dir repo_path, dir
+        create_dir repo_path, "environments"
 
         readme_body = <<EOH
 Requires Chef 0.10.0+.
@@ -298,12 +293,12 @@ def create_environments(repo_path)
 
 http://wiki.opscode.com/display/chef/Environments
 EOH
-        create_file repo_path, dir, "README.md", readme_body
+        create_file "#{repo_path}/environments", "README.md", readme_body
       end
 
       def create_roles(repo_path)
         dir = "roles"
-        create_dir repo_path, dir
+        create_dir repo_path, "roles"
 
         readme_body = <<EOH
 Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
@@ -325,21 +320,15 @@ def create_roles(repo_path)
 
     knife role from file roles/base_example.rb
 EOH
-        create_file repo_path, dir, "README.md", readme_body
+        create_file "#{repo_path}/roles", "README.md", readme_body
       end
 
       def create_gitignore(repo_path)
-        dir = ""
-
-        body = <<EOH
-.rake_test_cache
-EOH
-        create_file repo_path, dir, ".gitignore", body
+        body = ".rake_test_cache"
+        create_file repo_path, ".gitignore", body
       end
 
       def create_root_readme(repo_path)
-        dir = ""
-
         body = <<EOH
 Overview
 ========
@@ -408,12 +397,10 @@ def create_root_readme(repo_path)
 
 Read the README file in each of the subdirectories for more information about what goes in those directories.
 EOH
-        create_file repo_path, dir, "README.md", body
+        create_file repo_path, "README.md", body
       end
 
       def create_rakefile(repo_path)
-        dir = ""
-
         body = <<EOH
 #
 # Rakefile for Chef Server Repository
@@ -484,12 +471,10 @@ def create_rakefile(repo_path)
   FileUtils.rm_rf temp_dir
 end
 EOH
-        create_file repo_path, dir, "Rakefile", body
+        create_file repo_path, "Rakefile", body
       end
 
       def create_chefignore(repo_path)
-        dir = ""
-
         body = <<EOH
 # Put files/directories that should be ignored in this file.
 # # Lines that start with '# ' are comments.
@@ -503,7 +488,7 @@ def create_chefignore(repo_path)
 # subversion
 */.svn/*
 EOH
-        create_file repo_path, dir, "chefignore", body
+        create_file repo_path, "chefignore", body
       end
     end
   end

From 76d3e7dbde29bac7112436358fae6bd49f5ba03f Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Fri, 29 Jun 2012 14:24:13 -0700
Subject: [PATCH 8/9] Improve the error message for failing git init

---
 chef/lib/chef/knife/repo_create.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chef/lib/chef/knife/repo_create.rb b/chef/lib/chef/knife/repo_create.rb
index c87b94983b7..b9cae8c8840 100644
--- a/chef/lib/chef/knife/repo_create.rb
+++ b/chef/lib/chef/knife/repo_create.rb
@@ -68,8 +68,8 @@ def init_repo(repo_path)
         begin
           exec "git init #{repo_path}"
         rescue Errno::ENOENT
-          # Skip init if git is not found
-          msg("** git not found: Could not initialize repository")
+          # Skip init if there is a problem
+          msg("** Unable to initialize git repository")
         end
       end
 

From 77f756284cedab5f685a99eba414aaed6fe744b4 Mon Sep 17 00:00:00 2001
From: Chris Kelly <amateurhuman@gmail.com>
Date: Fri, 29 Jun 2012 14:25:12 -0700
Subject: [PATCH 9/9] Remove repo create spec since we aren't doing anything
 very dynamic

---
 chef/spec/unit/knife/repo_create_spec.rb | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 chef/spec/unit/knife/repo_create_spec.rb

diff --git a/chef/spec/unit/knife/repo_create_spec.rb b/chef/spec/unit/knife/repo_create_spec.rb
deleted file mode 100644
index a2aa4f4b525..00000000000
--- a/chef/spec/unit/knife/repo_create_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'tmpdir'
-
-describe Chef::Knife::RepoCreate do
-
-end