berkshelf 2.0.5 → 2.0.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.0.6
+
+* Fix installation failures due to latest release of ActiveSupport
+* --except and --only will now work with a lockfile present
+
 # 2.0.5
 
 * Improve speed of resolution when a lockfile is present

data/berkshelf.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.1'
   s.required_rubygems_version = '>= 1.8.0'
 
-  s.add_dependency 'activesupport',     '>= 3.2.0'
+  s.add_dependency 'activesupport',     '~> 3.2.0'
   s.add_dependency 'addressable',       '~> 2.3.4'
   s.add_dependency 'buff-shell_out',    '~> 0.1'
   s.add_dependency 'celluloid',         '>= 0.14.0'

data/features/groups_install.feature

@@ -28,6 +28,41 @@ Feature: Installing specific groups
     And the output should not contain "Using notme (1.0.0)"
     And the exit status should be 0
 
+  Scenario: Using the --except option with a lockfile
+    Given the cookbook store has the cookbooks:
+      | default  | 1.0.0 |
+      | takeme   | 1.0.0 |
+    Given I write to "Berksfile" with:
+      """
+      group :notme do
+        cookbook 'notme', '1.0.0'
+      end
+
+      cookbook 'default', '1.0.0'
+
+      group :takeme do
+        cookbook 'takeme', '1.0.0'
+      end
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "sources": {
+          "notme": { "locked_version": "1.0.0"},
+          "takeme": { "locked_version": "1.0.0"},
+          "default": { "locked_version": "1.0.0"}
+        }
+      }
+      """
+    When I successfully run `berks install --except notme`
+    Then the output should contain:
+      """
+      Using default (1.0.0)
+      Using takeme (1.0.0)
+      """
+    And the output should not contain "Using notme (1.0.0)"
+    And the exit status should be 0
+
   Scenario: Using the --only option
     Given the cookbook store has the cookbooks:
       | takeme   | 1.0.0 |

data/features/lockfile.feature

@@ -14,7 +14,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"80396ed07db133e0192593adebb360c27eed88c2",
         "sources":{
           "fake":{
             "locked_version":"1.0.0"
@@ -40,7 +39,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "374a3d22920abae4a6d620a14a32b90d8babda8f",
         "sources": {
           "fake": {
             "locked_version": "1.0.0"
@@ -64,7 +62,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"ebf27d476739b5aba7e7e8a61de23b3330e20a7d",
         "sources":{
           "fake":{
             "path":"./fake"
@@ -86,7 +83,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"80396ed07db133e0192593adebb360c27eed88c2",
         "sources":{
           "fake":{
             "locked_version":"1.0.0"
@@ -109,7 +105,6 @@ Feature: Creating and reading the Berkshelf lockfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"e42f8e41a5e646bd86591c5b7ec25442736b87fd",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"1.0.0"
@@ -121,7 +116,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"e42f8e41a5e646bd86591c5b7ec25442736b87fd",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"1.0.0"
@@ -142,7 +136,6 @@ Feature: Creating and reading the Berkshelf lockfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"3dced4fcd9c3f72b68e746190aaa1140bdc6cc3d",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.1.0"
@@ -154,7 +147,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"b2714a4f9bdf500cb20267067160a0b3c1d8404c",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.2.0"
@@ -174,7 +166,6 @@ Feature: Creating and reading the Berkshelf lockfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"c6438d7590f4d695d8abae83ff22586ba6d3a52e",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"1.0.0"
@@ -186,7 +177,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"c6438d7590f4d695d8abae83ff22586ba6d3a52e",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"1.0.0"
@@ -207,7 +197,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "b8e06c891c824b3e3481df024eb241e1c02572a6",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
@@ -230,7 +219,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "310f95bb86ba76b47eef28abc621d0e8de19bbb6",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
@@ -253,7 +241,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "ade51e222f569cc299f34ec1100d321f3b230c36",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
@@ -276,7 +263,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "3ac97aa503bcebb2b393410aebc176c3c5bed2d4",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
@@ -297,7 +283,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "f0b5a9c0230a3ff384badb0c40af1058cde75bee",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
@@ -320,7 +305,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "a148a5a75397588393801a2fd55df1325080868c",
         "sources":{
           "fake":{
             "path":"./fake"
@@ -341,7 +325,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
         "sources": {
           "fake": {
             "path": "."
@@ -360,7 +343,6 @@ Feature: Creating and reading the Berkshelf lockfile
     And the cookbook "fake" has the file "Berksfile.lock" with:
       """
       {
-        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
         "sources": {
           "fake": {
             "path": "."
@@ -373,7 +355,6 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
         "sources": {
           "fake": {
             "path": "."
@@ -393,7 +374,6 @@ Feature: Creating and reading the Berkshelf lockfile
   # Then the file "Berksfile.lock" should contain JSON:
   #   """
   #   {
-  #     "sha": "3232c5ae6f54aee3efc5fdcfce69249a2526822b",
   #     "sources":{
   #       "sudo":{
   #         "site":"opscode",

data/features/update_command.feature

@@ -20,7 +20,6 @@ Feature: Updating a cookbook defined by a Berksfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"b2714a4f9bdf500cb20267067160a0b3c1d8404c",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.1.0"
@@ -43,7 +42,6 @@ Feature: Updating a cookbook defined by a Berksfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"69b2e00e970d2bb6a9b1d09aeb3e6a17ef3df955",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.1.0"
@@ -58,7 +56,6 @@ Feature: Updating a cookbook defined by a Berksfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"69b2e00e970d2bb6a9b1d09aeb3e6a17ef3df955",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.2.0"
@@ -84,7 +81,6 @@ Feature: Updating a cookbook defined by a Berksfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"69b2e00e970d2bb6a9b1d09aeb3e6a17ef3df955",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.1.0"
@@ -99,7 +95,6 @@ Feature: Updating a cookbook defined by a Berksfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"69b2e00e970d2bb6a9b1d09aeb3e6a17ef3df955",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.2.0"
@@ -122,7 +117,6 @@ Feature: Updating a cookbook defined by a Berksfile
     Given I write to "Berksfile.lock" with:
       """
       {
-        "sha":"23150cfe61b7b86882013c8664883058560b899d",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "locked_version":"0.1.0"

data/features/upload_command.feature

@@ -293,3 +293,26 @@ Feature: Uploading cookbooks to a Chef Server
     And the Chef server should not have the cookbooks:
       | ekaf  | 2.0.0 |
     And the exit status should be 0
+
+  @focus
+  Scenario: With unicode characters
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "README.md" with:
+      """
+      Jamié Wiñsor
+      赛斯瓦戈
+      Μιψηαελ Ιωευ
+      جوستين كامبل
+      """
+    And the cookbook "fake" has the file "Berksfile" with:
+      """
+      site :opscode
+      metadata
+      """
+    When I cd to "fake"
+    And I successfully run `berks upload fake`
+    Then the output should contain:
+      """
+      Uploading fake (0.0.0)
+      """
+    And the exit status should be 0

data/lib/berkshelf/berksfile.rb

@@ -89,13 +89,7 @@ module Berkshelf
       @cached_cookbooks = nil
     end
 
-    # @return [String]
-    #   the shasum for the sources in the Berksfile (or metadata/path locations)
-    def sha
-      @sha ||= Digest::SHA1.hexdigest(shaable_contents.join("\n"))
-    end
-
-    # Add a cookbook source to the Berksfile to be retrieved and have it's dependencies recursively retrieved
+    # Add a cookbook dependency to the Berksfile to be retrieved and have it's dependencies recursively retrieved
     # and resolved.
     #
     # @example a cookbook source that will be retrieved from one of the default locations
@@ -196,8 +190,6 @@ module Berkshelf
       metadata_path = File.expand_path(File.join(path, 'metadata.rb'))
       metadata = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
 
-      shaable_contents << File.read(metadata_path)
-
       name = metadata.name.presence || File.basename(File.expand_path(path))
 
       add_source(name, nil, { path: path, metadata: true })
@@ -267,7 +259,6 @@ module Berkshelf
 
       if options[:path]
         metadata_file = File.expand_path(File.join(options[:path], 'metadata.rb'))
-        shaable_contents << File.read(metadata_file)
       end
 
       options[:constraint] = constraint
@@ -385,20 +376,14 @@ module Berkshelf
     #    sources are considered to be "unlocked". If a lockfile is specified, a
     #    definition is created via the following algorithm:
     #
-    #    - Compare the SHA of the current sources (as JSON) with the last-known
-    #      SHA of the sources.
-    #    - If the SHAs match, the sources have not been updated, so we can rely
-    #      solely on the locked ones.
-    #    - If the SHAs don't match, then the sources have diverged from the
-    #      lockfile, which means some sources are outdated. For each unlocked
-    #      source, see if there exists a locked version that still satisfies
-    #      the version constraint in the Berksfile. If there exists such a
-    #      source, remove it from the list of unlocked sources. If not, then
-    #      either a version constraint has changed, or a new source has been
-    #      added to the Berksfile. In the event that a locked_source exists,
-    #      but it no longer satisfies the constraint, this method will raise
-    #      a {Berkshelf::OutdatedCookbookSource}, and inform the user to run
-    #      <tt>berks update COOKBOOK</tt> to remedy the issue.
+    #    - For each source, see if there exists a locked version that still
+    #      satisfies the version constraint in the Berksfile. If
+    #      there exists such a source, remove it from the list of unlocked
+    #      sources. If not, then either a version constraint has changed,
+    #      or a new source has been added to the Berksfile. In the event that
+    #      a locked_source exists, but it no longer satisfies the constraint,
+    #      this method will raise a {Berkshelf::OutdatedCookbookSource}, and
+    #      inform the user to run <tt>berks update COOKBOOK</tt> to remedy the issue.
     #    - Remove any locked sources that no longer exist in the Berksfile
     #      (i.e. a cookbook source was removed from the Berksfile).
     #
@@ -423,11 +408,7 @@ module Berkshelf
     #
     # @return [Array<Berkshelf::CachedCookbook>]
     def install(options = {})
-      if self.sha == lockfile.sha
-        local_sources = locked_sources
-      else
-        local_sources = apply_lockfile(sources(options))
-      end
+      local_sources = apply_lockfile(sources(options))
 
       resolver          = resolve(local_sources)
       @cached_cookbooks = resolver[:solution]
@@ -437,7 +418,7 @@ module Berkshelf
 
       self.class.vendor(@cached_cookbooks, options[:path]) if options[:path]
 
-      lockfile.update(local_sources, sha: self.sha)
+      lockfile.update(local_sources)
 
       self.cached_cookbooks
     end
@@ -456,8 +437,6 @@ module Berkshelf
       # Unlock any/all specified cookbooks
       sources(options).each { |source| lockfile.unlock(source) }
 
-      lockfile.reset_sha!
-
       # NOTE: We intentionally do NOT pass options to the installer
       self.install
     end
@@ -823,12 +802,5 @@ module Berkshelf
         end
       end
 
-      # The contents of the files that we want to SHA for caching against
-      # the lockfile.
-      #
-      # @return [Array<String>]
-      def shaable_contents
-        @shaable_contents ||= [File.read(self.filepath)]
-      end
   end
 end

data/lib/berkshelf/lockfile.rb

@@ -13,10 +13,6 @@ module Berkshelf
     #   the Berksfile for this Lockfile
     attr_reader :berksfile
 
-    # @return [String]
-    #   the last known SHA of the Berksfile
-    attr_accessor :sha
-
     # Create a new lockfile instance associated with the given Berksfile. If a
     # Lockfile exists, it is automatically loaded. Otherwise, an empty instance is
     # created and ready for use.
@@ -34,21 +30,13 @@ module Berkshelf
     # Load the lockfile from file system.
     def load!
       contents = File.read(filepath).strip
-
       hash = parse(contents)
-      @sha = hash[:sha]
 
       hash[:sources].each do |name, options|
         add(CookbookSource.new(berksfile, name.to_s, options))
       end
     end
 
-    # Set the sha value to nil to mark that the lockfile is not out of
-    # sync with the Berksfile.
-    def reset_sha!
-      @sha = nil
-    end
-
     # The list of sources constrained in this lockfile.
     #
     # @return [Array<Berkshelf::CookbookSource>]
@@ -86,10 +74,8 @@ module Berkshelf
     #   the list of sources to update
     # @option options [String] :sha
     #   the sha of the Berksfile updating the sources
-    def update(sources, options = {})
+    def update(sources)
       reset_sources!
-      @sha = options[:sha]
-
       sources.each { |source| append(source) }
       save
     end
@@ -137,11 +123,9 @@ module Berkshelf
     #
     # @return [Hash]
     #   the hash representation of this lockfile
-    #   * :sha [String] the last-known sha for the berksfile
     #   * :sources [Array<Berkshelf::CookbookSource>] the list of sources
     def to_hash
       {
-        sha: sha,
         sources: @sources
       }
     end
@@ -225,8 +209,7 @@ module Berkshelf
             end
 
             {
-              sha: nil,
-              sources: sources
+              sources: sources,
             }
           end
         end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/spec/fixtures/cookbooks/example_cookbook/Berksfile.lock

@@ -1,5 +1,4 @@
 {
-  "sha": null,
   "sources": {
   }
 }

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -279,10 +279,7 @@ describe Berkshelf::Berksfile do
       Berkshelf::Resolver.stub(:new).and_return(resolver)
       Berkshelf::Lockfile.stub(:new).and_return(lockfile)
 
-      subject.stub(:sha).and_return('abc123')
-
       lockfile.stub(:sources).and_return([])
-      lockfile.stub(:sha).and_return('xyz456')
 
       resolver.stub(:sources).and_return([])
       lockfile.stub(:update)
@@ -308,7 +305,7 @@ describe Berkshelf::Berksfile do
 
       it 'writes a lockfile with the resolvers sources' do
         resolver.should_receive(:resolve)
-        lockfile.should_receive(:update).with([], sha: 'abc123')
+        lockfile.should_receive(:update).with([])
 
         subject.install
       end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -15,10 +15,6 @@ describe Berkshelf::Lockfile do
       }.to_not raise_error
     end
 
-    it 'has the correct sha' do
-      expect(subject.sha).to eq('6b76225554cc1f7c0aea0f8b3f10c6743aeba67e')
-    end
-
     it 'has the correct sources' do
       expect(subject).to have_source 'build-essential'
       expect(subject).to have_source 'chef-client'
@@ -29,12 +25,6 @@ describe Berkshelf::Lockfile do
 
   subject { Berkshelf::Lockfile.new(berksfile) }
 
-  describe '#reset_sha!' do
-    it 'sets the sha to nil' do
-      expect { subject.reset_sha! }.to change { subject.sha }.to nil
-    end
-  end
-
   describe '#sources' do
     it 'returns an array' do
       expect(subject.sources).to be_a(Array)
@@ -67,12 +57,6 @@ describe Berkshelf::Lockfile do
       subject.update([])
     end
 
-    it 'updates the sha' do
-      expect {
-        subject.update([])
-      }.to change { subject.sha }
-    end
-
     it 'appends each of the sources' do
       source = double('source')
       subject.should_receive(:append).with(source).once
@@ -133,10 +117,6 @@ describe Berkshelf::Lockfile do
   describe '#to_hash' do
     let(:hash) { subject.to_hash }
 
-    it 'has the `:sha` key' do
-      expect(hash).to have_key(:sha)
-    end
-
     it 'has the `:sources` key' do
       expect(hash).to have_key(:sources)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,14 +13,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
@@ -28,7 +28,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency