between_meals 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5952ca7e5fa6d2486432f7a3c6680e01829056e0
-  data.tar.gz: e1a35decf62bb0cc2fbb7bda9e449754184f50cd
+  metadata.gz: a8a35526d4eb577be4dab5579a7049efb1188f97
+  data.tar.gz: 2f277ba7902ccbd1d2cb4c95e768d3adb4171481
 SHA512:
-  metadata.gz: 5b179124ee7a2330a15e52c87784ad975f1110954cfefc61ad351dc125b57740604eb8197b2ec3320ee3c237ff1ae6bb79471b678a03fd5e4693837289ffaca3
-  data.tar.gz: fa1efa5aaa80231f1b9b2dab50427e608ea3a4bd6e1c910d36ab61ffa33928076b2f841e5aa1d8a4a93e00aaa19b8bd4a0545dccb0db4e1d0648090bc93e0b15
+  metadata.gz: 0dd9a6e457c41ac7385498944eee2e76e2b413983872616ebe835d76221accdf62fc240a7312fe287c08008095d29e210b9696d563399744149288eefd9dca28
+  data.tar.gz: d0eeca1bf8f1d2c4a9388fb1902cd5a679f2c88a4f0b38a48905b3c04ef5a5858a02bb03f89107df2f328a4eacd7bf8299dc657ea120d71ecd70c02d94fc5072

data/README.md

@@ -1,13 +1,14 @@
 # Between Meals
 
-[![Build Status](https://travis-ci.org/facebook/between-meals.svg)](http://travis-ci.org/facebook/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)
 
 ## Intro
 Ohai!
 
 Between Meals is the library for calculating what Chef objects where 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.

data/lib/between_meals/changes/change.rb

@@ -58,3 +58,4 @@ module BetweenMeals
     end
   end
 end
+# rubocop:enable ClassVars

data/lib/between_meals/changes/cookbook.rb

@@ -14,23 +14,16 @@
 # 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)
@@ -44,19 +37,63 @@ 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']
+            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]
+        @cookbook_dirs = cookbook_dirs
+        @name = self.class.explode_path(files.sample[:path])[:name]
         # if metadata.rb is being deleted
         #   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?
           @status = :deleted
@@ -67,16 +104,21 @@ 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 +126,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,7 +36,9 @@ 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) }.

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,7 +37,9 @@ 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) }.

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

@@ -27,15 +27,17 @@ module BetweenMeals
     end
 
     def cmd(params, cwd = nil)
-      unless cwd
-        cwd = File.expand_path(@cwd)
-      end
+      cwd ||= File.expand_path(@cwd)
       cmd = "#{@bin} #{params}"
       @logger.info("Running \"#{cmd}\"")
       c = Mixlib::ShellOut.new(
         cmd,
         :cwd => cwd,
       )
+      # 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!
       c

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']
@@ -225,6 +227,10 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
 -----END PRIVATE KEY-----
     BLOCK
 
+      unless File.directory?(File.dirname(@pem))
+        Dir.mkdir(File.dirname(@pem), 0o755)
+      end
+
       unless File.exists?(@pem)
         @logger.info("Generating #{@pem}")
         File.write(@pem, pem)

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

data/lib/between_meals/repo/git.rb

@@ -29,7 +29,7 @@ module BetweenMeals
         if File.exists?(File.expand_path(@repo_path))
           begin
             @repo = Rugged::Repository.new(File.expand_path(@repo_path))
-          rescue
+          rescue StandardError
             @repo = nil
           end
         else
@@ -86,7 +86,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.',
@@ -113,7 +113,7 @@ module BetweenMeals
           return true
         end
         return false
-      rescue
+      rescue StandardError
         return false
       end
 

data/lib/between_meals/repo/hg.rb

@@ -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,7 +65,7 @@ module BetweenMeals
 
       def update
         @cmd.pull.stdout
-      rescue
+      rescue StandardError
         @logger.error('Something went wrong with hg!')
         @logger.error(cmd.stdout)
         raise
@@ -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
 

data/lib/between_meals/repo/svn.rb

@@ -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
 

data/lib/between_meals/util.rb

@@ -86,3 +86,4 @@ module BetweenMeals
     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.8
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-12-18 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
@@ -145,23 +145,23 @@ 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
@@ -172,17 +172,17 @@ 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: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Between Meals