berktacular 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3e9b9b079fa0ae95ffd0bad4b3477caf4b083c
-  data.tar.gz: 29166df572df6ef73ffc02ebcfb287326c1cdb66
+  metadata.gz: 30147b682d76ffba4a4826f973b647444cfefafe
+  data.tar.gz: 8d3dcb173bbbffe624f5d564e0180e1587dbbe68
 SHA512:
-  metadata.gz: e2fac51cbd6c5fb901fb4179c3b92d81a6ed70937c645648223866a102d6f7db043e954c0d3955da2712939a1d232be6fd5deadb73e07c03f2740288eca4d0ad
-  data.tar.gz: 924cd1701c2053a37ad6158316264107777dd532681fdbe7a8caf367d42c8c80af24f6fddca12c8c634faa501d409a252943d0facf2aea61fb9692d9afc1f414
+  metadata.gz: 211a8fd5dc46ed3e66b32f034c7ca4ad165dd3fc5bea24ca192d29447468a2f7b6390f550aa8510c83989d7eb0c5dcf8bd47419cd8510db352eaa5c26b1e6c23
+  data.tar.gz: ea854a987a45998725080fe56217078de7b56ce9f85fc1ad647edbd9a32041859e19e3df93d6fddf8c3fc4c2c11fb2e3cbdc0780a62138bac95c4681063a40c0

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/bin/berktacular

@@ -18,6 +18,7 @@ upload      = false
 berks_conf  = nil
 knife_conf  = nil
 workdir     = nil
+parent_env_dir = nil
 verbose     = false
 source_list = []
 versions_only = false
@@ -69,6 +70,9 @@ options =  OptionParser.new do |opts|
     workdir = w
     preserve = true
   end
+  opts.on("--parent-env-directory DIR", String, "Directory to search for parent environments. Defaults to the directory of the env file") do |t|
+    parent_env_dir = t
+  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 " \
@@ -161,7 +165,8 @@ b = Berktacular::Berksfile.new(
   github_token: github_token,
   verbose: verbose,
   source_list: source_list,
-  multi_cookbook_dir: multi_cookbook_dir
+  multi_cookbook_dir: multi_cookbook_dir,
+  parent_env_dir: parent_env_dir
 )
 b.check_updates if check
 puts "#{b}" if printit

data/lib/berktacular/berksfile.rb

@@ -46,7 +46,8 @@ module Berktacular
         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
+        max_depth:      opts.has_key?(:max_depth) ? opts[:max_depth] : 10,
+        parent_env_dir: opts.has_key?(:parent_env_dir) ? opts[:parent_env_dir] : nil
       }
       @counter  = 0
       @env_hash =  expand_env_file(env_path)
@@ -254,10 +255,11 @@ module Berktacular
         raise "Environment file '#{env_file}' does not exist!"
       end
       if env.has_key?("parent")
+        parent_env_dir = @opts[:parent_env_dir].nil? ? File.dirname(env_file) : @opts[:parent_env_dir]
         parent = env["parent"]
         if !File.exists?(parent)
           parent = File.join(
-            File.dirname(env_file),
+            parent_env_dir,
             parent
           )
         end

data/lib/berktacular/cookbook.rb

@@ -113,7 +113,6 @@ module Berktacular
         if config.has_key?('github')
           line << "git: \"git@github.com:#{config['github']}.git\""
           line << "rel: \"#{config['rel']}\"" if config.has_key?('rel')
-          line << 'protocol: :ssh'
         end
         if @versions.has_key?(ver)
           line << "ref: \"#{@versions[ver]['ref']}\""

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ridley
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: ridley
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +84,16 @@ dependencies:
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -132,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Parse chef env files, generates a Berksfile and verifies it.
 test_files: []
-has_rdoc: