berkshelf 4.3.3 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0cbf16f01c0bcdadf86bd7e6ec8aef9af7e97e
-  data.tar.gz: 92860bdf3d253394c37d97e80e57f95246cfea6d
+  metadata.gz: c27a606d211874278312e4042caafc6216ea359e
+  data.tar.gz: ba10a2b3fb5062ab5b131736d9b6bf81364d97bd
 SHA512:
-  metadata.gz: 21cafcaad7db708ea675e18a0c71bc0a33d8702b30ec95bdf1dca1f1f1df0e5da032b7e6f8f48a2b1068a4b9f08cfc3f9e690fc0669f13421702c1e5f048def0
-  data.tar.gz: dd7bb1c777539df61d1527194008ebde8c9ff559610c48ae9d9a853c9bb81483b52939bfce2f41fe1cf82a7cca90fa88edb0eaa3421e1636f16d9829b0e278e8
+  metadata.gz: 67021e4486daa42743d41475869b6b32c47a86529c7c2ba908f2d896b408484819e267381adeec4522b10f73a97c652df03d53796ed02e52202bee60302c0b7e
+  data.tar.gz: 30e944818d39592b23cbaa267fc8788c2ab7ede8afd75cf0b3f0c5f5fbec95c912e4739bcbcfd62a84e1ad8c86c63b580cdd4c24934a8289381fc60d732b2a5e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [4.3.4](https://github.com/berkshelf/berkshelf/tree/4.3.4)(2016-06-13)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.3.3...4.3.4)
+
+**Merged pull requests:**
+
+- Use rubygem's tar implementation [\#1553](https://github.com/berkshelf/berkshelf/pull/1553)
+- Fixing some specs that fail on Windows [\#1554](https://github.com/berkshelf/berkshelf/pull/1554)
+- Deprecate `berks cookbook` in favor of `chef generate cookbook` [\#1565](https://github.com/berkshelf/berkshelf/pull/1565)
+- Deprecate `berks init` in favor of `chef generate cookbook` [\#1567](https://github.com/berkshelf/berkshelf/pull/1567)
+
 ## [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)
 

data/CONTRIBUTING.md

@@ -59,5 +59,6 @@ Once you are ready to release Berkshelf, perform the following:
 1. Update `CHANGELOG.md` with a new header indicating the version to be released
 1. Examine the diff ([example](https://github.com/berkshelf/berkshelf/compare/v4.0.1...master)) between master and the previous version.  Add all merged Pull Requests to the `CHANGELOG.md`
 1. Update `version.rb` to the desired release version
+1. Run `bundle update berkshelf`
 1. Create a PR and review the `version.rb` changes and `CHANGELOG.md` changes
 1. Once the PR is merged to master, run `rake release` on the master branch

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (4.3.3)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -31,6 +31,7 @@ PATH
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -80,7 +81,8 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.8.1)
+    chef-config (12.11.18)
+      fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.5.0)
@@ -132,6 +134,7 @@ GEM
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
+    fuzzyurl (0.8.0)
     gherkin (3.2.0)
     github_api (0.13.1)
       addressable (~> 2.4.0)
@@ -180,9 +183,9 @@ GEM
       guard (~> 1.1)
       spork (>= 0.8.4)
     hashdiff (0.3.0)
-    hashie (3.4.3)
-    hitimes (1.2.3)
-    hitimes (1.2.3-x86-mingw32)
+    hashie (3.4.4)
+    hitimes (1.2.4)
+    hitimes (1.2.4-x86-mingw32)
     http (0.9.9)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -192,7 +195,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
-    httpclient (2.7.1)
+    httpclient (2.7.2)
     i18n (0.7.0)
     ice_nine (0.11.2)
     iniparse (1.4.2)
@@ -207,11 +210,9 @@ GEM
     method_source (0.8.2)
     minitar (0.5.4)
     minitest (5.8.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.1.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
     mixlib-install (1.0.3)
       artifactory (>= 2.3.0)
@@ -223,7 +224,7 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.1.0)
-    molinillo (0.4.4)
+    molinillo (0.4.5)
     msgpack (0.5.12)
     msgpack (0.5.12-x86-mingw32)
     multi_json (1.11.2)
@@ -272,7 +273,7 @@ GEM
       http_parser.rb (>= 0.6.0)
       websocket-driver (>= 0.5.1)
     retryable (2.0.3)
-    ridley (4.5.0)
+    ridley (4.5.1)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
@@ -387,4 +388,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/berkshelf.gemspec

@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'octokit',              '~> 4.0'
   s.add_dependency 'celluloid',            '= 0.16.0'
   s.add_dependency 'celluloid-io',         '~> 0.16.1'
+  s.add_dependency 'mixlib-archive',       '~> 0.1'
 
   s.add_development_dependency 'aruba',         '~> 0.10.0' # Lock this here to avoid problems with public API changes
   s.add_development_dependency 'chef-zero',     '~> 4.0'

data/lib/berkshelf/cli.rb

@@ -269,6 +269,10 @@ module Berkshelf
 
     desc 'init [PATH]', 'Initialize Berkshelf in the given directory'
     def init(path = '.')
+      Berkshelf.formatter.deprecation <<EOF
+This command is being deprecated in favor of `chef generate cookbook` and will soon return an error.
+Please use `chef generate cookbook` instead of this command.
+EOF
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
       Berkshelf.formatter.deprecation '--vagrant is now the default' if options[:vagrant]
 
@@ -428,6 +432,10 @@ module Berkshelf
 
     desc 'cookbook NAME [PATH]', 'Create a skeleton for a new cookbook'
     def cookbook(name, path = nil)
+      Berkshelf.formatter.deprecation <<EOF
+This command is being deprecated in favor of `chef generate cookbook` and will soon return an error.
+Please use `chef generate cookbook` instead of this command.
+EOF
       path = File.join(Dir.pwd, name) if path.nil?
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
       Berkshelf.formatter.deprecation '--vagrant is now the default' if options[:vagrant]

data/lib/berkshelf/community_rest.rb

@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'retryable'
+require 'mixlib/archive'
 
 module Berkshelf
   class CommunityREST < Faraday::Connection
@@ -11,15 +12,12 @@ module Berkshelf
       #
       # @return [String]
       def unpack(target, destination)
-        if is_gzip_file(target)
-          Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open(target, 'rb')), destination)
-        elsif is_tar_file(target)
-          Archive::Tar::Minitar.unpack(target, destination)
+        if is_gzip_file(target) || is_tar_file(target)
+          Mixlib::Archive.new(target).extract(destination)
         else
           raise Berkshelf::UnknownCompressionType.new(target, destination)
         end
 
-        FileUtils.rm_rf Dir.glob("#{destination}/**/PaxHeader")
         destination
       end
 

data/lib/berkshelf/downloader.rb

@@ -1,6 +1,5 @@
 require 'net/http'
-require 'zlib'
-require 'archive/tar/minitar'
+require 'mixlib/archive'
 
 module Berkshelf
   class Downloader
@@ -109,8 +108,7 @@ module Berkshelf
         return nil unless resp.is_a?(Net::HTTPSuccess)
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
-        tgz = Zlib::GzipReader.new(File.open(archive_path, "rb"))
-        Archive::Tar::Minitar.unpack(tgz, unpack_dir)
+        Mixlib::Archive.new(archive_path).extract(unpack_dir)
 
         # we need to figure out where the cookbook is located in the archive. This is because the directory name
         # pattern is not cosistant between private and public github repositories
@@ -131,10 +129,7 @@ module Berkshelf
           archive_path.open('wb') { |local_file| local_file.write remote_file.read }
         end
 
-        archive_path.open('rb') do |file|
-          tgz = Zlib::GzipReader.new(file)
-          Archive::Tar::Minitar.unpack(tgz, unpack_dir.to_s)
-        end
+        Mixlib::Archive.new(archive_path).extract(unpack_dir)
 
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -7,18 +7,18 @@ describe Berkshelf::CommunityREST do
       let(:destination) { '/destination/bar' }
       let(:file) { double('file') }
       let(:gzip_reader) { double('gzip_reader') }
+      let(:archive) { double('mixlib_archive') }
 
       before do
         allow(File).to receive(:open).with(target, 'rb').and_return(file)
-        allow(Zlib::GzipReader).to receive(:new).with(file).and_return(gzip_reader)
-        allow(Archive::Tar::Minitar).to receive(:unpack).with(gzip_reader, destination)
+        allow(archive).to receive(:extract).with(destination)
+        allow(Mixlib::Archive).to receive(:new).with(target).and_return(archive)
       end
 
       it 'unpacks the tar' do
-        expect(File).to receive(:open).with(target, 'rb')
         expect(::IO).to receive(:binread).with(target, 2).and_return([0x1F, 0x8B].pack("C*"))
-        expect(Zlib::GzipReader).to receive(:new).with(file)
-        expect(Archive::Tar::Minitar).to receive(:unpack).with(gzip_reader, destination)
+        expect(Mixlib::Archive).to receive(:new).with(target).and_return(archive)
+        expect(archive).to receive(:extract).with(destination)
 
         expect(Berkshelf::CommunityREST.unpack(target, destination)).to eq(destination)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -256,6 +256,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: mixlib-archive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -635,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies