berkshelf 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3e18fe34db1ef6247c982bfcdee59145909ace
-  data.tar.gz: 2349d6fd268fe58dd5f28096bbd16aa57f8a4d57
+  metadata.gz: 5e3a4dcddb8f6d12c77772490069f719ead98156
+  data.tar.gz: dba1a0d5105358905a3c0ca3d54047e02d295ae8
 SHA512:
-  metadata.gz: 670473789eb3606bc9e867fbb6f28ce2858bfa1ef0092862627043008ffb7b807580bcfa06c3a01fb111a847144f9ff262041f93e0cc103e3b2db2a944101ecf
-  data.tar.gz: 0beb850938db36494f3ed5b272c6974706c57731cacc74ec62578a5c9f821fad1737dadbdd91a5f30f28be791b0b9781de9c685bcc73b121ad2202c1d7f3698e
+  metadata.gz: f933116dd5dbbe78186a8798e50cb9f15c92749e632fde5a7bdee589a74404d27ad049a020106e8dd5dbde4bba05befab68e2bd0850a388757a021bdcda08b76
+  data.tar.gz: 5d239e8b15c8a78138776a16a7e1795ea199c26a1978b506441124b23c6f54d54ee3cb5e836071103d6dd6cb919d808b8e674b71f3e6b307c1870c08d0c53e55

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [5.3.0](https://github.com/berkshelf/berkshelf/tree/5.3.0) (2016-12-15)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.2.0...5.3.0)
+## [5.4.0](https://github.com/berkshelf/berkshelf/tree/5.4.0) (2017-01-19)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.3.0...5.4.0)
+
+**Merged pull requests:**
+
+- vendor the metadata.rb file [\#1652](https://github.com/berkshelf/berkshelf/pull/1652) ([lamont-granquist](https://github.com/lamont-granquist))
+- Add a format option to berkz viz that outputs a dotfile [\#1646](https://github.com/berkshelf/berkshelf/pull/1646) ([borntyping](https://github.com/borntyping))
+
+## [v5.3.0](https://github.com/berkshelf/berkshelf/tree/v5.3.0) (2016-12-15)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.2.0...v5.3.0)
 
 **Merged pull requests:**
 
@@ -302,7 +310,7 @@
 - Fix typo in show cmd description [\#1187](https://github.com/berkshelf/berkshelf/pull/1187) ([dougireton](https://github.com/dougireton))
 - Do not care about ordered output during installation [\#1186](https://github.com/berkshelf/berkshelf/pull/1186) ([sethvargo](https://github.com/sethvargo))
 - Update README.md.erb [\#1183](https://github.com/berkshelf/berkshelf/pull/1183) ([mjuszczak](https://github.com/mjuszczak))
-- Fix Berkshelf::Graph\#update [\#1182](https://github.com/berkshelf/berkshelf/pull/1182) ([mjcdiggity](https://github.com/mjcdiggity))
+- Fix Berkshelf::Graph\#update [\#1182](https://github.com/berkshelf/berkshelf/pull/1182) ([carkmorwin](https://github.com/carkmorwin))
 - Update to buff-config ~\> 0.4 [\#1180](https://github.com/berkshelf/berkshelf/pull/1180) ([sethvargo](https://github.com/sethvargo))
 - Fix infinite lock check [\#1178](https://github.com/berkshelf/berkshelf/pull/1178) ([mi-wood](https://github.com/mi-wood))
 - Create a subclass of the shell instead of a module [\#1177](https://github.com/berkshelf/berkshelf/pull/1177) ([sethvargo](https://github.com/sethvargo))
@@ -359,7 +367,7 @@
 **Merged pull requests:**
 
 - `berks vendor` "cannot be trusted!" error [\#1124](https://github.com/berkshelf/berkshelf/pull/1124) ([JeanMertz](https://github.com/JeanMertz))
-- Fix community cookbook download error  [\#1123](https://github.com/berkshelf/berkshelf/pull/1123) ([mjcdiggity](https://github.com/mjcdiggity))
+- Fix community cookbook download error  [\#1123](https://github.com/berkshelf/berkshelf/pull/1123) ([carkmorwin](https://github.com/carkmorwin))
 - Remove gecode install instructions from README [\#1122](https://github.com/berkshelf/berkshelf/pull/1122) ([danielsdeleo](https://github.com/danielsdeleo))
 
 ## [v3.0.0.rc1](https://github.com/berkshelf/berkshelf/tree/v3.0.0.rc1) (2014-04-09)
@@ -1318,6 +1326,8 @@
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v0.1.0...v0.1.1)
 
 ## [v0.1.0](https://github.com/berkshelf/berkshelf/tree/v0.1.0) (2012-06-21)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/25612cf3601733a37727f1f490e69fdf48963d36...v0.1.0)
+
 **Merged pull requests:**
 
 - Rename to Berkshelf [\#54](https://github.com/berkshelf/berkshelf/pull/54) ([reset](https://github.com/reset))
@@ -1363,4 +1373,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -2,6 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :changelog do
+  gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
+end
+
 group :guard do
   gem 'coolline'
   gem 'guard'
@@ -30,6 +34,10 @@ group :guard do
   end
 end
 
+group :build do
+  gem 'rake',          '>= 10.1'
+end
+
 group :development do
   # these all deliberately float because berkshelf has a Gemfile.lock that
   # equality pins them.  temporarily pin as necessary for API breaks.
@@ -37,7 +45,6 @@ group :development do
   gem 'chef-zero',     '>= 4.0'
   gem 'dep_selector',  '>= 1.0'
   gem 'fuubar',        '>= 2.0'
-  gem 'rake',          '>= 10.1'
   gem 'rspec',         '>= 3.0'
   gem 'spork',         '>= 0.9'
   gem 'test-kitchen',  '>= 1.2'
@@ -47,10 +54,6 @@ group :development do
   gem 'activesupport', '~> 4.0'  # pinning for ruby 2.1.x
 end
 
-group :changelog do
-  gem 'github_changelog_generator', "1.11.3"
-end
-
 group :test do
   gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git", ref: "9fb3d95779c4ff72b0074072105caaf70b978bf0"
 end

data/Gemfile.lock

@@ -17,10 +17,24 @@ GIT
       semverse (>= 1.0, < 3.0)
       varia_model (~> 0.4)
 
+GIT
+  remote: https://github.com/tduffield/github-changelog-generator
+  revision: 8effcdd6988617b453669965fedc1280aa84bd7a
+  branch: adjust-tag-section-mapping
+  specs:
+    github_changelog_generator (1.14.2)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (>= 1.4)
+
 PATH
   remote: .
   specs:
-    berkshelf (5.3.0)
+    berkshelf (5.4.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -57,7 +71,6 @@ GEM
       ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
-    ast (2.3.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -97,7 +110,6 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    colorize (0.8.1)
     contracts (0.14.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
@@ -127,6 +139,8 @@ GEM
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
     ffi (1.9.14)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
@@ -136,20 +150,6 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gherkin (4.0.0)
-    github_api (0.14.5)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      oauth2 (~> 1.0)
-    github_changelog_generator (1.11.3)
-      bundler (>= 1.7)
-      colorize (~> 0.7)
-      github_api (~> 0.12)
-      overcommit (>= 0.31)
-      rake (>= 10.0)
-      rspec (>= 3.2)
-      rubocop (>= 0.31)
     grape (0.18.0)
       activesupport
       builder
@@ -202,9 +202,7 @@ GEM
     httpclient (2.8.2.4)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    iniparse (1.4.2)
     json (1.8.3)
-    jwt (1.5.6)
     libyajl2 (1.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -227,7 +225,7 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.4)
+    molinillo (0.5.5)
     msgpack (1.0.2)
     multi_json (1.12.1)
     multi_test (0.1.2)
@@ -247,20 +245,8 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    overcommit (0.37.0)
-      childprocess (~> 0.5.8)
-      iniparse (~> 1.4)
-    parser (2.3.3.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -268,7 +254,7 @@ GEM
     rack (2.0.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rainbow (2.1.0)
+    rainbow (2.2.1)
     rake (11.3.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
@@ -279,6 +265,7 @@ GEM
       http (>= 0.6.0.pre)
       http_parser.rb (>= 0.6.0)
       websocket-driver (>= 0.5.1)
+    retriable (3.0.0)
     retryable (2.0.4)
     ridley (5.1.0)
       addressable
@@ -311,12 +298,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.45.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
@@ -348,7 +329,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
@@ -380,7 +360,7 @@ DEPENDENCIES
   coolline
   dep_selector (>= 1.0)
   fuubar (>= 2.0)
-  github_changelog_generator (= 1.11.3)
+  github_changelog_generator!
   growl
   guard
   guard-cucumber
@@ -396,4 +376,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/lib/berkshelf/berksfile.rb

@@ -629,8 +629,6 @@ module Berkshelf
       Dir.mktmpdir('vendor') do |scratch|
         chefignore       = nil
         cached_cookbooks = install
-        raw_metadata_files = []
-
         return nil if cached_cookbooks.empty?
 
         cached_cookbooks.each do |cookbook|
@@ -649,27 +647,10 @@ 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
 
-        # 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: raw_metadata_files + EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: @delete)
+        FileSyncer.sync(scratch, destination, exclude: EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: @delete)
       end
 
       destination
@@ -694,12 +675,21 @@ module Berkshelf
     #
     # @return [String] path
     #   the path where the image was written
-    def viz(outfile = nil)
+    def viz(outfile = nil, format = 'png')
       outfile = File.join(Dir.pwd, outfile || 'graph.png')
 
       validate_lockfile_present!
       validate_lockfile_trusted!
-      Visualizer.from_lockfile(lockfile).to_png(outfile)
+      vizualiser = Visualizer.from_lockfile(lockfile)
+
+      case format
+      when 'dot'
+        vizualiser.to_dot_file(outfile)
+      when 'png'
+        vizualiser.to_png(outfile)
+      else
+        raise ConfigurationError, "Vizualiser format #{format} not recognised."
+      end
     end
 
     # Get the lockfile corresponding to this Berksfile. This is necessary because

data/lib/berkshelf/cli.rb

@@ -421,10 +421,16 @@ EOF
       desc: 'The name of the output file',
       aliases: '-o',
       banner: 'NAME'
+    method_option :outfile_format,
+      type: :string,
+      default: 'png',
+      desc: 'The format of the output file, either png or dot.',
+      aliases: '-f',
+      banner: 'FORMAT'
     desc "viz", "Visualize the dependency graph"
     def viz
       berksfile = Berksfile.from_options(options)
-      path = berksfile.viz(options[:outfile])
+      path = berksfile.viz(options[:outfile], options[:outfile_format])
 
       Berkshelf.ui.info(path)
     end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.3.0"
+  VERSION = "5.4.0"
 end

data/lib/berkshelf/visualizer.rb

@@ -76,6 +76,11 @@ module Berkshelf
       out
     end
 
+    def to_dot_file(outfile = 'graph.dot')
+      File.open(outfile, 'w') { |f| f.write(to_dot) }
+      File.expand_path(outfile)
+    end
+
     # Save the graph visually as a PNG.
     #
     # @param [String] outfile

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -387,10 +387,9 @@ describe Berkshelf::Berksfile do
   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(:options)    { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
+    let(:options)    { { :exclude => Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
 
     before do
       allow(Berkshelf::Installer).to receive(:new).and_return(installer)
@@ -402,9 +401,9 @@ describe Berkshelf::Berksfile do
       subject.vendor(destination)
     end
 
-    it 'excludes the top-level metadata.rb file' do
+    it 'includes the top-level metadata.rb file' do
       expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/recipes/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
-      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
+      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
     end
   end
 

data/spec/unit/berkshelf/visualizer_spec.rb

@@ -31,6 +31,15 @@ module Berkshelf
       end
 
       context 'when the graphviz command succeeds', :graphviz do
+        it 'builds a dot from a Lockfile' do
+          outfile = tmp_path.join('test-graph.dot').to_s
+          lockfile = Lockfile.from_file(fixtures_path.join('lockfiles/default.lock').to_s)
+
+          Visualizer.from_lockfile(lockfile).to_dot_file(outfile)
+
+          expect(File.exists?(outfile)).to be true
+        end
+
         it 'builds a png from a Lockfile' do
           outfile = tmp_path.join('test-graph.png').to_s
           lockfile = Lockfile.from_file(fixtures_path.join('lockfiles/default.lock').to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -478,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies