lolcommits 0.9.3.pre3 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c432270b046edb27829416bf9ada561b3aa0a5
-  data.tar.gz: d1238ceb4a716d739117795669c2ccf0c000a7ab
+  metadata.gz: 6864a969f2a474924b420bf5043e8f0cf8c4a06b
+  data.tar.gz: 7298c313a1747d98fb340edb3ffd36864ed8e22d
 SHA512:
-  metadata.gz: 85662930d7f30595deef8e6f4d9974057e2ff256a290369ea5db91d9747139a04ef93b5f22d62fc620eacb07d0a43c0835ac9fcedbd8dc40e2b9bf4745a9ea08
-  data.tar.gz: b46e6131b9874a545ecb4b904f90e5dea2494bcc6395a38a3bb472b3a22561bcf5c0d7701e1c2a63e9b579a89a2fe99a57e15440a64a7a2134d1e0df33d9dfeb
+  metadata.gz: eb73b9e99c8935a5609ec43e32d7e908fe9fb62f34da8576f4fd7dd50157430866174b2defe114c5870e8cbb0d9caea5ed85a0c5febc757b7a8caa33d9382b09
+  data.tar.gz: 969703fd3242a8ef0adcfe5b6d68da899421a882d4290ed89e2459f94584c47543e49a5cbe7452a04bc2f4c900aabf06b25200df2ee39d46003201491722f9e5

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
  - 2.2.4
  - 2.3.0
  - 2.3.3
- - 2.4.0
+ - 2.4.1
  - ruby-head
 
 before_install:

data/lib/lolcommits/backends/installation_git.rb

@@ -58,26 +58,18 @@ module Lolcommits
     end
 
     def self.hook_script(capture_args = '')
-      # TODO: have this return a single line bash like mercurial install, and DRY
-      # this method (only different in git is the rebase-merge check which could
-      # be extracted
       ruby_path     = Lolcommits::Platform.command_which('ruby', true)
       imagick_path  = Lolcommits::Platform.command_which('identify', true)
-      capture_cmd   = 'lolcommits --capture'
+      capture_cmd   = "if [ ! -d \"$GIT_DIR/rebase-merge\" ] && [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
+      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
 
       if Lolcommits::Platform.platform_windows?
-        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   = "if [ ! -d \"$GIT_DIR/rebase-merge\" ] && [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then #{capture_cmd} #{capture_args}; fi"
-        capture_cmd   = "#{locale_export} && #{hook_export} && #{capture_cmd}"
+        exports = "set path=#{ruby_path};#{imagick_path};%PATH%"
       end
 
       <<-EOS
 ### lolcommits hook (begin) ###
-#{capture_cmd}
+#{exports} && #{capture_cmd}
 ###  lolcommits hook (end)  ###
 EOS
     end

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -40,18 +40,14 @@ module Lolcommits
     def self.hook_script(capture_args = '')
       ruby_path     = Lolcommits::Platform.command_which('ruby', true)
       imagick_path  = Lolcommits::Platform.command_which('identify', true)
-      capture_cmd   = 'lolcommits --capture'
+      capture_cmd   = "if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
+      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
 
       if Lolcommits::Platform.platform_windows?
-        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} && if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then #{capture_cmd} #{capture_args}; fi"
+        exports = "set path=#{ruby_path};#{imagick_path};%PATH%"
       end
 
-      capture_cmd
+      "#{exports} && #{capture_cmd}"
     end
 
     def self.repository

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 module Lolcommits
-  VERSION  = '0.9.3.pre3'.freeze
+  VERSION  = '0.9.3'.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.pre3
+  version: 0.9.3
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -398,14 +398,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - imagemagick
 - a webcam
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.