berkshelf 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 337dda20878f2853b12de31de35dc8494dd7db0f
-  data.tar.gz: 64cac8f89b420097552be7c5f85bd1b497b250f5
+  metadata.gz: 50266e6e9de8493037de29ba7ef6a9322559ea4c
+  data.tar.gz: 5478e43f008f09d92faa9b9fbea8997a5f0f6c46
 SHA512:
-  metadata.gz: f63ff185f5d45c161e6e86e82001097d439d53c0eef3c0f8643f9038a5824fa83a90017b52890d66c17e03cea5a5653fc575491b305d65f32339179ed5e8b462
-  data.tar.gz: 67d89ec5fb953f45ffc7560cf204e3b42a1d7ed1f3d62d97e3b5d767f05a03f1bbd7acbb870c098b016ade7668d284446dfbd65abd6ee5c87e7521d5c631db8e
+  metadata.gz: bd54e2d87eda3052068b1832a7e2a4d00b3ed6b14b77272c661d3efb41abd374edba51a842b69a100d231b4a576afc8d55eae3996b9db81eea7f2c4a5e7366e7
+  data.tar.gz: aa4742f2622fb655f44d08428ab2cc6705b61a94f33ab06bc4444710dc0f31a6d51de185c0bbfc8635ca024eaf8c80a321b6eb22966d34d57900bd95d9269aff

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 > This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
 
+# 3.2.4
+
+* Bug Fixes
+  * Fix issue where older version of a cookbook would be presented as the latest available version from a remote API server's cache
+  * Exclude git directories when vendoring
+  * Fix a race condition in downloading cookbooks from Github or a URI location
+
 # 3.2.3
 
 * Bug Fixes

data/Gemfile

@@ -31,5 +31,5 @@ group :guard do
 end
 
 group :test do
-  gem "berkshelf-api", github: "berkshelf/berkshelf-api"
+  gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git"
 end

data/README.md

@@ -9,7 +9,7 @@ Manage a Cookbook or an Application's Cookbook dependencies
 
 ## Installation
 
-Berkshelf is now included as part of the [Chef-DK](http://chef.io/downloads/chef-dk). This is fastest, easiest, and the recommended installation method for getting up and running with Berkshelf.
+Berkshelf is now included as part of the [Chef-DK](https://downloads.chef.io/chef-dk/). This is fastest, easiest, and the recommended installation method for getting up and running with Berkshelf.
 
 > note: You may need to uninstall the Berkshelf gem especially if you are using a Ruby version manager you may need to uninstall all Berkshelf gems from each Ruby installation.
 

data/features/commands/search.feature

@@ -11,6 +11,6 @@ Feature: berks search
     * the output should contain:
       """
       berkshelf-api (1.2.2)
-      berkshelf-api-server (2.1.0)
+      berkshelf-api-server (2.1.1)
       berkshelf-cookbook-fixture (1.0.0)
       """

data/lib/berkshelf/berksfile.rb

@@ -31,7 +31,7 @@ module Berkshelf
 
     # Don't vendor VCS files.
     # Reference GNU tar --exclude-vcs: https://www.gnu.org/software/tar/manual/html_section/tar_49.html
-    EXCLUDED_VCS_FILES_WHEN_VENDORING = ['.arch-ids', '{arch}', '.bzr', '.bzrignore', '.bzrtags', 'CVS', '.cvsignore', '_darcs', '.git', '.hg', '.hgignore', '.hgrags', 'RCS', 'SCCS', '.svn'].freeze
+    EXCLUDED_VCS_FILES_WHEN_VENDORING = ['.arch-ids', '{arch}', '.bzr', '.bzrignore', '.bzrtags', 'CVS', '.cvsignore', '_darcs', '.git', '.hg', '.hgignore', '.hgrags', 'RCS', 'SCCS', '.svn', '**/.git'].freeze
 
     include Mixin::Logging
     include Cleanroom

data/lib/berkshelf/community_rest.rb

@@ -69,7 +69,7 @@ module Berkshelf
     # @option options [Float] :retry_interval (0.5)
     #   how often we should pause between retries
     def initialize(uri = V1_API, options = {})
-      options         = options.reverse_merge(retries: 5, retry_interval: 0.5)
+      options         = options.reverse_merge(retries: 5, retry_interval: 0.5, ssl: { verify: Berkshelf::Config.instance.ssl.verify })
       @api_uri        = uri
       @retries        = options.delete(:retries)
       @retry_interval = options.delete(:retry_interval)
@@ -199,6 +199,7 @@ module Berkshelf
         options = {}
         options.merge!(headers)
         options.merge!(open_uri_proxy_options)
+		    options.merge!(ssl_verify_mode: ssl_verify_mode)
       end
 
       def open_uri_proxy_options
@@ -208,5 +209,13 @@ module Berkshelf
           {}
         end
       end
+
+      def ssl_verify_mode
+        if Berkshelf::Config.instance.ssl.verify.nil? || Berkshelf::Config.instance.ssl.verify
+          OpenSSL::SSL::VERIFY_PEER
+        else
+          OpenSSL::SSL::VERIFY_NONE
+        end
+      end
   end
 end

data/lib/berkshelf/downloader.rb

@@ -75,7 +75,7 @@ module Berkshelf
         Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
         Ridley.open(credentials) { |r| r.cookbook.download(name, version) }
       when :github
-        require 'octokit' unless defined?(Octokit)
+        Thread.exclusive { require 'octokit' unless defined?(Octokit) }
 
         tmp_dir      = Dir.mktmpdir
         archive_path = File.join(tmp_dir, "#{name}-#{version}.tar.gz")
@@ -119,7 +119,7 @@ module Berkshelf
 
         File.join(unpack_dir, cookbook_directory)
       when :uri
-        require 'open-uri' unless defined?(OpenURI)
+        Thread.exclusive { require 'open-uri' unless defined?(OpenURI) }
 
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"

data/lib/berkshelf/source.rb

@@ -53,7 +53,7 @@ module Berkshelf
       universe
         .select { |cookbook| cookbook.name =~ Regexp.new(name) }
         .group_by(&:name)
-        .collect { |name, versions| versions.max_by(&:version) }
+        .collect { |name, versions| versions.max_by { |v| Semverse::Version.new(v.version) } }
     end
 
     # Determine if this source is a "default" source, as defined in the

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 end

data/spec/unit/berkshelf/source_spec.rb

@@ -38,5 +38,21 @@ module Berkshelf
         expect(instance).to_not be_default
       end
     end
+
+    describe "#search" do
+      let (:cookbooks) {[ 
+        APIClient::RemoteCookbook.new("cb1","1.0.8"),
+        APIClient::RemoteCookbook.new("cb1","1.0.22")
+      ]}
+
+      before do
+        allow_any_instance_of(APIClient::Connection).to receive(:universe).and_return(cookbooks)
+      end
+
+      it "returns the latest version" do
+        instance = described_class.new(Berksfile::DEFAULT_API_URL)
+        expect(instance.search("cb1")).to eq [cookbooks[1]]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable