between_meals 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f7e5e4186f163af47afb9a74c9f877d12949c3a637232747eb1fbfd1e9b845
-  data.tar.gz: 3e5e53f85e47ae60291c05c83e244e4d3414e4984443b9471ef4711aad36e937
+  metadata.gz: 514d9473b739b4589c6692a739cb10e7fbfa8d2d87fa86e975579d7e2756bc9c
+  data.tar.gz: f4984b471c7856b51f60f1fadf7b4b21f684482f2f123d9babab02445c87d102
 SHA512:
-  metadata.gz: 0ae9b2b8ad9a02e11dbbbce04bd8fb9e240f2c9af5ae4aa6bd709cc8a18e5453705d3bb41729ac4dd699c016aebbd658b62f0021779af47202c54882554d3d25
-  data.tar.gz: 138c9464b07cd6f797ac41fcb91bd360db357db3ca26a2ccca12b21f0d8afbabd99919e41129ae40a2f2b75e4ac1749822eeb291d126eb44172c42d39b109663
+  metadata.gz: a889b6ae00ddb079948b0e6a04cb2e2888ccff57e7fdf685facecc11baee5f0d7cd4bc8b4c730f4fdfdde924d0c358b5e06b06fb0ec5ad30d7edd793e16288f6
+  data.tar.gz: cbf64fb976eb7ed143b8024c7048595feec9967f65b37fb62c0b7195ee35db1a7a35f2c33715a36f5abbe88be0694fcee1edc64d4b3f98bccfe01410cd6a012a

data/lib/between_meals/changes/change.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,12 +22,27 @@ module BetweenMeals
   module Changes
     # Common functionality
     class Change
+      # Since we either need to upload or delete, we only accept two statuses.
+      # VCSs will differentiate between various kinds of modifies, adds, etc.
+      # so instead of handling all possibilities here, we expect the caller to
+      # collapse them into `:modified` or `:deleted`.
+      ALLOWED_STATUSES = [:modified, :deleted].freeze #: Array[Symbol]
       @@logger = nil
-      attr_accessor :name, :status
+      attr_accessor :name
+      attr_reader :status
+
+      #: () -> String
       def to_s
         @name
       end
 
+      def status=(value)
+        unless ALLOWED_STATUSES.include?(value)
+          fail "#{self.class} status attribute can only be one of #{ALLOWED_STATUSES} not #{value}"
+        end
+        @status = value
+      end
+
       # People who use us through find() can just pass in logger,
       # for everyone else, here's a setter
       def logger=(log)

data/lib/between_meals/changes/cookbook.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +40,7 @@ module BetweenMeals
         # 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 = {}
+        symlinks = {} #: Hash[String, Hash[String, String]]
         @cookbook_dirs.each do |dir|
           dir = File.join(@repo_dir, dir)
           # Find symlinks in each cookbook_dir
@@ -66,7 +64,7 @@ module BetweenMeals
         # 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 = []
+        links_to_append = [] #: Array[untyped]
         symlinks.each_value do |lrp| # link_abs_path, link_relative_path
           files.each do |f|
             # a symlink will never have trailing '/', add one.
@@ -119,9 +117,9 @@ module BetweenMeals
                %{^(#{cookbook_dirs.join('|')})/[^/]+/metadata\.(rb|json)$},
              )
            end.none?
-          @status = :deleted
+          self.status = :deleted
         else
-          @status = :modified
+          self.status = :modified
         end
       end
 

data/lib/between_meals/changes/databag.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +17,7 @@ module BetweenMeals
     # Changeset aware databag
     class Databag < Change
       attr_accessor :item
+
       def self.name_from_path(path, databag_dir)
         re = %r{^#{databag_dir}/([^/]+)/([^/]+)\.json}
         debug("[databag] Matching #{path} against #{re}")
@@ -31,8 +30,8 @@ module BetweenMeals
       end
 
       def initialize(file, databag_dir)
-        @status = file[:status]
-        @name, @item = self.class.name_from_path(file[:path], databag_dir)
+        self.status = file[:status] == :deleted ? :deleted : :modified
+        self.name, self.item = self.class.name_from_path(file[:path], databag_dir)
       end
 
       def self.find(list, databag_dir, logger)

data/lib/between_meals/changes/role.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,8 +28,8 @@ module BetweenMeals
       end
 
       def initialize(file, role_dir)
-        @status = file[:status] == :deleted ? :deleted : :modified
-        @name = self.class.name_from_path(file[:path], role_dir)
+        self.status = file[:status] == :deleted ? :deleted : :modified
+        self.name = self.class.name_from_path(file[:path], role_dir)
       end
 
       # Given a list of changed files

data/lib/between_meals/changeset.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +27,7 @@ module BetweenMeals
   class Changeset
     class ReferenceError < RuntimeError
     end
+
     # rubocop:disable Metrics/ParameterLists
     def initialize(
       logger, repo, start_ref, end_ref, locations, track_symlinks = false
@@ -43,7 +42,7 @@ module BetweenMeals
       # Figure out which files changed if refs provided
       # or return all files (full upload) otherwise
       if start_ref
-        @files = []
+        @files = [] #: Array[untyped]
         @repo.changes(start_ref, end_ref).each do |file|
           @files << file
         end

data/lib/between_meals/cmd.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/between_meals/knife.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -261,8 +259,10 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 
     def create_databag_if_missing(databag)
       s = Mixlib::ShellOut.new("#{@knife} data bag list" +
-                               " --format json #{@knife_verb_option} " +
+                               ' --format json ' +
                                "-c #{@config}").run_command
+
+      s.stdout.gsub!(/^[A-Z].*\n/, '')
       s.error!
       db = JSON.parse(s.stdout)
       unless db.include?(databag)
@@ -272,7 +272,7 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
     end
 
     def delete_databag_if_empty(databag)
-      s = Mixlib::ShellOut.new("#{@knife} data bag show #{databag}" +
+      s = Mixlib::ShellOut.new("#{@knife} data bag show #{databag}" + # steep:ignore
                                " --format json #{@knife_verb_option} " +
                                "-c #{@config}").run_command
       s.error!

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

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +16,8 @@ require 'between_meals/cmd'
 
 module BetweenMeals
   class Repo
-    class Git < BetweenMeals::Repo
-      class Cmd < BetweenMeals::Cmd
+    class Git < ::BetweenMeals::Repo
+      class Cmd < ::BetweenMeals::Cmd
         def config(key)
           s = cmd("config #{key}", nil, true)
           unless [0, 1].include?(s.exitstatus)

data/lib/between_meals/repo/git.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +26,7 @@ module BetweenMeals
       def setup
         if File.exist?(File.expand_path(@repo_path))
           begin
-            @repo = Rugged::Repository.new(File.expand_path(@repo_path))
+            @repo = Rugged::Repository.new(File.expand_path(@repo_path)) # steep:ignore
           rescue StandardError
             @repo = nil
           end
@@ -82,7 +80,7 @@ module BetweenMeals
 
       def checkout(url)
         @cmd.clone(url, @repo_path)
-        @repo = Rugged::Repository.new(File.expand_path(@repo_path))
+        @repo = Rugged::Repository.new(File.expand_path(@repo_path)) # steep:ignore
       end
 
       # Return files changed between two revisions

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

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,8 +17,8 @@ require 'tempfile'
 
 module BetweenMeals
   class Repo
-    class Hg < BetweenMeals::Repo
-      class Cmd < BetweenMeals::Cmd
+    class Hg < ::BetweenMeals::Repo
+      class Cmd < ::BetweenMeals::Cmd
         def rev(rev)
           cmd("log -r #{rev}")
         end

data/lib/between_meals/repo/hg.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +15,8 @@
 require 'between_meals/cmd'
 module BetweenMeals
   class Repo
-    class Svn < BetweenMeals::Repo
-      class Cmd < BetweenMeals::Cmd
+    class Svn < ::BetweenMeals::Repo
+      class Cmd < ::BetweenMeals::Cmd
         def diff(start_ref, end_ref, repo_path)
           cmd("diff -r #{start_ref}:#{end_ref} --summarize #{repo_path}")
         end

data/lib/between_meals/repo/svn.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,7 +67,7 @@ module BetweenMeals
             'Something went wrong. Please report this output.',
           )
           @logger.error(e)
-          stdout.lines.each do |line|
+          changes.lines.each do |line|
             @logger.error(line.strip)
           end
           exit(1)
@@ -105,7 +103,7 @@ module BetweenMeals
           when /^([\w ])\w?\s+(.+)$/
             {
               :status => Regexp.last_match(1) == 'D' ? :deleted : :modified,
-              :path => Regexp.last_match(2).sub("#{@repo_path}/", ''),
+              :path => Regexp.last_match(2).to_s.sub("#{@repo_path}/", ''),
             }
           else
             fail 'Failed to parse repo diff line.'

data/lib/between_meals/repo.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,35 +38,33 @@ module BetweenMeals
           exit(1)
         end
         logger.info('Trying to detect repo type')
-        require 'between_meals/repo/git'
-        require 'between_meals/repo/hg'
-        require 'between_meals/repo/svn'
-        [
-          BetweenMeals::Repo::Git,
-          BetweenMeals::Repo::Hg,
-          BetweenMeals::Repo::Svn,
-        ].each do |klass|
-          begin
-            r = klass.new(repo_path, logger)
-            if r.exists?
-              logger.info("Repo found to be #{klass.to_s.split('::').last}")
-              return r
-            end
-          rescue StandardError
-            logger.debug("Skipping #{klass}")
+        {
+          'Hg' => 'between_meals/repo/hg',
+          'Svn' => 'between_meals/repo/svn',
+          'Git' => 'between_meals/repo/git',
+        }.each do |klass_name, req|
+          require req
+          klass = BetweenMeals::Repo.const_get(klass_name)
+          r = klass.new(repo_path, logger)
+          if r.exists?
+            logger.info("Repo found to be #{klass.to_s.split('::').last}")
+            return r
           end
+        rescue StandardError
+          logger.debug("Skipping #{klass}")
+
         end
         logger.warn("Failed detecting repo type at #{repo_path}")
         exit(1)
+      when 'hg'
+        require 'between_meals/repo/hg'
+        BetweenMeals::Repo::Hg.new(repo_path, logger)
       when 'svn'
         require 'between_meals/repo/svn'
         BetweenMeals::Repo::Svn.new(repo_path, logger)
       when 'git'
         require 'between_meals/repo/git'
         BetweenMeals::Repo::Git.new(repo_path, logger)
-      when 'hg'
-        require 'between_meals/repo/hg'
-        BetweenMeals::Repo::Hg.new(repo_path, logger)
       else
         fail "Do not know repo type #{type}"
       end

data/lib/between_meals/util.rb

@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +32,7 @@ module BetweenMeals
     def time(logger = nil)
       @@logger = logger if logger
       t0 = Time.now
-      yield
+      yield # steep:ignore
       info("Executed in #{format('%.2f', Time.now - t0)}s")
     end
 
@@ -60,7 +58,7 @@ module BetweenMeals
 
     def execute(command, stream)
       info("Running: #{command}")
-      c = Mixlib::ShellOut.new(command, :live_stream => stream)
+      c = Mixlib::ShellOut.new(command, :live_stream => stream) # steep:ignore
       c.run_command
       c.stdout.lines.each do |line|
         info("STDOUT: #{line.strip}")
@@ -73,38 +71,38 @@ module BetweenMeals
 
     def port_open?(port)
       ips = Socket.ip_address_list
-      ips.map!(&:ip_address)
+      ips = ips.map { |i| i.ip_address.to_s }
       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
+
+        Timeout.timeout(1) do
+
+          s = TCPSocket.new(ip, port)
+          s.close
+          return true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
           next
+
         end
+      rescue Timeout::Error
+        next
+
       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
+
+        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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: between_meals
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Phil Dibowitz
 - Marcin Sawicki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2026-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -39,22 +39,8 @@ dependencies:
     - - ">="
       - !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'
 description: Library for calculating Chef differences between revisions
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -82,7 +68,7 @@ homepage: https://github.com/facebook/between-meals
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,15 +76,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Between Meals
 test_files: []