rabbitt-githooks 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537d8b0aba4a78077a2a83811f61275e92675096
-  data.tar.gz: 35f7835256d75573db5d1e2ab1390b0b9dba7e91
+  metadata.gz: b61c53d1075587aa48903e5e8d458e64ad00e3d4
+  data.tar.gz: 077f6f1aa451f7059bba3947647774fd06dfd772
 SHA512:
-  metadata.gz: d0a01ba51f8a80696f79fd3f1acac240419cc59d032b65473c5b9ba98808c7222f062fe31b4bf6a3fe3f9b22cdc9c96d7ebe2c0acb4953faa8ee4906e0c10758
-  data.tar.gz: 5da65f00da85068723387ff697f53feb488d1f2418021de602b4a22258282f3471f60772c9ea455b499361f55d79cbeb0b58a2e97e511035d195fde4c0647368
+  metadata.gz: 84d194395b306f6cdca5837351f2fe750e0b85cf69562717dfec06c67e3d58d0292e93489f274ae77d75507280ffb31a13810c813d7445371ce3cba72164251f
+  data.tar.gz: a8eede0ab599285938a71def5b385d25a3f76e7615b5164c84077b0c62bc240074fe8cce26d40564320186414d1f56dbe078b760f069375cd73cda5015776d47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.5.4)
+    rabbitt-githooks (1.5.5)
       rainbow (~> 2.0.0)
       thor (~> 0.18)
 
@@ -60,6 +60,3 @@ DEPENDENCIES
   ruby-lint (~> 2.0)
   simplecov (~> 0.9)
   yard (~> 0.7)
-
-BUNDLED WITH
-   1.10.6

data/lib/githooks/repository.rb

@@ -60,13 +60,11 @@ module GitHooks
     end
 
     def get_root_path(path)
-      @root_path ||= begin
-        git('rev-parse', '--show-toplevel', chdir: path).tap do |result|
-          unless result.status.success? && result.output !~ /not a git repository/i
-            fail Error::NotAGitRepo, "Unable to find a valid git repo in #{path}"
-          end
-        end.output.strip
-      end
+      git('rev-parse', '--show-toplevel', chdir: path).tap do |result|
+        unless result.status.success? && result.output !~ /not a git repository/i
+          fail Error::NotAGitRepo, "Unable to find a valid git repo in #{path}"
+        end
+      end.output.strip
     end
 
     def stash
@@ -123,8 +121,8 @@ module GitHooks
     def unpushed_commits
       result = git('log', '--format=%H', '@{upstream}..')
       if result.failure?
-        if result.error =~ /^fatal: no upstream configured for branch '([^']+)'/
-          fail Error::RemoteNotSet, "No upstream remote configured for '#{$1}'"
+        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

data/lib/githooks/repository/config.rb

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 module GitHooks
   class Repository
-    class Config # rubocop:disable ClassLength
+    class Config
       OPTIONS = {
         'hooks-path'       => { type: :path, multiple: false },
         'script'           => { type: :path, multiple: false },
@@ -28,7 +28,7 @@ module GitHooks
       }.freeze unless defined? OPTIONS
 
       OPTIONS.keys.each do |name|
-        method_name = name.gsub(/-/, '_')
+        method_name = name.tr('-', '_')
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{method_name}(options = {})
             result = get('#{name}', options)
@@ -39,10 +39,11 @@ module GitHooks
 
       def initialize(repository)
         @repository = repository
+        @config = nil
       end
 
       def [](option)
-        send(option.to_s.gsub('-', '_'))
+        send(option.to_s.tr('-', '_'))
       end
 
       def set(option, value, options = {}) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
@@ -76,17 +77,19 @@ module GitHooks
         option = "githooks.#{repo}.#{option}"
         git(global, var_type, add_type, option, value, chdir: repo).tap do |result|
           puts "Added option #{option} with value #{value}" if result.status.success?
+          @config = nil # reset config
         end
       end
 
       def remove_section(options = {})
-        repo   = options.delete(:repo_path) || @repository.path
-        global = (opt = options.delete(:global)).nil? ? false : opt
-        global = global ? '--global' : '--local'
+        repo    = options.delete(:repo_path) || @repository.path
+        global  = (opt = options.delete(:global)).nil? ? false : opt
+        global  = global ? '--global' : '--local'
+        @config = nil # reset config
         git(global, '--remove-section', "githooks.#{repo}", chdir: repo)
       end
 
-      def unset(option, *args) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity
+      def unset(option, *args) # rubocop:disable AbcSize
         options = args.extract_options!
         global  = (opt = options.delete(:global)).nil? ? false : opt
         global  = global ? '--global' : '--local'
@@ -100,6 +103,8 @@ module GitHooks
           git(global, '--unset', option, value_regex, options)
         end
 
+        @config = nil # reset config
+
         result.status.success?
       end
 
@@ -140,23 +145,25 @@ module GitHooks
         @repository.git(:config, *args)
       end
 
-      def config(*args) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
-        raw_config = git('--list', *args).output.split("\n").sort.uniq
-        raw_config.each_with_object({}) do |line, hash|
-          key, value = line.split(/\s*=\s*/)
-          key_parts = key.git_option_path_split
+      def config(*args) # rubocop:disable AbcSize
+        @config ||= begin
+          raw_config = git('--list', *args).output.split("\n").sort.uniq
+          raw_config.each_with_object({}) do |line, hash|
+            key, value = line.split(/\s*=\s*/)
+            key_parts = key.git_option_path_split
 
-          ptr = hash[key_parts.shift] ||= {} # rubocop:disable IndentationWidth
-          ptr = ptr[key_parts.shift]  ||= {} until key_parts.size == 1
+            ptr = hash[key_parts.shift] ||= {}
+            ptr = ptr[key_parts.shift] ||= {} until key_parts.size == 1
 
-          key = key_parts.shift
-          case ptr[key]
-            when nil then ptr[key] = value
-            when Array then ptr[key] << value
-            else ptr[key] = [ptr[key], value].flatten
-          end
+            key = key_parts.shift
+            case ptr[key]
+              when nil then ptr[key] = value
+              when Array then ptr[key] << value
+              else ptr[key] = [ptr[key], value].flatten
+            end
 
-          hash
+            hash
+          end
         end
       end
     end

data/lib/githooks/runner.rb

@@ -266,7 +266,7 @@ module GitHooks
     def load_tests(skip_bundler = nil)
       skip_bundler = skip_bundler.nil? ? options.skip_bundler : skip_bundler
 
-      hooks_path = repository.hooks_path
+      hooks_path = @hook_path.dup
       hooks_libs = hooks_path.join('lib')
       hooks_init = (p = hooks_path.join('hooks_init.rb')).exist? ? p : hooks_path.join('githooks_init.rb')
       gemfile    = hooks_path.join('Gemfile')

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.4' unless defined? VERSION
+  VERSION = '1.5.5' unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests