berkshelf 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7c3d3ea8e0b023a45bc50f25be258b223b309d
-  data.tar.gz: 3ec8c78126055e0185a1ebdf580d09876d420f3a
+  metadata.gz: 9fc48892092998c6c4609f996e7a0470b6dea6af
+  data.tar.gz: df867ca3468c988b011781e3c645f21a4eb8bfa6
 SHA512:
-  metadata.gz: c086ee08241ace4cc037cb88d86bd76afb102f5a8fb8edfa9af20616e236a2ef6899a08f787c407cee1a282cf026c994c0860a6e7187b375384c082979597aff
-  data.tar.gz: 19e8906d4b3971d28f1505dc2296fc1de85a7fb2013c5f47145c397d2fe5950f4b0cb021c6c5deffb8e017c36404e7a8daad3c99410d32371c4c8c5fe990e291
+  metadata.gz: 0423feeb86a7f1163daabb1ebf9e98aa6a69c945162bf48b39b83b08353a9402f035640519c028d6156d3c89a9802e44119966581b2a1f2f8b91bee419b808c5
+  data.tar.gz: ee5e644f38a0fa4a7a86b7565f290c749c0ab10be15716c54ac477e095315807280b49d8a1c779bf1317dd4217515bfe137b61c39f4f3e007f8546421e3c9288

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 > 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.2
+
+* Enhancements
+  * Use chef.io hostname in urls instead of getchef
+
+* Bug Fixes
+  * Fix syntax issue in generated Vagrantfile
+  * Only exclude the top level metadata.rb file when vendoring cookbooks rather than all files named metadata.rb
+  * Relative paths can now be passed to berks vendor
+
 # 3.2.1
 
 * Bug Fixes

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://getchef.com/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](http://chef.io/downloads/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/berksfile.feature

@@ -2,7 +2,7 @@ Feature: Evaluating a Berksfile
   Scenario: Containing pure Ruby
     Given I write to "Berksfile" with:
       """
-      source 'https://supermarket.getchef.com'
+      source 'https://supermarket.chef.io'
 
       if ENV['BACON']
         puts "If you don't got bacon..."

data/features/commands/upload.feature

@@ -407,7 +407,7 @@ Feature: berks upload
       """
     And the cookbook "fake" has the file "Berksfile" with:
       """
-      source 'https://supermarket.getchef.com'
+      source 'https://supermarket.chef.io'
       metadata
       """
     And the cookbook "fake" has the file "Berksfile.lock" with:

data/generator_files/Berksfile.erb

@@ -1,4 +1,4 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 <% if options[:chef_minitest] -%>
 
 group :integration do

data/generator_files/Vagrantfile.erb

@@ -18,7 +18,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   #   $ vagrant plugin install vagrant-omnibus
   #
-  if Vagrant.has_plugin?
+  if Vagrant.has_plugin?("vagrant-omnibus")
     config.omnibus.chef_version = '<%= berkshelf_config.vagrant.omnibus.version %>'
   end
 

data/lib/berkshelf/berksfile.rb

@@ -27,7 +27,11 @@ module Berkshelf
       end
     end
 
-    DEFAULT_API_URL = "https://supermarket.getchef.com".freeze
+    DEFAULT_API_URL = "https://supermarket.chef.io".freeze
+
+    # 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
 
     include Mixin::Logging
     include Cleanroom
@@ -168,7 +172,7 @@ module Berkshelf
     # in a second source would not be used.
     #
     # @example
-    #   source "https://supermarket.getchef.com"
+    #   source "https://supermarket.chef.io"
     #   source "https://berks-api.riotgames.com"
     #
     # @param [String] api_url
@@ -204,7 +208,7 @@ module Berkshelf
       if args.first == :opscode
         Berkshelf.formatter.deprecation "Your Berksfile contains a site location pointing to the Opscode Community " +
           "Site (site :opscode). Site locations have been replaced by the source location. Change this to: " +
-          "'source \"https://supermarket.getchef.com\"' to remove this warning. For more information visit " +
+          "'source \"https://supermarket.chef.io\"' to remove this warning. For more information visit " +
           "https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
         source(DEFAULT_API_URL)
         return
@@ -444,7 +448,7 @@ module Berkshelf
     #     "nginx" => {
     #       "local" => #<Version 1.8.0>,
     #       "remote" => {
-    #         #<Source uri: "https://supermarket.getchef.com"> #=> #<Version 2.6.2>
+    #         #<Source uri: "https://supermarket.chef.io"> #=> #<Version 2.6.2>
     #       }
     #     }
     #   }
@@ -574,9 +578,10 @@ module Berkshelf
     # @return [String, nil]
     #   the expanded path cookbooks were vendored to or nil if nothing was vendored
     def vendor(destination)
-      Dir.mktmpdir do |scratch|
+      Dir.mktmpdir('vendor') do |scratch|
         chefignore       = nil
         cached_cookbooks = install
+        raw_metadata_files = []
 
         return nil if cached_cookbooks.empty?
 
@@ -596,6 +601,8 @@ module Berkshelf
             cookbook.compile_metadata(cookbook_destination)
           end
 
+          raw_metadata_files << File::join(cookbook.cookbook_name, 'metadata.rb')
+
           FileUtils.cp_r(files, cookbook_destination)
         end
 
@@ -614,7 +621,7 @@ module Berkshelf
         #
         #   * https://tickets.opscode.com/browse/CHEF-4811
         #   * https://tickets.opscode.com/browse/CHEF-4810
-        FileSyncer.sync(scratch, destination, exclude: ['**/metadata.rb'])
+        FileSyncer.sync(scratch, destination, exclude: raw_metadata_files + EXCLUDED_VCS_FILES_WHEN_VENDORING)
       end
 
       destination

data/lib/berkshelf/community_rest.rb

@@ -50,7 +50,7 @@ module Berkshelf
         end
     end
 
-    V1_API = 'https://supermarket.getchef.com'.freeze
+    V1_API = 'https://supermarket.chef.io'.freeze
 
     # @return [String]
     attr_reader :api_uri

data/lib/berkshelf/errors.rb

@@ -450,7 +450,7 @@ module Berkshelf
       "default Berkshelf API server, add the following code to the top of " \
       "your Berksfile:" \
       "\n\n" \
-      "    source 'https://supermarket.getchef.com'"
+      "    source 'https://supermarket.chef.io'"
     end
   end
 

data/lib/berkshelf/file_syncer.rb

@@ -81,6 +81,7 @@ module Berkshelf
         when :link
           target = File.readlink(source_file)
 
+          destination = File.expand_path(destination)
           Dir.chdir(destination) do
             FileUtils.ln_sf(target, "#{destination}/#{relative_path}")
           end

data/lib/berkshelf/formatters/human.rb

@@ -57,7 +57,7 @@ module Berkshelf
     #
     # @param [Hash] hash
     #   the list of outdated cookbooks in the format
-    #   { 'cookbook' => { 'supermarket.getchef.com' => #<Cookbook> } }
+    #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       if hash.empty?
         Berkshelf.ui.info('All cookbooks up to date!')

data/lib/berkshelf/formatters/json.rb

@@ -89,7 +89,7 @@ module Berkshelf
     #
     # @param [Hash] hash
     #   the list of outdated cookbooks in the format
-    #   { 'cookbook' => { 'supermarket.getchef.com' => #<Cookbook> } }
+    #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       hash.each do |name, info|
         info['remote'].each do |remote_source, remote_version|

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -382,4 +382,28 @@ describe Berkshelf::Berksfile do
       subject.upload
     end
   end
+
+  describe '#vendor' do
+    let(:cached_cookbook)    { double(Berkshelf::CachedCookbook, cookbook_name: 'my_cookbook', path: '/my_cookbook/path', compiled_metadata?: true) }
+    let(:installer)          { double(Berkshelf::Installer, run: [cached_cookbook]) }
+    let(:raw_metadata_files) { [File::join(cached_cookbook.cookbook_name, 'metadata.rb')] }
+
+    let(:destination) { '/a/destination/path' }
+    let(:excludes)    { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING } }
+
+    before do
+      allow(Berkshelf::Installer).to receive(:new).and_return(installer)
+    end
+
+    it 'invokes FileSyncer with correct arguments' do
+      expect(Berkshelf::FileSyncer).to receive(:sync).with(/vendor/, destination, excludes)
+
+      subject.vendor(destination)
+    end
+
+    it 'excludes the top-level metadata.rb file' do
+      expect(excludes[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/recipes/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
+      expect(excludes[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
+    end
+  end
 end

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -71,7 +71,7 @@ describe Berkshelf::CookbookGenerator do
           contains "description      'Installs/Configures sparkle_motion'"
         end
         file 'Berksfile' do
-          contains 'source "https://supermarket.getchef.com"'
+          contains 'source "https://supermarket.chef.io"'
           contains 'metadata'
         end
         file 'Gemfile'

data/spec/unit/berkshelf/file_syncer_spec.rb

@@ -56,6 +56,45 @@ module Berkshelf
         FileUtils.touch(File.join(source, '.dot_folder', 'file_f'))
 
         FileUtils.touch(File.join(source, '.file_g'))
+
+        # VCS files: Arch
+        FileUtils.mkdir_p(File.join(source, '.arch-ids'))
+        FileUtils.mkdir_p(File.join(source, '{arch}'))
+
+        # VCS files: Bazaar
+        FileUtils.touch(File.join(source, '.bzr'))
+        FileUtils.touch(File.join(source, '.bzrignore'))
+        FileUtils.touch(File.join(source, '.bzrtags'))
+
+        # VCS files: CVS
+        FileUtils.mkdir_p(File.join(source, 'CVS'))
+        FileUtils.touch(File.join(source, '.cvsignore'))
+
+        # VCS files: Darcs
+        FileUtils.touch(File.join(source, '_darcs'))
+
+        # VCS files: git
+        FileUtils.mkdir_p(File.join(source, '.git', 'objects', '08'))
+        FileUtils.touch(File.join(source, '.git', 'HEAD'))
+        git_readonly_file = File.join(source, '.git', 'objects', '08', '01ddba0b1237b2e0e602cf5fdb6544561950cb')
+        FileUtils.touch(File.join(git_readonly_file))
+        FileUtils.chmod("ugo=r", git_readonly_file)
+        FileUtils.touch(File.join(source, '.gitignore'))
+
+        # VCS files: Mercurial
+        FileUtils.touch(File.join(source, '.hg'))
+        FileUtils.touch(File.join(source, '.hgignore'))
+        FileUtils.touch(File.join(source, '.hgrags'))
+
+        # VCS files: RCS
+        FileUtils.mkdir_p(File.join(source, 'RCS'))
+
+        # VCS files: SCCS
+        FileUtils.mkdir_p(File.join(source, 'SCCS'))
+
+        # VCS files: Subversion
+        FileUtils.mkdir_p(File.join(source, '.svn'))
+
         source
       end
 
@@ -99,6 +138,46 @@ module Berkshelf
           expect("#{destination}/existing_file").to_not be_a_file
           expect("#{destination}/.existing_file").to_not be_a_file
         end
+
+        it 'skips excluded VCS files' do
+          described_class.sync(source, destination, exclude: Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING)
+
+          # VCS files: Arch
+          expect("#{destination}/.arch-ids").to_not be_a_directory
+          expect("#{destination}/{arch}").to_not be_a_directory
+
+          # VCS files: Bazaar
+          expect("#{destination}/.bzr").to_not be_a_file
+          expect("#{destination}/.bzrignore").to_not be_a_file
+          expect("#{destination}/.bzrtags").to_not be_a_file
+
+          # VCS files: CVS
+          expect("#{destination}/CVS").to_not be_a_directory
+          expect("#{destination}/.cvsignore").to_not be_a_file
+
+          # VCS files: Darcs
+          expect("#{destination}/_darcs").to_not be_a_file
+
+          # VCS files: git
+          expect("#{destination}/.git/objects/08/01ddba0b1237b2e0e602cf5fdb6544561950cb").to_not be_a_file
+          expect("#{destination}/.git/HEAD").to_not be_a_file
+          expect("#{destination}/.git").to_not be_a_directory
+
+          # VCS files: Mercurial
+          expect("#{destination}/.hg").to_not be_a_file
+          expect("#{destination}/.hgignore").to_not be_a_file
+          expect("#{destination}/.hgrags").to_not be_a_file
+
+          # VCS files: RCS
+          expect("#{destination}/RCS").to_not be_a_directory
+
+          # VCS files: SCCS
+          expect("#{destination}/SCCS").to_not be_a_directory
+
+          # VCS files: Subversion
+          expect("#{destination}/.svn").to_not be_a_directory
+
+        end
       end
 
       context 'with deeply nested paths and symlinks' do
@@ -164,6 +243,16 @@ module Berkshelf
 
           expect("#{destination}/root").to be_a_symlink_to('/foo/bar')
         end
+
+        it 'copies relative and absolute symlinks when destination is a relative path' do
+          described_class.sync(source, "#{destination.gsub(Dir.pwd, '.')}")
+
+          expect("#{destination}/links/index.html").to be_a_symlink_to("./home.html")
+          expect("#{destination}/links/default.html").to be_a_symlink_to("./home.html")
+          expect("#{destination}/links/apt").to be_a_symlink_to("../source/bin/apt")
+          expect("#{destination}/root").to be_a_symlink_to('/foo/bar')
+        end
+
       end
 
       context 'when :exclude is given' do

data/spec/unit/berkshelf/installer_spec.rb

@@ -6,7 +6,7 @@ describe Berkshelf::Installer do
   subject { described_class.new(berksfile) }
 
   describe "#build_universe" do
-    let(:source_one) { double('one', uri: 'https://supermarket.getchef.com') }
+    let(:source_one) { double('one', uri: 'https://supermarket.chef.io') }
     let(:source_two) { double('two', uri: 'https://api.chef.org') }
     let(:sources) { [ source_one, source_two ] }
 

data/spec/unit/berkshelf/source_spec.rb

@@ -29,7 +29,7 @@ module Berkshelf
       end
 
       it 'returns true when the scheme is different' do
-        instance = described_class.new('http://supermarket.getchef.com')
+        instance = described_class.new('http://supermarket.chef.io')
         expect(instance).to be_default
       end
 

metadata

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