berkshelf 3.0.0.beta4 → 3.0.0.beta5

data/spec/unit/berkshelf/dependency_spec.rb

@@ -261,12 +261,12 @@ describe Berkshelf::Dependency do
     subject { described_class.new(berksfile, cookbook_name, options).scm_location? }
 
     context "when the location is a GitLocation" do
-      let(:options) { { git: "git@github.com:RiotGames/berkshelf.git" } }
+      let(:options) { { git: "git@github.com:berkshelf/berkshelf.git" } }
       it { should be_true }
     end
 
     context "when the location is a GithubLocation" do
-      let(:options) { { github: "RiotGames/berkshelf" } }
+      let(:options) { { github: "berkshelf/berkshelf" } }
       it { should be_true }
     end
 
@@ -286,7 +286,7 @@ describe Berkshelf::Dependency do
     end
 
     context "when the location is not a PathLocation" do
-      let(:options) { { github: "RiotGames/berkshelf" } }
+      let(:options) { { github: "berkshelf/berkshelf" } }
       it { should be_false }
     end
   end

data/spec/unit/berkshelf/formatters_spec.rb

@@ -13,7 +13,7 @@ describe Berkshelf::Formatters do
   let(:format_id) { :rspec }
   let(:format_klass) { Class.new { include Berkshelf::Formatters::AbstractFormatter } }
 
-  describe '.register' do
+  describe '::register' do
     it 'adds the class of the includer to the list of registered formatters with the id' do
       Berkshelf::Formatters.register(format_id, format_klass)
 
@@ -41,7 +41,7 @@ describe Berkshelf::Formatters do
     end
   end
 
-  describe '.formatters' do
+  describe '::formatters' do
     before do
       Berkshelf::Formatters.register(format_id, format_klass)
     end
@@ -54,7 +54,7 @@ describe Berkshelf::Formatters do
     end
   end
 
-  describe '.get' do
+  describe '::get' do
     before { Berkshelf::Formatters.register(format_id, format_klass) }
 
     it 'returns the class constant of the given formatter ID' do
@@ -69,7 +69,7 @@ describe Berkshelf::Formatters do
   end
 
   describe Berkshelf::Formatters::AbstractFormatter do
-    describe '.register_formatter' do
+    describe '::register_formatter' do
       it 'delegates to Formatters' do
         Berkshelf::Formatters.should_receive(:register).with(:rspec, format_klass)
 

data/spec/unit/berkshelf/git_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Berkshelf::Git do
   let(:git) { Berkshelf::Git }
 
-  describe '.find_git' do
+  describe '::find_git' do
     it 'finds git' do
       expect(Berkshelf::Git.find_git).to_not be_nil
     end
@@ -17,7 +17,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.clone' do
+  describe '::clone' do
     let(:target) { clone_path('nginx') }
 
     it 'clones the repository to the target path' do
@@ -29,7 +29,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.checkout' do
+  describe '::checkout' do
     let(:repo_path) { clone_path('nginx') }
     let(:repo) {
       origin_uri = git_origin_for('nginx', tags: ['1.0.1', '1.0.2'], branches: ['topic', 'next_topic'])
@@ -90,7 +90,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.rev_parse' do
+  describe '::rev_parse' do
     let(:repo_path) { clone_path('nginx') }
     before(:each) do |example|
       origin_uri = git_origin_for('nginx', tags: ['1.1.1'])
@@ -106,7 +106,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.show_ref' do
+  describe '::show_ref' do
     let(:repo_path) { clone_path('nginx') }
     let(:tags) { ['1.0.1'] }
     let(:branches) { ['topic'] }
@@ -140,7 +140,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.revision_from_ref' do
+  describe '::revision_from_ref' do
     let(:repo_path) { clone_path('nginx') }
     let(:tags) { ['1.0.1'] }
     let(:branches) { ['topic'] }
@@ -188,7 +188,7 @@ describe Berkshelf::Git do
   let(:http_uri) { 'http://github.com/reset/solve.git' }
   let(:invalid_uri) { '/something/on/disk' }
 
-  describe '.validate_uri' do
+  describe '::validate_uri' do
     context 'given a valid Git read-only URI' do
       it 'returns true' do
         expect(Berkshelf::Git.validate_uri(readonly_uri)).to be_true
@@ -262,7 +262,7 @@ describe Berkshelf::Git do
     end
   end
 
-  describe '.validate_uri!' do
+  describe '::validate_uri!' do
     context 'given a valid Git read-only URI' do
       it 'returns true' do
         expect(Berkshelf::Git.validate_uri!(readonly_uri)).to be_true

data/spec/unit/berkshelf/installer_spec.rb

@@ -12,8 +12,8 @@ describe Berkshelf::Installer do
     before { berksfile.stub(sources: sources) }
 
     it "sends the message #universe on each source" do
-      source_one.should_receive(:universe)
-      source_two.should_receive(:universe)
+      source_one.should_receive(:build_universe)
+      source_two.should_receive(:build_universe)
 
       subject.build_universe
     end

data/spec/unit/berkshelf/locations/git_location_spec.rb

@@ -12,12 +12,6 @@ describe Berkshelf::GitLocation do
         }.to raise_error(Berkshelf::InvalidGitURI)
       end
     end
-
-    describe "::tmpdir" do
-      it 'creates a temporary directory within the Berkshelf temporary directory' do
-        expect(described_class.tmpdir).to include(Berkshelf.tmp_dir)
-      end
-    end
   end
 
   let(:storage_path) { Berkshelf::CookbookStore.instance.storage_path }
@@ -79,7 +73,7 @@ describe Berkshelf::GitLocation do
       subject { described_class.new(dependency, git: "file://#{fake_remote}.git") }
 
       it 'raises a CookbookNotFound error' do
-        subject.stub(:clone).and_return {
+        Berkshelf::Git.stub(:clone).and_return {
           FileUtils.mkdir_p(fake_remote)
           Dir.chdir(fake_remote) { |dir| `git init && echo hi > README && git add README && git commit README -m 'README'`; dir }
         }
@@ -98,7 +92,7 @@ describe Berkshelf::GitLocation do
     end
 
     context 'given a value for tag' do
-      let(:tag) { '1.0.0' }
+      let(:tag) { 'v1.0.0' }
 
       subject do
         described_class.new(dependency, git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', tag: tag)

data/spec/unit/berkshelf/locations/mercurial_location_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Berkshelf::MercurialLocation do
-
   include Berkshelf::RSpec::Mercurial
 
   let(:cookbook_uri) { mercurial_origin_for('fake_cookbook', is_cookbook: true, tags: ["1.0.0"], branches: ["mybranch"]) }
@@ -9,7 +8,7 @@ describe Berkshelf::MercurialLocation do
   let(:dependency) { double('dep', name: "berkshelf-cookbook-fixture", version_constraint: constraint) }
   let(:storage_path) { Berkshelf::CookbookStore.instance.storage_path }
 
-  describe '.initialize' do
+  describe '::initialize' do
     it 'raises InvalidHgURI if given an invalid URI for options[:hg]' do
       expect {
         described_class.new(dependency, hg: '/something/on/disk')
@@ -17,18 +16,10 @@ describe Berkshelf::MercurialLocation do
     end
   end
 
-  describe '.tmpdir' do
-    it 'creates a temporary directory within the Berkshelf temporary directory' do
-      expect(described_class.tmpdir).to include(Berkshelf.tmp_dir)
-    end
-  end
-
   subject { described_class.new(dependency, hg: cookbook_uri) }
 
   describe '#download' do
-
-    before() do
-      # recreate the fake repo
+    before do
       clean_tmp_path
       FileUtils.mkdir_p(storage_path)
       cookbook_uri
@@ -113,13 +104,8 @@ describe Berkshelf::MercurialLocation do
 
     context 'given a value for tag' do
       let(:tag) { '1.0.0' }
+      subject { described_class.new(dependency, hg: cookbook_uri, tag: tag) }
 
-      subject do
-        described_class.new(dependency,
-                                   hg: cookbook_uri,
-                                   tag: tag
-        )
-      end
       let(:cached) { subject.download }
       let(:sha) { subject.rev }
       let(:expected_path) { storage_path.join("#{cached.cookbook_name}-#{sha}") }
@@ -131,13 +117,8 @@ describe Berkshelf::MercurialLocation do
 
     context 'give a value for branch' do
       let(:branch) { 'mybranch' }
+      subject { described_class.new(dependency, hg: cookbook_uri, branch: branch) }
 
-      subject do
-        described_class.new(dependency,
-                                   hg: cookbook_uri,
-                                   branch: branch
-        )
-      end
       let(:cached) { subject.download }
       let(:sha) { subject.rev }
       let(:expected_path) { storage_path.join("#{cached.cookbook_name}-#{sha}") }

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -8,7 +8,7 @@ describe Berkshelf::Lockfile do
     File.stub(:read).and_return(content)
   end
 
-  describe '.initialize' do
+  describe '::initialize' do
     it 'does not throw an exception' do
       expect {
         Berkshelf::Lockfile.from_berksfile(berksfile)

data/spec/unit/berkshelf/mercurial_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Berkshelf::Mercurial do
-
   include Berkshelf::RSpec::Mercurial
 
   let(:hg) { Berkshelf::Mercurial }
 
-  describe '.find_hg' do
+  describe '::find_hg' do
     it 'finds hg' do
       expect(described_class.find_hg).to_not be_nil
     end
@@ -20,7 +19,7 @@ describe Berkshelf::Mercurial do
     end
   end
 
-  describe '.clone' do
+  describe '::clone' do
     let(:target) { clone_path('nginx') }
 
     it 'clones the repository to the target path' do
@@ -33,7 +32,7 @@ describe Berkshelf::Mercurial do
     end
   end
 
-  describe '.checkout' do
+  describe '::checkout' do
     let(:repo_path) { clone_path('nginx') }
     let(:repo) {
       origin_uri = mercurial_origin_for('nginx', tags: ['1.0.1', '1.0.2'], branches: ['topic', 'next_topic'])
@@ -94,7 +93,7 @@ describe Berkshelf::Mercurial do
     end
   end
 
-  describe '.rev_parse' do
+  describe '::rev_parse' do
     let(:repo_path) { clone_path('nginx') }
 
     before(:each) do
@@ -115,7 +114,7 @@ describe Berkshelf::Mercurial do
   let(:http_uri) { 'http://hghub.com/reset/' }
   let(:invalid_uri) { '/something/on/disk' }
 
-  describe '.validate_uri' do
+  describe '::validate_uri' do
     context 'given an invalid URI' do
       it 'returns false' do
         expect(described_class.validate_uri(invalid_uri)).to be_false
@@ -141,7 +140,7 @@ describe Berkshelf::Mercurial do
     end
   end
 
-  describe '.validate_uri!' do
+  describe '::validate_uri!' do
     context 'given an invalid URI' do
       it 'raises InvalidHgURI' do
         expect {

data/spec/unit/berkshelf/packager_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Berkshelf::Packager do
+  let(:target) { tmp_path.join("cookbooks.tar.gz").to_s }
+  subject { described_class.new(target) }
+
+  its(:out_file) { should eql(target) }
+
+  describe "#run" do
+    let(:cookbooks) { fixtures_path.join("cookbooks") }
+
+    it "writes a tar to the #out_file" do
+      subject.run(cookbooks)
+      expect(File.exist?(subject.out_file)).to be_true
+    end
+  end
+
+  describe "#validate!" do
+    let(:out_dir) { File.dirname(target) }
+
+    context "when the out_file's directory is not writable" do
+      before { File.stub(:directory?).with(out_dir).and_return(false) }
+
+      it "raises an error" do
+        expect { subject.validate! }.to raise_error(Berkshelf::PackageError,
+          "Path is not a directory: #{out_dir}")
+      end
+    end
+
+    context "when the out_file's directory is not a directory" do
+      before { File.stub(:writable?).with(out_dir).and_return(false) }
+
+      it "raises an error" do
+        expect { subject.validate! }.to raise_error(Berkshelf::PackageError,
+          "Directory is not writable: #{out_dir}")
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/ui_spec.rb

@@ -112,8 +112,8 @@ describe Thor::Base.shell do
         subject.stub(:quiet?).and_return(true)
       end
 
-      it 'does not output anything', :not_supported_on_windows do
-        stdout.should_not_receive(:puts)
+      it "outputs an error message", :not_supported_on_windows do
+        stderr.should_receive(:puts)
         subject.error 'error!'
       end
     end

data/spec/unit/berkshelf_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Berkshelf do
-  describe '.formatter' do
+  describe '::formatter' do
     context 'with default formatter' do
       before { Berkshelf.instance_variable_set(:@formatter, nil) }
 
@@ -30,7 +30,7 @@ describe Berkshelf do
     end
   end
 
-  describe '.log' do
+  describe '::log' do
     it 'returns Berkshelf::Logger' do
       expect(Berkshelf.log).to eq(Berkshelf::Logger)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta4
+  version: 3.0.0.beta5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -28,6 +28,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.4
+- !ruby/object:Gem::Dependency
+  name: berkshelf-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -74,30 +88,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.5
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -373,8 +387,6 @@ files:
 - generator_files/licenses/reserved.erb
 - generator_files/metadata.rb.erb
 - lib/berkshelf.rb
-- lib/berkshelf/api_client.rb
-- lib/berkshelf/api_client/remote_cookbook.rb
 - lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
@@ -411,6 +423,7 @@ files:
 - lib/berkshelf/mixin.rb
 - lib/berkshelf/mixin/dsl_eval.rb
 - lib/berkshelf/mixin/logging.rb
+- lib/berkshelf/packager.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/resolver/graph.rb
 - lib/berkshelf/source.rb
@@ -445,8 +458,6 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/mercurial.rb
 - spec/support/path_helpers.rb
-- spec/unit/berkshelf/api_client/remote_cookbook_spec.rb
-- spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cli_spec.rb
@@ -455,6 +466,7 @@ files:
 - 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
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
@@ -472,6 +484,7 @@ files:
 - spec/unit/berkshelf/mercurial_spec.rb
 - spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
+- spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
 - spec/unit/berkshelf/source_spec.rb
@@ -563,8 +576,6 @@ test_files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/mercurial.rb
 - spec/support/path_helpers.rb
-- spec/unit/berkshelf/api_client/remote_cookbook_spec.rb
-- spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cli_spec.rb
@@ -573,6 +584,7 @@ test_files:
 - 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
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
@@ -590,6 +602,7 @@ test_files:
 - spec/unit/berkshelf/mercurial_spec.rb
 - spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
+- spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
 - spec/unit/berkshelf/source_spec.rb