berkshelf 0.6.0.beta2 → 0.6.0.beta3

data/.gitignore

@@ -16,8 +16,7 @@ tmp
 \#*
 .DS_Store
 /spec/knife.rb
-/spec/validator.pem
-/spec/berkshelf.pem
+/spec/*.pem
 /spec/fixtures/vcr_cassettes
 /features/config.yml
 *.sw[op]

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+matrix:
+  allow_failures:
+    - rvm: 1.9.2
+script: 'bundle exec thor ci'

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source :rubygems
 
 gemspec

data/README.md

@@ -1,4 +1,5 @@
 # Berkshelf
+[![Build Status](https://travis-ci.org/RiotGames/berkshelf.png)](https://travis-ci.org/RiotGames/berkshelf)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/RiotGames/berkshelf)
 
 Manage a Cookbook or an Application's Cookbook dependencies

data/Thorfile

@@ -36,6 +36,13 @@ class Default < Thor
     exec "cucumber --color --format progress --tags ~@no_run"
   end
 
+  desc "ci", "Run all test suites"
+  def ci
+    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
+    exec "rspec --tag ~chef_server --tag ~focus spec &&
+          cucumber --format progress --tags ~@chef_server"
+  end
+
   class VCR < Thor
     namespace :vcr
 

data/berkshelf.gemspec

@@ -16,14 +16,17 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
+  s.add_runtime_dependency 'chozo', '>= 0.1.0'
   s.add_runtime_dependency 'ridley',  '>= 0.0.5'
-  s.add_runtime_dependency 'solve',   '>= 0.3.0'
+  s.add_runtime_dependency 'solve',   '>= 0.4.0.rc1'
   s.add_runtime_dependency 'chef',    '~> 10.12'
   s.add_runtime_dependency 'minitar'
   s.add_runtime_dependency 'thor',    '~> 0.16.0'
   s.add_runtime_dependency 'vagrant', '~> 1.0.5'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'hashie'
+  s.add_runtime_dependency 'activemodel'
 
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'cucumber'

data/features/config.feature

@@ -0,0 +1,97 @@
+Feature: cookbook creation with a config file
+  As a Cookbook author  
+  I want to quickly generate a cookbook with my own customizations
+  So that I don't have to spend time modifying the default generated output each time
+
+  Scenario: creating a new cookbook when no Berkshelf config exists
+    Given I do not have a Berkshelf config file
+    When I run the cookbook command to create "sparkle_motion"
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.vm.host_name = "sparkle_motion-berkshelf" |
+      | config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal" |
+      | config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box" |
+    And the exit status should be 0
+
+  Scenario: creating a new cookbook using a Berkshelf config
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "vagrant": {
+        "vm": {
+          "box": "my_box",
+          "box_url": "http://files.vagrantup.com/lucid64.box",
+          "forward_port": {
+            "12345": "54321"
+          },
+          "host_name": "my_host",
+          "network": {
+            "bridged": true,
+            "hostonly": "12.34.56.78"
+          }
+        }
+      }
+    }
+    """
+    When I run the cookbook command to create "sparkle_motion"
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.vm.box = "my_box" |
+      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
+      | config.vm.forward_port 12345, 54321 |
+      | config.vm.host_name = "my_host" |
+      | config.vm.network :hostonly, "12.34.56.78" |
+      | config.vm.network :bridged |
+    And the exit status should be 0
+
+  Scenario: creating a new cookbook using a partial Berkshelf config
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "vagrant": {
+        "vm": {
+          "forward_port": {
+            "12345": "54321"
+          }
+        }
+      }
+    }
+    """
+    When I run the cookbook command to create "sparkle_motion"
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.vm.forward_port 12345, 54321 |
+    And the exit status should be 0
+
+  Scenario: creating a new cookbook using an invalid Berkshelf config
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "wat": null
+    }
+    """
+    When I run the cookbook command to create "sparkle_motion"
+    Then the output should contain "Invalid configuration"
+    And the output should contain "wat is not a valid key"
+    And the CLI should exit with the status code for error "InvalidConfiguration"
+
+  Scenario: creating a new cookbook with a chef client config
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "vagrant": {
+        "chef": {
+          "chef_server_url": "localhost:4000",
+          "validation_client_name": "my_client-validator",
+          "validation_key_path": "/a/b/c/my_client-validator.pem"
+        },
+        "vm": {
+          "provision": "chef_client"
+        }
+      }
+    }
+    """
+    When I run the cookbook command to create "sparkle_motion"
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.vm.provision :chef_client |
+      | chef.chef_server_url = "localhost:4000" |
+      | chef.validation_client_name = "my_client-validator" |
+      | chef.validation_key_path = "/a/b/c/my_client-validator.pem" |
+    Then the exit status should be 0

data/features/config_command.feature

@@ -0,0 +1,10 @@
+Feature: config command
+  As a Cookbook author  
+  I want to quickly generate a Berkshelf config
+  So I can easily tell which options are available to me
+
+  Scenario: creating a new config
+    Given I do not have a Berkshelf config file
+    When I run the config command
+    Then I should have a Berkshelf config file
+    And the exit status should be 0

data/features/cookbook_command.feature

@@ -8,18 +8,6 @@ Feature: cookbook command
     Then I should have a new cookbook skeleton "sparkle_motion"
     And the exit status should be 0
 
-  Scenario: creating a new cookbook skeleton with Vagrant support
-    When I run the cookbook command to create "sparkle_motion" with options:
-      | --vagrant |
-    Then I should have a new cookbook skeleton "sparkle_motion" with Vagrant support
-    And the exit status should be 0
-
-  Scenario: creating a new cookbook skeleton with Git support
-    When I run the cookbook command to create "sparkle_motion" with options:
-      | --git |
-    Then I should have a new cookbook skeleton "sparkle_motion" with Git support
-    And the exit status should be 0
-
   Scenario: creating a new cookbook skeleton with Foodcritic support
     When I run the cookbook command to create "sparkle_motion" with options:
       | --foodcritic |
@@ -37,3 +25,15 @@ Feature: cookbook command
       | --no-bundler |
     Then I should have a new cookbook skeleton "sparkle_motion" without Bundler support
     And the exit status should be 0
+
+  Scenario: creating a new cookbook skeleton without Git support
+    When I run the cookbook command to create "sparkle_motion" with options:
+      | --skip-git |
+    Then I should have a new cookbook skeleton "sparkle_motion" without Git support
+    And the exit status should be 0
+
+  Scenario: creating a new cookbook skeleton without Vagrant support
+    When I run the cookbook command to create "sparkle_motion" with options:
+      | --skip-vagrant |
+    Then I should have a new cookbook skeleton "sparkle_motion" without Vagrant support
+    And the exit status should be 0

data/features/default_locations.feature

@@ -4,6 +4,7 @@ Feature: Berksfile default locations
   So I can set the precedence of where cookbook sources are downloaded from or define an alternate location for all 
   cookbook sources to attempt to retrieve from
 
+  @chef_server
   Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is satisfied by the chef_api(1) location
     Given I write to "Berksfile" with:
       """
@@ -23,6 +24,7 @@ Feature: Berksfile default locations
       | artifact | 0.10.0 |
     And the exit status should be 0
 
+  @chef_server
   Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is not satisfied by the chef_api(1) location
     Given I write to "Berksfile" with:
       """
@@ -42,6 +44,7 @@ Feature: Berksfile default locations
       | artifact | 0.10.0 |
     And the exit status should be 0
 
+  @chef_server
   Scenario: with a default site(1) and chef_api(2) location with a cookbook source that is satisfied by the site(1) location
     Given I write to "Berksfile" with:
       """
@@ -61,6 +64,7 @@ Feature: Berksfile default locations
       | artifact | 0.10.0 |
     And the exit status should be 0
 
+  @chef_server
   Scenario: with a default chef_api(1) location and a cookbook source that is satisfied by the chef_api(1) location but has an explicit location set
     Given I write to "Berksfile" with:
       """
@@ -79,6 +83,7 @@ Feature: Berksfile default locations
       | artifact | 0.10.0 |
     And the exit status should be 0
 
+  @chef_server
   Scenario: with a defualt chef_api(1) location and a cookbook source that is not satisfied by it
     Given I write to "Berksfile" with:
       """

data/features/install.feature

@@ -194,6 +194,7 @@ Feature: install cookbooks from a Berksfile
       """
     And the CLI should exit with the status code for error "InternalError"
 
+  @chef_server
   Scenario: with a cookbook definition containing a chef_api source location
     Given I write to "Berksfile" with:
       """
@@ -258,3 +259,18 @@ Feature: install cookbooks from a Berksfile
       Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'node_name', 'client_key'.
       """
     And the CLI should exit with the status code for error "InvalidChefAPILocation"
+
+  Scenario: with a git error during download
+    Given I write to "Berksfile" with:
+      """
+      cookbook "ohai"
+      cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      Installing ohai (1.1.2) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Failed to download doesntexist from git: 'git://github.com/asdjhfkljashflkjashfakljsf'
+      An error occured during Git execution:
+      """
+      And the CLI should exit with the status code for error "GitError"

data/features/json_formatter.feature

@@ -29,7 +29,7 @@ Feature: --format json
     And the JSON at "cookbooks/0/version" should be "1.2.4"
     And the JSON should not have "cookbooks/0/location"
 
-  @slow_process
+  @chef_server
   Scenario: JSON output when running the upload command
     Given a Berksfile with path location sources to fixtures:
       | example_cookbook | example_cookbook-0.5.0 |

data/features/step_definitions/cli_steps.rb

@@ -59,13 +59,17 @@ When /^I run the upload command with flags:$/ do |flags|
 end
 
 When /^I run the cookbook command to create "(.*?)"$/ do |name|
-  run_simple(unescape("berks cookbook #{name}"))
+  run_simple(unescape("berks cookbook #{name}"), false)
 end
 
 When /^I run the cookbook command to create "(.*?)" with options:$/ do |name, options|
   run_simple(unescape("berks cookbook #{name} #{options.raw.join(" ")}"))
 end
 
+When /^I run the config command$/ do
+  run_simple unescape("berks config")
+end
+
 Then /^the CLI should exit with the status code for error "(.*?)"$/ do |error_constant|
   exit_status = Berkshelf.const_get(error_constant).status_code
   assert_exit_status(exit_status)

data/features/step_definitions/filesystem_steps.rb

@@ -18,6 +18,16 @@ Given /^I do not have a Berksfile\.lock$/ do
   in_current_dir { FileUtils.rm_f(Berkshelf::Lockfile::DEFAULT_FILENAME) }
 end
 
+Given /^I have a Berkshelf config file containing:$/ do |contents|
+  write_file File.expand_path("~/.berkshelf/config.json"), contents
+end
+
+Given /^I do not have a Berkshelf config file$/ do
+  file = File.expand_path "~/.berkshelf/config.json"
+
+  remove_file file if File.exists? file
+end
+
 Given /^the cookbook "(.*?)" has the file "(.*?)" with:$/ do |cookbook_name, file_name, content|
   write_file(File.join(cookbook_name, file_name), content)
 end
@@ -85,27 +95,17 @@ Then /^I should have a new cookbook skeleton "(.*?)"$/ do |name|
     directory "templates" do
       directory "default"
     end
-    file "README.md"
-    file "metadata.rb"
+    file ".gitignore"
+    file "chefignore"
     file "Berksfile" do
       contains "metadata"
     end
-    file "chefignore"
-    file "Berksfile"
     file "Gemfile" do
       contains "gem 'berkshelf'"
-    end
-  }
-end
-
-Then /^I should have a new cookbook skeleton "(.*?)" with Vagrant support$/ do |name|
-  steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
-
-  cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
-    file "Gemfile" do
       contains "gem 'vagrant'"
     end
+    file "metadata.rb"
+    file "README.md"
     file "Vagrantfile" do
       contains "require 'berkshelf/vagrant'"
       contains "recipe[#{name}::default]"
@@ -113,15 +113,6 @@ Then /^I should have a new cookbook skeleton "(.*?)" with Vagrant support$/ do |
   }
 end
 
-Then /^I should have a new cookbook skeleton "(.*?)" with Git support$/ do |name|
-  steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
-
-  cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
-    file ".gitignore"
-  }
-end
-
 Then /^I should have a new cookbook skeleton "(.*?)" with Foodcritic support$/ do |name|
   steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
 
@@ -178,6 +169,21 @@ Then /^I should have a new cookbook skeleton "(.*?)" without Bundler support$/ d
   }
 end
 
+Then /^I should have a new cookbook skeleton "(.*?)" without Git support$/ do |name|
+  Pathname.new(current_dir).join(name).should have_structure {
+    no_file ".gitignore"
+  }
+end
+
+Then /^I should have a new cookbook skeleton "(.*?)" without Vagrant support$/ do |name|
+  Pathname.new(current_dir).join(name).should have_structure {
+    file "Gemfile" do
+      does_not_contain "gem 'vagrant'"
+    end
+    no_file "Vagrantfile"
+  }
+end
+
 Then /^the cookbook "(.*?)" should have the following files:$/ do |name, files|
   check_file_presence(files.raw.map{|file_row| File.join(name, file_row[0])}, true)
 end
@@ -195,6 +201,16 @@ Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name,
   }
 end
 
+Then /^the resulting "(.+)" Vagrantfile should contain:$/ do |cookbook_name, content|
+  Pathname.new(current_dir).join(cookbook_name).should have_structure {
+    file "Vagrantfile" do
+      content.respond_to?(:raw) ?
+        content.raw.flatten.each { |string| contains string } :
+        contains(content)
+    end
+  }
+end
+
 Then /^the directory "(.*?)" should have the following files:$/ do |name, files|
   check_file_presence(files.raw.map{|file_row| File.join(name, file_row[0])}, true)
 end
@@ -218,3 +234,9 @@ end
 Then /^the current directory should not have the following files:$/ do |files|
   check_file_presence(files.raw.map{|file_row| file_row[0]}, false)
 end
+
+Then /^I should have a Berkshelf config file$/ do
+  Pathname.new(ENV['HOME']).join(".berkshelf").should have_structure {
+    file "config.json"
+  }
+end

data/features/upload_command.feature

@@ -3,7 +3,7 @@ Feature: upload command
   I need a way to upload cookbooks to a Chef server that I have installed into my Bookshelf
   So they are available to Chef clients
 
-  @no_run @slow_process
+  @no_run @chef_server
   Scenario: running the upload command when the Sources in the Berksfile are already installed
     Given I write to "Berksfile" with:
       """
@@ -23,7 +23,7 @@ Feature: upload command
       | openssl | 1.0.0 |
     And the exit status should be 0
 
-  @slow_process
+  @chef_server
   Scenario: running the upload command when the Sources in the Berksfile have not been installed
     Given I write to "Berksfile" with:
       """
@@ -42,7 +42,7 @@ Feature: upload command
       | openssl | 1.0.0 |
     And the exit status should be 0
 
-  @slow_process
+  @chef_server
   Scenario: running the upload command with a Berksfile containing a source that has a path location
     Given a Berksfile with path location sources to fixtures:
       | example_cookbook | example_cookbook-0.5.0 |
@@ -55,7 +55,7 @@ Feature: upload command
       | example_cookbook | 0.5.0 |
     And the exit status should be 0
 
-  @slow_process
+  @chef_server
   Scenario: running the upload command with a Berksfile containing a source that has a Git location
     Given I write to "Berksfile" with:
       """

data/generator_files/Gemfile.erb

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
 
 gem 'berkshelf'
 <% if options[:foodcritic] -%>
@@ -7,6 +7,6 @@ gem 'thor-foodcritic'
 <% if options[:scmversion] -%>
 gem 'thor-scmversion'
 <% end -%>
-<% if options[:vagrant] -%>
+<% unless options[:skip_vagrant] -%>
 gem 'vagrant', '~> 1.0.5'
 <% end -%>

data/generator_files/Vagrantfile.erb

@@ -27,11 +27,24 @@ Vagrant::Config.run do |config|
   # to skip installing and copying to Vagrant's shelf.
   # config.berkshelf.except = []
 
-  config.vm.host_name = "<%= cookbook_name %>-berkshelf"
+<% if options[:berkshelf_config][:vagrant][:vm][:box].present? -%>
+  config.vm.host_name = "<%= options[:berkshelf_config][:vagrant][:vm][:host_name] %>"
+<% else -%>
+  config.vm.host_name = "<%= "#{cookbook_name}-berkshelf" %>"
+<% end -%>
+
 
   # CentOS 6.3
+<% if options[:berkshelf_config][:vagrant][:vm][:box].present? -%>
+  config.vm.box = "<%= options[:berkshelf_config][:vagrant][:vm][:box] %>"
+<% else %>
   config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal"
+<% end -%>
+<% if options[:berkshelf_config][:vagrant][:vm][:box_url].present? -%>
+  config.vm.box_url = "<%= options[:berkshelf_config][:vagrant][:vm][:box_url] %>"
+<% else %>
   config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box"
+<% end -%>
 
   # Boot with a GUI so you can see the screen. (Default is headless)
   # config.vm.boot_mode = :gui
@@ -40,16 +53,22 @@ Vagrant::Config.run do |config|
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  config.vm.network :hostonly, "33.33.33.10"
+  # config.vm.network :hostonly, "33.33.33.10"
+<% if options[:berkshelf_config][:vagrant][:vm][:network][:hostonly].present? -%>
+  config.vm.network :hostonly, "<%= options[:berkshelf_config][:vagrant][:vm][:network][:hostonly] %>"
+<% end -%>
 
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another
   # physical device on your network.
-  # config.vm.network :bridged
+  <% unless options[:berkshelf_config][:vagrant][:vm][:network][:bridged].present? %># <% end %>config.vm.network :bridged
 
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
   # config.vm.forward_port 80, 8080
+<% options[:berkshelf_config][:vagrant][:vm][:forward_port].each do |guest, host| %>
+  config.vm.forward_port <%= guest %>, <%= host %>
+<% end if options[:berkshelf_config][:vagrant][:vm][:forward_port].present? %>
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
@@ -59,6 +78,17 @@ Vagrant::Config.run do |config|
   config.ssh.max_tries = 40
   config.ssh.timeout   = 120
 
+<% if options[:berkshelf_config][:vagrant][:vm][:provision] == "chef_client" -%>
+  config.vm.provision :chef_client do |chef|
+    chef.chef_server_url = "<%= options[:berkshelf_config][:vagrant][:chef][:chef_server_url] %>"
+    chef.validation_client_name = "<%= options[:berkshelf_config][:vagrant][:chef][:validation_client_name] %>"
+    chef.validation_key_path = "<%= options[:berkshelf_config][:vagrant][:chef][:validation_key_path] %>"
+
+    chef.run_list = [
+      "recipe[<%= cookbook_name %>::default]"
+    ]
+  end
+<% else -%>
   config.vm.provision :chef_solo do |chef|    
     chef.json = {
       :mysql => {
@@ -72,14 +102,5 @@ Vagrant::Config.run do |config|
       "recipe[<%= cookbook_name %>::default]"
     ]
   end
-
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = 'https://api.opscode.com/organizations/vialstudios'
-  #   chef.validation_client_name = 'vialstudios-validator'
-  #   chef.validation_key_path = '/Users/reset/.chef/vialstudios-validator.pem'
-  #
-  #   chef.run_list = [
-  #     "recipe[<%= cookbook_name %>::default]"
-  #   ]
-  # end
+<% end -%>
 end

data/generator_files/config.json

@@ -0,0 +1,22 @@
+{
+  "vagrant": {
+    "chef": {
+      "chef_server_url": "https://api.opscode.com/organizations/ORGNAME",
+        "validation_client_name": "ORGNAME-validator",
+        "validation_key_path": "~/validation.pem"
+    },
+    "vm": {
+      "box": "base",
+      "box_url": "http://files.vagrantup.com/lucid64.box",
+      "forward_port": {
+        "80": "8080"
+      },
+      "host_name": "berkshelf-cookbook",
+      "network": {
+        "bridged": true,
+        "hostonly": "192.168.33.10"
+      },
+      "provision": "chef_solo"
+    }
+  }
+}

data/lib/berkshelf/cli.rb

@@ -27,6 +27,11 @@ module Berkshelf
     map 'ver'       => :version
     map 'book'      => :cookbook
 
+    desc "config", "Generate a default Berkshelf configuration file"
+    def config
+      ConfigGenerator.new.invoke_all
+    end
+
     class_option :config,
       type: :string,
       default: Berkshelf::DEFAULT_CONFIG,
@@ -145,21 +150,12 @@ module Berkshelf
       Berkshelf.formatter.msg license
     end
 
-    method_option :vagrant,
-      type: :boolean,
-      desc: "Creates a Vagrantfile and dynamically change other generated files to support Vagrant"
-    method_option :git,
-      type: :boolean,
-      desc: "Creates additional git specific files if your project will be managed by git"
     method_option :foodcritic,
       type: :boolean,
       desc: "Creates a Thorfile with Foodcritic support to lint test your cookbook"
     method_option :scmversion,
       type: :boolean,
       desc: "Creates a Thorfile with SCMVersion support to manage versions for continuous integration"
-    method_option :no_bundler,
-      type: :boolean,
-      desc: "Skips generation of a Gemfile and other Bundler specific support"
     method_option :license,
       type: :string,
       default: "reserved",
@@ -173,8 +169,27 @@ module Berkshelf
       type: :string,
       desc: "Email address of cookbook maintainer",
       aliases: "-e"
+    method_option :no_bundler,
+      type: :boolean,
+      desc: "Skips generation of a Gemfile and other Bundler specific support"
+    method_option :vagrant,
+      type: :boolean,
+      hide: true
+    method_option :skip_vagrant,
+      type: :boolean,
+      desc: "Skips adding a Vagrantfile and adding supporting gems to the Gemfile"
+    method_option :git,
+      type: :boolean,
+      hide: true
+    method_option :skip_git,
+      type: :boolean,
+      desc: "Skips adding a .gitignore and running git init in the cookbook directory"
+
     desc "cookbook NAME", "Create a skeleton for a new cookbook"
     def cookbook(name)
+      Berkshelf.formatter.deprecation "--git is now the default" if options[:git]
+      Berkshelf.formatter.deprecation "--vagrant is now the default" if options[:vagrant]
+
       ::Berkshelf::CookbookGenerator.new([name, File.join(Dir.pwd, name)], options).invoke_all
     end