berkshelf 3.0.0.beta2 → 3.0.0.beta3

data/lib/berkshelf/resolver.rb

@@ -68,7 +68,7 @@ module Berkshelf
       graph.populate_store
       graph.populate(berksfile.sources)
 
-      Solve.it!(graph, demand_array).collect do |name, version|
+      Solve.it!(graph, demand_array, ENV['DEBUG_RESOLVER'] ? { ui: Berkshelf.ui } : {}).collect do |name, version|
         dependency = get_demand(name) || Dependency.new(berksfile, name, locked_version: version)
         [ name, version, dependency ]
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.0.0.beta2"
+  VERSION = "3.0.0.beta3"
 end

data/spec/spec_helper.rb

@@ -3,19 +3,10 @@ require 'spork'
 Spork.prefork do
   require 'rspec'
   require 'webmock/rspec'
-  require 'vcr'
   require 'berkshelf/api/rspec'
 
   Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
 
-  VCR.configure do |config|
-    config.configure_rspec_metadata!
-    config.cassette_library_dir = 'spec/fixtures/cassettes'
-    config.hook_into :webmock
-    config.default_cassette_options = { record: :new_episodes }
-    config.ignore_localhost = true
-  end
-
   RSpec.configure do |config|
     config.include Berkshelf::RSpec::FileSystemMatchers
     config.include Berkshelf::RSpec::ChefAPI

data/spec/support/chef_server.rb

@@ -53,30 +53,47 @@ module Berkshelf::RSpec
       ChefServer.server
     end
 
-    def chef_client(name, hash = Hash.new)
+    def chef_client(name, hash = {})
       load_data(:clients, name, hash)
     end
 
-    def chef_data_bag(name, hash = Hash.new)
-      ChefServer.server.load_data({ 'data' => { name => hash }})
+    def chef_cookbook(name, hash = {})
+      chef_server.load_data({ 'cookbooks' => { name => hash }})
     end
 
-    def chef_environment(name, hash = Hash.new)
+    def chef_cookbooks
+      chef_server.data_store.list(['cookbooks']).inject({}) do |hash, name|
+        hash[name] = chef_server.data_store.list(['cookbooks', name])
+        hash
+      end
+    end
+
+    def chef_data_bag(name, hash = {})
+      chef_server.load_data({ 'data' => { name => hash }})
+    end
+
+    def chef_environment(name, hash = {})
       load_data(:environments, name, hash)
     end
 
-    def chef_node(name, hash = Hash.new)
+    def chef_environment_locks(name)
+      JSON.parse(chef_server.data_store.get(['environments', name]))['cookbook_versions']
+    rescue ChefZero::DataStore::DataNotFoundError
+      {}
+    end
+
+    def chef_node(name, hash = {})
       load_data(:nodes, name, hash)
     end
 
-    def chef_role(name, hash = Hash.new)
+    def chef_role(name, hash = {})
       load_data(:roles, name, hash)
     end
 
     private
 
       def load_data(key, name, hash)
-        ChefServer.server.load_data({ key.to_s => { name => JSON.generate(hash) }})
+        chef_server.load_data({ key.to_s => { name => JSON.generate(hash) }})
       end
   end
 end

data/spec/unit/berkshelf/api_client/remote_cookbook_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Berkshelf::APIClient::RemoteCookbook do
-	let(:name) { "ruby" }
-	let(:version) { "1.2.3" }
+  let(:name) { "ruby" }
+  let(:version) { "1.2.3" }
   let(:dependencies) { double('dependencies') }
   let(:platforms) { double('platforms') }
   let(:location_type) { "chef_server" }
   let(:location_path) { "http://localhost:8080" }
 
   let(:attributes) do
-  	{ dependencies: dependencies, platforms: platforms, location_path: location_path, location_type: location_type }
+    { dependencies: dependencies, platforms: platforms, location_path: location_path, location_type: location_type }
   end
 
   subject { described_class.new(name, version, attributes) }

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -8,7 +8,7 @@ describe Berkshelf::Berksfile do
       it "returns an array including the default sources" do
         expect(subject).to be_a(Array)
         expect(subject).to have(1).item
-        expect(subject.map(&:to_s)).to include("http://api.berkshelf.com")
+        expect(subject.map(&:to_s)).to include("https://api.berkshelf.com")
       end
     end
 
@@ -449,6 +449,40 @@ describe Berkshelf::Berksfile do
         upload
       end
     end
+
+    context 'when a client name is passed as an option' do
+      let(:options) do
+        {
+            client_name: 'passed-in-client-name'
+        }
+      end
+      let(:ridley_options) do
+        default_ridley_options.merge(
+            { server_url: 'http://configured-chef-server/', client_name: 'passed-in-client-name'})
+      end
+
+      it 'uses the passed in :client_name' do
+        Ridley.should_receive(:open).with(ridley_options)
+        upload
+      end
+    end
+
+    context 'when a client key is passed as an option' do
+      let(:options) do
+        {
+            client_key: 'passed-in-client-key'
+        }
+      end
+      let(:ridley_options) do
+        default_ridley_options.merge(
+            { server_url: 'http://configured-chef-server/', client_key: 'passed-in-client-key'})
+      end
+
+      it 'uses the passed in :client_key' do
+        Ridley.should_receive(:open).with(ridley_options)
+        upload
+      end
+    end
   end
 
   describe "#apply" do

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -30,6 +30,14 @@ describe Berkshelf::CachedCookbook do
           expect(described_class.from_store_path(path)).to be_nil
         end
       end
+
+      context 'given an already cached cookbook' do
+        let!(:cached) { described_class.from_store_path(path) }
+
+        it 'returns the cached cookbook instance' do
+          expect(described_class.from_store_path(path)).to eq(cached)
+        end
+      end
     end
 
     describe '::checksum' do

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Berkshelf::CommunityREST, vcr: { record: :new_episodes, serialize_with: :json } do
+describe Berkshelf::CommunityREST do
   describe "ClassMethods" do
     describe "::unpack" do
       let(:target) { '/foo/bar' }
@@ -73,85 +73,136 @@ describe Berkshelf::CommunityREST, vcr: { record: :new_episodes, serialize_with:
     end
 
     it 'unpacks the archive' do
+      stub_request(:get, "#{api_uri}/cookbooks/bacon/versions/1_0_0").to_return(
+        status: 200,
+        body: '{ "cookbook": "/path/to/cookbook", "version": "1.0.0" }',
+        headers: { 'Content-Type' => 'application/json' },
+      )
+
       Berkshelf::CommunityREST.should_receive(:unpack).with('/foo/bar').once.and_return('/foo/nginx')
       archive.should_receive(:unlink).once
 
-      subject.download('nginx', '1.4.0')
+      subject.download('bacon', '1.0.0')
     end
   end
 
   describe '#find' do
     it 'returns the cookbook and version information' do
-      result = subject.find('nginx', '1.4.0')
+      stub_request(:get, "#{api_uri}/cookbooks/bacon/versions/1_0_0").to_return(
+        status: 200,
+        body: '{ "cookbook": "/path/to/cookbook", "version": "1.0.0" }',
+        headers: { 'Content-Type' => 'application/json' },
+      )
+
+      result = subject.find('bacon', '1.0.0')
 
-      expect(result.cookbook).to eq('http://cookbooks.opscode.com/api/v1/cookbooks/nginx')
-      expect(result.version).to eq('1.4.0')
+      expect(result.cookbook).to eq('/path/to/cookbook')
+      expect(result.version).to eq('1.0.0')
     end
 
     it 'raises a CookbookNotFound error on a 404 response for a non-existent cookbook' do
-      expect {
-        subject.find('not_a_real_cookbook_that_anyone_should_ever_make', '0.1.0')
-      }.to raise_error(Berkshelf::CookbookNotFound)
-    end
+      stub_request(:get, "#{api_uri}/cookbooks/not_real/versions/1_0_0").to_return(
+        status: 404,
+        body: nil,
+      )
 
-    it 'raises a CookbookNotFound error on a 404 response for a non-existent version' do
       expect {
-        subject.find('nginx', '0.0.0')
+        subject.find('not_real', '1.0.0')
       }.to raise_error(Berkshelf::CookbookNotFound)
     end
 
-    # @warn if you re-record the VCR cassettes, you'll need to manually change the
-    # HTTP Response Code in the YAML file to 500
     it 'raises a CommunitySiteError error on any non 200 or 404 response' do
+      stub_request(:get, "#{api_uri}/cookbooks/not_real/versions/1_0_0").to_return(
+        status: 500,
+        body: nil,
+      )
+
       expect {
-        subject.find('not_a_real_cookbook_that_anyone_should_ever_make', '0.0.0')
+        subject.find('not_real', '1.0.0')
       }.to raise_error(Berkshelf::CommunitySiteError)
     end
   end
 
   describe '#latest_version' do
     it 'returns the version number of the latest version of the cookbook' do
-      expect(subject.latest_version('nginx')).to eq('1.4.0')
+      stub_request(:get, "#{api_uri}/cookbooks/bacon").to_return(
+        status: 200,
+        body: '{ "latest_version": "1.0.0" }',
+        headers: { 'Content-Type' => 'application/json' }
+      )
+
+      latest = subject.latest_version('bacon')
+      expect(latest).to eq('1.0.0')
     end
 
     it 'raises a CookbookNotFound error on a 404 response' do
+      stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
+        status: 404,
+        body: nil,
+      )
+
       expect {
-        subject.latest_version('not_a_real_cookbook_that_anyone_should_ever_make')
+        subject.latest_version('not_real')
       }.to raise_error(Berkshelf::CookbookNotFound)
     end
 
-    # @warn if you re-record the VCR cassettes, you'll need to manually change the
-    # HTTP Response Code in the YAML file to 500
     it 'raises a CommunitySiteError error on any non 200 or 404 response' do
+      stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
+        status: 500,
+        body: nil,
+      )
+
       expect {
-        subject.latest_version('not_a_real_cookbook_that_anyone_should_ever_make')
+        subject.latest_version('not_real')
       }.to raise_error(Berkshelf::CommunitySiteError)
     end
   end
 
   describe '#versions' do
     it 'returns an array containing an item for each version' do
-      expect(subject.versions('nginx')).to have(24).versions
+      stub_request(:get, "#{api_uri}/cookbooks/bacon").to_return(
+        status: 200,
+        body: '{ "versions": ["/bacon/versions/1_0_0", "/bacon/versions/2_0_0"] }',
+        headers: { 'Content-Type' => 'application/json' }
+      )
+
+      versions = subject.versions('bacon')
+      expect(versions.size).to eq(2)
     end
 
     it 'raises a CookbookNotFound error on a 404 response' do
+      stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
+        status: 404,
+        body: nil,
+      )
+
       expect {
-        subject.versions('not_a_real_cookbook_that_anyone_should_ever_make')
+        subject.versions('not_real')
       }.to raise_error(Berkshelf::CookbookNotFound)
     end
 
-    # @warn if you re-record the VCR cassettes, you'll need to manually change the
-    # HTTP Response Code in the YAML file to 500
     it 'raises a CommunitySiteError error on any non 200 or 404 response' do
+      stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
+        status: 500,
+        body: nil,
+      )
+
       expect {
-        subject.versions('not_a_real_cookbook_that_anyone_should_ever_make')
+        subject.versions('not_real')
       }.to raise_error(Berkshelf::CommunitySiteError)
     end
   end
 
   describe '#satisfy' do
     it 'returns the version number of the best solution' do
-      expect(subject.satisfy('nginx', '= 1.1.0')).to eq('1.1.0')
+      stub_request(:get, "#{api_uri}/cookbooks/bacon").to_return(
+        status: 200,
+        body: '{ "versions": ["/bacon/versions/1_0_0", "/bacon/versions/2_0_0"] }',
+        headers: { 'Content-Type' => 'application/json' }
+      )
+
+      result = subject.satisfy('bacon', '= 1.0.0')
+      expect(result).to eq('1.0.0')
     end
   end
 

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -14,7 +14,7 @@ describe Berkshelf::CookbookGenerator do
       capture(:stdout) { Berkshelf::CookbookGenerator.new([target, name]).invoke_all }
     end
 
-    specify do
+    it "generates a new cookbook" do
       expect(target).to have_structure {
         directory 'attributes'
         directory 'files' do
@@ -39,7 +39,13 @@ describe Berkshelf::CookbookGenerator do
           contains 'All rights reserved - Do Not Redistribute'
         end
         file 'README.md' do
-          contains '# sparkle_motion cookbook'
+          contains 'sparkle_motion cookbook'
+          contains '======================='
+          contains '- `toaster` - sparkle_motion needs toaster to brown your bagel.'
+          contains '#### sparkle_motion::default'
+          contains "    <td><tt>['sparkle_motion']['bacon']</tt></td>"
+          contains "Just include `sparkle_motion` in your node's `run_list`:"
+          contains '    "recipe[sparkle_motion]"'
           contains 'Author:: YOUR_NAME (<YOUR_EMAIL>)'
         end
         file 'metadata.rb' do
@@ -50,7 +56,7 @@ describe Berkshelf::CookbookGenerator do
           contains "description      'Installs/Configures sparkle_motion'"
         end
         file 'Berksfile' do
-          contains 'source "http://api.berkshelf.com"'
+          contains 'source "https://api.berkshelf.com"'
           contains 'metadata'
         end
         file 'Gemfile'

data/spec/unit/berkshelf/dependency_spec.rb

@@ -215,7 +215,7 @@ describe Berkshelf::Dependency do
     end
 
     it 'includes the locked version' do
-      subject.stub(cached_cookbook: double('cached', version: '1.2.3'))
+      subject.stub(locked_version: double('cached', to_s: '1.2.3'))
 
       expect(hash).to have_key(:locked_version)
       expect(hash[:locked_version]).to eq('1.2.3')
@@ -275,4 +275,19 @@ describe Berkshelf::Dependency do
       it { should be_false }
     end
   end
+
+  describe "#path_location?" do
+    let(:options) { Hash.new }
+    subject { described_class.new(berksfile, cookbook_name, options).path_location? }
+
+    context "when the location is a PathLocation" do
+      let(:options) { { path: fixtures_path.join("cookbooks", "example_cookbook") } }
+      it { should be_true }
+    end
+
+    context "when the location is not a PathLocation" do
+      let(:options) { { github: "RiotGames/berkshelf" } }
+      it { should be_false }
+    end
+  end
 end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
-describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with: :json } do
+describe Berkshelf::InitGenerator do
   let(:target) { tmp_path.join("some_cookbook") }
   let(:resolver) { double('resolver') }
   let(:kitchen_generator) { double('kitchen-generator', invoke_all: nil) }
 
   before do
     Kitchen::Generator::Init.stub(:new).with(any_args()).and_return(kitchen_generator)
+    FileUtils.mkdir_p(target)
+    File.open(File.join(target, 'metadata.rb'), 'w') do |f|
+      f.write("name 'some_cookbook'")
+    end
   end
 
   context 'with default options' do
@@ -25,8 +29,11 @@ describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with:
         end
         file 'Vagrantfile' do
           contains 'recipe[some_cookbook::default]'
+          contains ' config.omnibus.chef_version = :latest'
+          contains 'config.vm.box = "opscode_ubuntu-12.04_provisionerless"'
+          contains 'config.vm.box_url = "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box"'
         end
-        no_file 'chefignore'
+        file 'chefignore'
       }
     end
   end
@@ -46,13 +53,17 @@ describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with:
     end
   end
 
+  context 'with no metadata' do
+    before do
+      FileUtils.rm(File.join(target, 'metadata.rb'))
+      expect {
+        Berkshelf::InitGenerator.new([target]).invoke_all
+        }.to raise_error(Berkshelf::NotACookbook)
+    end
+  end
+
   context 'with a metadata entry in the Berksfile' do
     before(:each) do
-      Dir.mkdir target
-      File.open(target.join('metadata.rb'), 'w+') do |f|
-        f.write ''
-      end
-
       capture(:stdout) {
         Berkshelf::InitGenerator.new([target], metadata_entry: true).invoke_all
       }
@@ -164,6 +175,59 @@ describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with:
     end
   end
 
+  context "given the 'vagrant.omnibus.enabled' option set to false" do
+    before do
+      Berkshelf::Config.instance.vagrant.omnibus.enabled = false
+      capture(:stdout) {
+        Berkshelf::InitGenerator.new([target]).invoke_all
+      }
+    end
+
+    it "generates a Vagrantfile without the 'config.omnibus.chef_version' value set" do
+      expect(target).to have_structure {
+        file 'Vagrantfile' do
+          contains "#config.omnibus.chef_version"
+        end
+      }
+    end
+  end
+
+  context "given the 'vagrant.omnibus.version' option set" do
+    before do
+      Berkshelf::Config.instance.vagrant.omnibus.enabled = true
+      Berkshelf::Config.instance.vagrant.omnibus.version = "11.4.4"
+      capture(:stdout) {
+        Berkshelf::InitGenerator.new([target]).invoke_all
+      }
+    end
+
+    it "generates a Vagrantfile with the 'config.omnibus.chef_version' value set" do
+      expect(target).to have_structure {
+        file 'Vagrantfile' do
+          contains " config.omnibus.chef_version = \"11.4.4\""
+        end
+      }
+    end
+  end
+
+  context "given the 'vagrant.omnibus.version' option set to 'latest'" do
+    before do
+      Berkshelf::Config.instance.vagrant.omnibus.enabled = true
+      Berkshelf::Config.instance.vagrant.omnibus.version = "latest"
+      capture(:stdout) {
+        Berkshelf::InitGenerator.new([target]).invoke_all
+      }
+    end
+
+    it "generates a Vagrantfile with the 'config.omnibus.chef_version' value set to :latest" do
+      expect(target).to have_structure {
+        file 'Vagrantfile' do
+          contains " config.omnibus.chef_version = :latest"
+        end
+      }
+    end
+  end
+
   context 'with the chef_minitest option true' do
     before(:each) do
         Berkshelf::Resolver.stub(:resolve) { resolver }