berkshelf 1.0.0.rc1 → 1.0.0.rc2

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - ruby-head
 matrix:
   allow_failures:
     - rvm: 1.9.2
+    - rvm: ruby-head
 script: 'bundle exec thor spec:ci'

data/Gemfile

@@ -3,15 +3,15 @@ source :rubygems
 gemspec
 
 group :development do
-  gem 'yard'
-  gem 'spork'
+  gem 'coolline'
   gem 'guard', '>= 1.5.0'
-  gem 'guard-yard'
+  gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'guard-spork'
-  gem 'guard-cucumber'
-  gem 'coolline'
+  gem 'guard-yard'
   gem 'redcarpet'
+  gem 'spork'
+  gem 'yard'
 
   require 'rbconfig'
 
@@ -28,19 +28,19 @@ group :development do
     gem 'rb-inotify', require: false
 
   elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-    gem 'win32console', require: false
     gem 'rb-notifu', '>= 0.0.4', require: false
     gem 'wdm', require: false
+    gem 'win32console', require: false
   end
 end
 
 group :test do
-  gem 'thor'
-  gem 'rake', '>= 0.9.2.2'
-  gem 'rspec'
+  gem 'aruba'
   gem 'fuubar'
   gem 'json_spec'
-  gem 'webmock'
+  gem 'rake', '>= 0.9.2.2'
+  gem 'rspec'
+  gem 'thor'
   gem 'vcr'
-  gem 'aruba'
+  gem 'webmock'
 end

data/Guardfile

@@ -12,7 +12,7 @@ guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
   watch(%r{ext/.+\.c})
 end
 
-guard 'rspec', version: 2, cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
+guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')       { "spec" }

data/README.md

@@ -31,7 +31,7 @@ and run:
     $ cd berkshelf
     $ bundle install
 
-Bundler will install all gems and their dependencies required for testing and developing. 
+Bundler will install all gems and their dependencies required for testing and developing.
 
 ### Running unit (RSpec) and acceptance (Cucumber) tests
 

data/berkshelf.gemspec

@@ -26,15 +26,14 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_runtime_dependency 'chozo', '>= 0.2.1'
-  s.add_runtime_dependency 'ridley', '>= 0.0.5'
-  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_dependency 'activesupport'
+  s.add_dependency 'chef', '>= 10.12.0'
+  s.add_dependency 'ridley', '>= 0.4.1'
+  s.add_dependency 'chozo', '>= 0.2.2'
+  s.add_dependency 'hashie'
+  s.add_dependency 'minitar'
+  s.add_dependency 'multi_json', '>= 1.3.0'
+  s.add_dependency 'solve', '>= 0.4.0.rc1'
+  s.add_dependency 'thor', '~> 0.16.0'
+  s.add_dependency 'vagrant', '~> 1.0.5'
 end

data/features/config.feature

@@ -1,5 +1,5 @@
 Feature: cookbook creation with a config file
-  As a Cookbook author  
+  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
 

data/features/cookbook_command.feature

@@ -1,5 +1,5 @@
 Feature: cookbook command
-  As a Cookbook author  
+  As a Cookbook author
   I want a way to quickly generate a Cookbook skeleton that contains supporting Berkshelf files
   So I can quickly and automatically generate a Cookbook containing Berkshelf supporting files or other common supporting files
 

data/features/default_locations.feature

@@ -1,14 +1,14 @@
 Feature: Berksfile default locations
   As a Berkshelf user
   I want to be able to define default locations in my Berksfile
-  So I can set the precedence of where cookbook sources are downloaded from or define an alternate location for all 
+  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:
       """
-      chef_api :knife
+      chef_api :config
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
 
       cookbook "artifact", "= 0.10.0"
@@ -28,7 +28,7 @@ Feature: Berksfile default locations
   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:
       """
-      chef_api :knife
+      chef_api :config
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
 
       cookbook "artifact", "= 0.10.0"
@@ -49,7 +49,7 @@ Feature: Berksfile default locations
     Given I write to "Berksfile" with:
       """
       site 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      chef_api :knife
+      chef_api :config
 
       cookbook "artifact", "= 0.10.0"
       """
@@ -68,7 +68,7 @@ Feature: Berksfile default locations
   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:
       """
-      chef_api :knife
+      chef_api :config
 
       cookbook 'artifact', '= 0.10.0', site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
@@ -87,7 +87,7 @@ Feature: Berksfile default locations
   Scenario: with a defualt chef_api(1) location and a cookbook source that is not satisfied by it
     Given I write to "Berksfile" with:
       """
-      chef_api :knife
+      chef_api :config
 
       cookbook 'artifact', '= 0.10.0'
       """

data/features/groups_install.feature

@@ -9,7 +9,7 @@ Feature: installing groups
       group :notme do
         cookbook "nginx", "= 0.101.2"
       end
-      
+
       cookbook "artifact", "= 0.10.0"
 
       group :takeme do
@@ -30,7 +30,7 @@ Feature: installing groups
       group :notme do
         cookbook "nginx", "= 0.101.2"
       end
-      
+
       cookbook "artifact", "= 0.10.0"
 
       group :takeme do
@@ -51,7 +51,7 @@ Feature: installing groups
       group :notme do
         cookbook "nginx", "= 0.101.2"
       end
-      
+
       cookbook "artifact", "= 0.10.0"
 
       group :takeme do

data/features/init_command.feature

@@ -1,5 +1,5 @@
 Feature: initialize command
-  As a Cookbook author  
+  As a Cookbook author
   I want a way to quickly prepare a Cookbook on my local disk with Berkshelf files
   So that I can resolve my Cookbook's dependencies with Berkshelf
 

data/features/lockfile.feature

@@ -1,6 +1,6 @@
 Feature: Berksfile.lock
   As a user
-  I want my versions to be locked even when I don't specify versions in my Berksfile 
+  I want my versions to be locked even when I don't specify versions in my Berksfile
   So when I share my repository, all other developers get the same versions that I did when I installed.
 
   @slow_process

data/features/support/env.rb

@@ -62,6 +62,6 @@ end
 
 Spork.each_run do
   Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
-  
+
   require 'berkshelf'
 end

data/features/upload_command.feature

@@ -23,7 +23,7 @@ Feature: upload command
       | openssl | 1.0.0 |
     And the exit status should be 0
 
-  @chef_server
+  @chef_server @slow_process
   Scenario: running the upload command when the Sources in the Berksfile have not been installed
     Given I write to "Berksfile" with:
       """

data/lib/berkshelf.rb

@@ -4,8 +4,8 @@ require 'chef/knife'
 require 'chef/platform'
 
 require 'chozo/core_ext'
+
 require 'active_support/core_ext'
-require 'active_model'
 require 'archive/tar/minitar'
 require 'forwardable'
 require 'hashie'
@@ -28,27 +28,27 @@ module Berkshelf
   DEFAULT_STORE_PATH = File.expand_path("~/.berkshelf").freeze
   DEFAULT_FILENAME = 'Berksfile'.freeze
 
-  autoload :UI, 'berkshelf/ui'
-  autoload :Cli, 'berkshelf/cli'
-  autoload :Git, 'berkshelf/git'
-  autoload :Berksfile, 'berkshelf/berksfile'
-  autoload :Lockfile, 'berkshelf/lockfile'
   autoload :BaseGenerator, 'berkshelf/base_generator'
-  autoload :InitGenerator, 'berkshelf/init_generator'
+  autoload :Berksfile, 'berkshelf/berksfile'
+  autoload :CachedCookbook, 'berkshelf/cached_cookbook'
+  autoload :Cli, 'berkshelf/cli'
+  autoload :Config, 'berkshelf/config'
   autoload :CookbookGenerator, 'berkshelf/cookbook_generator'
   autoload :CookbookSource, 'berkshelf/cookbook_source'
   autoload :CookbookStore, 'berkshelf/cookbook_store'
-  autoload :CachedCookbook, 'berkshelf/cached_cookbook'
   autoload :Downloader, 'berkshelf/downloader'
-  autoload :Uploader, 'berkshelf/uploader'
+  autoload :Git, 'berkshelf/git'
+  autoload :InitGenerator, 'berkshelf/init_generator'
+  autoload :Lockfile, 'berkshelf/lockfile'
   autoload :Resolver, 'berkshelf/resolver'
-  autoload :Config, 'berkshelf/config'
+  autoload :UI, 'berkshelf/ui'
+  autoload :Uploader, 'berkshelf/uploader'
 
   require 'berkshelf/location'
 
   class << self
     attr_accessor :ui
-    
+
     attr_writer :cookbook_store
 
     # @return [Pathname]
@@ -66,7 +66,7 @@ module Berkshelf
     # to or uploaded from here. By default this is '~/.berkshelf' but
     # can be overridden by specifying a value for the ENV variable
     # 'BERKSHELF_PATH'.
-    # 
+    #
     # @return [String]
     def berkshelf_path
       ENV["BERKSHELF_PATH"] || DEFAULT_STORE_PATH
@@ -99,8 +99,8 @@ module Berkshelf
     # metadata.rb file of a Chef Cookbook. If no metadata.rb file
     # was found, nil is returned.
     #
-    # @return [Pathname] 
-    #   path to metadata.rb 
+    # @return [Pathname]
+    #   path to metadata.rb
     def find_metadata(path = Dir.pwd)
       path = Pathname.new(path)
       path.ascend do |potential_root|

data/lib/berkshelf/base_generator.rb

@@ -8,7 +8,7 @@ module Berkshelf
         Berkshelf.root.join("generator_files")
       end
     end
-    
+
     include Thor::Actions
 
     def initialize(*args)

data/lib/berkshelf/berksfile.rb

@@ -29,7 +29,7 @@ module Berkshelf
       def vendor(cookbooks, path)
         path = File.expand_path(path)
         FileUtils.mkdir_p(path)
-        
+
         scratch = Berkshelf.mktmpdir
         cookbooks.each do |cb|
           dest = File.join(scratch, cb.cookbook_name, "/")
@@ -52,7 +52,7 @@ module Berkshelf
     # @return [String]
     #   The path on disk to the file representing this instance of Berksfile
     attr_reader :filepath
-    
+
     # @return [Berkshelf::Downloader]
     attr_reader :downloader
 
@@ -90,8 +90,8 @@ module Berkshelf
     # @example a cookbook source that will be retrieved from a Chef API (Chef Server)
     #   cookbook 'artifact', chef_api: 'https://api.opscode.com/organizations/vialstudios', node_name: 'reset', client_key: '/Users/reset/.chef/knife.rb'
     #
-    # @example a cookbook source that will be retrieved from a Chef API using your Knife config
-    #   cookbook 'artifact', chef_api: :knife
+    # @example a cookbook source that will be retrieved from a Chef API using your Berkshelf config
+    #   cookbook 'artifact', chef_api: :config
     #
     # @overload cookbook(name, version_constraint, options = {})
     #   @param [#to_s] name
@@ -101,9 +101,9 @@ module Berkshelf
     #   @option options [Symbol, Array] :group
     #     the group or groups that the cookbook belongs to
     #   @option options [String, Symbol] :chef_api
-    #     a URL to a Chef API. Alternatively the symbol :knife can be provided
+    #     a URL to a Chef API. Alternatively the symbol :config can be provided
     #     which will instantiate this location with the values found in your
-    #     knife configuration.
+    #     Berkshelf configuration.
     #   @option options [String] :site
     #     a URL pointing to a community API endpoint
     #   @option options [String] :path
@@ -122,9 +122,9 @@ module Berkshelf
     #   @option options [Symbol, Array] :group
     #     the group or groups that the cookbook belongs to
     #   @option options [String, Symbol] :chef_api
-    #     a URL to a Chef API. Alternatively the symbol :knife can be provided
+    #     a URL to a Chef API. Alternatively the symbol :config can be provided
     #     which will instantiate this location with the values found in your
-    #     knife configuration.
+    #     Berkshelf configuration.
     #   @option options [String] :site
     #     a URL pointing to a community API endpoint
     #   @option options [String] :path
@@ -141,7 +141,7 @@ module Berkshelf
       name, constraint = args
 
       options[:group] = Array(options[:group])
-      
+
       if @@active_group
         options[:group] += @@active_group
       end
@@ -208,11 +208,11 @@ module Berkshelf
     # contain an explicit location.
     #
     # @note
-    #   specifying the symbol :knife as the value of the chef_api default location will attempt to use the
-    #   contents of your user's Knife.rb to find the Chef API to interact with.
+    #   specifying the symbol :config as the value of the chef_api default location will attempt to use the
+    #   contents of your Berkshelf configuration to find the Chef API to interact with.
     #
-    # @example using the symbol :knife to add a Chef API default location
-    #   chef_api :knife
+    # @example using the symbol :config to add a Chef API default location
+    #   chef_api :config
     #
     # @example using a URL, node_name, and client_key to add a Chef API default location
     #   chef_api "https://api.opscode.com/organizations/vialstudios", node_name: "reset", client_key: "/Users/reset/.chef/knife.rb"
@@ -263,7 +263,7 @@ module Berkshelf
       @sources.has_key?(source.to_s)
     end
 
-    # @option options [Symbol, Array] :except 
+    # @option options [Symbol, Array] :except
     #   Group(s) to exclude to exclude from the returned Array of sources
     #   group to not be installed
     # @option options [Symbol, Array] :only
@@ -325,8 +325,8 @@ module Berkshelf
     end
     alias_method :get_source, :[]
 
-    # @option options [Symbol, Array] :except 
-    #   Group(s) to exclude which will cause any sources marked as a member of the 
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
     #   group to not be installed
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
@@ -362,12 +362,12 @@ module Berkshelf
     # @option options [String] :organization
     #   the Organization to connect to. This is only used if you are connecting to
     #   private Chef or hosted Chef
-    # @option options [Boolean] :force Upload the Cookbook even if the version 
+    # @option options [Boolean] :force Upload the Cookbook even if the version
     #   already exists and is frozen on the target Chef Server
-    # @option options [Boolean] :freeze Freeze the uploaded Cookbook on the Chef 
+    # @option options [Boolean] :freeze Freeze the uploaded Cookbook on the Chef
     #   Server so that it cannot be overwritten
-    # @option options [Symbol, Array] :except 
-    #   Group(s) to exclude which will cause any sources marked as a member of the 
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
     #   group to not be installed
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
@@ -396,8 +396,8 @@ module Berkshelf
 
     # Finds a solution for the Berksfile and returns an array of CachedCookbooks.
     #
-    # @option options [Symbol, Array] :except 
-    #   Group(s) to exclude which will cause any sources marked as a member of the 
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
     #   group to not be installed
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the

data/lib/berkshelf/cached_cookbook.rb

@@ -135,7 +135,7 @@ module Berkshelf
     #
     #   example:
     #     {
-    #       "da97c94bb6acb2b7900cbf951654fea3" => "/Users/reset/.berkshelf/nginx-0.101.2/README.md"  
+    #       "da97c94bb6acb2b7900cbf951654fea3" => "/Users/reset/.berkshelf/nginx-0.101.2/README.md"
     #     }
     def checksums
       {}.tap do |checksums|

data/lib/berkshelf/cli.rb

@@ -11,7 +11,7 @@ module Berkshelf
         Berkshelf.formatter.cleanup_hook unless config[:current_task].name == "help"
       end
     end
-    
+
     def initialize(*args)
       super(*args)