berktacular 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd96380cb5328cdcb55bb90c68f82bbf7c880d88
-  data.tar.gz: 3acd725fb400db94b90e9d5c715b93e3e827ff23
+  metadata.gz: dd3e9b9b079fa0ae95ffd0bad4b3477caf4b083c
+  data.tar.gz: 29166df572df6ef73ffc02ebcfb287326c1cdb66
 SHA512:
-  metadata.gz: 237987cab59af28eb1bbceb9be83025cce24202bce5f6a077ea430a631099926c975a9e7039a3b18a9c87c03f0ee301d4b01c806900dd8dafb57f032990c61a9
-  data.tar.gz: ce2bd2304cad516b5c0cea0718fd29f26d6fc419039017c2dd5dd653f7694a0e76d74b715462e8272269a125e7ce00b6b0e25f857a8a8aef7155e0e89e96ec4e
+  metadata.gz: e2fac51cbd6c5fb901fb4179c3b92d81a6ed70937c645648223866a102d6f7db043e954c0d3955da2712939a1d232be6fd5deadb73e07c03f2740288eca4d0ad
+  data.tar.gz: 924cd1701c2053a37ad6158316264107777dd532681fdbe7a8caf367d42c8c80af24f6fddca12c8c634faa501d409a252943d0facf2aea61fb9692d9afc1f414

data/VERSION

@@ -1 +1 @@
-1.2.2
+2.0.0

data/bin/berktacular

@@ -18,7 +18,6 @@ upload      = false
 berks_conf  = nil
 knife_conf  = nil
 workdir     = nil
-parent_env_dir = nil
 verbose     = false
 source_list = []
 versions_only = false
@@ -70,9 +69,6 @@ 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 " \
@@ -165,8 +161,7 @@ b = Berktacular::Berksfile.new(
   github_token: github_token,
   verbose: verbose,
   source_list: source_list,
-  multi_cookbook_dir: multi_cookbook_dir,
-  parent_env_dir: parent_env_dir
+  multi_cookbook_dir: multi_cookbook_dir
 )
 b.check_updates if check
 puts "#{b}" if printit

data/lib/berktacular/berksfile.rb

@@ -46,8 +46,7 @@ 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,
-        parent_env_dir: opts.has_key?(:parent_env_dir) ? opts[:parent_env_dir] : nil
+        max_depth:      opts.has_key?(:max_depth) ? opts[:max_depth] : 10
       }
       @counter  = 0
       @env_hash =  expand_env_file(env_path)
@@ -255,11 +254,10 @@ 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(
-            parent_env_dir,
+            File.dirname(env_file),
             parent
           )
         end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: solve
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -52,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +56,16 @@ dependencies:
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -166,8 +132,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Parse chef env files, generates a Berksfile and verifies it.
 test_files: []
+has_rdoc: