berkshelf 3.0.0.beta6 → 3.0.0.beta7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta6
+  version: 3.0.0.beta7
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -354,7 +354,6 @@ files:
 - features/config.feature
 - features/help.feature
 - features/json_formatter.feature
-- features/licenses.feature
 - features/lockfile.feature
 - features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
@@ -366,11 +365,11 @@ files:
 - features/step_definitions/filesystem_steps.rb
 - features/step_definitions/gem_steps.rb
 - features/step_definitions/json_steps.rb
-- features/step_definitions/lockfile_steps.rb
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
 - generator_files/Berksfile.erb
+- generator_files/CHANGELOG.md.erb
 - generator_files/Gemfile.erb
 - generator_files/README.md.erb
 - generator_files/Thorfile.erb
@@ -448,7 +447,10 @@ files:
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
+- spec/fixtures/lockfiles/2.0.lock
+- spec/fixtures/lockfiles/blank.lock
 - spec/fixtures/lockfiles/default.lock
+- spec/fixtures/lockfiles/empty.lock
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb
@@ -479,6 +481,7 @@ files:
 - spec/unit/berkshelf/locations/git_location_spec.rb
 - spec/unit/berkshelf/locations/mercurial_location_spec.rb
 - spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
 - spec/unit/berkshelf/mercurial_spec.rb
@@ -536,7 +539,6 @@ test_files:
 - features/config.feature
 - features/help.feature
 - features/json_formatter.feature
-- features/licenses.feature
 - features/lockfile.feature
 - features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
@@ -548,7 +550,6 @@ test_files:
 - features/step_definitions/filesystem_steps.rb
 - features/step_definitions/gem_steps.rb
 - features/step_definitions/json_steps.rb
-- features/step_definitions/lockfile_steps.rb
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
@@ -566,7 +567,10 @@ test_files:
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
+- spec/fixtures/lockfiles/2.0.lock
+- spec/fixtures/lockfiles/blank.lock
 - spec/fixtures/lockfiles/default.lock
+- spec/fixtures/lockfiles/empty.lock
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb
@@ -597,6 +601,7 @@ test_files:
 - spec/unit/berkshelf/locations/git_location_spec.rb
 - spec/unit/berkshelf/locations/mercurial_location_spec.rb
 - spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
 - spec/unit/berkshelf/mercurial_spec.rb

data/features/licenses.feature

@@ -1,79 +0,0 @@
-Feature: Installing cookbooks with specific licenses
-  Background:
-    * the Berkshelf API server's cache is empty
-    * the Chef Server is empty
-    * the cookbook store is empty
-    * I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'fake', '1.0.0'
-      """
-
-  Scenario: when licenses is defined
-    Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 | mit |
-    And I have a Berkshelf config file containing:
-      """
-      { "allowed_licenses": ["mit"] }
-      """
-    When I successfully run `berks install`
-    Then the output should not contain:
-      """
-      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 |
-    And I have a Berkshelf config file containing:
-      """
-      { "allowed_licenses": ["apache2"] }
-      """
-    When I successfully run `berks install`
-    Then the output should contain:
-      """
-      '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 |
-    And I have a Berkshelf config file containing:
-      """
-      { "allowed_licenses": ["mit"], "raise_license_exception": true }
-      """
-    When I successfully run `berks install`
-    Then the output should not contain:
-      """
-      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 |
-    And I have a Berkshelf config file containing:
-      """
-      { "allowed_licenses": ["apache2"], "raise_license_exception": true }
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      'mit' is not in your list of allowed 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 |
-    And I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'fake', path: '../../tmp/berkshelf/cookbooks/fake-0.1.0'
-      """
-    And I have a Berkshelf config file containing:
-      """
-      { "allowed_licenses": ["apache2"], "raise_license_exception": true }
-      """
-    When I successfully run `berks install`
-    Then the output should not contain:
-      """
-      'mit' is not in your list of allowed licenses
-      """

data/features/step_definitions/lockfile_steps.rb

@@ -1,57 +0,0 @@
-Then(/^the output should warn about the old lockfile format$/) do
-  message = Berkshelf::Lockfile.class_eval('LockfileLegacy.send(:warning_message)')
-  expect(all_output).to include(message)
-end
-
-Given /^the Lockfile has:$/ do |table|
-  result = { 'dependencies' => {} }
-
-  table.raw.each do |name, locked_or_path, ref, rel|
-    result['dependencies'][name] = {}
-
-    if locked_or_path =~ /(\d+\.){2}\d/
-      result['dependencies'][name]['locked_version'] = locked_or_path
-    else
-      result['dependencies'][name]['path'] = locked_or_path
-    end
-
-    unless ref.nil?
-      result['dependencies'][name]['rel'] = ref
-    end
-
-    unless rel.nil?
-      result['dependencies'][name]['rel'] = rel
-    end
-  end
-
-  File.open(File.join(current_dir, 'Berksfile.lock'), 'w') do |file|
-    file.write(JSON.pretty_generate(result) + "\n")
-  end
-end
-
-Then /^the Lockfile should have:$/ do |table|
-  hash = JSON.parse(File.read(File.join(current_dir, 'Berksfile.lock')))
-  dependencies = hash['dependencies']
-
-  table.raw.each do |name, locked_or_path, ref, rel|
-    expect(dependencies).to have_key(name)
-
-    if locked_or_path =~ /(\d+\.){2}\d/
-      expect(dependencies[name]).to have_key('locked_version')
-      expect(dependencies[name]['locked_version']).to eq(locked_or_path)
-    else
-      expect(dependencies[name]).to have_key('path')
-      expect(dependencies[name]['path']).to eq(locked_or_path)
-    end
-
-    unless ref.nil?
-      expect(dependencies[name]).to have_key('ref')
-      expect(dependencies[name]['ref']).to eq(ref)
-    end
-
-    unless rel.nil?
-      expect(dependencies[name]).to have_key('rel')
-      expect(dependencies[name]['rel']).to eq(rel)
-    end
-  end
-end