berktacular 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb6b4f68edec2f117fac5fe278528a608a147e7
-  data.tar.gz: bfac47d7cf35f86f56eb4d424b55f7b5684d85c7
+  metadata.gz: f7726b1582a4399d6a82bc73d9d9753b0e8d3943
+  data.tar.gz: cd4f5d8b9fa377f6deecffeb9d39b01435f76dbe
 SHA512:
-  metadata.gz: 067c4df6bf09bfc3891017c04c77b737a290cb28e1c435e0f4e79706b8d61c113bcb45536f387747a9aea951f82cabd0f77a727898fe09ca0a549d703e2c2336
-  data.tar.gz: 54674b306779da178c450f63783a60012d66e23fd57bc16b8c91868e79c29e3889fa38246bd47282de66c8b1fbb58871e1f3846ee5cda5454bccf245561a3b3a
+  metadata.gz: 9410e6368a66220dd90f2464d5b1387085034e419fbb102a05d8fb7f4340fe877ef8b0fa7dabbc0aeb6019208ca4863cde123a06b4df6b7163320b5b90b59bd4
+  data.tar.gz: 34893ffc90c76f9cd47980da97659bdb7c7a4a3f83d8c3e5304b6cc4ae47e58eae0c37e93eaf23f90d0e82d658e66bed8860e224a28c6c252dd70f8fab913ae6

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/bin/berktacular

@@ -21,6 +21,7 @@ workdir     = nil
 verbose     = false
 source_list = []
 versions_only = false
+multi_cookbook_dir = nil
 
 options =  OptionParser.new do |opts|
   opts.banner = "Read environment json file and spit out a berksfile"
@@ -68,6 +69,13 @@ options =  OptionParser.new do |opts|
     workdir = w
     preserve = true
   end
+  opts.on("-m PATH", "--multi-cookbook-dir PATH", String,
+      "Treat the given directory as a multi-cookbook directory, and allow referring to cookbooks " \
+      "under this directory when the 'rel' configuration parameter is specified and the version " \
+      "matches. This helps test pull requests that introduce a new cookbook version and " \
+      "update an environment file to point to that version at the same time.") do |m|
+    multi_cookbook_dir = m
+  end
   opts.on("-s", "--source SOURCE", String,
     "Add this source to the generated Berksfile in addition to the default source",
     "(https://api.berkshelf.com). This may be e.g. an internal Berkshelf API server URL.",
@@ -141,6 +149,12 @@ if upload
   end
 end
 
+if multi_cookbook_dir && !Dir.exists?(multi_cookbook_dir)
+  warn "The multi-cookbook directory not found at '#{multi_cookbook_dir}'"
+  warn options
+  exit 6
+end
+
 # We have to set our work dir now or berktacular will give us a new one each time we pass in nil.
 workdir = Berktacular.best_temp_dir unless workdir
 puts "Using workdir: '#{workdir}'" if verbose
@@ -152,7 +166,8 @@ b = Berktacular::Berksfile.new(
   upgrade: upgrade,
   github_token: github_token,
   verbose: verbose,
-  source_list: source_list
+  source_list: source_list,
+  multi_cookbook_dir: multi_cookbook_dir
 )
 b.check_updates if check
 puts "#{b}" if printit

data/lib/berktacular/berksfile.rb

@@ -35,7 +35,8 @@ module Berktacular
         :upgrade      => opts.has_key?(:upgrade)      ? opts[:upgrade]      : false,
         :github_token => opts.has_key?(:github_token) ? opts[:github_token] : nil,
         :verbose      => opts.has_key?(:verbose)      ? opts[:verbose]      : false,
-        :source_list  => opts.has_key?(:source_list)  ? opts[:source_list]  : []
+        :source_list  => opts.has_key?(:source_list)  ? opts[:source_list]  : [],
+        :multi_cookbook_dir => opts.has_key?(:multi_cookbook_dir) ? opts[:multi_cookbook_dir] : nil
       }
       @installed = {}
       # only connect once, pass the client to each cookbook.  and only if needed
@@ -194,7 +195,7 @@ module Berktacular
     # @return [Array] a list of Cookbook objects for this environment.
     def cookbooks
       @cookbooks ||= @cookbook_versions.sort.map do |book, version|
-        Cookbook.new(book, version, @cookbook_locations[book], @opts )
+        Cookbook.new(book, version, @cookbook_locations[book], @opts)
       end
     end
 
@@ -204,9 +205,9 @@ module Berktacular
       cookbooks.each do |b|
         candidates = b.check_updates
         next unless candidates.any?
-        puts  "Cookbook: #{b.name} (auto upgrade: #{b.auto_upgrade ? 'enabled' : 'disabled'})",
-              "\tCurrent: #{b.version_number}",
-              "\tUpdates: #{candidates.join(", ")}"
+        puts "Cookbook: #{b.name} (auto upgrade: #{b.auto_upgrade ? 'enabled' : 'disabled'})",
+             "\tCurrent: #{b.version_number}",
+             "\tUpdates: #{candidates.join(", ")}"
       end
     end
 

data/lib/berktacular/cookbook.rb

@@ -1,8 +1,9 @@
 require 'semverse'
+require 'ridley'
 
 module Berktacular
 
-  # This class represents a cookbook entry form a Berksfile
+  # This class represents a cookbook entry from a Berksfile
 
   class Cookbook
 
@@ -35,6 +36,7 @@ module Berktacular
       @upgrade          = opts.has_key?(:upgrade)      ? opts[:upgrade]         : false
       @git_client       = opts.has_key?(:git_client)   ? opts[:git_client].dup  : nil
       @verbose          = opts.has_key?(:verbose)      ? opts[:verbose]         : false
+      @multi_cookbook_dir = opts[:multi_cookbook_dir]
       check_updates if @auto_upgrade && @upgrade
     end
 
@@ -91,6 +93,22 @@ module Berktacular
       ver = (upgrade && @candidates && @candidates.first) || @version_number
       line = []
       if config
+        # Allow using coobkooks residing in subdirectories of a "multi-cookbook directory"
+        # (this can be e.g. the Chef repository) if the version matches.
+        if config.has_key?('rel') && @multi_cookbook_dir
+          local_cookbook_dir = File.join(@multi_cookbook_dir, config['rel'])
+          if Dir.exists?(local_cookbook_dir)
+            metadata_path = Dir["#{File.join(local_cookbook_dir, 'metadata')}.{rb,json}"].first
+            if metadata_path
+              metadata = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
+              if metadata.version == ver
+                line << "path: \"#{local_cookbook_dir}\""
+                return line.join(', ')
+              end
+            end
+          end
+        end
+
         if config.has_key?('github')
           line << "git: \"git@github.com:#{config['github']}.git\""
           line << "rel: \"#{config['rel']}\"" if config.has_key?('rel')
@@ -106,7 +124,7 @@ module Berktacular
           end
         end
       else
-        line << " \"#{ver}\""
+        line << "\"#{ver}\""
       end
       line.join(", ").gsub('%{version}', ver)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -139,12 +139,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- VERSION
 - bin/berktacular
 - lib/berktacular.rb
 - lib/berktacular/berksfile.rb
-- lib/berktacular/version.rb
 - lib/berktacular/cookbook.rb
-- VERSION
+- lib/berktacular/version.rb
 homepage: https://rubygems.org/gems/berktacular
 licenses:
 - Apache License, Version 2.0
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parse chef env files, generates a Berksfile and verifies it.