berkshelf 6.3.4 → 7.0.0

data/spec/unit/berkshelf/visualizer_spec.rb

@@ -37,7 +37,7 @@ module Berkshelf
 
           Visualizer.from_lockfile(lockfile).to_dot_file(outfile)
 
-          expect(File.exists?(outfile)).to be true
+          expect(File.exist?(outfile)).to be true
         end
 
         it "builds a png from a Lockfile" do
@@ -46,7 +46,7 @@ module Berkshelf
 
           Visualizer.from_lockfile(lockfile).to_png(outfile)
 
-          expect(File.exists?(outfile)).to be true
+          expect(File.exist?(outfile)).to be true
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.3.4
+  version: 7.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,36 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: buff-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: buff-extensions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -70,54 +42,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +70,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: ridley
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -228,20 +152,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.7.2
-    - - "<"
+        version: 13.6.52
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: 13.6.52
+- !ruby/object:Gem::Dependency
+  name: chef-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.7.2
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: 2.2.5
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -275,9 +221,7 @@ files:
 - features/berksfile.feature
 - features/commands/apply.feature
 - features/commands/contingent.feature
-- features/commands/cookbook.feature
 - features/commands/info.feature
-- features/commands/init.feature
 - features/commands/install.feature
 - features/commands/list.feature
 - features/commands/outdated.feature
@@ -293,7 +237,6 @@ files:
 - features/commands/verify.feature
 - features/commands/viz.feature
 - features/community_site.feature
-- features/config.feature
 - features/help.feature
 - features/json_formatter.feature
 - features/lifecycle.feature
@@ -335,15 +278,14 @@ files:
 - lib/berkshelf/api_client/errors.rb
 - lib/berkshelf/api_client/remote_cookbook.rb
 - lib/berkshelf/api_client/version.rb
-- lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
+- lib/berkshelf/chef_config_compat.rb
 - lib/berkshelf/chef_repo_universe.rb
 - lib/berkshelf/cli.rb
 - lib/berkshelf/commands/shelf.rb
 - lib/berkshelf/community_rest.rb
 - lib/berkshelf/config.rb
-- lib/berkshelf/cookbook_generator.rb
 - lib/berkshelf/cookbook_store.rb
 - lib/berkshelf/core_ext.rb
 - lib/berkshelf/core_ext/file.rb
@@ -358,7 +300,6 @@ files:
 - lib/berkshelf/formatters/human.rb
 - lib/berkshelf/formatters/json.rb
 - lib/berkshelf/formatters/null.rb
-- lib/berkshelf/init_generator.rb
 - lib/berkshelf/installer.rb
 - lib/berkshelf/location.rb
 - lib/berkshelf/locations/base.rb
@@ -378,7 +319,6 @@ files:
 - lib/berkshelf/source.rb
 - lib/berkshelf/source_uri.rb
 - lib/berkshelf/ssl_policies.rb
-- lib/berkshelf/streaming_file_adapter.rb
 - lib/berkshelf/thor.rb
 - lib/berkshelf/thor_ext.rb
 - lib/berkshelf/thor_ext/hash_with_indifferent_access.rb
@@ -395,6 +335,13 @@ files:
 - spec/fixtures/complex-cookbook-path/cookbooks/app/metadata.rb
 - spec/fixtures/complex-cookbook-path/cookbooks/jenkins-config/metadata.rb
 - spec/fixtures/complex-cookbook-path/cookbooks/jenkins/metadata.rb
+- spec/fixtures/cookbook-path-uploader/apt-2.3.6/metadata.rb
+- spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb
+- spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb
+- spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb
+- spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb
+- spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb
+- spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb
 - spec/fixtures/cookbook-path/jenkins-config/metadata.rb
 - spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb
 - spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb
@@ -431,7 +378,6 @@ files:
 - spec/unit/berkshelf/cli_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
-- spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/core_ext/pathname_spec.rb
@@ -443,7 +389,6 @@ files:
 - spec/unit/berkshelf/formatters/human_spec.rb
 - spec/unit/berkshelf/formatters/json_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
-- spec/unit/berkshelf/init_generator_spec.rb
 - spec/unit/berkshelf/installer_spec.rb
 - spec/unit/berkshelf/location_spec.rb
 - spec/unit/berkshelf/locations/base_spec.rb
@@ -476,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -484,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -493,9 +438,7 @@ test_files:
 - features/berksfile.feature
 - features/commands/apply.feature
 - features/commands/contingent.feature
-- features/commands/cookbook.feature
 - features/commands/info.feature
-- features/commands/init.feature
 - features/commands/install.feature
 - features/commands/list.feature
 - features/commands/outdated.feature
@@ -511,7 +454,6 @@ test_files:
 - features/commands/verify.feature
 - features/commands/viz.feature
 - features/community_site.feature
-- features/config.feature
 - features/help.feature
 - features/json_formatter.feature
 - features/lifecycle.feature
@@ -537,6 +479,13 @@ test_files:
 - spec/fixtures/complex-cookbook-path/cookbooks/app/metadata.rb
 - spec/fixtures/complex-cookbook-path/cookbooks/jenkins-config/metadata.rb
 - spec/fixtures/complex-cookbook-path/cookbooks/jenkins/metadata.rb
+- spec/fixtures/cookbook-path-uploader/apt-2.3.6/metadata.rb
+- spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb
+- spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb
+- spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb
+- spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb
+- spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb
+- spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb
 - spec/fixtures/cookbook-path/jenkins-config/metadata.rb
 - spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb
 - spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb
@@ -573,7 +522,6 @@ test_files:
 - spec/unit/berkshelf/cli_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
-- spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/core_ext/pathname_spec.rb
@@ -585,7 +533,6 @@ test_files:
 - spec/unit/berkshelf/formatters/human_spec.rb
 - spec/unit/berkshelf/formatters/json_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
-- spec/unit/berkshelf/init_generator_spec.rb
 - spec/unit/berkshelf/installer_spec.rb
 - spec/unit/berkshelf/location_spec.rb
 - spec/unit/berkshelf/locations/base_spec.rb

data/features/commands/cookbook.feature

@@ -1,35 +0,0 @@
-Feature: berks cookbook
-  Scenario: With the default options
-    When I successfully run `berks cookbook sparkle_motion`
-    Then I should have a new cookbook skeleton "sparkle_motion"
-
-  Scenario Outline: With various options
-    When I successfully run `berks cookbook sparkle_motion --<option>`
-    Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
-  Examples:
-    | option            | feature         |
-    | foodcritic        | Foodcritic      |
-    | chef-minitest     | Chef-Minitest   |
-    | scmversion        | SCMVersion      |
-    | no-bundler        | no Bundler      |
-    # Disable testing of skip git until Test Kitchen supports the skip_git flag in its generator
-    # https://github.com/opscode/test-kitchen/issues/141
-    # | skip-git          | no Git          |
-    | skip-vagrant      | no Vagrant      |
-    | skip-test-kitchen | no Test Kitchen |
-
-  Scenario Outline: When a required supporting gem is not installed
-    Given the gem "<gem>" is not installed
-    When I successfully run `berks cookbook sparkle_motion --<option>`
-    Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
-    And the output should contain a warning to suggest supporting the option "<option>" by installing "<gem>"
-  Examples:
-    | option     | feature    | gem             |
-    | foodcritic | Foodcritic | foodcritic      |
-    | scmversion | SCMVersion | thor-scmversion |
-
-  Scenario: When bundler is not installed
-    Given the gem "bundler" is not installed
-    When I successfully run `berks cookbook sparkle_motion`
-    Then I should have a new cookbook skeleton "sparkle_motion"
-    And the output should contain a warning to suggest supporting the default for "bundler" by installing "bundler"

data/features/commands/init.feature

@@ -1,27 +0,0 @@
-Feature: berks init
-  Scenario: initializing a path containing a cookbook
-    Given a cookbook named "sparkle_motion"
-    When I successfully run `berks init sparkle_motion`
-    Then the cookbook "sparkle_motion" should have the following files:
-      | Berksfile  |
-      | chefignore |
-    And the file "Berksfile" in the cookbook "sparkle_motion" should contain:
-      """
-      metadata
-      """
-    And the output should contain "Successfully initialized"
-
-  Scenario: initializing a path that does not contain a cookbook
-    Given a directory named "not_a_cookbook"
-    When I run `berks init not_a_cookbook`
-    And the exit status should be "NotACookbook"
-
-  Scenario: initializing with no value given for target
-    Given I write to "metadata.rb" with:
-      """
-      name 'sparkle_motion'
-      """
-    When I successfully run `berks init`
-    Then the output should contain "Successfully initialized"
-    And a file named "Berksfile" should exist
-    And a file named "chefignore" should exist

data/features/config.feature

@@ -1,111 +0,0 @@
-Feature: Reading a Berkshelf configuration file
-  Scenario: Missing a Berkshelf configuration file
-    When I successfully run `berks cookbook sparkle_motion`
-    Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = 'latest' |
-      | config.vm.box = 'bento/ubuntu-14.04' |
-
-  Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "vagrant": {
-        "omnibus": {
-          "version": "11.4.4"
-        },
-        "vm": {
-          "box": "bento/ubuntu-14.04",
-          "forward_port": {
-            "12345": "54321"
-          }
-        }
-      }
-    }
-    """
-    When I successfully run `berks cookbook sparkle_motion`
-    Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = '11.4.4' |
-      | config.vm.box = 'bento/ubuntu-14.04' |
-      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, type: 'dhcp' |
-    And the exit status should be 0
-
-  Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version to latest
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "vagrant": {
-        "omnibus": {
-          "version": "latest"
-        },
-        "vm": {
-          "box": "bento/ubuntu-14.04",
-          "forward_port": {
-            "12345": "54321"
-          }
-        }
-      }
-    }
-    """
-    When I successfully run `berks cookbook sparkle_motion`
-    Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = 'latest' |
-      | config.vm.box = 'bento/ubuntu-14.04' |
-      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, type: 'dhcp' |
-
-  Scenario: Using a partial Berkshelf configuration file
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "vagrant": {
-        "vm": {
-          "forward_port": {
-            "12345": "54321"
-          }
-        }
-      }
-    }
-    """
-    When I successfully run `berks cookbook sparkle_motion`
-    Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-
-  Scenario: Using an invalid Berkshelf configuration file
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "vagrant": {
-        "vm": {
-          "box": 1
-        }
-      }
-    }
-    """
-    When I run `berks cookbook sparkle_motion`
-    Then the output should contain "Invalid configuration"
-    And the output should contain "vagrant.vm.box Expected attribute: 'vagrant.vm.box' to be a type of: 'String'"
-    And the exit status should be "InvalidConfiguration"
-
-  Scenario: Using a Berkshelf configuration file with Chef configuration information
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "chef": {
-        "chef_server_url": "localhost:4000",
-        "validation_client_name": "my_client-validator",
-        "validation_key_path": "/a/b/c/my_client-validator.pem"
-      },
-      "vagrant": {
-        "vm": {
-          "provision": "chef_client"
-        }
-      }
-    }
-    """
-    When I successfully run `berks cookbook 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' |