berkshelf 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be55c4c1bb887daab19c58ef3a4f2f905af29033
-  data.tar.gz: f0d4402fa9850c728b51ba239fec76de438fef1f
+  metadata.gz: bf7c3d3ea8e0b023a45bc50f25be258b223b309d
+  data.tar.gz: 3ec8c78126055e0185a1ebdf580d09876d420f3a
 SHA512:
-  metadata.gz: fe6cbe54f7acb7d5cdae6cced81df057585c0b8efba3fe532d7fd72ef7f28449f1a05a7859c977acf39f01090a0ec34da5ff3416ced45a9dd8df552aa7c126d7
-  data.tar.gz: 5d92e870bcac605248af9bfc0d7c5c8b827d63ea11014c7a95ff66177fcb6d67ec056f94d2605d22064a38f251ffa725799ecaf3ff202b7611dcaf3a15b2e955
+  metadata.gz: c086ee08241ace4cc037cb88d86bd76afb102f5a8fb8edfa9af20616e236a2ef6899a08f787c407cee1a282cf026c994c0860a6e7187b375384c082979597aff
+  data.tar.gz: 19e8906d4b3971d28f1505dc2296fc1de85a7fb2013c5f47145c397d2fe5950f4b0cb021c6c5deffb8e017c36404e7a8daad3c99410d32371c4c8c5fe990e291

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 > 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.1
+
+* Bug Fixes
+  * Fix issue with copying raw metadata when vendoring / packaging.
+  * Berkshelf should cleanup any temporary directories it creates. There is still work to be done in any of Berkshelf's dependencies.
+
 # 3.2.0
 
 * Improvements

data/lib/berkshelf.rb

@@ -8,7 +8,6 @@ require 'ridley'
 require 'semverse'
 require 'solve'
 require 'thor'
-require 'tmpdir'
 require 'uri'
 require 'celluloid'
 
@@ -105,20 +104,6 @@ module Berkshelf
       end
     end
 
-    # @return [String]
-    def tmp_dir
-      File.join(berkshelf_path, 'tmp')
-    end
-
-    # Creates a temporary directory within the Berkshelf path
-    #
-    # @return [String]
-    #   path to the created temporary directory
-    def mktmpdir
-      FileUtils.mkdir_p(tmp_dir)
-      Dir.mktmpdir(nil, tmp_dir)
-    end
-
     # @return [Berkshelf::CookbookStore]
     def cookbook_store
       CookbookStore.instance

data/lib/berkshelf/berksfile.rb

@@ -574,48 +574,49 @@ module Berkshelf
     # @return [String, nil]
     #   the expanded path cookbooks were vendored to or nil if nothing was vendored
     def vendor(destination)
-      scratch          = Berkshelf.mktmpdir
-      chefignore       = nil
-      cached_cookbooks = install
+      Dir.mktmpdir do |scratch|
+        chefignore       = nil
+        cached_cookbooks = install
 
-      return nil if cached_cookbooks.empty?
+        return nil if cached_cookbooks.empty?
 
-      cached_cookbooks.each do |cookbook|
-        Berkshelf.formatter.vendor(cookbook, destination)
-        cookbook_destination = File.join(scratch, cookbook.cookbook_name)
-        FileUtils.mkdir_p(cookbook_destination)
+        cached_cookbooks.each do |cookbook|
+          Berkshelf.formatter.vendor(cookbook, destination)
+          cookbook_destination = File.join(scratch, cookbook.cookbook_name)
+          FileUtils.mkdir_p(cookbook_destination)
 
-        # Dir.glob does not support backslash as a File separator
-        src   = cookbook.path.to_s.gsub('\\', '/')
-        files = FileSyncer.glob(File.join(src, '*'))
+          # Dir.glob does not support backslash as a File separator
+          src   = cookbook.path.to_s.gsub('\\', '/')
+          files = FileSyncer.glob(File.join(src, '*'))
 
-        chefignore = Ridley::Chef::Chefignore.new(cookbook.path.to_s) rescue nil
-        chefignore.apply!(files) if chefignore
+          chefignore = Ridley::Chef::Chefignore.new(cookbook.path.to_s) rescue nil
+          chefignore.apply!(files) if chefignore
 
-        unless cookbook.compiled_metadata?
-          cookbook.compile_metadata(cookbook_destination)
+          unless cookbook.compiled_metadata?
+            cookbook.compile_metadata(cookbook_destination)
+          end
+
+          FileUtils.cp_r(files, cookbook_destination)
         end
 
-        FileUtils.cp_r(files, cookbook_destination)
+        # Don't vendor the raw metadata (metadata.rb). The raw metadata is
+        # unecessary for the client, and this is required until compiled metadata
+        # (metadata.json) takes precedence over raw metadata in the Chef-Client.
+        #
+        # We can change back to including the raw metadata in the future after
+        # this has been fixed or just remove these comments. There is no
+        # circumstance that I can currently think of where raw metadata should
+        # ever be read by the client.
+        #
+        # - Jamie
+        #
+        # See the following tickets for more information:
+        #
+        #   * https://tickets.opscode.com/browse/CHEF-4811
+        #   * https://tickets.opscode.com/browse/CHEF-4810
+        FileSyncer.sync(scratch, destination, exclude: ['**/metadata.rb'])
       end
 
-      # Don't vendor the raw metadata (metadata.rb). The raw metadata is
-      # unecessary for the client, and this is required until compiled metadata
-      # (metadata.json) takes precedence over raw metadata in the Chef-Client.
-      #
-      # We can change back to including the raw metadata in the future after
-      # this has been fixed or just remove these comments. There is no
-      # circumstance that I can currently think of where raw metadata should
-      # ever be read by the client.
-      #
-      # - Jamie
-      #
-      # See the following tickets for more information:
-      #
-      #   * https://tickets.opscode.com/browse/CHEF-4811
-      #   * https://tickets.opscode.com/browse/CHEF-4810
-      FileSyncer.sync(scratch, destination, exclude: ["**/*/metadata.rb"])
-
       destination
     end
 

data/lib/berkshelf/community_rest.rb

@@ -10,7 +10,7 @@ module Berkshelf
       #   file path to extract the contents of the target to
       #
       # @return [String]
-      def unpack(target, destination = Dir.mktmpdir)
+      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)
@@ -18,6 +18,7 @@ module Berkshelf
         else
           raise Berkshelf::UnknownCompressionType.new(target)
         end
+
         FileUtils.rm_rf Dir.glob("#{destination}/**/PaxHeader")
         destination
       end
@@ -100,7 +101,8 @@ module Berkshelf
     #   cookbook filepath, or nil if archive does not contain a cookbook
     def download(name, version)
       archive   = stream(find(name, version)[:file])
-      extracted = self.class.unpack(archive.path)
+      scratch = Dir.mktmpdir
+      extracted = self.class.unpack(archive.path, scratch)
 
       if File.cookbook?(extracted)
         extracted

data/lib/berkshelf/downloader.rb

@@ -15,7 +15,10 @@ module Berkshelf
       @berksfile = berksfile
     end
 
-    # Download the given Berkshelf::Dependency.
+    # Download the given Berkshelf::Dependency. If the optional block is given,
+    # the temporary path to the cookbook is yielded and automatically deleted
+    # when the block returns. If no block is given, it is the responsibility of
+    # the caller to remove the tmpdir.
     #
     # @param [String] name
     # @param [String] version
@@ -25,12 +28,18 @@ module Berkshelf
     # @raise [CookbookNotFound]
     #
     # @return [String]
-    def download(*args)
+    def download(*args, &block)
       options = args.last.is_a?(Hash) ? args.pop : Hash.new
       dependency, version = args
 
       sources.each do |source|
         if result = try_download(source, dependency, version)
+          if block_given?
+            value = yield result
+            FileUtils.rm_rf(result)
+            return value
+          end
+
           return result
         end
       end

data/lib/berkshelf/installer.rb

@@ -102,8 +102,9 @@ module Berkshelf
 
             Berkshelf.formatter.install(source, cookbook)
 
-            stash = downloader.download(name, version)
-            CookbookStore.import(name, version, stash)
+            downloader.download(name, version) do |stash|
+              CookbookStore.import(name, version, stash)
+            end
           end
         end
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -78,6 +78,7 @@ describe Berkshelf::CommunityREST do
     before do
       allow(subject).to receive(:stream).with(any_args()).and_return(archive)
       allow(Berkshelf::CommunityREST).to receive(:unpack)
+        .and_return('/some/path')
     end
 
     it 'unpacks the archive' do
@@ -87,7 +88,10 @@ describe Berkshelf::CommunityREST do
         headers: { 'Content-Type' => 'application/json' },
       )
 
-      expect(Berkshelf::CommunityREST).to receive(:unpack).with('/foo/bar').once.and_return('/foo/nginx')
+      expect(Berkshelf::CommunityREST).to receive(:unpack)
+        .with('/foo/bar', String)
+        .and_return('/foo/nginx')
+        .once
       expect(archive).to receive(:unlink).once
 
       subject.download('bacon', '1.0.0')

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -1,17 +1,30 @@
 require 'spec_helper'
 
 describe Berkshelf::CookbookGenerator do
-  let(:name) { 'sparkle_motion' }
+  let(:name)             { 'sparkle_motion' }
+  let(:license)          { 'reserved' }
+  let(:maintainer)       { 'Berkshelf Core' }
+  let(:maintainer_email) { 'core@berkshelf.com' }
+
   let(:target) { tmp_path.join(name) }
   let(:kitchen_generator) { double('kitchen-generator', invoke_all: nil) }
 
   before do
-    allow(Kitchen::Generator::Init).to receive(:new).with(any_args()).and_return(kitchen_generator)
+    allow(Kitchen::Generator::Init)
+      .to receive(:new)
+      .with(any_args())
+      .and_return(kitchen_generator)
   end
 
   context 'with default options' do
     before do
-      capture(:stdout) { Berkshelf::CookbookGenerator.new([target, name]).invoke_all }
+      capture(:stdout) do
+        Berkshelf::CookbookGenerator.new([target, name],
+          license:          license,
+          maintainer:       maintainer,
+          maintainer_email: maintainer_email,
+        ).invoke_all
+      end
     end
 
     it "generates a new cookbook" do
@@ -26,7 +39,7 @@ describe Berkshelf::CookbookGenerator do
           file 'default.rb' do
             contains '# Cookbook Name:: sparkle_motion'
             contains '# Recipe:: default'
-            contains "# Copyright (C) #{Time.now.year} YOUR_NAME"
+            contains "# Copyright (C) #{Time.now.year} Berkshelf Core"
             contains '# All rights reserved - Do Not Redistribute'
           end
         end
@@ -35,7 +48,7 @@ describe Berkshelf::CookbookGenerator do
           directory 'default'
         end
         file 'LICENSE' do
-          contains "Copyright (C) #{Time.now.year} YOUR_NAME"
+          contains "Copyright (C) #{Time.now.year} Berkshelf Core"
           contains 'All rights reserved - Do Not Redistribute'
         end
         file 'README.md' do
@@ -44,7 +57,7 @@ describe Berkshelf::CookbookGenerator do
           contains "    <td><tt>['sparkle_motion']['bacon']</tt></td>"
           contains "Include `sparkle_motion` in your node's `run_list`:"
           contains '    "recipe[sparkle_motion::default]"'
-          contains 'Author:: YOUR_NAME (<YOUR_EMAIL>)'
+          contains 'Author:: Berkshelf Core (<core@berkshelf.com>)'
         end
         file 'CHANGELOG.md' do
           contains '# 0.1.0'
@@ -52,8 +65,8 @@ describe Berkshelf::CookbookGenerator do
         end
         file 'metadata.rb' do
           contains "name             'sparkle_motion'"
-          contains "maintainer       'YOUR_NAME'"
-          contains "maintainer_email 'YOUR_EMAIL'"
+          contains "maintainer       'Berkshelf Core'"
+          contains "maintainer_email 'core@berkshelf.com'"
           contains "license          'All rights reserved'"
           contains "description      'Installs/Configures sparkle_motion'"
         end

data/spec/unit/berkshelf/file_syncer_spec.rb

@@ -180,6 +180,19 @@ module Berkshelf
           expect("#{destination}/.file_g").to be_a_file
         end
 
+        it 'does not copy files and folder matching a pattern with a wildcard' do
+          described_class.sync(source, destination, exclude: '**/file_e')
+
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to_not be_a_file
+          expect("#{destination}/.dot_folder").to be_a_directory
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+        end
+
         it 'removes existing files and folders in destination' do
           FileUtils.mkdir_p("#{destination}/existing_folder")
           FileUtils.touch("#{destination}/existing_file")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable