berkshelf 1.0.4 → 1.1.0.rc1

data/lib/berkshelf/errors.rb

@@ -1,3 +1,5 @@
+require 'vagrant/errors'
+
 module Berkshelf
   class BerkshelfError < StandardError
     class << self
@@ -11,6 +13,34 @@ module Berkshelf
     alias_method :message, :to_s
   end
 
+  # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
+  # wrapped in this proxy object so they are properly handled when Vagrant encounters
+  # an exception.
+  #
+  # @example wrapping an error encountered within the Vagrant plugin
+  #   rescue BerkshelfError => e
+  #     VagrantWrapperError.new(e)
+  #   end
+  class VagrantWrapperError < Vagrant::Errors::VagrantError
+    # @param [BerkshelfError]
+    attr_reader :original
+
+    # @param [BerkshelfError] original
+    def initialize(original)
+      @original = original
+    end
+
+    def to_s
+      "#{original.class}: #{original.to_s}"
+    end
+
+    private
+
+      def method_missing(fun, *args, &block)
+        original.send(fun, *args, &block)
+      end
+  end
+
   class InternalError < BerkshelfError; status_code(99); end
   class ArgumentError < InternalError; end
   class AbstractFunction < InternalError
@@ -36,6 +66,7 @@ module Berkshelf
       out << stderr.prepend_each("\n", "\t")
     end
   end
+  class PrivateGitRepo < GitError; end
 
   class DuplicateSourceDefined < BerkshelfError; status_code(105); end
   class NoSolution < BerkshelfError; status_code(106); end

data/lib/berkshelf/locations/github_location.rb

@@ -47,7 +47,7 @@ module Berkshelf
     def to_s
       s = "#{self.class.location_key}: '#{repo_identifier}'"
       s << " with branch: '#{branch}'" if branch
-      s << " over protocol: '#{protocol}'" unless default_protocol?
+      s << " over protocol: '#{protocol}'"
       s
     end
 

data/lib/berkshelf/lockfile.rb

@@ -4,6 +4,34 @@ module Berkshelf
       def remove!
         FileUtils.rm_f DEFAULT_FILENAME
       end
+
+      # @param [Array<CookbookSource>] sources
+      def update!(sources)
+        contents = File.readlines(DEFAULT_FILENAME)
+        contents.delete_if do |line|
+          line =~ /cookbook '(#{sources.map(&:name).join('|')})'/
+        end
+
+        contents += sources.map { |source| definition(source) }
+        File.open(DEFAULT_FILENAME, 'wb') { |f| f.write(contents.join("\n").squeeze("\n")) }
+      end
+
+      # @param [CookbookSource] source
+      #
+      # @return [String]
+      def definition(source)
+        definition = "cookbook '#{source.name}'"
+
+        if source.location.is_a?(GitLocation)
+          definition += ", :git => '#{source.location.uri}', :ref => '#{source.location.branch || 'HEAD'}'"
+        elsif source.location.is_a?(PathLocation)
+          definition += ", :path => '#{source.location.path}'"
+        else
+          definition += ", :locked_version => '#{source.locked_version}'"
+        end
+
+        definition
+      end
     end
 
     DEFAULT_FILENAME = "#{Berkshelf::DEFAULT_FILENAME}.lock".freeze
@@ -15,28 +43,12 @@ module Berkshelf
     end
 
     def write(filename = DEFAULT_FILENAME)
-      content = sources.map { |source| get_source_definition(source) }.join("\n")
+      content = sources.map { |source| self.class.definition(source) }.join("\n")
       File.open(filename, "wb") { |f| f.write content }
     end
 
     def remove!
       self.class.remove!
     end
-
-    private
-
-      def get_source_definition(source)
-        definition = "cookbook '#{source.name}'"
-
-        if source.location.is_a?(GitLocation)
-          definition += ", :git => '#{source.location.uri}', :ref => '#{source.location.branch || 'HEAD'}'"
-        elsif source.location.is_a?(PathLocation)
-          definition += ", :path => '#{source.location.path}'"
-        else
-          definition += ", :locked_version => '#{source.locked_version}'"
-        end
-
-        return definition
-      end
   end
 end

data/lib/berkshelf/vagrant/action/clean.rb

@@ -17,6 +17,8 @@ module Berkshelf
           end
 
           @app.call(env)
+        rescue BerkshelfError => e
+          raise VagrantWrapperError.new(e)
         end
       end
     end

data/lib/berkshelf/vagrant/action/install.rb

@@ -20,6 +20,8 @@ module Berkshelf
           end
 
           @app.call(env)
+        rescue BerkshelfError => e
+          raise VagrantWrapperError.new(e)
         end
 
         private

data/lib/berkshelf/vagrant/action/upload.rb

@@ -16,6 +16,8 @@ module Berkshelf
           end
 
           @app.call(env)
+        rescue BerkshelfError => e
+          raise VagrantWrapperError.new(e)
         end
 
         private

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.0.4"
+  VERSION = "1.1.0.rc1"
 end

data/spec/support/chef_api.rb

@@ -89,7 +89,10 @@ EOF
           end
         end
 
-        File.write(cookbook_path.join("metadata.rb"), metadata)
+        File.open(cookbook_path.join("metadata.rb"), 'w+') do |f|
+          f.write metadata
+        end
+        
         cookbook_path
       end
 

data/spec/unit/berkshelf/errors_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "berkshelf errors" do
+  describe Berkshelf::VagrantWrapperError do
+    subject { described_class }
+
+    it "proxies messages to the original exception" do
+      original = double('original_error')
+      original.should_receive(:a_message)
+
+      subject.new(original).a_message
+    end
+  end
+end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -46,7 +46,9 @@ module Berkshelf
     context "with a metadata entry in the Berksfile" do
       before do
         Dir.mkdir target
-        File.write target.join("metadata.rb"), ""
+        File.open(target.join("metadata.rb"), 'w+') do |f|
+          f.write ""
+        end
         generator = subject.new([target], metadata_entry: true)
         capture(:stdout) { generator.invoke_all }
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -203,6 +203,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .rvmrc
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -217,9 +218,12 @@ files:
 - features/default_locations.feature
 - features/groups_install.feature
 - features/init_command.feature
-- features/install.feature
+- features/install_command.feature
 - features/json_formatter.feature
+- features/list_command.feature
 - features/lockfile.feature
+- features/outdated_command.feature
+- features/show_command.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
@@ -229,7 +233,7 @@ files:
 - features/step_definitions/json_steps.rb
 - features/step_definitions/utility_steps.rb
 - features/support/env.rb
-- features/update.feature
+- features/update_command.feature
 - features/upload_command.feature
 - features/vendor_install.feature
 - generator_files/Berksfile.erb
@@ -329,6 +333,7 @@ files:
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
+- spec/unit/berkshelf/errors_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb
@@ -356,12 +361,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1057242199231529064
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -375,9 +377,12 @@ test_files:
 - features/default_locations.feature
 - features/groups_install.feature
 - features/init_command.feature
-- features/install.feature
+- features/install_command.feature
 - features/json_formatter.feature
+- features/list_command.feature
 - features/lockfile.feature
+- features/outdated_command.feature
+- features/show_command.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
@@ -387,7 +392,7 @@ test_files:
 - features/step_definitions/json_steps.rb
 - features/step_definitions/utility_steps.rb
 - features/support/env.rb
-- features/update.feature
+- features/update_command.feature
 - features/upload_command.feature
 - features/vendor_install.feature
 - spec/fixtures/Berksfile
@@ -430,6 +435,7 @@ test_files:
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
+- spec/unit/berkshelf/errors_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb

data/features/update.feature

@@ -1,19 +0,0 @@
-Feature: update
-  As a user
-  I want a way to update the versions without clearing out the files I've downloaded
-  So that I can update faster than a clean install
-
-  Scenario: knife berkshelf update
-    Given I write to "Berksfile" with:
-      """
-      cookbook "artifact", "0.10.0"
-      """
-    Given I write to "Berksfile.lock" with:
-      """
-      cookbook 'artifact', :locked_version => '0.1.0'
-      """
-    When I run the update command
-    Then the file "Berksfile.lock" should contain exactly:
-      """
-      cookbook 'artifact', :locked_version => '0.10.0'
-      """