between_meals 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a2f47358db13a1a9c1fbf6c038fc6c13f9c45a972a42b72abc6c592e41aa86
-  data.tar.gz: 2be633f930866b32923a3e22a2eb2ccc30aa3e29d748d3ab71b3af49cc650410
+  metadata.gz: e58d518baa0534eecc6de15ac0fb0f7f09a6069f6fb870a60c55adf2cf2f8404
+  data.tar.gz: 44aaa21c488bea122a228466f0c30f5d0c9eab3ff778b3f60242cccaf2020ee6
 SHA512:
-  metadata.gz: 1886e90d8bfaf9488f1dc919e8031aa334b98df14de5a51f7d1a86cad5dd11769cb2460427da2a9cca806537012ff765a43f31394da99e83218c2b2884fa885b
-  data.tar.gz: aa03b1ec64dea20775f6d9554caef8d295b826db5279e1bda6ecb944e9cf32a3e586370ddccc4c06550e94ad60ebd528c710c08c1869a6ce360cd3bcbbaf6527
+  metadata.gz: 7a44420814d8e34888bea5be482a7d8b43d30979c0c8369cb11e0b13ff4cddc36e0a3da29a955d70917ba9b878fa75213640b718658c0f4b6fabbd199e002f8a
+  data.tar.gz: 12dece7d9a249c883bef1eb0c6460977998fbc7b7e6ba90ecaf5bb7912d374df72b919bd78b1aece7548e1063664e04b6d80007ad5c68baaf2a587060cc6a0aa

data/lib/between_meals/knife.rb

@@ -39,6 +39,14 @@ module BetweenMeals
       @config = opts[:config] ||
                 "#{@home}/.chef/knife-#{@user}-taste-tester.rb"
       @knife = opts[:bin] || 'knife'
+      @knife_verb_option = ''
+      unless @logger.nil?
+        if @logger.level == Logger::DEBUG
+          @knife_verb_option = '-VV'
+        elsif @logger.level == Logger::INFO
+          @knife_verb_option = '-V'
+        end
+      end
       @berks = opts[:berks_bin] || 'berks'
       @berks_config = opts[:berks_config]
       @pem = opts[:pem] ||
@@ -55,7 +63,8 @@ module BetweenMeals
     def role_upload_all
       if File.exists?(@role_dir)
         roles = File.join(@role_dir, "*.#{@role_type}")
-        exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
+        exec!("#{@knife} role from file #{roles} #{@knife_verb_option} " +
+          "-c #{@config}", @logger)
       end
     end
 
@@ -64,22 +73,23 @@ module BetweenMeals
         roles = roles.map do |x|
           File.join(@role_dir, "#{x.name}.#{@role_type}")
         end.join(' ')
-        exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
+        exec!("#{@knife} role from file #{roles} #{@knife_verb_option} " +
+          "-c #{@config}", @logger)
       end
     end
 
     def role_delete(roles)
       if roles.any?
         roles.each do |role|
-          exec!(
-            "#{@knife} role delete #{role.name} --yes -c #{@config}", @logger
-          )
+          exec!("#{@knife} role delete #{role.name} #{@knife_verb_option} " +
+            "--yes -c #{@config}", @logger)
         end
       end
     end
 
     def cookbook_upload_all
-      exec!("#{@knife} cookbook upload -a -c #{@config}", @logger)
+      exec!("#{@knife} cookbook upload -a #{@knife_verb_option} " +
+        "-c #{@config}", @logger)
     end
 
     def berks_cookbook_upload_all
@@ -99,7 +109,8 @@ module BetweenMeals
     def cookbook_upload(cookbooks)
       if cookbooks.any?
         cookbooks = cookbooks.map(&:name).join(' ')
-        exec!("#{@knife} cookbook upload #{cookbooks} -c #{@config}", @logger)
+        exec!("#{@knife} cookbook upload #{cookbooks} #{@knife_verb_option} " +
+          "-c #{@config}", @logger)
       end
     end
 
@@ -126,7 +137,8 @@ module BetweenMeals
       if cookbooks.any?
         cookbooks.each do |cookbook|
           exec!("#{@knife} cookbook delete #{cookbook.name}" +
-                  " --purge -a --yes -c #{@config}", @logger)
+                  " --purge -a --yes #{@knife_verb_option} -c #{@config}",
+                @logger)
         end
       end
     end
@@ -149,7 +161,8 @@ module BetweenMeals
             File.join(@databag_dir, dbname, "#{x.item}.json")
           end.join(' ')
           exec!(
-            "#{@knife} data bag from file #{dbname} #{dbitems} -c #{@config}",
+            "#{@knife} data bag from file #{dbname} #{dbitems} " +
+            "#{@knife_verb_option} -c #{@config}",
             @logger,
           )
         end
@@ -161,7 +174,7 @@ module BetweenMeals
         databags.group_by(&:name).each do |dbname, dbs|
           dbs.each do |db|
             exec!("#{@knife} data bag delete #{dbname} #{db.item}" +
-                    " --yes -c #{@config}", @logger)
+                    " --yes #{@knife_verb_option} -c #{@config}", @logger)
           end
           delete_databag_if_empty(dbname)
         end
@@ -186,8 +199,11 @@ BLOCK
         cfg << "  \"#{dir}\",\n"
       end
       cfg << "]\n"
-      unless File.directory?(File.dirname(@config))
+      begin
         Dir.mkdir(File.dirname(@config), 0o755)
+      rescue Errno::EEXIST
+        # not an error if it's already there.
+        nil
       end
       if !File.exists?(@config) ||
          ::Digest::MD5.hexdigest(cfg) !=
@@ -228,8 +244,11 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 -----END PRIVATE KEY-----
       BLOCK
 
-      unless File.directory?(File.dirname(@pem))
+      begin
         Dir.mkdir(File.dirname(@pem), 0o755)
+      rescue Errno::EEXIST
+        # not an error if it's already there.
+        nil
       end
 
       unless File.exists?(@pem)
@@ -242,22 +261,25 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 
     def create_databag_if_missing(databag)
       s = Mixlib::ShellOut.new("#{@knife} data bag list" +
-                               " --format json -c #{@config}").run_command
+                               " --format json #{@knife_verb_option} " +
+                               "-c #{@config}").run_command
       s.error!
       db = JSON.parse(s.stdout)
       unless db.include?(databag)
-        exec!("#{@knife} data bag create #{databag} -c #{@config}", @logger)
+        exec!("#{@knife} data bag create #{databag} #{@knife_verb_option} " +
+          "-c #{@config}", @logger)
       end
     end
 
     def delete_databag_if_empty(databag)
       s = Mixlib::ShellOut.new("#{@knife} data bag show #{databag}" +
-                               " --format json -c #{@config}").run_command
+                               " --format json #{@knife_verb_option} " +
+                               "-c #{@config}").run_command
       s.error!
       db = JSON.parse(s.stdout)
       if db.empty?
-        exec!("#{@knife} data bag delete #{databag} --yes -c #{@config}",
-              @logger)
+        exec!("#{@knife} data bag delete #{databag} --yes " +
+          "#{@knife_verb_option} -c #{@config}", @logger)
       end
     end
   end

data/lib/between_meals/repo/git.rb

@@ -154,53 +154,54 @@ module BetweenMeals
 
         # rubocop:disable MultilineBlockChain
         changes.lines.map do |line|
-          case line
-          when /^A\s+(\S+)$/
+          parts = line.chomp.split("\t")
+          case parts[0]
+          when 'A'
             # A path
             {
               :status => :modified,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^C(?:\d*)\s+(\S+)\s+(\S+)/
+          when /^C(?:\d*)/
             # C<numbers> path1 path2
             {
               :status => :modified,
-              :path => Regexp.last_match(2),
+              :path => parts[2],
             }
-          when /^D\s+(\S+)$/
+          when 'D'
             # D path
             {
               :status => :deleted,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^M(?:\d*)\s+(\S+)$/
+          when /^M(?:\d*)/
             # M<numbers> path
             {
               :status => :modified,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^R(?:\d*)\s+(\S+)\s+(\S+)/
+          when /^R(?:\d*)/
             # R<numbers> path1 path2
             [
               {
                 :status => :deleted,
-                :path => Regexp.last_match(1),
+                :path => parts[1],
               },
               {
                 :status => :modified,
-                :path => Regexp.last_match(2),
+                :path => parts[2],
               },
             ]
-          when /^T\s+(\S+)$/
+          when 'T'
             # T path
             [
               {
                 :status => :deleted,
-                :path => Regexp.last_match(1),
+                :path => parts[1],
               },
               {
                 :status => :modified,
-                :path => Regexp.last_match(1),
+                :path => parts[1],
               },
             ]
           else

data/lib/between_meals/repo/hg.rb

@@ -166,41 +166,42 @@ module BetweenMeals
         #    = origin of the previous file (with --copies)
 
         changes.lines.map do |line|
-          case line
-          when /^A (\S+)$/
+          parts = line.chomp.split(nil, 2)
+          case parts[0]
+          when 'A'
             {
               :status => :added,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^C (\S+)$/
+          when 'C'
             {
               :status => :clean,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^R (\S+)$/
+          when 'R'
             {
               :status => :deleted,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^M (\S+)$/
+          when 'M'
             {
               :status => :modified,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^! (\S+)$/
+          when '!'
             {
               :status => :missing,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^\? (\S+)$/
+          when '?'
             {
               :status => :untracked,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
-          when /^I (\S+)$/
+          when 'I'
             {
               :status => :ignored,
-              :path => Regexp.last_match(1),
+              :path => parts[1],
             }
           else
             fail 'Failed to parse repo diff line.'

data/lib/between_meals/repo/svn.rb

@@ -102,7 +102,7 @@ module BetweenMeals
         # http://svnbook.red-bean.com/en/1.0/re26.html
         changes.lines.map do |line|
           case line
-          when /^([\w ])\w?\s+(\S+)$/
+          when /^([\w ])\w?\s+(.+)$/
             {
               :status => Regexp.last_match(1) == 'D' ? :deleted : :modified,
               :path => Regexp.last_match(2).sub("#{@repo_path}/", ''),

data/lib/between_meals/util.rb

@@ -38,16 +38,17 @@ module BetweenMeals
       info("Executed in #{format('%.2f', Time.now - t0)}s")
     end
 
-    def exec!(command, logger = nil)
+    def exec!(command, logger = nil, stream = nil)
       @@logger = logger if logger
-      c = execute(command)
+      c = execute(command, stream)
       c.error!
       return c.status.exitstatus, c.stdout
     end
 
-    def exec(command, logger = nil)
+    def exec(command, logger = nil, stream = nil)
       @@logger = logger if logger
-      c = execute(command)
+
+      c = execute(command, stream)
       return c.status.exitstatus, c.stdout
     end
 
@@ -57,9 +58,9 @@ module BetweenMeals
       @@logger&.info(msg)
     end
 
-    def execute(command)
+    def execute(command, stream)
       info("Running: #{command}")
-      c = Mixlib::ShellOut.new(command)
+      c = Mixlib::ShellOut.new(command, :live_stream => stream)
       c.run_command
       c.stdout.lines.each do |line|
         info("STDOUT: #{line.strip}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: between_meals
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -150,7 +150,7 @@ files:
 - lib/between_meals/util.rb
 homepage: https://github.com/facebook/between-meals
 licenses:
-- Apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []