berkshelf 6.3.4 → 7.0.0

data/features/commands/info.feature

@@ -19,10 +19,7 @@
         """
                 Name: fake
              Version: 1.0.0
-         Description: A fabulous new cookbook
-              Author: YOUR_COMPANY_NAME
-               Email: YOUR_EMAIL
-             License: none
+             License: All rights reserved
         """
 
     Scenario: When the parameter is a transitive dependency
@@ -50,10 +47,7 @@
         """
                 Name: dep
              Version: 1.0.0
-         Description: A fabulous new cookbook
-              Author: YOUR_COMPANY_NAME
-               Email: YOUR_EMAIL
-             License: none
+             License: All rights reserved
         """
 
     Scenario: When the cookbook is not in the Berksfile
@@ -97,3 +91,51 @@
         Cookbook 'fake' (1.0.0) not found in the cookbook store!
         """
       And the exit status should be "CookbookNotFound"
+
+Scenario: When the cookbook is a vendored cookbook
+      Given the cookbook store has the cookbooks:
+        | fake | 1.0.0 |
+      And I have a Berksfile pointing at the local Berkshelf API with:
+        """
+        cookbook 'fake', '1.0.0'
+        """
+      And I write to "Berksfile.lock" with:
+        """
+        DEPENDENCIES
+          fake (= 1.0.0)
+
+        GRAPH
+          fake (1.0.0)
+        """
+      And the cookbook store cookbook "fake" "1.0.0" is vendored without a metadata.rb
+      When I successfully run `berks info fake`
+      Then the output should contain:
+        """
+                Name: fake
+             Version: 1.0.0
+             License: All rights reserved
+        """
+
+Scenario: When the cookbook is a vendored cookbook
+      Given the cookbook store has the cookbooks:
+        | fake | 1.0.0 |
+      And I have a Berksfile pointing at the local Berkshelf API with:
+        """
+        cookbook 'fake', '1.0.0'
+        """
+      And I write to "Berksfile.lock" with:
+        """
+        DEPENDENCIES
+          fake (= 1.0.0)
+
+        GRAPH
+          fake (1.0.0)
+        """
+      And the cookbook store cookbook "fake" "1.0.0" is vendored with a metadata.rb
+      When I successfully run `berks info fake`
+      Then the output should contain:
+        """
+                Name: fake
+             Version: 1.0.0
+             License: All rights reserved
+        """

data/features/commands/shelf/show.feature

@@ -17,10 +17,7 @@ Feature: berks shelf show
       Displaying all versions of 'fake' in the Berkshelf shelf:
               Name: fake
            Version: 1.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
     And the output should not contain:
       """
@@ -37,10 +34,7 @@ Feature: berks shelf show
       Displaying 'fake' (1.0.0) in the Berkshelf shelf:
               Name: fake
            Version: 1.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
     And the output should not contain:
       """
@@ -70,31 +64,19 @@ Feature: berks shelf show
       Displaying all versions of 'fake' in the Berkshelf shelf:
               Name: fake
            Version: 1.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
 
               Name: fake
            Version: 1.1.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
 
               Name: fake
            Version: 1.2.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
 
               Name: fake
            Version: 2.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
 
   Scenario: With multiple cookbook versions installed and the --version flag
@@ -109,35 +91,23 @@ Feature: berks shelf show
       Displaying 'fake' (1.0.0) in the Berkshelf shelf:
               Name: fake
            Version: 1.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
     And the output should not contain:
       """
               Name: fake
            Version: 1.1.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
     And the output should not contain:
       """
               Name: fake
            Version: 1.2.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """
     And the output should not contain:
       """
               Name: fake
            Version: 2.0.0
-       Description: A fabulous new cookbook
-            Author: YOUR_COMPANY_NAME
-             Email: YOUR_EMAIL
-           License: none
+           License: All rights reserved
       """

data/features/commands/upload.feature

@@ -27,6 +27,79 @@ Feature: berks upload
       | fake | 1.0.0 |
       | ekaf | 2.0.0 |
 
+  Scenario: a cookbook without metadata.json
+    Given a cookbook named "fake"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I write to "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+      """
+    When I successfully run `berks install`
+    And I successfully run `berks upload`
+    Then the Chef Server should have the cookbooks:
+      | bacon | 1.0.0 |
+    And a file named "metadata.json" should not exist
+
+  Scenario: a cookbook with metadata.json
+    Given a cookbook named "fake"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I write to "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+      """
+    And I write to "metadata.json" with:
+      """
+      {
+        "name": "bacon",
+        "description": "",
+        "long_description": "",
+        "maintainer": "",
+        "maintainer_email": "",
+        "license": "All rights reserved",
+        "platforms": {
+
+        },
+        "dependencies": {
+
+        },
+        "providing": {
+
+        },
+        "attributes": {
+
+        },
+        "recipes": {
+
+        },
+        "version": "1.0.0",
+        "source_url": "",
+        "issues_url": "",
+        "privacy": false,
+        "chef_versions": [
+
+        ],
+        "ohai_versions": [
+
+        ],
+        "gems": [
+
+        ]
+      }
+      """
+    When I successfully run `berks install`
+    And I successfully run `berks upload`
+    Then the Chef Server should have the cookbooks:
+      | bacon | 1.0.0 |
+    And a file named "metadata.json" should exist
+
   Scenario: a cookbook with a path location
     Given a cookbook named "fake"
     And I have a Berksfile pointing at the local Berkshelf API with:

data/features/commands/vendor.feature

@@ -107,3 +107,46 @@ Feature: Vendoring cookbooks to a directory
     When I successfully run `berks vendor path/to/cukebooks`
     Then the directory "path/to/cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
 
+  Scenario: vendoring a cookbook with chefignores
+    Given a cookbook named "bacon"
+    And the cookbook "bacon" has the file "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+      """
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'bacon', path: './bacon'
+      """
+    And the cookbook "bacon" has the file "chefignore" with:
+      """
+      *.turd
+      """
+    And the cookbook "bacon" has the file "foo.turd" with:
+      """
+      poop
+      """
+    And the cookbook "bacon" has the file "recipes/foo.turd" with:
+      """
+      poop
+      """
+    When I successfully run `berks vendor vendor`
+    Then the directory "vendor/bacon" should contain version "1.0.0" of the "bacon" cookbook
+    And a file named "vendor/bacon/foo.turd" should not exist
+    And a file named "vendor/bacon/recipes/foo.turd" should not exist
+
+  Scenario: metadata.json / metadata.rb handling when vendoring a cookbook
+    Given a cookbook named "bacon"
+    And the cookbook "bacon" has the file "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+      """
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'bacon', path: './bacon'
+      """
+    When I successfully run `berks vendor vendor`
+    Then the directory "vendor/bacon" should contain version "1.0.0" of the "bacon" cookbook
+    And a file named "vendor/bacon/metadata.json" should exist
+    And a file named "vendor/bacon/metadata.rb" should exist

data/features/json_formatter.feature

@@ -110,7 +110,7 @@ Feature: --format json
           {
             "name": "example_cookbook",
             "version": "0.5.0",
-            "uploaded_to": "http://localhost:26310/"
+            "uploaded_to": "http://localhost:26310"
           }
         ],
         "errors": [],

data/features/step_definitions/chef_server_steps.rb

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

data/features/step_definitions/filesystem_steps.rb

@@ -36,6 +36,22 @@ Given /^the cookbook store contains a cookbook "(.*?)" "(.*?)" with dependencies
   generate_cookbook(cookbook_store.storage_path, name, version, dependencies: dependencies.raw)
 end
 
+Given(/^the cookbook store cookbook "(.*?)" "(.*?)" is vendored without a metadata.rb$/) do |name, version|
+  cookbook_path = File.join(cookbook_store.storage_path, "#{name}-#{version}")
+  cookbook = Berkshelf::CachedCookbook.from_path(cookbook_path)
+  cookbook.compile_metadata()
+  metadata_file = File.join(cookbook_path, "metadata.rb")
+  File.unlink(metadata_file) if File.file?(metadata_file)
+end
+
+Given(/^the cookbook store cookbook "(.*?)" "(.*?)" is vendored with a metadata.rb$/) do |name, version|
+  cookbook_path = File.join(cookbook_store.storage_path, "#{name}-#{version}")
+  cookbook = Berkshelf::CachedCookbook.from_path(cookbook_path)
+  cookbook.compile_metadata()
+  metadata_file = File.join(cookbook_path, "metadata.rb")
+  raise "internal error, fixture cookbook should have a metadata.rb" unless File.file?(metadata_file)
+end
+
 Given(/^the cookbook store is empty$/) do
   Berkshelf::CookbookStore.instance.clean!
 end

data/features/support/env.rb

@@ -42,16 +42,17 @@ Before do
   reload_configs
   Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil)
 
-  endpoints = [
-    {
-      type: "chef_server",
-      options: {
-        url: "http://localhost:#{CHEF_SERVER_PORT}",
-        client_name: "reset",
-        client_key: File.expand_path("spec/config/berkshelf.pem"),
-      },
-    },
-  ]
+  # This appears to be dead code
+  #endpoints = [
+  #  {
+  #    type: "chef_server",
+  #    options: {
+  #      url: "http://localhost:#{CHEF_SERVER_PORT}",
+  #      client_name: "reset",
+  #      client_key: File.expand_path("spec/config/berkshelf.pem"),
+  #    },
+  #  },
+  #]
 
   Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
 

data/lib/berkshelf.rb

@@ -1,3 +1,4 @@
+
 # XXX: work around logger spam from hashie
 # https://github.com/intridea/hashie/issues/394
 begin
@@ -8,23 +9,21 @@ rescue LoadError
   # intentionally left blank
 end
 
-require "buff/extensions"
 require "cleanroom"
 require "digest/md5"
 require "forwardable"
 require "json"
 require "pathname"
-require "ridley"
 require "semverse"
 require "solve"
 require "thor"
 require "uri"
-require "celluloid"
 
 JSON.create_id = nil
 
 require_relative "berkshelf/core_ext"
 require_relative "berkshelf/thor_ext"
+require "berkshelf/chef_config_compat"
 
 module Berkshelf
   Encoding.default_external = Encoding::UTF_8
@@ -68,7 +67,7 @@ module Berkshelf
     include Mixin::Logging
 
     attr_writer :berkshelf_path
-    attr_accessor :ui
+    attr_writer :ui
 
     # @return [Pathname]
     def root
@@ -105,9 +104,9 @@ module Berkshelf
 
     # The Chef configuration file.
     #
-    # @return [Ridley::Chef::Config]
+    # @return [Berkshelf::ChefConfigCompat]
     def chef_config
-      @chef_config ||= Ridley::Chef::Config.new(ENV["BERKSHELF_CHEF_CONFIG"])
+      @chef_config ||= Berkshelf::ChefConfigCompat.new(ENV["BERKSHELF_CHEF_CONFIG"])
     end
 
     # @param [Ridley::Chef::Config]
@@ -151,29 +150,29 @@ module Berkshelf
                                  end
       ssl_options[:cert_store] = ssl_policy.store if ssl_policy.store
 
-      ridley_options               = options.slice(:ssl)
+      ridley_options = {}
+      ridley_options[:ssl]         = options[:ssl] if options.key?(:ssl)
       ridley_options[:server_url]  = options[:server_url] || Berkshelf.config.chef.chef_server_url
       ridley_options[:client_name] = options[:client_name] || Berkshelf.config.chef.node_name
       ridley_options[:client_key]  = options[:client_key] || Berkshelf.config.chef.client_key
       ridley_options[:ssl]         = ssl_options
 
-      unless ridley_options[:server_url].present?
+      if !ridley_options[:server_url] || ridley_options[:server_url] =~ /^\s*$/
         raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.server_url"
       end
 
-      unless ridley_options[:client_name].present?
+      if !ridley_options[:client_name] || ridley_options[:client_name] =~ /^\s*$/
         raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.node_name"
       end
 
-      unless ridley_options[:client_key].present?
+      if !ridley_options[:client_key] || ridley_options[:client_key] =~ /^\s*$/
         raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.client_key"
       end
 
-      # @todo  Something scary going on here - getting an instance of Kitchen::Logger from test-kitchen
-      # https://github.com/opscode/test-kitchen/blob/master/lib/kitchen.rb#L99
-      Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
-      Ridley.open(ridley_options, &block)
-    rescue Ridley::Errors::RidleyError => ex
+      RidleyCompat.new_client(ridley_options, &block)
+    rescue ChefConnectionError, BerkshelfError
+      raise
+    rescue => ex
       log.exception(ex)
       raise ChefConnectionError, ex # todo implement
     end
@@ -220,17 +219,15 @@ module Berkshelf
 end
 
 require_relative "berkshelf/lockfile"
-require_relative "berkshelf/base_generator"
 require_relative "berkshelf/berksfile"
 require_relative "berkshelf/cached_cookbook"
 require_relative "berkshelf/cli"
+require_relative "berkshelf/chef_config_compat"
 require_relative "berkshelf/community_rest"
-require_relative "berkshelf/cookbook_generator"
 require_relative "berkshelf/cookbook_store"
 require_relative "berkshelf/config"
 require_relative "berkshelf/dependency"
 require_relative "berkshelf/downloader"
-require_relative "berkshelf/init_generator"
 require_relative "berkshelf/installer"
 require_relative "berkshelf/logger"
 require_relative "berkshelf/resolver"
@@ -239,6 +236,4 @@ require_relative "berkshelf/source_uri"
 require_relative "berkshelf/validator"
 require_relative "berkshelf/ssl_policies"
 
-Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN
-Celluloid.logger.level = Logger::ERROR