rabbitt-githooks 1.5.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61c53d1075587aa48903e5e8d458e64ad00e3d4
-  data.tar.gz: 077f6f1aa451f7059bba3947647774fd06dfd772
+  metadata.gz: 3fc9f2e2715c624c84800b1e4acce192ec17d659
+  data.tar.gz: 82068a8270deeb4810e2c4f32b3f5748e9352423
 SHA512:
-  metadata.gz: 84d194395b306f6cdca5837351f2fe750e0b85cf69562717dfec06c67e3d58d0292e93489f274ae77d75507280ffb31a13810c813d7445371ce3cba72164251f
-  data.tar.gz: a8eede0ab599285938a71def5b385d25a3f76e7615b5164c84077b0c62bc240074fe8cce26d40564320186414d1f56dbe078b760f069375cd73cda5015776d47
+  metadata.gz: 665c5935ad4362aafd8ec3800dd04a0d0aeda3c030e12679a93067355c1009a5980b088ffe5593012c631094204fb22cb4d74012e5e0f71d4cc33e6a861bd31b
+  data.tar.gz: bc720d2df0b87b5ec92b3e5478a952bb3aa7b10f498f8607ddd987ee79642cad45c92707119d70bf1211797df5ae6025c0941097b410ed063890ff03ef9ea44e

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.5.5)
+    rabbitt-githooks (1.6.0)
       rainbow (~> 2.0.0)
-      thor (~> 0.18)
+      thor (~> 0.19.1)
 
 GEM
   remote: http://rubygems.org/
@@ -60,3 +60,6 @@ DEPENDENCIES
   ruby-lint (~> 2.0)
   simplecov (~> 0.9)
   yard (~> 0.7)
+
+BUNDLED WITH
+   1.10.6

data/lib/githooks.rb

@@ -35,6 +35,14 @@ module GitHooks
   class << self
     attr_reader :debug, :verbose, :ignore_script, :hooks_root
 
+    def quieted
+      od, ov = @debug, @verbose
+      @debug, @verbose = false, false
+      yield
+    ensure
+      @debug, @verbose = od, ov
+    end
+
     def debug?
       return true if ENV['GITHOOKS_DEBUG']
       return true if ARGV.include?('--debug')

data/lib/githooks/action.rb

@@ -133,6 +133,9 @@ module GitHooks
 
     # DSL Methods
 
+    # FIXME: these should be switched to behaviors that are included
+    # into this classs
+
     def skip!
       throw :skip, true
     end

data/lib/githooks/cli.rb

@@ -75,8 +75,9 @@ module GitHooks
       #       the argument list to the script
 
       desc :execute, 'Runs the selected hooks, passing the argument list to the script'
-      method_option :staged, aliases: '-S', type: :boolean, desc: 'test staged files', default: nil
-      method_option :tracked, aliases: '-A', type: :boolean, desc: 'test all tracked files', default: false
+      method_option :staged, aliases: '-S', type: :boolean, desc: 'test staged files (disabled if unstaged, tracked or untracked set)', default: true
+      method_option :unstaged, aliases: '-U', type: :boolean, desc: 'test unstaged files', default: false
+      method_option :tracked, aliases: '-A', type: :boolean, desc: 'test tracked files', default: false
       method_option :untracked, aliases: '-T', type: :boolean, desc: 'test untracked files', default: false
       method_option :script, aliases: '-s', type: :string, desc: 'Path to script to run', default: nil
       method_option :'hooks-path', aliases: '-p', type: :string, desc: 'Path to library of tests', default: nil
@@ -84,27 +85,22 @@ module GitHooks
       method_option :'skip-pre', type: :boolean, desc: 'Skip PreRun Scripts', default: false
       method_option :'skip-post', type: :boolean, desc: 'Skip PostRun Scripts', default: false
       method_option :'skip-bundler', type: :boolean, desc: %q"Don't load bundler gemfile", default: false
-      method_option :'hook', type: :string, enum: Hook::VALID_PHASES, desc: 'Hook to run', default: 'pre-commit'
+      method_option :hook, type: :string, enum: Hook::VALID_PHASES, desc: 'Hook to run', default: 'pre-commit'
       method_option :args, type: :array, desc: 'Args to pass to pre/post scripts and main testing script', default: []
-      def execute
+      def execute(hooks = [])
         GitHooks.verbose = options['verbose']
         GitHooks.debug = options['debug']
 
         opts = options.dup
-        opts['staged'] ||= !(opts['tracked'] || opts['untracked'])
-
-        if opts['staged']
-          if opts['tracked']
-            warn '--tracked conflicts with --staged. Dropping --tracked...'
-            opts['tracked'] = false
-          elsif opts['untracked']
-            warn '--untracked conflicts with --staged. Dropping --untracked...'
-            opts['untracked'] = false
-          end
+
+        if opts['tracked'] || opts['untracked'] || opts['unstaged']
+          opts['staged'] = false
         end
 
         opts['skip-bundler'] ||= !!ENV['GITHOOKS_SKIP_BUNDLER']
 
+        opts['hook'] = hooks unless hooks.empty?
+
         Runner.new(opts).run
       end
 

data/lib/githooks/core_ext/string/inflections.rb

@@ -16,9 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
-=begin
-  Mostly borrowed from Rails' ActiveSupport::Inflections
-=end
+# Mostly borrowed from Rails' ActiveSupport::Inflections
 
 class String
   def constantize
@@ -38,7 +36,7 @@ class String
 
   def camelize!
     tap do
-      gsub!('-', '_')
+      tr!('-', '_')
       sub!(/^[a-z\d]*/, &:capitalize)
       gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
       gsub!('/', '::')
@@ -79,7 +77,7 @@ class String
   def dasherize!
     tap do
       underscore!
-      gsub!(/_/, '-')
+      tr!('_', '-')
     end
   end
 end

data/lib/githooks/error.rb

@@ -7,7 +7,7 @@ module GitHooks
     class AlreadyAttached < GitHooks::Error; end
     class NotAttached < GitHooks::Error; end
     class InvalidPhase < GitHooks::Error; end
-
+    class InvalidLimiterCallable < GitHooks::Error; end
     class RemoteNotSet < GitHooks::Error
       attr_accessor :branch
     end

data/lib/githooks/hook.rb

@@ -117,6 +117,9 @@ module GitHooks
 
     # DSL methods
 
+    # FIXME: these should be switched to behaviors that are included
+    # into this classs
+
     def config_path
       GitHooks.hooks_root.join('configs')
     end
@@ -173,7 +176,7 @@ module GitHooks
         @hook.repository
       end
 
-      def files # rubocop:disable Metrics/AbcSize
+      def files # rubocop:disable AbcSize,MethodLength
         @files ||= begin
           options = {
             staged:    hook.staged,
@@ -183,10 +186,12 @@ module GitHooks
 
           if %w[ commit-msg pre-push ].include? hook.phase
             begin
-              if (parent_sha = repository.last_unpushed_commit_parent)
-                options.merge!(ref: parent_sha)
-              end
+              parent_sha = repository.last_unpushed_commit_parent_sha || \
+                           repository.branch_point_sha
+              options.merge!(ref: parent_sha) if parent_sha
             rescue Error::RemoteNotSet
+              STDERR.puts 'Couldn\'t find starting reference point for push ' \
+                          'manifest generation. Falling back to all tracked files.'
               # remote not set yet, so let's only focus on what's tracked for now
               options[:tracked]   = true
               options[:untracked] = false

data/lib/githooks/repository.rb

@@ -119,25 +119,53 @@ module GitHooks
     end
 
     def unpushed_commits
-      result = git('log', '--format=%H', '@{upstream}..')
-      if result.failure?
-        if result.error =~ /no upstream configured for branch (["'])((?:(?!\1).)+)\1\z/i
-          fail Error::RemoteNotSet, "No upstream remote configured for '#{$2}'"
-        else
-          fail Error::CommandExecutionFailure, result.error
-        end
+      unless remote_branch
+        fail Error::RemoteNotSet, "No upstream remote configured for branch '#{current_branch}'"
       end
-      result.output.split(/\s*\n\s*/).collect(&:strip)
+
+      git('log', '--format=%H', '@{upstream}..') do |result|
+        fail(Error::CommandExecutionFailure, result.error) if result.failure?
+      end.output.split(/\s*\n\s*/).collect(&:strip)
     end
 
-    def revision_parent(revision)
-      return unless (result = git('rev-parse', "#{revision}~1")).status.success?
+    def revision_sha(revision)
+      return unless (result = git('rev-parse', revision)).status.success?
       result.output.strip
     end
 
-    def last_unpushed_commit_parent
-      oldest_sha = unpushed_commits.last
-      revision_parent(oldest_sha) unless oldest_sha.nil?
+    def current_branch
+      @branch ||= begin
+        branch = git('symbolic-ref', '--short', '--quiet', 'HEAD').output.strip
+        if branch.empty?
+          hash = git('rev-parse', 'HEAD').output.strip
+          branch = git('name-rev', '--name-only', hash).output.strip
+        end
+        branch
+      end
+    end
+
+    def remote_branch
+      result = git('rev-parse', '--symbolic-full-name', '--abbrev-ref', "#{current_branch}@{u}")
+      result.success? ? result.output.strip.split('/').last : nil
+    end
+
+    def branch_point_sha
+      # Try to backtrack back to where we branched from, and use that as our
+      # sha to compare against.
+
+      # HACK: there's a better way but, it's too late and I'm too tired to
+      # think of it right now.
+      refs = 0.upto(100).to_a.collect { |x| "#{current_branch}~#{x}" }
+      previous_branch = git('name-rev', '--name-only', *refs).
+                        output_lines.find { |x| x.strip != current_branch }
+      revision_sha(previous_branch) if previous_branch != current_branch
+    end
+
+    def last_unpushed_commit_parent_sha
+      last_unpushed_sha = unpushed_commits.last
+      revision_sha("#{last_unpushed_sha}~1") unless last_unpushed_sha.nil?
+    rescue Error::RemoteNotSet
+      nil
     end
 
   private

data/lib/githooks/repository/file.rb

@@ -58,8 +58,7 @@ module GitHooks
         path.basename.to_s
       end
 
-      # rubocop:disable CyclomaticComplexity
-      def attribute_value(attribute)
+      def attribute_value(attribute) # rubocop:disable Metrics/CyclomaticComplexity
         case attribute
           when :name then name
           when :path then path.to_s
@@ -72,10 +71,32 @@ module GitHooks
         end
       end
 
-      def match(type, selector) # rubocop:disable AbcSize
+      def match(type, selector)
+        if selector.respond_to? :call
+          match_callable(type, selector)
+        else
+          match_type(type, selector)
+        end
+      end
+
+      # rubocop:disable ElseAlignment, IndentationWidth
+      def match_callable(type, selector)
         value = attribute_value(type)
-        return selector.call(value) if selector.respond_to? :call
 
+        case (arity = selector.arity)
+          when 0 then fail ArgumentError, 'limiter recieves no parameters'
+          when -4..-1, 3 then selector.call(value, type, self)
+          when 1 then selector.call(value)
+          when 2 then selector.call(value, type)
+        else
+          fail ArgumentError, 'expected limiter to receive at most 3 parameters, ' \
+                               "but it receives #{arity}"
+        end
+      end
+      # rubocop:enable ElseAlignment, IndentationWidth
+
+      def match_type(type, selector) # rubocop:disable AbcSize,CyclomaticComplexity
+        value = attribute_value(type)
         case type
           when :name  then selector.is_a?(Regexp) ? value =~ selector : value == selector
           when :path  then selector.is_a?(Regexp) ? value =~ selector : value == selector
@@ -85,7 +106,6 @@ module GitHooks
           when :score then selector == value
         end
       end
-      # rubocop:enable CyclomaticComplexity
 
       def fd
         case type

data/lib/githooks/repository/limiter.rb

@@ -21,23 +21,29 @@ module GitHooks
     class Limiter
       attr_reader :type, :only
 
-      def initialize(type, options = {})
+      def initialize(type)
         @type     = type
-        @only     = options.delete(:only) || options.delete(:to)
+        @only     = nil
         @inverted = false
       end
 
       def only(*args)
         return @only if args.empty?
+        file, line = caller.first.split(':')[0..1]
         @only = args.flatten
+        @only.each do |selector|
+          if selector.respond_to?(:call) && selector.arity == 0
+            fail Error::InvalidLimiterCallable, "Bad #{@type} limiter at #{file}:#{line}; " \
+                                                'expected callable to recieve at least one parameter but receives none.'
+          end
+        end
         self
       end
       alias_method :to, :only
 
-      def inverted
-        @inverted = true
+      def except(*args)
+        only(*args).tap { invert! }
       end
-      alias_method :invert, :inverted
 
       def limit(files)
         files.select! do |file|
@@ -52,6 +58,10 @@ module GitHooks
 
     private
 
+      def invert!
+        @inverted = true
+      end
+
       def match_file(file, match_value)
         if @inverted
           [*match_value].none? { |value| file.match(@type, value) }

data/lib/githooks/runner.rb

@@ -145,9 +145,9 @@ module GitHooks
         puts "    #{hook_path}"
         puts
 
-        SystemUtils.quiet { load_tests(true) }
+        GitHooks.quieted { load_tests(true) }
 
-        %w{ pre-commit commit-msg }.each do |phase|
+        Hook::VALID_PHASES.each do |phase|
           next unless Hook.phases[phase]
 
           puts "  Phase #{phase.camelize}:"

data/lib/githooks/section.rb

@@ -102,6 +102,9 @@ module GitHooks
 
     ## DSL
 
+    # FIXME: these should be switched to behaviors that are included
+    # into this classs
+
     def config_path
       GitHooks.hooks_root.join('configs')
     end

data/lib/githooks/system_utils.rb

@@ -13,13 +13,11 @@ module GitHooks
     module_function :which
 
     def find_bin(name)
-      # rubocop:disable MultilineBlockChain, Blocks
       ENV['PATH'].split(/:/).collect { |path|
         Pathname.new(path) + name.to_s
       }.select { |path|
         path.exist? && path.executable?
       }.collect(&:to_s)
-      # rubocop:enable MultilineBlockChain, Blocks
     end
     module_function :find_bin
 
@@ -35,15 +33,6 @@ module GitHooks
     end
     module_function :with_path
 
-    def quiet(&_block)
-      od, ov = GitHooks.debug, GitHooks.verbose
-      GitHooks.debug, GitHooks.verbose = false, false
-      yield
-    ensure
-      GitHooks.debug, GitHooks.verbose = od, ov
-    end
-    module_function :quiet
-
     def command(name)
       (@commands ||= {})[name] ||= begin
         Command.new(name).tap { |cmd|
@@ -134,22 +123,32 @@ module GitHooks
         options.delete(:use_name) ? name : bin_path.to_s
       end
 
-      def prep_env(env = ENV, options = {})
+      def sanitize_env(env = ENV.to_h, options = {})
         include_keys = options.delete(:include) || ENV_WHITELIST
         exclude_keys = options.delete(:exclude) || []
 
-        if exclude_keys.size > 0 && include_keys.size > 0
-          raise ArgumentError, "include and exclude are mutually exclusive"
+        unless exclude_keys.empty? ^ include_keys.empty?
+          fail ArgumentError, 'include and exclude are mutually exclusive'
         end
 
-        Hash[env].each_with_object([]) do |(key, value), array|
-          if exclude_keys.size > 0
-            next if exclude_keys.include?(key)
-          elsif include_keys.size > 0
-            next unless include_keys.include?(key)
-          end
+        env.to_h.reject do |key, _|
+          exclude_keys.include?(key) || !include_keys.include?(key)
+        end
+      end
 
-          array << %Q'#{key}=#{value.inspect}'
+      def with_sanitized_env(env = {})
+        env ||= {}
+        old_env = ENV.to_h
+        new_env = sanitize_env(
+          ENV.to_h.merge(env),
+          include: ENV_WHITELIST | env.keys
+        )
+
+        begin
+          ENV.replace(new_env)
+          yield
+        ensure
+          ENV.replace(old_env)
         end
       end
 
@@ -169,10 +168,6 @@ module GitHooks
         command.push options.delete(:post_run) if options[:post_run]
         command = shellwords(command.flatten.join(';'))
 
-        command_env    = options.delete(:env) || {}
-        whitelist_keys = ENV_WHITELIST | command_env.keys
-        environment    = prep_env(ENV.to_h.merge(command_env), include: whitelist_keys).join(' ')
-
         error_file = Tempfile.new('ghstderr')
 
         script_file = Tempfile.new('ghscript')
@@ -182,27 +177,25 @@ module GitHooks
         script_file.rewind
 
         begin
-          real_command = "/usr/bin/env -i #{environment} bash #{script_file.path}"
+          real_command = "/usr/bin/env bash #{script_file.path}"
 
-          if GitHooks.verbose?
-            $stderr.puts "Command Line  :\n----\n#{real_command}\n----\n"
-            $stderr.puts "Command Script:\n----\n#{script_file.read}\n----\n"
+          output = with_sanitized_env(options.delete(:env)) do
+            %x{ #{real_command} }
           end
 
-          output = %x{ #{real_command} }
           result = Result.new(output, error_file.read, $?)
 
           if GitHooks.verbose?
             if result.failure?
-              STDERR.puts "Command failed with exit code [#{result.status.exitstatus}]",
-                          "ENVIRONMENT:\n\t#{environment}\n\n",
-                          "COMMAND:\n\t#{command.join(' ')}\n\n",
-                          "OUTPUT:\n-----\n#{result.output}\n-----\n\n",
-                          "ERROR:\n-----\n#{result.error}\n-----\n\n"
+              STDERR.puts "---\nCommand failed with exit code [#{result.status.exitstatus}]",
+                          "COMMAND: #{command.join(' ')}\n",
+                          result.output.strip.empty? ? '' : "OUTPUT:\n#{result.output}\n---\n",
+                          result.error.strip.empty? ? '' : "ERROR:\n#{result.error}\n---\n"
             else
-              STDERR.puts "Command succeeded with exit code [#{result.status.exitstatus}]",
-                          "OUTPUT:\n-----\n#{result.output}\n-----\n\n",
-                          "ERROR:\n-----\n#{result.error}\n-----\n\n"
+              STDERR.puts "---\nCommand succeeded with exit code [#{result.status.exitstatus}]",
+                          "COMMAND: #{command.join(' ')}\n",
+                          result.output.strip.empty? ? '' : "OUTPUT:\n#{result.output}\n---\n",
+                          result.error.strip.empty? ? '' : "ERROR:\n#{result.error}\n---\n"
             end
           end
 

data/lib/githooks/version.rb

@@ -18,5 +18,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 =end
 
 module GitHooks
-  VERSION = '1.5.5' unless defined? VERSION
+  VERSION = '1.6.0' unless defined? VERSION
 end

data/rabbitt-githooks.gemspec

@@ -39,7 +39,7 @@ begin
     spec.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
     spec.add_dependency 'rainbow', '~> 2.0.0'
-    spec.add_dependency 'thor', '~> 0.18'
+    spec.add_dependency 'thor', '~> 0.19.1'
 
     spec.add_development_dependency 'rake', '~> 10.1'
     spec.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests