berkshelf 3.0.0.beta4 → 3.0.0.beta5

data/features/licenses.feature

@@ -8,7 +8,6 @@ Feature: Installing cookbooks with specific licenses
       cookbook 'fake', '1.0.0'
       """
 
-
   Scenario: when licenses is defined
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 | mit |
@@ -22,7 +21,6 @@ Feature: Installing cookbooks with specific licenses
       is not in your list of allowed licenses
       """
 
-
   Scenario: when a license is not listed
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 | mit |
@@ -36,7 +34,6 @@ Feature: Installing cookbooks with specific licenses
       'mit' is not in your list of allowed licenses
       """
 
-
   Scenario: when raise_license_exception is defined
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 | mit |
@@ -50,7 +47,6 @@ Feature: Installing cookbooks with specific licenses
       is not in your list of allowed licenses
       """
 
-
   Scenario: when raise_license_exception is defined and a license is not listed
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 | mit |
@@ -65,7 +61,6 @@ Feature: Installing cookbooks with specific licenses
       """
     And the exit status should be "LicenseNotAllowed"
 
-
   Scenario: when the cookbook is a path location
     Given the cookbook store has the cookbooks:
       | fake | 0.1.0 | mit |

data/features/lockfile.feature

@@ -11,7 +11,6 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
       | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a |
 
-
   Scenario: Writing the Berksfile.lock
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -21,7 +20,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 1.0.0 |
 
-
   Scenario: Writing the Berksfile.lock when a 1.0 lockfile is present
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -36,7 +34,6 @@ Feature: Creating and reading the Berkshelf lockfile
     And the Lockfile should have:
       | fake | 1.0.0 |
 
-
   Scenario: Writing the Berksfile.lock when a 1.0 lockfile is present and contains a full path
     Given a cookbook named "fake"
     And I have a Berksfile pointing at the local Berkshelf API with:
@@ -52,7 +49,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | ./fake |
 
-
   Scenario: Writing the Berksfile.lock when a 2.0 lockfile is present
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -72,7 +68,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 1.0.0 |
 
-
   Scenario: Reading the Berksfile.lock when it contains an invalid path location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -84,7 +79,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 1.0.0 |
 
-
   Scenario: Installing a cookbook with dependencies
     Given the cookbook store has the cookbooks:
       | dep | 1.0.0 |
@@ -99,7 +93,6 @@ Feature: Creating and reading the Berkshelf lockfile
       | fake | 1.0.0 |
       | dep  | 1.0.0 |
 
-
   Scenario: Writing the Berksfile.lock with a pessimistic lock
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -111,7 +104,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 1.0.0 |
 
-
   Scenario: Updating with a Berksfile.lock with pessimistic lock
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -123,7 +115,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 0.2.0 |
 
-
   Scenario: Updating with a Berksfile.lock with hard lock
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -135,7 +126,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | 0.1.0 |
 
-
   Scenario: Updating a Berksfile.lock with a git location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -145,7 +135,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | berkshelf-cookbook-fixture | 1.0.0 | 919afa0c402089df23ebdf36637f12271b8a96b4 |
 
-
   Scenario: Updating a Berksfile.lock with a git location and a branch
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -155,7 +144,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
 
-
   Scenario: Updating a Berksfile.lock with a git location and a branch
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -165,7 +153,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
 
-
   Scenario: Updating a Berksfile.lock with a GitHub location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -175,7 +162,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | berkshelf-cookbook-fixture | 1.0.0 | 919afa0c402089df23ebdf36637f12271b8a96b4 |
 
-
   Scenario: Updating a Berksfile.lock when a git location with :rel
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -185,7 +171,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a | cookbooks/berkshelf-cookbook-fixture |
 
-
   Scenario: Updating a Berksfile.lock with a path location
     Given a cookbook named "fake"
     And I have a Berksfile pointing at the local Berkshelf API with:
@@ -196,7 +181,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | ./fake |
 
-
   Scenario: Installing a Berksfile with a metadata location
     Given a cookbook named "fake"
     And I cd to "fake"
@@ -208,7 +192,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | . |
 
-
   Scenario: Installing a Berksfile with a metadata location
     Given a cookbook named "fake"
     And I cd to "fake"
@@ -222,7 +205,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the Lockfile should have:
       | fake | . |
 
-
   Scenario: Installing when the locked version is no longer satisfied
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -244,7 +226,6 @@ Feature: Creating and reading the Berkshelf lockfile
       """
     And the exit status should be "OutdatedDependency"
 
-
   Scenario: Installing when the Lockfile is empty
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -257,7 +238,6 @@ Feature: Creating and reading the Berkshelf lockfile
       Using fake (1.0.0)
       """
 
-
   Scenario: Installing when the Lockfile is in a bad state
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """

data/features/step_definitions/chef_server_steps.rb

@@ -5,8 +5,14 @@ Given(/^the Chef Server is empty$/) do
 end
 
 Given /^the Chef Server has cookbooks:$/ do |cookbooks|
-  cookbooks.raw.each do |name, version|
-    chef_cookbook(name, { 'metadata.rb' => "version '#{version}'" })
+  cookbooks.raw.each do |name, version, dependencies|
+    metadata = []
+    metadata << "version '#{version}'"
+    dependencies.to_s.split(',').map { |d| d.split(' ', 2) }.each do |(name, constraint)|
+      metadata << "depends '#{name}', '#{constraint}'"
+    end
+
+    chef_cookbook(name, { 'metadata.rb' => metadata.join("\n") })
   end
 end
 

data/generator_files/Gemfile.erb

@@ -5,9 +5,9 @@ gem 'berkshelf'
 # Uncomment these lines (and the ones in the generated Vagrantfile) if you want
 # to live on the Edge:
 #
-# gem "berkshelf", github: "RiotGames/berkshelf"
+# gem "berkshelf", github: "berkshelf/berkshelf"
 # gem "vagrant", github: "mitchellh/vagrant", tag: "v1.3.5"
-# gem "vagrant-berkshelf", github: "RiotGames/vagrant-berkshelf"
+# gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
 # gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus", tag: "v1.1.2"
 
 <% if options[:foodcritic] -%>

data/lib/berkshelf.rb

@@ -1,8 +1,6 @@
 require 'buff/extensions'
-require 'archive/tar/minitar'
 require 'digest/md5'
 require 'forwardable'
-require 'hashie'
 require 'json'
 require 'pathname'
 require 'ridley'
@@ -10,7 +8,6 @@ require 'solve'
 require 'thor'
 require 'tmpdir'
 require 'uri'
-require 'zlib'
 
 JSON.create_id = nil
 
@@ -170,7 +167,6 @@ module Berkshelf
 end
 
 require_relative 'berkshelf/lockfile'
-require_relative 'berkshelf/api_client'
 require_relative 'berkshelf/base_generator'
 require_relative 'berkshelf/berksfile'
 require_relative 'berkshelf/cached_cookbook'

data/lib/berkshelf/berksfile.rb

@@ -1,3 +1,5 @@
+require_relative "packager"
+
 module Berkshelf
   class Berksfile
     class << self
@@ -500,7 +502,6 @@ module Berkshelf
         force: false,
         freeze: true,
         halt_on_frozen: false,
-        skip_dependencies: false,
         cookbooks: [],
         validate: true
       }.merge(options)
@@ -516,64 +517,33 @@ module Berkshelf
     # name attribute is not given, all cookbooks in the Berksfile will be
     # packaged.
     #
-    # @param [String] name
-    #   the name of the cookbook to package
-    # @param [Hash] options
-    #   a list of options
+    # @param [String] path
+    #   the path where the tarball will be created
     #
-    # @option options [String] :output
-    #   the path to output the tarball
-    # @option options [Boolean] :ignore_chefignore
-    #   do not apply the chefignore file to the packed cookbooks
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any dependencies marked as a member of the
+    #   group to not be installed
+    # @option options [Symbol, Array] :only
+    #   Group(s) to include which will cause any dependencies marked as a member of the
+    #   group to be installed and all others to be ignored
+    #
+    # @raise [Berkshelf::PackageError]
     #
     # @return [String]
     #   the path to the package
-    def package(name = nil, options = {})
-      tar_name = "#{name || 'package'}.tar.gz"
-      output   = File.expand_path(File.join(options[:output], tar_name))
+    def package(path, options = {})
+      packager = Packager.new(path)
+      packager.validate!
 
-      cached_cookbooks = unless name.nil?
-        unless dependency = find(name)
-          raise CookbookNotFound, "Cookbook '#{name}' is not in your Berksfile"
+      outdir = Dir.mktmpdir do |temp_dir|
+        source = Berkshelf.ui.mute do
+          vendor(File.join(temp_dir, "cookbooks"), options.slice(:only, :except))
         end
-
-        options[:cookbooks] = name
-        Berkshelf.ui.mute { install(options) }
-      else
-        Berkshelf.ui.mute { install(options) }
+        packager.run(source)
       end
 
-      cached_cookbooks.each { |cookbook| validate_files!(cookbook) }
-
-      Dir.mktmpdir do |tmp|
-        cookbooks_dir = File.join(tmp, 'cookbooks')
-        FileUtils.mkdir_p(cookbooks_dir)
-
-        cached_cookbooks.each do |cookbook|
-          path        = cookbook.path.to_s
-          destination = File.join(cookbooks_dir, cookbook.cookbook_name)
-
-          FileUtils.cp_r(path, destination)
-
-          unless options[:ignore_chefignore]
-            chefignore = Ridley::Chef::Chefignore.new(destination) rescue nil
-            Dir["#{destination}/**/*"].each do |path|
-              FileUtils.rm_rf(path) if chefignore.ignored?(path)
-            end if chefignore
-          end
-        end
-
-        FileUtils.mkdir_p(options[:output])
-
-        Dir.chdir(tmp) do |dir|
-          tgz = Zlib::GzipWriter.new(File.open(output, 'wb'))
-          Archive::Tar::Minitar.pack('.', tgz)
-        end
-      end
-
-      Berkshelf.formatter.package(name, output)
-
-      output
+      Berkshelf.formatter.package(outdir)
+      outdir
     end
 
     # Install the Berksfile or Berksfile.lock and then copy the cached cookbooks into

data/lib/berkshelf/cli.rb

@@ -67,6 +67,7 @@ module Berkshelf
       end
 
       if @options[:debug]
+        ENV["BERKSHELF_DEBUG"] = "true"
         Berkshelf.logger.level = ::Logger::DEBUG
       end
 
@@ -127,11 +128,17 @@ module Berkshelf
       banner: 'PATH'
     method_option :path,
       type: :string,
-      desc: 'Path to install cookbooks to (i.e. vendor/cookbooks).',
       aliases: '-p',
-      banner: 'PATH'
+      hide: true
     desc 'install', 'Install the cookbooks specified in the Berksfile'
     def install
+      if options[:path]
+        # TODO: Remove in Berkshelf 4.0
+        Berkshelf.formatter.deprecation "`berks install --path [PATH}` has been replaced by `berks vendor`."
+        Berkshelf.formatter.deprecation "Re-run your command as `berks vendor [PATH]` or see `berks help vendor`."
+        exit(1)
+      end
+
       berksfile = Berkshelf::Berksfile.from_file(options[:berksfile])
       berksfile.install(options)
     end
@@ -319,20 +326,24 @@ module Berkshelf
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
-    method_option :output,
-      type: :string,
-      default: '.',
-      desc: 'Path to output the tarball',
-      aliases: '-o',
-      banner: 'PATH'
-    method_option :ignore_chefignore,
-      type: :boolean,
-      desc: 'Do not apply the chefignore to the packaged contents',
-      default: false
-    desc "package [COOKBOOK]", "Package a cookbook and its dependencies as a tarball"
-    def package(name = nil)
+    method_option :except,
+      type: :array,
+      desc: "Exclude cookbooks that are in these groups.",
+      aliases: "-e"
+    method_option :only,
+      type: :array,
+      desc: "Only cookbooks that are in these groups.",
+      aliases: "-o"
+    desc "package [PATH]", "Vendor and archive the dependencies of a Berksfile"
+    def package(path = nil)
+      if path.nil?
+        path ||= File.join(Dir.pwd, "cookbooks-#{Time.now.to_i}.tar.gz")
+      else
+        path = File.expand_path(path)
+      end
+
       berksfile = Berkshelf::Berksfile.from_file(options[:berksfile])
-      berksfile.package(name, options)
+      berksfile.package(path, options)
     end
 
     method_option :except,

data/lib/berkshelf/config.rb

@@ -123,5 +123,9 @@ module Berkshelf
       type: Boolean,
       default: true,
       required: true
+    attribute 'github.access_token',
+      type: String,
+      default: '',
+      required: false
   end
 end

data/lib/berkshelf/cookbook_generator.rb

@@ -75,7 +75,7 @@ module Berkshelf
     private
 
       def commented(content)
-        content.split("\n").collect { |s| "# #{s}" }.join("\n")
+        content.split("\n").collect { |s| s == "" ? "#" : "# #{s}"}.join("\n")
       end
 
       def license_name

data/lib/berkshelf/cookbook_store.rb

@@ -95,6 +95,14 @@ module Berkshelf
     # @return [Array<Berkshelf::CachedCookbook>]
     def cookbooks(filter = nil)
       cookbooks = storage_path.children.collect do |path|
+        begin
+          Solve::Version.split(File.basename(path).slice(CachedCookbook::DIRNAME_REGEXP, 2))
+        rescue Solve::Errors::InvalidVersionFormat
+          # Skip cookbooks that were downloaded by an SCM location. These can not be considered
+          # complete cookbooks.
+          next
+        end
+
         CachedCookbook.from_store_path(path)
       end.compact
 

data/lib/berkshelf/core_ext/file.rb

@@ -1,13 +1,13 @@
 class File
   class << self
-    # Returns true or false if the given path is a Chef Cookbook
+    # Returns true or false if the given path contains a Chef Cookbook
     #
     # @param [#to_s] path
     #   path of directory to reflect on
     #
     # @return [Boolean]
     def cookbook?(path)
-      File.exists?(File.join(path, 'metadata.rb'))
+      File.exists?(File.join(path, "metadata.json")) || File.exists?(File.join(path, "metadata.rb"))
     end
     alias_method :chef_cookbook?, :cookbook?
   end