lolcommits 0.5.6 → 0.5.7

data/lib/lolcommits/plugins/lolsrv.rb

@@ -42,11 +42,11 @@ module Lolcommits
 
     def upload(file, sha)
       RestClient.post(configuration['server'] + '/uplol',
-                      :lol => File.new(file),
-                      :url => self.runner.url + sha,
-                      :repo => self.runner.repo,
+                      :lol  => File.new(file),
+                      :url  => self.runner.git_info.url + sha,
+                      :repo => self.runner.git_info.repo,
                       :date => File.ctime(file),
-                      :sha => sha)
+                      :sha  => sha)
     rescue => e
       log_error(e, "ERROR: Upload of lol #{sha} FAILED #{e.class} - #{e.message}")
     end

data/lib/lolcommits/plugins/uploldz.rb

@@ -13,15 +13,18 @@ module Lolcommits
     def run_postcapture
       return unless valid_configuration?
 
-      repo = self.runner.repo.to_s
-      if repo.empty?
+      if self.runner.git_info.repo.empty?
         puts 'Repo is empty, skipping upload'
       else
-        debug 'Calling ' + configuration['endpoint'] + ' with repo ' + repo
+        debug "Posting capture to #{configuration['endpoint']}"
         RestClient.post(configuration['endpoint'],
-                        :file => File.new(self.runner.main_image),
-                        :repo => repo,
-                        :key => configuration['optional_key'])
+                        :file         => File.new(self.runner.main_image),
+                        :message      => self.runner.message,
+                        :repo         => self.runner.git_info.repo,
+                        :author_name  => self.runner.git_info.author_name,
+                        :author_email => self.runner.git_info.author_email,
+                        :sha          => self.runner.sha,
+                        :key          => configuration['optional_key'])
       end
     rescue => e
       log_error(e, "ERROR: RestClient POST FAILED #{e.class} - #{e.message}")

data/lib/lolcommits/runner.rb

@@ -3,9 +3,9 @@ module Lolcommits
   PLUGINS = Lolcommits::Plugin.subclasses
 
   class Runner
-    attr_accessor :capture_delay, :capture_stealth, :capture_device, :message, :sha,
-                  :snapshot_loc, :main_image, :repo, :config, :repo_internal_path,
-                  :font, :capture_animate, :url
+    attr_accessor :capture_delay, :capture_stealth, :capture_device, :message,
+                  :sha, :snapshot_loc, :main_image, :config, :font, :git_info,
+                  :capture_animate
 
     include Methadone::CLILogging
 
@@ -15,12 +15,9 @@ module Lolcommits
       end
 
       if self.sha.nil? || self.message.nil?
-        git_info = GitInfo.new
-        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
-        self.url  = git_info.url
+        self.git_info = GitInfo.new
+        self.sha      = git_info.sha if self.sha.nil?
+        self.message  = git_info.message if self.message.nil?
       end
     end
 
@@ -113,8 +110,8 @@ module Lolcommits
 
   def die_if_rebasing!
     debug "Runner: Making sure user isn't rebasing"
-    if not self.repo_internal_path.nil?
-      mergeclue = File.join self.repo_internal_path, 'rebase-merge'
+    if self.git_info && !self.git_info.repo_internal_path.nil?
+      mergeclue = File.join self.git_info.repo_internal_path, 'rebase-merge'
       if File.directory? mergeclue
         debug 'Runner: Rebase detected, silently exiting!'
         exit 0

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Lolcommits
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/lolcommits.gemspec

@@ -27,35 +27,37 @@ Gem::Specification.new do |s|
   s.requirements << 'imagemagick'
   s.requirements << 'a webcam'
 
-  # core gem dependencies
-  s.add_runtime_dependency('mini_magick', '~> 3.8.1')
-  s.add_runtime_dependency('git', '~> 1.2.5')
+  # hold back upgrading (and why)
+  s.add_runtime_dependency('rest-client', '~> 1.6.7') # uploldz (coveralls requires uses this older version)
+  s.add_runtime_dependency('mini_magick', '~> 3.8.1') # ~> 4+ fails with JRuby
+  s.add_runtime_dependency('mime-types', '~> 1.25')   # ~> 2+ requires Ruby >= 1.9.2
+  s.add_runtime_dependency('httparty', '~> 0.11.0')   # ~> 0.13+ requires Ruby >= 1.9.3
+
+  # core
+  s.add_runtime_dependency('git', '~> 1.2.8')
   s.add_runtime_dependency('choice', '~> 0.1.6')
-  s.add_runtime_dependency('launchy', '~> 2.2.0')
-  s.add_runtime_dependency('methadone', '~> 1.2.4')
-  s.add_runtime_dependency('open4', '~> 1.3.0')
-
-  # development dependencies
-  s.add_development_dependency('rdoc')
-  s.add_development_dependency('aruba', '~> 0.5.1')
-  s.add_development_dependency('rake', '~> 10.0.2')
-  s.add_development_dependency('fivemat', '~> 1.2.1')
-  s.add_development_dependency('faker')
-  s.add_development_dependency('travis')
-  s.add_development_dependency('coveralls')
-  s.add_development_dependency('magic_encoding')
-  if RUBY_VERSION >= '1.9.2'
-    s.add_development_dependency('rubocop', '~> 0.18.1')
+  s.add_runtime_dependency('launchy', '~> 2.4.3')
+  s.add_runtime_dependency('methadone', '~> 1.8.0')
+  s.add_runtime_dependency('open4', '~> 1.3.4')
+
+  # plugin gems
+  s.add_runtime_dependency('twitter', '~> 5.13.0')       # twitter
+  s.add_runtime_dependency('oauth', '~> 0.4.7')          # twitter oauth
+  s.add_runtime_dependency('yam', '~> 2.4.0')            # yammer
+  s.add_runtime_dependency('json', '~> 1.8.1')           # lolsrv
+  s.add_runtime_dependency('httmultiparty', '~> 0.3.16') # dot_com
+
+  # development gems
+  s.add_development_dependency('fivemat', '~> 1.3.1')
+  s.add_development_dependency('rdoc', '~> 4.2.0')
+  s.add_development_dependency('aruba', '~> 0.6.1')
+  s.add_development_dependency('rake', '~> 10.4.2')
+  s.add_development_dependency('ffaker', '~> 1.25.0')
+  s.add_development_dependency('travis', '~> 1.7.4')
+  s.add_development_dependency('coveralls', '~> 0.7.2')
+  s.add_development_dependency('test-unit', '~> 3.0.7')
+
+  if RUBY_VERSION >= '1.9.3'
+    s.add_development_dependency('rubocop', '~> 0.27.1')
   end
-
-  # plugin dependencies
-  s.add_runtime_dependency('twitter', '~> 4.8.1')     #twitter
-  s.add_runtime_dependency('yam', '~> 2.0.1')         #yammer
-  s.add_runtime_dependency('oauth')                   #twitter
-  s.add_runtime_dependency('rest-client')             #uploldz
-  s.add_runtime_dependency('httmultiparty')           #dot_com
-  s.add_runtime_dependency('httparty', "~> 0.11.0")   #dot_com
-  s.add_runtime_dependency('json', '~> 1.7.6')        #lolsrv
-  s.add_runtime_dependency('mime-types', '~> 1.25')
-
 end

data/test/test_lolcommits.rb

@@ -3,6 +3,7 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'test/unit'
+require 'ffaker'
 # Loads lolcommits directly from the lib folder so don't have to create
 # a gem before testing
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -33,16 +34,26 @@ class LolTest < Test::Unit::TestCase
   #
   # issue #136, https://github.com/mroth/lolcommits/issues/136
   def test_lol_twitter_build_tweet
-    long_commit_message = %q{I wanna run, I want to hide, I want to tear down
-the walls that hold me inside. I want to reach out, and touch the flame...
-Where the streets have no name.. ah ah ah.. I want to feel sunlight on my
-face... I see the dust clouds disappear, without a trace... I want to take
-shelter... from the poison rain...  where the streets have no name... oahhhhh
-where the streets have no name... where the streets have no name }.gsub("\n", ' ')
+    long_commit_message = Faker::Lorem.sentence(500)
+    plugin              = Lolcommits::LolTwitter.new(nil)
+    max_tweet_size      = 116
+    suffix              = '... #lolcommits'
 
+    Lolcommits::LolTwitter.send(:define_method, :max_tweet_size, Proc.new { max_tweet_size })
+    assert_match "#{long_commit_message[0..(max_tweet_size - suffix.length)]}#{suffix}", plugin.build_tweet(long_commit_message)
+  end
+
+  def test_lol_twitter_prefix_suffix
     plugin = Lolcommits::LolTwitter.new(nil)
     Lolcommits::LolTwitter.send(:define_method, :max_tweet_size, Proc.new { 116 })
-    assert_match 'I wanna run, I want to hide, I want to tear down the walls that hold me inside. I want to reach out, a... #lolcommits', plugin.build_tweet(long_commit_message)
+    assert_match 'commit msg #lolcommits', plugin.build_tweet('commit msg')
+
+    plugin_config = {
+      'prefix' => '@prefixing!',
+      'suffix' => '#suffixing!'
+    }
+    Lolcommits::LolTwitter.send(:define_method, :configuration, Proc.new { plugin_config })
+    assert_match '@prefixing! commit msg #suffixing!', plugin.build_tweet('commit msg')
   end
 
   #
@@ -64,11 +75,4 @@ where the streets have no name... where the streets have no name }.gsub("\n", '
     assert commandcam_perms == 0755 || commandcam_perms == 0775,
            "expected perms of 755/775 but instead got #{sprintf '%o', commandcam_perms}"
   end
-
-  # Hmm.. webcam capture breaks travis-ci tests
-  # def test_can_capture
-  #  assert_nothing_raised do
-  #    Lolcommits.capture(0,true,'test commit message','test-sha-001')
-  #  end
-  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,330 +9,330 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
-  name: git
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 3.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 3.8.1
 - !ruby/object:Gem::Dependency
-  name: choice
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: choice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.4.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
+        version: 1.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
-  type: :development
+        version: 1.3.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: fivemat
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
+        version: 5.13.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 5.13.0
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.4.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: yam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.8.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: magic_encoding
+  name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.3.16
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: twitter
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
-  type: :runtime
+        version: 4.2.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: yam
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
+        version: 0.6.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 10.4.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.25.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.7.4
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
+        version: 0.7.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
-  name: json
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
-  type: :runtime
+        version: 3.0.7
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :runtime
+        version: 0.27.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 0.27.1
 description: ! "  lolcommits takes a snapshot with your webcam every time you git
   commit code,\n  and archives a lolcat style image with it. It's selfies for software\n
   \ developers. `git blame` has never been so much fun.\n"
@@ -349,6 +349,7 @@ files:
 - .gitattributes
 - .gitignore
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG
 - CONTRIBUTING
@@ -388,7 +389,6 @@ files:
 - lib/lolcommits/runner.rb
 - lib/lolcommits/version.rb
 - lolcommits.gemspec
-- rubocop-todo.yml
 - test/images/test_image.jpg
 - test/test_lolcommits.rb
 - vendor/ext/CommandCam/COPYING
@@ -420,7 +420,7 @@ requirements:
 - imagemagick
 - a webcam
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.