rabbitt-githooks 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2910eaac5a0a17a57550adbda1fb32c5663d511
-  data.tar.gz: beacd673a92ee04af1e4a876fc05ff83282a3115
+  metadata.gz: 9be7b07bbebbb66c3fc6cbc08f76c2759f4f24bc
+  data.tar.gz: 6521197f0aa99b077a74a4b7362541de2ee8f635
 SHA512:
-  metadata.gz: bdb2a859e74d8ce90bf8644f20a0409b056a35599bacb1d87b7dbab3cfd0fbe3ca793dc17023f61c6059a0d0897dfb29223ec96c57221868e84c027e72d3f973
-  data.tar.gz: 8e756225570a161cab9eabe5a22fbf3ed001d0d008c3e5a7058d850b905bf22c19f932f59b6b39fd36c7a183128b10cd8c7170a2e13d05ac65801ff1f26c5e44
+  metadata.gz: 6b6da3d8b71bff3f1bb1b3a705183aa67c06ba73cf210046d5cade7d2dcca6b277438b0b0a5902a0b22b67ade84a6a8b38c38902a70bcf0921d6b56c7a8a21f3
+  data.tar.gz: 680979f0543e112cf61a1ef9ecad384691c646659e7d5f47f674fc7122390680b477ed0e6c7fd669a8e3f3351490d64628add6015e288fd436caf1a9b6df2525

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.5.0)
+    rabbitt-githooks (1.5.1)
       rainbow (~> 2.0.0)
       thor (~> 0.18)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    multi_json (1.10.1)
-    parser (2.2.0.2)
+    json (1.8.3)
+    json (1.8.3-java)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
     rainbow (2.0.0)
     rake (10.4.2)
     rspec (2.99.0)
@@ -26,22 +27,22 @@ GEM
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
-    rubocop (0.29.0)
+    rspec-mocks (2.99.4)
+    rubocop (0.34.2)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-lint (2.0.3)
-      parser (~> 2.1, >= 2.1.1)
+    ruby-lint (2.0.5)
+      parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
-    ruby-progressbar (1.7.1)
-    simplecov (0.9.1)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     thor (0.19.1)
     yard (0.8.7.6)
@@ -59,3 +60,6 @@ DEPENDENCIES
   ruby-lint (~> 2.0)
   simplecov (~> 0.9)
   yard (~> 0.7)
+
+BUNDLED WITH
+   1.10.6

data/lib/githooks/section.rb

@@ -48,6 +48,7 @@ module GitHooks
     # overrides previous action method to only return
     # actions that have a non-empty manifest
     def actions
+      return @actions unless @hook.phase == 'pre-commit'
       @actions.reject { |action| action.manifest.empty? }
     end
     alias_method :__getobj__, :actions

data/lib/githooks/system_utils.rb

@@ -64,7 +64,7 @@ module GitHooks
 
       ENV_WHITELIST = %w(
         PATH HOME LDFLAGS CPPFLAGS DISPLAY EDITOR
-        LANG LC_ALL SHELL SHLVL TERM TMPDIR USER
+        LANG LC_ALL SHELL SHLVL TERM TMPDIR USER HOME
         SSH_USER SSH_AUTH_SOCK
         GEM_HOME GEM_PATH MY_RUBY_HOME
         GIT_DIR GIT_AUTHOR_DATE GIT_INDEX_FILE GIT_AUTHOR_NAME GIT_PREFIX GIT_AUTHOR_EMAIL
@@ -134,9 +134,22 @@ module GitHooks
         options.delete(:use_name) ? name : bin_path.to_s
       end
 
-      def prep_env(env = {})
-        Hash[env].each_with_object([]) do |(k, v), array|
-          array << %Q|#{k}="#{v}"| if ENV_WHITELIST.include? k
+      def prep_env(env = ENV, 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"
+        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
+
+          array << %Q'#{key}=#{value.inspect}'
         end
       end
 
@@ -156,7 +169,9 @@ module GitHooks
         command.push options.delete(:post_run) if options[:post_run]
         command = shellwords(command.flatten.join(';'))
 
-        environment = prep_env(options.delete(:env) || ENV).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')
 

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-21 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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests