between_meals 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e58d518baa0534eecc6de15ac0fb0f7f09a6069f6fb870a60c55adf2cf2f8404
-  data.tar.gz: 44aaa21c488bea122a228466f0c30f5d0c9eab3ff778b3f60242cccaf2020ee6
+  metadata.gz: 21f7e5e4186f163af47afb9a74c9f877d12949c3a637232747eb1fbfd1e9b845
+  data.tar.gz: 3e5e53f85e47ae60291c05c83e244e4d3414e4984443b9471ef4711aad36e937
 SHA512:
-  metadata.gz: 7a44420814d8e34888bea5be482a7d8b43d30979c0c8369cb11e0b13ff4cddc36e0a3da29a955d70917ba9b878fa75213640b718658c0f4b6fabbd199e002f8a
-  data.tar.gz: 12dece7d9a249c883bef1eb0c6460977998fbc7b7e6ba90ecaf5bb7912d374df72b919bd78b1aece7548e1063664e04b6d80007ad5c68baaf2a587060cc6a0aa
+  metadata.gz: 0ae9b2b8ad9a02e11dbbbce04bd8fb9e240f2c9af5ae4aa6bd709cc8a18e5453705d3bb41729ac4dd699c016aebbd658b62f0021779af47202c54882554d3d25
+  data.tar.gz: 138c9464b07cd6f797ac41fcb91bd360db357db3ca26a2ccca12b21f0d8afbabd99919e41129ae40a2f2b75e4ac1749822eeb291d126eb44172c42d39b109663

data/README.md

@@ -1,7 +1,6 @@
 # Between Meals
 
-[![TravisCI](https://travis-ci.org/facebook/between-meals.svg)](http://travis-ci.org/facebook/between-meals)
-[![CircleCI](https://circleci.com/gh/facebook/between-meals.svg?style=svg)](https://circleci.com/gh/facebook/between-meals)
+![Continuous Integration](https://github.com/facebook/between-meals/workflows/Continuous%20Integration/badge.svg?event=push)
 
 ## Intro
 Ohai!
@@ -19,7 +18,6 @@ functions.
 ## Dependencies
 
 * Colorize
-* JSON
 * Mixlib::ShellOut
 * Rugged
 

data/lib/between_meals/cmd.rb

@@ -26,7 +26,7 @@ module BetweenMeals
       @logger = params[:logger] || Logger.new(STDOUT)
     end
 
-    def cmd(params, cwd = nil)
+    def cmd(params, cwd = nil, nofail = false)
       cwd ||= File.expand_path(@cwd)
       cmd = "#{@bin} #{params}"
       @logger.info("Running \"#{cmd}\"")
@@ -40,7 +40,8 @@ module BetweenMeals
         },
       )
       c.run_command
-      if 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

data/lib/between_meals/knife.rb

@@ -61,7 +61,7 @@ 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} #{@knife_verb_option} " +
           "-c #{@config}", @logger)
@@ -123,7 +123,7 @@ 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} && " +
@@ -205,7 +205,7 @@ BLOCK
         # 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}")
@@ -251,7 +251,7 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
         nil
       end
 
-      unless File.exists?(@pem)
+      unless File.exist?(@pem)
         @logger.info("Generating #{@pem}")
         File.write(@pem, pem)
       end

data/lib/between_meals/repo.rb

@@ -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,7 +26,7 @@ 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 StandardError
@@ -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
@@ -108,7 +114,7 @@ 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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: between_meals
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,77 +53,7 @@ dependencies:
     - - ">="
       - !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: 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'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.49.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.49.1
-description: Library for calculation Chef differences between revisions
+description: Library for calculating Chef differences between revisions
 email: 
 executables: []
 extensions: []
@@ -167,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Between Meals