berktacular 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7726b1582a4399d6a82bc73d9d9753b0e8d3943
-  data.tar.gz: cd4f5d8b9fa377f6deecffeb9d39b01435f76dbe
+  metadata.gz: 2b550dd28f7c682c8659d022921d89a65785053a
+  data.tar.gz: c1c53aeeb4858818ccddb394229c2f38d8d3caa8
 SHA512:
-  metadata.gz: 9410e6368a66220dd90f2464d5b1387085034e419fbb102a05d8fb7f4340fe877ef8b0fa7dabbc0aeb6019208ca4863cde123a06b4df6b7163320b5b90b59bd4
-  data.tar.gz: 34893ffc90c76f9cd47980da97659bdb7c7a4a3f83d8c3e5304b6cc4ae47e58eae0c37e93eaf23f90d0e82d658e66bed8860e224a28c6c252dd70f8fab913ae6
+  metadata.gz: 638e0ef1f4a61e6754482c2b371dc1167a4671d27e4c297867ef2f1674fa82381e49f3cf37e2c3bdca30b8ad02fc9bd85a166c98d88276808f23d803272eeceb
+  data.tar.gz: 548d71a31fd89eb2781657a40fe85f075e0b3a0faf4956cdad663f3212ce77e538a111a4fcdd5d80f1b785fba75f17c5d5f3052f74822de32c800b5b1f69daaa

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.1

data/bin/berktacular

@@ -118,12 +118,6 @@ unless env_file && File.exist?(env_file)
   exit 2
 end
 
-my_env = JSON.parse( File.read( env_file ) )
-if versions_only
-  # Ignore cookbook locations. Only include versions in the generated Berksfile.
-  my_env.delete('cookbook_locations')
-end
-
 unless github_token
   if File.exists? gtoken_path
     github_token = IO.read(gtoken_path).strip
@@ -162,7 +156,7 @@ puts "Using workdir: '#{workdir}'" if verbose
 # Create a new berksfile
 puts "Checking updates, this can take some time..." if check || upgrade
 b = Berktacular::Berksfile.new(
-  my_env,
+  env_file,
   upgrade: upgrade,
   github_token: github_token,
   verbose: verbose,

data/lib/berktacular/berksfile.rb

@@ -1,5 +1,18 @@
 require 'ostruct'
 require 'json'
+require 'solve'
+
+# Taken from http://stackoverflow.com/a/25990044
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2|
+      Hash === v1 && Hash === v2 ?
+        v1.merge(v2, &merger) :
+        [:undefined, nil, :nil].include?(v2) ? v1 : v2
+    }
+    self.merge(second, &merger)
+  end
+end
 
 module Berktacular
 
@@ -25,19 +38,23 @@ module Berktacular
     # @option opts [True,False] :verbose (False) be more verbose.
     # @option opts [Array<String>] :source_list additional Berkshelf API sources to include in the
     #   generated Berksfile.
-    def initialize( environment, opts = {})
-      @env_hash           = environment # Save the whole thing so we can emit an updated version if needed.
-      @name               = environment['name']               || nil
-      @description        = environment['description']        || nil
-      @cookbook_versions  = environment['cookbook_versions']  || {}
-      @cookbook_locations = environment['cookbook_locations'] || {}
+    def initialize( env_path, opts = {})
       @opts = {
-        :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]  : [],
-        :multi_cookbook_dir => opts.has_key?(:multi_cookbook_dir) ? opts[:multi_cookbook_dir] : nil
+        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]  : [],
+        multi_cookbook_dir:  opts.has_key?(:multi_cookbook_dir) ? opts[:multi_cookbook_dir] : nil,
+        versions_only:  opts.has_key?(:versions_only) ? opts[:versions_only] : false,
+        max_depth:      opts.has_key?(:max_depth) ? opts[:max_depth] : 10
       }
+      @counter  = 0
+      @env_hash =  expand_env_file(env_path)
+
+      @name               = @env_hash['name']               || nil
+      @description        = @env_hash['description']        || nil
+      @cookbook_versions  = @env_hash['cookbook_versions']  || {}
+      @cookbook_locations = @env_hash['cookbook_locations'] || {}
       @installed = {}
       # only connect once, pass the client to each cookbook.  and only if needed
       connect_to_git if @opts[:upgrade]
@@ -225,6 +242,30 @@ module Berktacular
       )
     end
 
+    # recursively expand env_file @opts[:max_depth] times.
+    # @return [Hash] of merged env_file
+    def expand_env_file(env_file)
+      raise "Exceeded max depth!" if @counter > @opts[:max_depth]
+      @counter += 1
+      env = {}
+      if File.exists?(env_file)
+        env = JSON.parse( File.read(env_file) )
+      else
+        raise "Environment file '#{env_file}' does not exist!"
+      end
+      if env.has_key?("parent")
+        parent = env["parent"]
+        if !File.exists?(parent)
+          parent = File.join(
+            File.dirname(env_file),
+            parent
+          )
+        end
+        env = expand_env_file( parent ).deep_merge( env )
+      end
+      env
+    end
+
     def metadata_from_json(json_str)
       OpenStruct.new(JSON.parse(json_str))
     end

data/lib/berktacular/cookbook.rb

@@ -32,7 +32,8 @@ module Berktacular
       @version_solved   = Semverse::Version.new(@version_number)
       @auto_upgrade     = config && config['auto_upgrade']  || false
       @versions         = config && config['versions']      || {}
-      @config           = config ? config.reject{ |k,v| k == 'auto_upgrade' || k == 'versions' } : nil
+      @location         = config ? config.reject{ |k,v| k == 'auto_upgrade' || k == 'versions' } : nil
+      @version_only     = opts.has_key?(:versions_only) ? opts[:versions_only]  : false
       @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
@@ -58,15 +59,15 @@ module Berktacular
     # param upgrade [True,False] ('@upgrade') whether or not to force the lastest version when @auto_update is enabled
     # @return [String] a Berksfile line for this cookbook
     def line(upgrade = @upgrade)
-      "cookbook \"#{@name}\", #{generate_conf_line(upgrade, @config )}"
+      "cookbook \"#{@name}\", #{generate_conf_line(upgrade, @location )}"
     end
 
     # @return [Array] a list of available cookbook version newer then we started with, with most recent first
     def check_updates
       tag_re = Regexp.new(
-        "^#{ (@config || {})['tag'] || '%{version}' }$" % { :version => "(#{VERSION_RE.source})" }
+        "^#{ (@location || {})['tag'] || '%{version}' }$" % { version: "(#{VERSION_RE.source})" }
       )
-      @candidates ||= if @config && @config['github']
+      @candidates ||= if @location && @location['github']
         get_tags_from_github
       else
         []
@@ -92,7 +93,7 @@ module Berktacular
     def generate_conf_line(upgrade, config)
       ver = (upgrade && @candidates && @candidates.first) || @version_number
       line = []
-      if config
+      if config && ! @version_only
         # 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
@@ -117,10 +118,10 @@ module Berktacular
         if @versions.has_key?(ver)
           line << "ref: \"#{@versions[ver]['ref']}\""
         else
-          if !@config.has_key?('tag')
+          if !@location.has_key?('tag')
             line << "tag: \"#{ver}\""
           else
-            line << "tag: \"#{@config['tag']}\""
+            line << "tag: \"#{@location['tag']}\""
           end
         end
       else
@@ -132,9 +133,9 @@ module Berktacular
     # return [Array] a list of tags from the github repository of this cookbook.
     def get_tags_from_github
       @@tags_cache ||= {}
-      repo_path = @config['github']
+      repo_path = @location['github']
       return @@tags_cache[repo_path] if @@tags_cache[repo_path]
-      tags = @git_client.tags(@config['github']).map { |obj| obj.name }
+      tags = @git_client.tags(@location['github']).map { |obj| obj.name }
       @@tags_cache[repo_path] = tags
       tags
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -90,14 +90,14 @@ dependencies:
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Parse chef env files, generates a Berksfile and verifies it.