between_meals 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a8a35526d4eb577be4dab5579a7049efb1188f97
-  data.tar.gz: 2f277ba7902ccbd1d2cb4c95e768d3adb4171481
+SHA256:
+  metadata.gz: 4187ff23bfead830c0060f80b680700c3a704ab519e66c7781ef58812bf15a1f
+  data.tar.gz: 9894dbd0357a7742a1ad20e22306814014199e53587dd24b7952d31c0602a4ee
 SHA512:
-  metadata.gz: 0dd9a6e457c41ac7385498944eee2e76e2b413983872616ebe835d76221accdf62fc240a7312fe287c08008095d29e210b9696d563399744149288eefd9dca28
-  data.tar.gz: d0eeca1bf8f1d2c4a9388fb1902cd5a679f2c88a4f0b38a48905b3c04ef5a5858a02bb03f89107df2f328a4eacd7bf8299dc657ea120d71ecd70c02d94fc5072
+  metadata.gz: dbcba7682efd6869b714586ef98c78d7bc66fb08d7f006068ad2c346d46f543f0805be0b1efabd253b6218fc7fd55c6ed2aba093cf571c92fa155a6a8e35b6a5
+  data.tar.gz: 3d77520b0ba7818363d05ee6e739d7bf5b895d1873660550991cacbd18d075e70ada620553a95818c0f55f59e746bfd1c3114da3fc6fc42f4e40bbfd0c384f09

data/README.md

@@ -6,7 +6,7 @@
 ## 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 backs Taste Tester and Grocery Delivery.
 

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)

data/lib/between_meals/changes/cookbook.rb

@@ -28,6 +28,7 @@ module BetweenMeals
           debug("[cookbook] Matching #{path} against ^#{re}")
           m = path.match(re)
           next unless m
+
           info("Cookbook is #{m[1]}")
           return {
             :cookbook_dir => dir,
@@ -51,6 +52,7 @@ module BetweenMeals
           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
@@ -70,6 +72,7 @@ module BetweenMeals
             # a symlink will never have trailing '/', add one.
             f[:path] += '/' if f[:path] == lrp['link']
             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'])
@@ -83,7 +86,8 @@ module BetweenMeals
         @files = files
         @cookbook_dirs = cookbook_dirs
         @name = self.class.explode_path(files.sample[:path])[:name]
-        # if metadata.rb is being deleted
+        # 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
@@ -95,7 +99,13 @@ module BetweenMeals
              )
            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
@@ -109,6 +119,7 @@ module BetweenMeals
         @@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

data/lib/between_meals/changes/databag.rb

@@ -40,6 +40,7 @@ module BetweenMeals
         @@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

@@ -41,6 +41,7 @@ module BetweenMeals
         @@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/knife.rb

@@ -113,6 +113,7 @@ module BetweenMeals
         @cookbook_dirs.each do |path|
           cookbooks.each do |cb|
             next unless File.exists?("#{path}/#{cb}")
+
             @logger.warn("Running berkshelf on cookbook: #{cb}")
             exec!("cd #{path}/#{cb} && #{@berks} install #{berks_config} && " +
               "#{@berks} upload #{berks_config}", @logger)
@@ -225,7 +226,7 @@ zvgEHqbS0/QkJGOZ+UifPRanTDuGYQkPdHHOER4UghbM+Kz5rZbBicJ3bCyNOsah
 IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 6wX4GR84dwyhG80yd4TP8Qo=
 -----END PRIVATE KEY-----
-    BLOCK
+      BLOCK
 
       unless File.directory?(File.dirname(@pem))
         Dir.mkdir(File.dirname(@pem), 0o755)

data/lib/between_meals/repo/git.rb

@@ -112,6 +112,7 @@ module BetweenMeals
         if @cmd.merge_base(rev, master).stdout.strip == rev
           return true
         end
+
         return false
       rescue StandardError
         return false

data/lib/between_meals/repo/hg.rb

@@ -165,7 +165,6 @@ module BetweenMeals
         #  I = ignored
         #    = origin of the previous file (with --copies)
 
-        # rubocop:disable MultilineBlockChain
         changes.lines.map do |line|
           case line
           when /^A (\S+)$/
@@ -207,7 +206,6 @@ module BetweenMeals
             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/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 :)
@@ -52,7 +54,7 @@ module BetweenMeals
     private
 
     def info(msg)
-      @@logger.info(msg) if @@logger
+      @@logger&.info(msg)
     end
 
     def execute(command)
@@ -69,21 +71,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
-      rescue Timeout::Error
-        return false
       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
+      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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !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
@@ -110,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,19 +110,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 description: Library for calculation Chef differences between revisions
 email: 
 executables: []
@@ -182,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Between Meals