lolcommits 0.4.1 → 0.4.2

data/.travis.yml

@@ -3,17 +3,17 @@ rvm:
  - 1.8.7
  - 1.9.2
  - 1.9.3
- - ruby-head
+ - 2.0.0
 
 before_install:
-# - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 16126D3A3E5C1192
+ # imagemagick is installed by default on normal travis image now
  - sudo apt-get update -qq
- - sudo apt-get install -qq -y mplayer imagemagick libmagickwand-dev
+ - sudo apt-get install -qq -y mplayer 
+ # - sudo apt-get install -qq -y imagemagick libmagickwand-dev
 
-#test against ruby-head as well so we know what's coming down the pipe
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+# matrix:
+  # allow_failures:
+    # - rvm: 2.0.0
 
 branches:
   except:

data/CHANGELOG

@@ -1,6 +1,11 @@
-0.4.2 (in development)
+0.4.3 (in development)
   * TODO: figure out problems with GUI clients
-  * TODO: figure out ruby 2.0 compatibility and testing
+
+0.4.2 (11 March 2013)
+  * fix ruby 2.0 compatibility (#91)
+  * gracefully detect upstream issue with git color.ui being set to always (#50)
+  * handle external capture devices with special characters in name (#93)
+  * fixes to the uploldz plugin (#92)
 
 0.4.1 (17 February 2013)
   * add lolsrv plugin (thx @sebastianmarr!, #82)

data/bin/lolcommits

@@ -24,24 +24,31 @@ def command?(name)
   $?.success?
 end
 
-if Configuration.is_mac?
-  unless File.executable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
-    fatal "Couldn't properly execute imagesnap for some reason, please file a bug?!"
+def die_on_fatal_conditions!
+  if Configuration.is_mac?
+    unless File.executable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
+      fatal "Couldn't properly execute imagesnap for some reason, please file a bug?!"
+      exit 1
+    end
+  elsif Configuration.is_linux?
+    if not command?('mplayer')
+      fatal "Couldn't find mplayer in your PATH!"
+      exit 1
+    end
+  end
+  unless File.readable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+    fatal "Couldn't properly read Impact font from gem package, please file a bug?!"
     exit 1
   end
-elsif Configuration.is_linux?
-  if not command?('mplayer')
-    fatal "Couldn't find mplayer in your PATH!"
+  unless Configuration.valid_imagemagick_installed?
+    fatal "FATAL: ImageMagick does not appear to be properly installed!"
+    exit 1
+  end
+  if Configuration.git_config_color_always?
+    fatal "Due to a bug in the ruby-git library, git config for color.ui cannot be set to 'always'."
+    fatal "Try setting it to 'auto' instead!"
     exit 1
   end
-end
-unless File.readable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
-  fatal "Couldn't properly read Impact font from gem package, please file a bug?!"
-  exit 1
-end
-unless Configuration.valid_imagemagick_installed?
-  fatal "FATAL: ImageMagick does not appear to be properly installed!"
-  exit 1
 end
 
 def die_if_not_git_repo!
@@ -274,6 +281,11 @@ if debug_mode
   debug "Outputting at DEBUG verbosity"
 end
 
+#
+# check for fatal conditions before execution
+#
+die_on_fatal_conditions!
+
 #
 # Handle actions manually since choice seems weird
 #

data/features/bugs.feature

@@ -45,3 +45,14 @@ Feature: Bug regression testing
     When I run `lolcommits`
     Then the output should contain "ImageMagick does not appear to be properly installed"
     And the exit status should be 1
+
+  #
+  # issue #50, https://github.com/mroth/lolcommits/issues/50
+  #
+  Scenario: catch upstream bug with ruby-git and color=always
+    Given I am in a git repository named "whatev" with lolcommits enabled
+    And I successfully run `git config color.ui always`
+    When I run `lolcommits`
+    Then the output should contain "Due to a bug in the ruby-git library, git config for color.ui cannot be set to 'always'."
+    And the output should contain "Try setting it to 'auto' instead!"
+    And the exit status should be 1

data/features/plugins.feature

@@ -1,6 +1,6 @@
 Feature: Plugins Work
 
-  @focus @announce @slow_process
+  @slow_process
   Scenario: Lolcommits.com integration works
     Given I am in a git repository named "dot_com" with lolcommits enabled
     When I run `lolcommits --config` and wait for output

data/lib/lolcommits/capture_mac.rb

@@ -1,7 +1,7 @@
 module Lolcommits
   class CaptureMac < Capturer
     def capture_device_string
-      @capture_device.nil? ? nil : "-d #{@capture_device}"
+      @capture_device.nil? ? nil : "-d \"#{@capture_device}\""
     end
 
     def capture

data/lib/lolcommits/configuration.rb

@@ -137,6 +137,10 @@ module Lolcommits
       MiniMagick::valid_version_installed?
     end
 
+    def self.git_config_color_always?
+      `git config color.ui`.chomp =~ /always/
+    end
+
     # Cross-platform way of finding an executable in the $PATH.
     # idea taken from http://bit.ly/qDaTbY
     #

data/lib/lolcommits/git_info.rb

@@ -1,7 +1,7 @@
 module Lolcommits
   class GitInfo
     include Methadone::CLILogging
-    attr_accessor :sha, :message, :repo_internal_path
+    attr_accessor :sha, :message, :repo_internal_path, :repo
 
     def initialize
       debug "GitInfo: attempting to read local repository"
@@ -13,11 +13,15 @@ module Lolcommits
       self.message = commit.message.split("\n").first
       self.sha     = commit.sha[0..10]
       self.repo_internal_path = g.repo.path
+      regex = /.*[:\/](\w*).git/
+      match = g.remote.url.match regex if g.remote.url
+      self.repo = match[1] if match
       
       debug "GitInfo: parsed the following values from commit:"
       debug "GitInfo: \t#{self.message}"
       debug "GitInfo: \t#{self.sha}"
       debug "GitInfo: \t#{self.repo_internal_path}" 
+      debug "GitInfo: \t#{self.repo}"
     end
   end
 end

data/lib/lolcommits/plugins/uploldz.rb

@@ -13,12 +13,16 @@ module Lolcommits
     end
 
     def run
+      repo = self.runner.repo.to_s
       if configuration['endpoint'].empty?
         puts "Endpoint URL is empty, please run lolcommits --config to add one."
+      elsif repo.empty?
+        puts "Repo is empty, skipping upload"
       else
-        RestClient.post(configuration['endpoint'],
+        plugdebug "Calling " + configuration['endpoint'] + " with repo " + repo
+        RestClient.post(configuration['endpoint'], 
           :file => File.new(self.runner.main_image),
-          :repo => self.runner.repo)
+          :repo => repo)
       end
 
     end

data/lib/lolcommits/runner.rb

@@ -31,6 +31,7 @@ module Lolcommits
         self.sha = git_info.sha if self.sha.nil?
         self.message = git_info.message if self.message.nil?
         self.repo_internal_path = git_info.repo_internal_path
+        self.repo = git_info.repo
       end
     end
 

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -367,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4513374714395710926
+      hash: 4005532101610258654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4513374714395710926
+      hash: 4005532101610258654
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 1.8.25