berkshelf 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dfb528241733545692cab7c850e1a35ff9f57aa
-  data.tar.gz: 2a6407bfbe5bdddd753810b460fa9f773e99e2ae
+  metadata.gz: 3e0cbf16f01c0bcdadf86bd7e6ec8aef9af7e97e
+  data.tar.gz: 92860bdf3d253394c37d97e80e57f95246cfea6d
 SHA512:
-  metadata.gz: bd7c57ae3367773a9352070667397b3fc4f350daecf11651e35b1692c4dbe5e8dae6201a83a43cb09355712fbaec2e490df7309ec9468753caaf1d6cd7edf509
-  data.tar.gz: 7eb2e959314c311eeb1d82d7e3f926ce46646edf386b0f662647b5dcb7be904917f5521e95592398d015e96ce31a6f038ffee8d6a21f2b76698cafe3c5a3307f
+  metadata.gz: 21cafcaad7db708ea675e18a0c71bc0a33d8702b30ec95bdf1dca1f1f1df0e5da032b7e6f8f48a2b1068a4b9f08cfc3f9e690fc0669f13421702c1e5f048def0
+  data.tar.gz: dd7bb1c777539df61d1527194008ebde8c9ff559610c48ae9d9a853c9bb81483b52939bfce2f41fe1cf82a7cca90fa88edb0eaa3421e1636f16d9829b0e278e8

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [4.3.3](https://github.com/berkshelf/berkshelf/tree/4.3.3) (2016-05-09)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.3.2...4.3.3)
+
+**Merged pull requests:**
+
+- Fixing some specs that fail on Windows [\#1554](https://github.com/berkshelf/berkshelf/pull/1554) ([tyler-ball](https://github.com/tyler-ball))
+- fix up @reset's review comments from \#1527 [\#1543](https://github.com/berkshelf/berkshelf/pull/1543) ([thommay](https://github.com/thommay))
+- Correct usage of Net::HTTP.new [\#1532](https://github.com/berkshelf/berkshelf/pull/1532) ([xeron](https://github.com/xeron))
+
 ## [4.3.2](https://github.com/berkshelf/berkshelf/tree/4.3.2) (2016-04-05)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.3.1...4.3.2)
 

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (4.3.2)
+    berkshelf (4.3.3)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)

data/lib/berkshelf/downloader.rb

@@ -102,9 +102,9 @@ module Berkshelf
         end
 
         # We use Net::HTTP.new and then get here, because Net::HTTP.get does not support proxy settings.
-        http = Net::HTTP.new(url.host,
-                             use_ssl: url.scheme == "https",
-                             verify_mode: (options[:ssl_verify].nil? || options[:ssl_verify]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE)
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = url.scheme == "https"
+        http.verify_mode = (options[:ssl_verify].nil? || options[:ssl_verify]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
         resp = http.get(url.request_uri)
         return nil unless resp.is_a?(Net::HTTPSuccess)
         open(archive_path, "wb") { |file| file.write(resp.body) }

data/lib/berkshelf/mixin/git.rb

@@ -13,7 +13,7 @@ module Berkshelf
       # @raise [String]
       #   the +$stdout+ from the command
       def git(command, error = true)
-        unless Berkshelf.which('git') || Berkshelf.which('git.exe')
+        unless Berkshelf.which('git') || Berkshelf.which('git.exe') || Berkshelf.which('git.bat')
           raise GitNotInstalled.new
         end
 

data/lib/berkshelf/source.rb

@@ -4,15 +4,9 @@ module Berkshelf
   class Source
     include Comparable
 
-    # @return [Berkshelf::SourceURI]
-    attr_accessor :uri
-
-    # @return [Berkshelf::APIClient]
-    attr_accessor :api_client
-
     attr_accessor :source
 
-    # @param [String, Berkshelf::SourceURI] uri
+    # @param [String, Berkshelf::SourceURI] source
     def initialize(source)
       @source = source
       @universe   = nil

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "4.3.2"
+  VERSION = "4.3.3"
 end

data/spec/unit/berkshelf/file_syncer_spec.rb

@@ -180,7 +180,7 @@ module Berkshelf
         end
       end
 
-      context 'with deeply nested paths and symlinks' do
+      context 'with deeply nested paths and symlinks', :not_supported_on_windows do
         let(:source) do
           source = File.join(tmp_path, 'source')
           FileUtils.mkdir_p(source)

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -5,16 +5,17 @@ describe Berkshelf::Lockfile do
   subject { Berkshelf::Lockfile.new(filepath: filepath) }
 
   describe '.from_berksfile' do
+    let(:lock_path) { File.absolute_path('/path/to/Bacon') }
     let(:berksfile) do
       double('Berksfile',
-        filepath: '/path/to/Bacon',
+        filepath: lock_path,
       )
     end
 
     subject { described_class.from_berksfile(berksfile) }
 
     it 'uses the basename of the Berksfile' do
-      expect(subject.filepath).to eq("/path/to/Bacon.lock")
+      expect(subject.filepath).to eq("#{lock_path}.lock")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -635,7 +635,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies