between_meals 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5952ca7e5fa6d2486432f7a3c6680e01829056e0
-  data.tar.gz: e1a35decf62bb0cc2fbb7bda9e449754184f50cd
+SHA256:
+  metadata.gz: 21f7e5e4186f163af47afb9a74c9f877d12949c3a637232747eb1fbfd1e9b845
+  data.tar.gz: 3e5e53f85e47ae60291c05c83e244e4d3414e4984443b9471ef4711aad36e937
 SHA512:
-  metadata.gz: 5b179124ee7a2330a15e52c87784ad975f1110954cfefc61ad351dc125b57740604eb8197b2ec3320ee3c237ff1ae6bb79471b678a03fd5e4693837289ffaca3
-  data.tar.gz: fa1efa5aaa80231f1b9b2dab50427e608ea3a4bd6e1c910d36ab61ffa33928076b2f841e5aa1d8a4a93e00aaa19b8bd4a0545dccb0db4e1d0648090bc93e0b15
+  metadata.gz: 0ae9b2b8ad9a02e11dbbbce04bd8fb9e240f2c9af5ae4aa6bd709cc8a18e5453705d3bb41729ac4dd699c016aebbd658b62f0021779af47202c54882554d3d25
+  data.tar.gz: 138c9464b07cd6f797ac41fcb91bd360db357db3ca26a2ccca12b21f0d8afbabd99919e41129ae40a2f2b75e4ac1749822eeb291d126eb44172c42d39b109663

data/README.md

@@ -1,13 +1,13 @@
 # Between Meals
 
-[![Build Status](https://travis-ci.org/facebook/between-meals.svg)](http://travis-ci.org/facebook/between-meals)
+![Continuous Integration](https://github.com/facebook/between-meals/workflows/Continuous%20Integration/badge.svg?event=push)
 
 ## Intro
 Ohai!
 
-Between Meals is the library for calculating what Chef objects where modified
+Between Meals is the library for calculating what Chef objects were modified
 between two revisions in a version control system. It is also the library
-that that backs Taste Tester and Grocery Delivery.
+that backs Taste Tester and Grocery Delivery.
 
 It currently supports SVN, GIT and HG, but plugins can easily be written for
 other source control systems.
@@ -18,7 +18,9 @@ functions.
 ## Dependencies
 
 * Colorize
-* JSON
 * Mixlib::ShellOut
 * Rugged
 
+## License
+
+See the `LICENSE` file in this repo.

data/lib/between_meals/changes/change.rb

@@ -37,15 +37,11 @@ module BetweenMeals
       end
 
       def self.info(msg)
-        if @@logger
-          @@logger.info(msg)
-        end
+        @@logger&.info(msg)
       end
 
       def self.debug(msg)
-        if @@logger
-          @@logger.debug(msg)
-        end
+        @@logger&.debug(msg)
       end
 
       def info(msg)
@@ -58,3 +54,4 @@ module BetweenMeals
     end
   end
 end
+# rubocop:enable ClassVars

data/lib/between_meals/changes/cookbook.rb

@@ -14,27 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable ClassVars
 module BetweenMeals
   module Changes
     # Changeset aware cookbook
     class Cookbook < Change
-      def self.meaningful_cookbook_file?(path, cookbook_dirs)
-        cookbook_dirs.each do |dir|
-          re = %r{^#{dir}/([^/]+)/.*}
-          m = path.match(re)
-          debug("[cookbook] #{path} meaningful? [#{re}]: #{m}")
-          return true if m
-        end
-        false
+      def self.meaningful_cookbook_file?(path)
+        !explode_path(path).nil?
       end
 
-      def self.explode_path(path, cookbook_dirs)
-        cookbook_dirs.each do |dir|
+      def self.explode_path(path)
+        @cookbook_dirs.each do |dir|
           re = %r{^#{dir}/([^/]+)/.*}
           debug("[cookbook] Matching #{path} against ^#{re}")
           m = path.match(re)
           next unless m
+
           info("Cookbook is #{m[1]}")
           return {
             :cookbook_dir => dir,
@@ -44,21 +38,87 @@ module BetweenMeals
         nil
       end
 
+      def self.map_symlinks(files)
+        # For each symlink get the source path, if any files have changed under
+        # the source path, fake them as coming from the symlink path. This
+        # allows the normal cookbook logic to just work.
+        symlinks = {}
+        @cookbook_dirs.each do |dir|
+          dir = File.join(@repo_dir, dir)
+          # Find symlinks in each cookbook_dir
+          links = Dir.foreach(dir).select do |d|
+            File.symlink?(File.join(dir, d))
+          end
+          links.each do |link|
+            link = File.join(dir, link)
+            next if symlinks[link]
+
+            source = File.realpath(link)
+            repo = File.join(@repo_dir, '/')
+            # maps absolute symlink path to relative source and link paths
+            symlinks[link] = {
+              'source' => source.gsub(repo, ''),
+              'link' => link.gsub(repo, ''),
+            }
+          end
+        end
+
+        # Create the file hash expected for each file that is a link or coming
+        # from a linked directory but fake the source path as a symlink path.
+        # Hacky but works :)
+        links_to_append = []
+        symlinks.each_value do |lrp| # link_abs_path, link_relative_path
+          files.each do |f|
+            # a symlink will never have trailing '/', add one.
+            f[:path] += '/' if f[:path] == lrp['link']
+
+            # If a metadata file in the path of a symlink target directory has a
+            # deleted status, check if a metadata file exists in the symlink
+            # source directory. If so, mark it as modified to prevent deletion.
+            symlink_source_dir = File.join(@repo_dir, lrp['source'])
+            if (f[:path] == File.join(lrp['link'], 'metadata.rb') ||
+                f[:path] == File.join(lrp['link'], 'metadata.json')) &&
+                f[:status] == :deleted &&
+                (File.file?(File.join(symlink_source_dir, 'metadata.rb')) ||
+                 File.file?(File.join(symlink_source_dir, 'metadata.json')))
+              f[:status] = :modified
+            end
+
+            next unless f[:path].start_with?(lrp['source'])
+
+            # This make a deep dup of the file hash
+            l = Marshal.load(Marshal.dump(f))
+            l[:path].gsub!(lrp['source'], lrp['link'])
+            links_to_append << l
+          end
+        end
+        links_to_append
+      end
+
       def initialize(files, cookbook_dirs)
         @files = files
-        @name = self.class.explode_path(
-          files.sample[:path],
-          cookbook_dirs,
-        )[:name]
-        # if metadata.rb is being deleted
+        @cookbook_dirs = cookbook_dirs
+        @name = self.class.explode_path(files.sample[:path])[:name]
+        # if metadata.(json|rb) is being deleted and we aren't also
+        # adding/modifying one of those two,
         #   cookbook is marked for deletion
         # otherwise it was modified
         #   and will be re-uploaded
         if files.
            select { |x| x[:status] == :deleted }.
-           map { |x| x[:path].match(%{.*metadata\.rb$}) }.
+           map do |x|
+             x[:path].match(
+               %{^(#{cookbook_dirs.join('|')})/[^/]+/metadata\.(rb|json)$},
+             )
+           end.
            compact.
-           any?
+           any? &&
+           files.reject { |x| x[:status] == :deleted }.
+           map do |x|
+             x[:path].match(
+               %{^(#{cookbook_dirs.join('|')})/[^/]+/metadata\.(rb|json)$},
+             )
+           end.none?
           @status = :deleted
         else
           @status = :modified
@@ -67,16 +127,22 @@ module BetweenMeals
 
       # Given a list of changed files
       # create a list of Cookbook objects
-      def self.find(list, cookbook_dirs, logger)
+      def self.find(list, cookbook_dirs, logger, repo, track_symlinks = false)
+        # rubocop:disable ClassVars
         @@logger = logger
+        # rubocop:enable ClassVars
         return [] if list.nil? || list.empty?
+
         # rubocop:disable MultilineBlockChain
+        @repo_dir = File.realpath(repo.repo_path)
+        @cookbook_dirs = cookbook_dirs
+        list += map_symlinks(list) if track_symlinks
         list.
           group_by do |x|
           # Group by prefix of cookbok_dir + cookbook_name
           # so that we treat deletes and modifications across
           # two locations separately
-          g = self.explode_path(x[:path], cookbook_dirs)
+          g = self.explode_path(x[:path])
           g[:cookbook_dir] + '/' + g[:name] if g
         end.
           map do |_, change|
@@ -84,10 +150,10 @@ module BetweenMeals
           # Changes to OWNERS or other stuff that might end up
           # in [core, other, secure] dirs are ignored
           is_cookbook = change.select do |c|
-            self.meaningful_cookbook_file?(c[:path], cookbook_dirs)
+            self.meaningful_cookbook_file?(c[:path])
           end.any?
           if is_cookbook
-            BetweenMeals::Changes::Cookbook.new(change, cookbook_dirs)
+            BetweenMeals::Changes::Cookbook.new(change, @cookbook_dirs)
           end
         end.compact
         # rubocop:enable MultilineBlockChain

data/lib/between_meals/changes/databag.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable ClassVars
 module BetweenMeals
   module Changes
     # Changeset aware databag
@@ -37,8 +36,11 @@ module BetweenMeals
       end
 
       def self.find(list, databag_dir, logger)
+        # rubocop:disable ClassVars
         @@logger = logger
+        # rubocop:enable ClassVars
         return [] if list.nil? || list.empty?
+
         list.
           select { |x| self.name_from_path(x[:path], databag_dir) }.
           map do |x|

data/lib/between_meals/changes/role.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable ClassVars
 module BetweenMeals
   module Changes
     # Changeset aware role
@@ -38,8 +37,11 @@ module BetweenMeals
       # Given a list of changed files
       # create a list of Role objects
       def self.find(list, role_dir, logger)
+        # rubocop:disable ClassVars
         @@logger = logger
+        # rubocop:enable ClassVars
         return [] if list.nil? || list.empty?
+
         list.
           select { |x| self.name_from_path(x[:path], role_dir) }.
           map do |x|

data/lib/between_meals/changeset.rb

@@ -29,13 +29,17 @@ module BetweenMeals
   class Changeset
     class ReferenceError < RuntimeError
     end
-
-    def initialize(logger, repo, start_ref, end_ref, locations)
+    # rubocop:disable Metrics/ParameterLists
+    def initialize(
+      logger, repo, start_ref, end_ref, locations, track_symlinks = false
+    )
+      # rubocop:enable Metrics/ParameterLists
       @logger = logger
       @repo = repo
       @cookbook_dirs = locations[:cookbook_dirs].dup
       @role_dir = locations[:role_dir]
       @databag_dir = locations[:databag_dir]
+      @track_symlinks = track_symlinks
       # Figure out which files changed if refs provided
       # or return all files (full upload) otherwise
       if start_ref
@@ -49,7 +53,9 @@ module BetweenMeals
     end
 
     def cookbooks
-      BetweenMeals::Changes::Cookbook.find(@files, @cookbook_dirs, @logger)
+      BetweenMeals::Changes::Cookbook.find(
+        @files, @cookbook_dirs, @logger, @repo, @track_symlinks
+      )
     end
 
     def roles

data/lib/between_meals/cmd.rb

@@ -26,18 +26,28 @@ module BetweenMeals
       @logger = params[:logger] || Logger.new(STDOUT)
     end
 
-    def cmd(params, cwd = nil)
-      unless cwd
-        cwd = File.expand_path(@cwd)
-      end
+    def cmd(params, cwd = nil, nofail = false)
+      cwd ||= File.expand_path(@cwd)
       cmd = "#{@bin} #{params}"
       @logger.info("Running \"#{cmd}\"")
       c = Mixlib::ShellOut.new(
         cmd,
         :cwd => cwd,
+        :env => {
+          # macOS needs /usr/local/bin as hg cannot be installed in /bin or
+          # /usr/bin
+          'PATH' => '/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin',
+        },
       )
       c.run_command
-      c.error!
+      # If the user asked us not to fail, let them handle error reporting
+      if c.error? && !nofail
+        # Let's make sure the error goes to the logs
+        @logger.error("#{@bin} failed: #{c.format_for_exception}")
+        # if our logger is STDOUT, we'll double log when we throw
+        # the exception, but that's OK
+        c.error!
+      end
       c
     end
   end

data/lib/between_meals/knife.rb

@@ -26,6 +26,8 @@ module BetweenMeals
   class Knife
     include BetweenMeals::Util
 
+    attr_accessor :cookbook_dirs
+
     def initialize(opts = {})
       @logger = opts[:logger] || nil
       @user = opts[:user] || ENV['USER']
@@ -37,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] ||
@@ -51,9 +61,10 @@ module BetweenMeals
     end
 
     def role_upload_all
-      if File.exists?(@role_dir)
+      if File.exist?(@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
 
@@ -62,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
@@ -97,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
 
@@ -110,7 +123,8 @@ module BetweenMeals
       if cookbooks.any?
         @cookbook_dirs.each do |path|
           cookbooks.each do |cb|
-            next unless File.exists?("#{path}/#{cb}")
+            next unless File.exist?("#{path}/#{cb}")
+
             @logger.warn("Running berkshelf on cookbook: #{cb}")
             exec!("cd #{path}/#{cb} && #{@berks} install #{berks_config} && " +
               "#{@berks} upload #{berks_config}", @logger)
@@ -123,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
@@ -146,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
@@ -158,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
@@ -183,10 +199,13 @@ 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) ||
+      if !File.exist?(@config) ||
          ::Digest::MD5.hexdigest(cfg) !=
          ::Digest::MD5.hexdigest(File.read(@config))
         @logger.info("Generating #{@config}")
@@ -223,9 +242,16 @@ zvgEHqbS0/QkJGOZ+UifPRanTDuGYQkPdHHOER4UghbM+Kz5rZbBicJ3bCyNOsah
 IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 6wX4GR84dwyhG80yd4TP8Qo=
 -----END PRIVATE KEY-----
-    BLOCK
+      BLOCK
+
+      begin
+        Dir.mkdir(File.dirname(@pem), 0o755)
+      rescue Errno::EEXIST
+        # not an error if it's already there.
+        nil
+      end
 
-      unless File.exists?(@pem)
+      unless File.exist?(@pem)
         @logger.info("Generating #{@pem}")
         File.write(@pem, pem)
       end
@@ -235,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.rb

@@ -27,7 +27,7 @@ module BetweenMeals
       @repo = nil
       @bin = nil
       setup
-    rescue
+    rescue StandardError
       @logger.warn("Unable to read repo from #{File.expand_path(repo_path)}")
       exit(1)
     end
@@ -54,7 +54,7 @@ module BetweenMeals
               logger.info("Repo found to be #{klass.to_s.split('::').last}")
               return r
             end
-          rescue
+          rescue StandardError
             logger.debug("Skipping #{klass}")
           end
         end
@@ -87,6 +87,12 @@ module BetweenMeals
       fail "#{__method__} not implemented"
     end
 
+    # Only interesting in the case of git where we have an underlying
+    # repo object courtesy of Rugged.
+    def repo_object
+      fail "#{__method__} not implemented"
+    end
+
     # This method *must* succeed in the case of no repo directory so that
     # users can call `checkout`. Users may call `exists?` to find out if
     # we have an underlying repo yet.

data/lib/between_meals/repo/git.rb

@@ -26,10 +26,10 @@ module BetweenMeals
   class Repo
     class Git < BetweenMeals::Repo
       def setup
-        if File.exists?(File.expand_path(@repo_path))
+        if File.exist?(File.expand_path(@repo_path))
           begin
             @repo = Rugged::Repository.new(File.expand_path(@repo_path))
-          rescue
+          rescue StandardError
             @repo = nil
           end
         else
@@ -43,6 +43,12 @@ module BetweenMeals
         )
       end
 
+      # Allow people to get access to the underlying Rugged
+      # object for their hooks
+      def repo_object
+        @repo
+      end
+
       def exists?
         !@repo.nil?
       end
@@ -86,7 +92,7 @@ module BetweenMeals
         stdout = @cmd.diff(start_ref, end_ref).stdout
         begin
           parse_status(stdout).compact
-        rescue => e
+        rescue StandardError => e
           # We've seen some weird non-reproducible failures here
           @logger.error(
             'Something went wrong. Please report this output.',
@@ -108,12 +114,13 @@ module BetweenMeals
         @repo.index.map { |x| { :path => x[:path], :status => :created } }
       end
 
-      def upstream?(rev, master = 'remotes/trunk')
+      def upstream?(rev, master = 'upstream/master')
         if @cmd.merge_base(rev, master).stdout.strip == rev
           return true
         end
+
         return false
-      rescue
+      rescue StandardError
         return false
       end
 
@@ -153,53 +160,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/git/cmd.rb

@@ -21,7 +21,11 @@ module BetweenMeals
     class Git < BetweenMeals::Repo
       class Cmd < BetweenMeals::Cmd
         def config(key)
-          cmd("config #{key}")
+          s = cmd("config #{key}", nil, true)
+          unless [0, 1].include?(s.exitstatus)
+            s.error!
+          end
+          s
         end
 
         def clone(url, repo_path)

data/lib/between_meals/repo/hg.rb

@@ -32,7 +32,7 @@ module BetweenMeals
       end
 
       def exists?
-        Dir.exists?(Pathname.new(@repo_path).join('.hg'))
+        Dir.exist?(Pathname.new(@repo_path).join('.hg'))
       end
 
       def head_rev
@@ -50,7 +50,7 @@ module BetweenMeals
         stdout = @cmd.status(start_ref, end_ref).stdout
         begin
           parse_status(stdout).compact
-        rescue => e
+        rescue StandardError => e
           # We've seen some weird non-reproducible failures here
           @logger.error(
             'Something went wrong. Please report this output.',
@@ -65,9 +65,9 @@ module BetweenMeals
 
       def update
         @cmd.pull.stdout
-      rescue
+      rescue StandardError => e
         @logger.error('Something went wrong with hg!')
-        @logger.error(cmd.stdout)
+        @logger.error(e)
         raise
       end
 
@@ -83,7 +83,7 @@ module BetweenMeals
           :time => Time.parse(@cmd.log('date|isodate', 'master').stdout),
           :rev => @cmd.log('node', 'master').stdout,
         }]
-      rescue
+      rescue StandardError
         [{
           :time => nil,
           :rev => nil,
@@ -103,7 +103,7 @@ module BetweenMeals
 
       def last_msg
         @cmd.log('desc').stdout
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -115,13 +115,13 @@ module BetweenMeals
 
       def email
         username[2]
-      rescue
+      rescue StandardError
         nil
       end
 
       def name
         username[1]
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -143,7 +143,7 @@ module BetweenMeals
       def valid_ref?(ref)
         @cmd.rev(ref)
         return true
-      rescue
+      rescue StandardError
         raise Changeset::ReferenceError
       end
 
@@ -165,49 +165,48 @@ module BetweenMeals
         #  I = ignored
         #    = origin of the previous file (with --copies)
 
-        # rubocop:disable MultilineBlockChain
         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.'
           end
         end
-        # rubocop:enable MultilineBlockChain
       end
     end
   end

data/lib/between_meals/repo/hg/cmd.rb

@@ -50,7 +50,7 @@ module BetweenMeals
           begin
             f.write(msg)
             f.flush
-            cmd("commit --amend -l #{f.path}")
+            cmd("commit --amend --exclude '**' -l #{f.path}")
           ensure
             f.close
             f.unlink

data/lib/between_meals/repo/svn.rb

@@ -33,7 +33,7 @@ module BetweenMeals
       end
 
       def exists?
-        Dir.exists?(Pathname.new(@repo_path).join('.svn'))
+        Dir.exist?(Pathname.new(@repo_path).join('.svn'))
       end
 
       def head_rev
@@ -64,7 +64,7 @@ module BetweenMeals
 
         begin
           parse_status(changes).compact
-        rescue => e
+        rescue StandardError => e
           @logger.error(
             'Something went wrong. Please report this output.',
           )
@@ -88,12 +88,11 @@ module BetweenMeals
         end
       end
 
-      def upstream?
-      end
+      def upstream?; end
 
       def valid_ref?(ref)
         @cmd.info_r(ref, @repo_path)
-      rescue
+      rescue StandardError
         raise Changeset::ReferenceError
       end
 
@@ -103,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

@@ -15,13 +15,15 @@
 # limitations under the License.
 
 require 'colorize'
+require 'net/http'
+require 'openssl'
 require 'socket'
 require 'timeout'
 
 module BetweenMeals
   # A set of simple utility functions used throughout BetweenMeals
   #
-  # Feel freeo to use... note that if you pass in a logger once
+  # Feel free to use... note that if you pass in a logger once
   # you don't need to again, but be safe and always pass one in. :)
 
   # Util classes need class vars :)
@@ -36,28 +38,29 @@ 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
 
     private
 
     def info(msg)
-      @@logger.info(msg) if @@logger
+      @@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}")
@@ -69,20 +72,43 @@ module BetweenMeals
     end
 
     def port_open?(port)
-      begin
-        Timeout.timeout(1) do
-          begin
-            s = TCPSocket.new('localhost', port)
-            s.close
-            return true
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-            return false
+      ips = Socket.ip_address_list
+      ips.map!(&:ip_address)
+      ips.each do |ip|
+        begin
+          Timeout.timeout(1) do
+            begin
+              s = TCPSocket.new(ip, port)
+              s.close
+              return true
+            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+              next
+            end
+          end
+        rescue Timeout::Error
+          next
+        end
+      end
+      return false
+    end
+
+    def chef_zero_running?(port, use_ssl)
+      Timeout.timeout(1) do
+        begin
+          http = Net::HTTP.new('localhost', port)
+          if use_ssl
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           end
+          res = http.get('/')
+          return res['Server'] == 'chef-zero'
+        rescue StandardError
+          return false
         end
-      rescue Timeout::Error
-        return false
       end
+    rescue Timeout::Error
       return false
     end
   end
 end
+# rubocop:enable ClassVars

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: between_meals
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,135 +9,51 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Library for calculation Chef differences between revisions
+description: Library for calculating Chef differences between revisions
 email: 
 executables: []
 extensions: []
@@ -145,26 +61,26 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- README.md
 - LICENSE
-- lib/between_meals/util.rb
+- README.md
+- lib/between_meals/changes/change.rb
+- lib/between_meals/changes/cookbook.rb
+- lib/between_meals/changes/databag.rb
+- lib/between_meals/changes/role.rb
 - lib/between_meals/changeset.rb
+- lib/between_meals/cmd.rb
 - lib/between_meals/knife.rb
 - lib/between_meals/repo.rb
-- lib/between_meals/cmd.rb
-- lib/between_meals/changes/databag.rb
-- lib/between_meals/changes/cookbook.rb
-- lib/between_meals/changes/change.rb
-- lib/between_meals/changes/role.rb
 - lib/between_meals/repo/git.rb
-- lib/between_meals/repo/svn.rb
 - lib/between_meals/repo/git/cmd.rb
-- lib/between_meals/repo/svn/cmd.rb
-- lib/between_meals/repo/hg/cmd.rb
 - lib/between_meals/repo/hg.rb
+- lib/between_meals/repo/hg/cmd.rb
+- lib/between_meals/repo/svn.rb
+- lib/between_meals/repo/svn/cmd.rb
+- lib/between_meals/util.rb
 homepage: https://github.com/facebook/between-meals
 licenses:
-- Apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -172,17 +88,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Between Meals