lolcommits 0.9.3.pre2 → 0.9.3.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f9361b802d1360887f9abf9851379a40a006af
-  data.tar.gz: f6eaccaf5bcd60b3de0919d0e2d50cd0c9b42c60
+  metadata.gz: d1c432270b046edb27829416bf9ada561b3aa0a5
+  data.tar.gz: d1238ceb4a716d739117795669c2ccf0c000a7ab
 SHA512:
-  metadata.gz: 7760ce09dbb11464c376382c1d7aad4503affba32f36aaae686f0095ad0348e97f5dc6d20185bbe26709936cca5e68f60aa99f6e705252a21479a44868c366dc
-  data.tar.gz: a55a968ffcb164820a4b7ca18994ebd58a7da8ca95cf06033e4ab069a5560cb0f22459757a374a74be3382bba48399b635c31c2c66d8e9d9b58523768daf5d08
+  metadata.gz: 85662930d7f30595deef8e6f4d9974057e2ff256a290369ea5db91d9747139a04ef93b5f22d62fc620eacb07d0a43c0835ac9fcedbd8dc40e2b9bf4745a9ea08
+  data.tar.gz: b46e6131b9874a545ecb4b904f90e5dea2494bcc6395a38a3bb472b3a22561bcf5c0d7701e1c2a63e9b579a89a2fe99a57e15440a64a7a2134d1e0df33d9dfeb

data/lib/lolcommits/backends/installation_git.rb

@@ -66,19 +66,18 @@ module Lolcommits
       capture_cmd   = 'lolcommits --capture'
 
       if Lolcommits::Platform.platform_windows?
-        capture_cmd = 'if "%LOLCOMMITS_CAPTURE_DISABLED%"=="true" (exit)'
-        capture_cmd = "set path=#{ruby_path};#{imagick_path};%PATH%&&#{capture_cmd}"
+        exports     = "set path=#{ruby_path};#{imagick_path};%PATH%"
+        capture_cmd = "#{exports} && IF \\I NOT \"%LOLCOMMITS_CAPTURE_DISABLED%\"==\"true\" #{capture_cmd} #{capture_args}"
       else
         locale_export = "LANG=\"#{ENV['LANG']}\""
         hook_export   = "PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
-        capture_cmd   = "#{locale_export} #{hook_export} #{capture_cmd}"
+        capture_cmd   = "if [ ! -d \"$GIT_DIR/rebase-merge\" ] && [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then #{capture_cmd} #{capture_args}; fi"
+        capture_cmd   = "#{locale_export} && #{hook_export} && #{capture_cmd}"
       end
 
       <<-EOS
 ### lolcommits hook (begin) ###
-if [ ! -d "$GIT_DIR/rebase-merge" ] && [ "$LOLCOMMITS_CAPTURE_DISABLED" != "true" ]; then
-#{capture_cmd} #{capture_args}
-fi
+#{capture_cmd}
 ###  lolcommits hook (end)  ###
 EOS
     end

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -43,13 +43,12 @@ module Lolcommits
       capture_cmd   = 'lolcommits --capture'
 
       if Lolcommits::Platform.platform_windows?
-        capture_cmd = 'if "%LOLCOMMITS_CAPTURE_DISABLED%"=="true" (exit)'
-        capture_cmd = "set path=#{ruby_path};#{imagick_path};%PATH%&&#{capture_cmd} #{capture_args}"
+        exports     = "set path=#{ruby_path};#{imagick_path};%PATH%"
+        capture_cmd = "#{exports} && IF \\I NOT \"%LOLCOMMITS_CAPTURE_DISABLED%\"==\"true\" #{capture_cmd} #{capture_args}"
       else
         locale_export = "LANG=\"#{ENV['LANG']}\""
         hook_export   = "PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
-        capture_cmd   = "#{locale_export} #{hook_export} #{capture_cmd}"
-        capture_cmd   = "if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then #{capture_cmd} #{capture_args}; fi"
+        capture_cmd   = "#{locale_export} && #{hook_export} && if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then #{capture_cmd} #{capture_args}; fi"
       end
 
       capture_cmd

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 module Lolcommits
-  VERSION  = '0.9.3.pre2'.freeze
+  VERSION  = '0.9.3.pre3'.freeze
   GEM_NAME = 'lolcommits'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.9.3.pre2
+  version: 0.9.3.pre3
 platform: ruby
 authors:
 - Matthew Rothenberg