berkshelf 4.3.5 → 5.0.0

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -28,7 +28,7 @@ describe Berkshelf::InitGenerator do
         file 'Vagrantfile' do
           contains %(recipe[some_cookbook::default])
           contains %(config.omnibus.chef_version = 'latest')
-          contains %(config.vm.box = 'chef/ubuntu-14.04')
+          contains %(config.vm.box = 'bento/ubuntu-14.04')
         end
         file 'chefignore'
       }

data/spec/unit/berkshelf/lockfile_parser_spec.rb

@@ -28,6 +28,11 @@ describe Berkshelf::Lockfile do
       expect(subject.find('jenkins').version_constraint.to_s).to eq('>= 0.0.0')
       expect(subject.find('runit').version_constraint.to_s).to eq('>= 0.0.0')
       expect(subject.find('yum').version_constraint.to_s).to eq('>= 0.0.0')
+
+      expect(subject.find('apt').locked_version.to_s).to eq('2.3.6')
+      expect(subject.find('jenkins').locked_version.to_s).to eq('2.0.3')
+      expect(subject.find('runit').locked_version.to_s).to eq('1.5.8')
+      expect(subject.find('yum').locked_version.to_s).to eq('3.0.6')
     end
 
     it 'sets the graph' do
@@ -88,6 +93,9 @@ describe Berkshelf::Lockfile do
 
       expect(subject.find('apt').version_constraint.to_s).to eq('~> 2.0')
       expect(subject.find('jenkins').version_constraint.to_s).to eq('~> 2.0')
+
+      expect(subject.find('apt').locked_version.to_s).to eq('2.3.6')
+      expect(subject.find('jenkins').locked_version.to_s).to eq('2.0.3')
     end
 
     it 'sets the graph' do

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -199,6 +199,7 @@ describe Berkshelf::Lockfile do
       )
       apt_master = apt.dup
       allow(apt_master).to receive_messages(location: 'github')
+      allow(apt_master).to receive_messages(cached_cookbook: cookbook)
       berksfile = double('berksfile', dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt_master)

data/spec/unit/berkshelf/validator_spec.rb

@@ -8,7 +8,7 @@ describe Berkshelf::Validator do
       allow(Dir).to receive(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
       expect {
         subject.validate_files(cookbook)
-      }.to raise_error
+      }.to raise_error(Berkshelf::InvalidCookbookFiles)
     end
 
     it 'does not raise an error when the cookbook is valid' do

data/spec/unit/berkshelf_spec.rb

@@ -27,6 +27,33 @@ module Berkshelf
     end
   end
 
+  describe '.berkshelf_path' do
+    before { Berkshelf.instance_variable_set(:@berkshelf_path, nil) }
+
+    context 'with default path' do
+      before do
+        @berkshelf_path = ENV['BERKSHELF_PATH']
+        ENV['BERKSHELF_PATH'] = nil
+      end
+
+      after do
+        ENV['BERKSHELF_PATH'] = @berkshelf_path
+      end
+
+      it 'is ~/.berkshelf' do
+        expect(Berkshelf.berkshelf_path).to eq File.expand_path('~/.berkshelf')
+        expect(Berkshelf.instance_variable_get(:@berkshelf_path)).to eq File.expand_path('~/.berkshelf')
+      end
+    end
+
+    context 'with ENV["BERKSHELF_PATH"]' do
+      it 'is ENV["BERKSHELF_PATH"]' do
+        expect(Berkshelf.berkshelf_path).to eq File.expand_path(ENV['BERKSHELF_PATH'])
+        expect(Berkshelf.instance_variable_get(:@berkshelf_path)).to eq File.expand_path(ENV['BERKSHELF_PATH'])
+      end
+    end
+  end
+
   describe '::log' do
     it 'returns Berkshelf::Logger' do
       expect(Berkshelf.log).to be_a(Berkshelf::Logger)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,50 +38,50 @@ dependencies:
   name: berkshelf-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: buff-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
@@ -178,28 +178,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -228,34 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: mixlib-archive
   requirement: !ruby/object:Gem::Requirement
@@ -270,166 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: chef-zero
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: dep_selector
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.8
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -457,6 +275,7 @@ files:
 - Thorfile
 - berkshelf.gemspec
 - bin/berks
+- docs/berkshelf_for_newcomers.md
 - features/berksfile.feature
 - features/commands/apply.feature
 - features/commands/contingent.feature
@@ -641,15 +460,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.0
+      version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -761,4 +580,3 @@ test_files:
 - spec/unit/berkshelf/validator_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb
-has_rdoc: