berktacular 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYzNTEyMDVhOTg4NzViYWQxOTM3MjNlZDI2NWQ0MWQzY2E2MDIxZQ==
+    ZTZkZDMxZjZhNjhhMTE4OGFiOThiZGY4NzYzZDY0Y2UxNTBhMDhlYQ==
   data.tar.gz: !binary |-
-    YTIyZTIyODlkM2JiNmY1N2IyZWY5NGViOTEzY2ZhZGUwMDM3ZTBmZQ==
+    ZDY2ODBmYTkyM2Y4ZGI2OTVlMWM0MTI0NjYzNTNmYWIwMjE2MjkwYw==
 SHA512:
   metadata.gz: !binary |-
-    YTEyYjcwZjQ4ZjEwMTc1ZGMxYzcwYWYwYzZiNDFmZDI2N2M1YmIwN2FhMDk4
-    ZDdkOTVkY2E1ZjYzM2E1MWYyOTVhZWM5NTI2OGJjZGMyMWM1YzJhNTJlYjkx
-    MDMzMDk1NDYzNmZjOTQ0YTk0MGZjMTBlMTBmMzNmMTA0OTAxOGI=
+    NWU4ZDJiMWQxZTliYWVhMWRiZjQzNDU4NGJjZTIxYzAwZjFhYWUyODk3ZmIx
+    OWZiOGJmYjllM2RlZTA4YmNiZTJiNGU1YWE3NzI0OGMyMmM0ZDAzMmI3MGM1
+    MDNiM2ZjNWFhMWI4ZWFhYTI3NTQyMzM0YzMxMTYxNDMxMmRhYTA=
   data.tar.gz: !binary |-
-    NjJhM2EzYzczMDczMWE1OTQxNjFhNGM5NTBkZGYwYTBiMTM0NDJlNWEyYWYx
-    YzZiMzY5OWUzMmVlYjU2NThhNGE5YjI0OWQ0ZDQyMjk0MDU4OTY1ODQ2NTNl
-    ZTZkM2JlNjYyYzkzMzI0ZDQxYzk3ODg0YzQ4M2YyNWZjNGM4MzA=
+    MTIzNzcwOTIyN2ZlZDA2NjkzNDdiYjMyOTA5ZThiMWZjYjdlYTJlNTFlN2Ew
+    NTc0MDMyNDMxNTVlMTM3ZGNlMWI5OTM3ZDEwYzdlZjAxNjZkYzJkM2UyMDdi
+    NjJlNWNkMmNiMmZmNDRjOTk1NDAxZmUyMjk5MWZiZGE5OTNjZDM=

data/bin/berktacular

@@ -69,6 +69,10 @@ options =  OptionParser.new do |opts|
   opts.on("-v", "--verbose", "Turn on verbose output" ) do
     verbose = true
   end
+  opts.on("--version", "Print the version and exit" ) do
+    puts Berktacular::VERSION
+    exit 0
+  end
   opts.on_tail("-h", "--help", "Print this help message" ) do
     puts opts
     exit 0
@@ -81,7 +85,7 @@ options =  OptionParser.new do |opts|
   end
 end
 # Enable verify by default if uploading, unless the user has surpressed it.
-verify ||= upload
+verify = upload if verify.nil?
 
 require 'json'
 require 'solve'
@@ -105,13 +109,13 @@ unless github_token
 end
 
 if upload
-  berks_conf ||= "#{File.join(ENV['HOME'], File.basename(env_file, ".json") + "-berkshelf.json" )}"
+  berks_conf ||= "#{File.join(ENV['HOME'], '.chef' , File.basename(env_file, ".json") + "-berkshelf.json" )}"
   unless File.exists? berks_conf
     warn "The berkshelf config file could not be found at '#{berks_conf}'"
     warn options
     exit 4
   end
-  knife_conf ||= "#{File.join(ENV['HOME'], File.basename(env_file, ".json") + "-knife.rb" )}"
+  knife_conf ||= "#{File.join(ENV['HOME'], '.chef' , File.basename(env_file, ".json") + "-knife.rb" )}"
   unless File.exists? knife_conf
     warn "The knife config file could not be found at '#{knife_conf}'"
     warn options
@@ -119,6 +123,10 @@ if upload
   end
 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
+
 # Create a new berksfile
 puts "Checking updates, this can take some time..." if check || upgrade
 b = Berktacular::Berksfile.new(my_env, upgrade: upgrade, github_token: github_token, verbose: verbose)
@@ -145,7 +153,7 @@ if verify
 end
 
 if upload
-  unless b.upload(knife_conf, workdir)
+  unless b.upload(berks_conf, knife_conf, workdir)
     puts "Upload failed!"
     exit 11
   end

data/lib/berktacular/berksfile.rb

@@ -68,10 +68,11 @@ module Berktacular
         # remove the Berksfile.lock if it exists (it shouldn't).
         berksfile = File.join(workdir, "Berksfile")
         lck       = berksfile + ".lock"
+        cookbooks = File.join(workdir, "cookbooks")
         FileUtils.rm(lck) if File.exists? lck
         File.write(berksfile, self)
-        Berktacular.run_command("berks install --berksfile #{berksfile} --path #{workdir}")
-        @installed[workdir] = {berksfile: berksfile, lck: lck}
+        Berktacular.run_command("berks install --berksfile #{berksfile} --path #{cookbooks}")
+        @installed[workdir] = {berksfile: berksfile, lck: lck, cookbooks: cookbooks}
       end
       workdir
     end
@@ -84,7 +85,7 @@ module Berktacular
       workdir       = install(workdir)
       versions      = {}
       dependencies  = {}
-      Dir["#{workdir}/*"].each do |cookbook_dir|
+      Dir["#{@installed[workdir][:cookbooks]}/*"].each do |cookbook_dir|
         next unless File.directory?(cookbook_dir)
         metadata_path   = File.join(cookbook_dir, 'metadata.rb')
         metadata        = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
@@ -130,8 +131,9 @@ module Berktacular
       raise "No berks config, required for upload" unless berks_conf && File.exists?(berks_conf)
       raise "No knife config, required for upload" unless knife_conf && File.exists?(knife_conf)
       workdir       = install(workdir)
-      new_env_file  = File.write(File.join(workdir, @name + ".rb"), env_file_json )
-      Berktacular.run_command("berks upload --berksfile #{@installed[workdir][:berksfile]} --c #{berks_conf}")
+      new_env_file  = File.join(workdir, @name + ".json")
+      File.write(new_env_file, env_file_json)
+      Berktacular.run_command("berks upload --berksfile #{@installed[workdir][:berksfile]} -c #{berks_conf}")
       Berktacular.run_command("knife environment from file #{new_env_file} -c #{knife_conf}")
     end
 

data/lib/berktacular/version.rb

@@ -1,4 +1,4 @@
 module Berktacular
   # the gem version.
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeff Harvey-Smith