between_meals 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4187ff23bfead830c0060f80b680700c3a704ab519e66c7781ef58812bf15a1f
-  data.tar.gz: 9894dbd0357a7742a1ad20e22306814014199e53587dd24b7952d31c0602a4ee
+  metadata.gz: 14a2f47358db13a1a9c1fbf6c038fc6c13f9c45a972a42b72abc6c592e41aa86
+  data.tar.gz: 2be633f930866b32923a3e22a2eb2ccc30aa3e29d748d3ab71b3af49cc650410
 SHA512:
-  metadata.gz: dbcba7682efd6869b714586ef98c78d7bc66fb08d7f006068ad2c346d46f543f0805be0b1efabd253b6218fc7fd55c6ed2aba093cf571c92fa155a6a8e35b6a5
-  data.tar.gz: 3d77520b0ba7818363d05ee6e739d7bf5b895d1873660550991cacbd18d075e70ada620553a95818c0f55f59e746bfd1c3114da3fc6fc42f4e40bbfd0c384f09
+  metadata.gz: 1886e90d8bfaf9488f1dc919e8031aa334b98df14de5a51f7d1a86cad5dd11769cb2460427da2a9cca806537012ff765a43f31394da99e83218c2b2884fa885b
+  data.tar.gz: aa03b1ec64dea20775f6d9554caef8d295b826db5279e1bda6ecb944e9cf32a3e586370ddccc4c06550e94ad60ebd528c710c08c1869a6ce360cd3bcbbaf6527

data/README.md

@@ -23,3 +23,6 @@ functions.
 * Mixlib::ShellOut
 * Rugged
 
+## License
+
+See the `LICENSE` file in this repo.

data/lib/between_meals/changes/cookbook.rb

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

data/lib/between_meals/cmd.rb

@@ -33,13 +33,20 @@ module BetweenMeals
       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',
+        },
       )
-      # macOS needs /usr/local/bin as hg cannot be installed in /bin or /usr/bin
-      c.environment = {
-        'PATH' => '/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin',
-      }
       c.run_command
-      c.error!
+      if c.error?
+        # 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/repo/hg.rb

@@ -65,9 +65,9 @@ module BetweenMeals
 
       def update
         @cmd.pull.stdout
-      rescue StandardError
+      rescue StandardError => e
         @logger.error('Something went wrong with hg!')
-        @logger.error(cmd.stdout)
+        @logger.error(e)
         raise
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: between_meals
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Between Meals