lolcommits 0.9.6 → 0.9.7.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33ddf0cccf67ca8a53bca770511378f57aa078fa
-  data.tar.gz: 9d2daa0667501a5586cc2c3ed5cba15edff372a8
+  metadata.gz: eabd6f7bcb218a41800639928db4cb88cc0ea270
+  data.tar.gz: 58a67da5eb1241edda555e12341805a6fd0ce15c
 SHA512:
-  metadata.gz: 1b7f3e952d3cd800e07b9a13569b35bf4f6a74d303ec56ec44147629b78b105dbc2b1f32300c1dedc12a2c1eb1d90e6b2259e31f44b8e4ed1093a22e7fab40ea
-  data.tar.gz: 46b71b2b04d56a99dc7240dea7d431599136f6780575725d5c260011c1eaa6bec87463dbfe13f6b4b9ca524a80746e365e1eefa50320eb99428ce7b0bd0c3f37
+  metadata.gz: e5e9b23c5e2ed563887a1492be9c34bb2641902989ea354ce41ef0ed76c2603ebca4e7241711185eb2603fa9fdb105981621fec792c54f873812f1501582b3cd
+  data.tar.gz: c6b3b127488061f76b706fbc1bb5d7164a48cdbb34aa992ae9c75858e18110abc8dc0f35963b80c40df66e7a392ea631e9ab0b779421cc71ab5050c34f5556df

data/.travis.yml

@@ -12,7 +12,7 @@ rvm:
 
 before_install:
  # stub mplayer/ffmpeg so it looks like they are installed
- - mkdir ~/bin
+ - mkdir -p ~/bin
  - touch ~/bin/mplayer ~/bin/ffmpeg
  - chmod +x ~/bin/mplayer ~/bin/ffmpeg
  - export PATH=~/bin:$PATH

data/CHANGELOG.md

@@ -8,6 +8,11 @@ project adheres to [Semantic Versioning][Semver].
   * WIP - extract more plugins to gems ...
   * Your contribution here!
 
+## [0.9.7][] (17 September 2017)
+  * Extract dotcom to gem (@matthutchinson [#355][])
+  * Extract uploldz to gem (@matthutchinson [#354][])
+  * Extract lolsrv to gem (@matthutchinson [#353][])
+
 ## [0.9.6][] (28 August 2017)
   * Clean legacy plugin methods (@matthutchinson [#348][])
   * Extract Slack Plugin to gem (@matthutchinson [#349][])
@@ -289,8 +294,9 @@ project adheres to [Semantic Versioning][Semver].
   instead of compositing multiply image Caption objects (this seems to be more
   reliable to not glitch.)
 
-[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.9.6...HEAD
-[0.9.5]: https://github.com/mroth/lolcommits/compare/v0.9.5...v0.9.6
+[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.9.7...HEAD
+[0.9.7]: https://github.com/mroth/lolcommits/compare/v0.9.6...v0.9.7
+[0.9.6]: https://github.com/mroth/lolcommits/compare/v0.9.5...v0.9.6
 [0.9.5]: https://github.com/mroth/lolcommits/compare/v0.9.4...v0.9.5
 [0.9.4]: https://github.com/mroth/lolcommits/compare/v0.9.3...v0.9.4
 [0.9.3]: https://github.com/mroth/lolcommits/compare/v0.9.2...v0.9.3
@@ -460,3 +466,6 @@ project adheres to [Semantic Versioning][Semver].
 [#349]: https://github.com/mroth/lolcommits/pull/349
 [#351]: https://github.com/mroth/lolcommits/pull/351
 [#352]: https://github.com/mroth/lolcommits/pull/352
+[#353]: https://github.com/mroth/lolcommits/pull/353
+[#354]: https://github.com/mroth/lolcommits/pull/354
+[#355]: https://github.com/mroth/lolcommits/pull/355

data/features/support/env.rb

@@ -4,7 +4,7 @@ require 'open3'
 require 'ffaker'
 require 'fileutils'
 
-require File.join(File.expand_path(File.dirname(__FILE__)), 'path_helpers')
+require File.join(__dir__, 'path_helpers')
 include Lolcommits
 
 World(PathHelpers)

data/lib/lolcommits.rb

@@ -29,10 +29,7 @@ require 'lolcommits/backends/git_info'
 require 'lolcommits/backends/mercurial_info'
 
 require 'lolcommits/plugin/base'
-require 'lolcommits/plugin/dot_com'
-require 'lolcommits/plugin/uploldz'
 require 'lolcommits/plugin/term_output'
-require 'lolcommits/plugin/lolsrv'
 require 'lolcommits/plugin/lol_yammer'
 require 'lolcommits/plugin/lol_protonet'
 require 'lolcommits/plugin/lol_tumblr'

data/lib/lolcommits/backends/git_info.rb

@@ -17,6 +17,7 @@ module Lolcommits
       debug "GitInfo: \t#{repo_internal_path}"
       debug "GitInfo: \t#{repo}"
       debug "GitInfo: \t#{branch}"
+      debug "GitInfo: \t#{commit_date}"
       debug "GitInfo: \t#{author_name}" if author_name
       debug "GitInfo: \t#{author_email}" if author_email
     end
@@ -42,7 +43,9 @@ module Lolcommits
 
     def url
       @url ||= begin
-        remote_https_url(repository.remote.url) if repository.remote
+        if repository.remote && repository.remote.url
+          remote_https_url(repository.remote.url)
+        end
       end
     end
 
@@ -68,10 +71,14 @@ module Lolcommits
       @author_email ||= last_commit.author.email if last_commit.author
     end
 
+    def commit_date
+      @commit_date ||= last_commit.date.utc
+    end
+
     private
 
     def remote_https_url(url)
-      url.tr(':', '/').tr(/^git@/, 'https://').tr(/\.git$/, '') + '/commit/'
+      url.tr(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '') + '/commit/'
     end
 
     def repository(path = '.')

data/lib/lolcommits/backends/installation_git.rb

@@ -67,11 +67,11 @@ module Lolcommits
         exports = "set path=\"#{ruby_path};#{imagick_path};%PATH%\""
       end
 
-      <<-EOS
+      <<-HOOK
 ### lolcommits hook (begin) ###
 #{exports} && #{capture_cmd}
 ###  lolcommits hook (end)  ###
-EOS
+HOOK
     end
 
     # does a git hook exist at all?

data/lib/lolcommits/backends/mercurial_info.rb

@@ -24,6 +24,7 @@ module Lolcommits
       debug "MercurialInfo: \t#{repo_internal_path}"
       debug "MercurialInfo: \t#{repo}"
       debug "MercurialInfo: \t#{branch}"
+      debug "MercurialInfo: \t#{commit_date}"
       debug "MercurialInfo: \t#{author_name}" if author_name
       debug "MercurialInfo: \t#{author_email}" if author_email
     end
@@ -63,6 +64,10 @@ module Lolcommits
       @author_email ||= last_commit.author_email
     end
 
+    def commit_date
+      @commit_date ||= last_commit.date.utc
+    end
+
     private
 
     def repository(path = '.')

data/lib/lolcommits/configuration.rb

@@ -2,7 +2,9 @@ module Lolcommits
   class Configuration
     LOLCOMMITS_BASE = ENV['LOLCOMMITS_DIR'] || File.join(ENV['HOME'], '.lolcommits')
     LOLCOMMITS_ROOT = File.join(File.dirname(__FILE__), '../..')
-    attr_accessor :plugin_manager, :loldir
+
+    attr_accessor :plugin_manager
+    attr_writer :loldir
 
     def initialize(plugin_manager, test_mode: false)
       @plugin_manager = plugin_manager

data/lib/lolcommits/gem_plugin.rb

@@ -14,7 +14,7 @@ module Lolcommits
       rescue LoadError => e
         warn "Found plugin #{name}, but could not require gem '#{gem_name}'"
         warn e
-      rescue => e
+      rescue StandardError => e
         warn "require gem '#{gem_name}' failed with: #{e}"
       end
 
@@ -40,7 +40,7 @@ module Lolcommits
 
     def plugin_klass
       self.class.const_get(plugin_klass_name)
-    rescue => e
+    rescue StandardError => e
       warn "failed to load constant from plugin gem '#{plugin_klass_name}: #{e}'"
     end
 

data/lib/lolcommits/platform.rb

@@ -65,7 +65,7 @@ module Lolcommits
       # cli_version check will throw a MiniMagick::Error exception if IM is not
       # installed in PATH, since it attempts to parse output from `identify`
       !MiniMagick.cli_version.nil?
-    rescue
+    rescue StandardError
       return false
     end
 

data/lib/lolcommits/plugin/lol_flowdock.rb

@@ -56,7 +56,7 @@ module Lolcommits
             content: File.new(runner.main_image)
           )
           debug response
-        rescue => e
+        rescue StandardError => e
           retries -= 1
           retry if retries > 0
           puts "Posting to flowdock failed - #{e.message}"

data/lib/lolcommits/plugin/lol_yammer.rb

@@ -71,7 +71,7 @@ module Lolcommits
           response = client.create_message(post, attachment1: lolimage)
           debug response.body.inspect
           puts "\t--> Status posted!" if response
-        rescue => e
+        rescue StandardError => e
           retries -= 1
           retry if retries > 0
           puts "Status not posted - #{e.message}"

data/lib/lolcommits/test_helpers/git_repo.rb

@@ -6,7 +6,7 @@ module Lolcommits
       end
 
       def repo_path
-        '~/.lolcommits/sample-plugin-test-repo'
+        '~/.lolcommits/plugin-test-repo'
       end
 
       def repo_exists?

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 module Lolcommits
-  VERSION  = '0.9.6'.freeze
+  VERSION  = '0.9.7.pre1'.freeze
   GEM_NAME = 'lolcommits'.freeze
 end

data/lolcommits.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
   s.license     = 'LGPL-3'
   s.summary     = 'Capture webcam image on git commit for lulz.'
 
-  s.description = <<-EOF
+  s.description = <<-DESC
   lolcommits takes a snapshot with your webcam every time you git commit code,
   and archives a lolcat style image with it. It's selfies for software
   developers. `git blame` has never been so much fun.
-  EOF
+DESC
 
-  s.post_install_message = <<-EOF
+  s.post_install_message = <<-POSTINSTALL
   -------------------------------------------------------------------------------
 
   Lolcommits: quick message from the dev team! v0.9.5 extracts the Twitter plugin
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   Happy Lol'ing!
 
   -------------------------------------------------------------------------------
-EOF
+POSTINSTALL
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -67,7 +67,6 @@ EOF
 
   # plugin gems
   s.add_runtime_dependency('yam', '~> 2.5.0')            # yammer
-  s.add_runtime_dependency('httmultiparty', '~> 0.3.16') # dot_com
   s.add_runtime_dependency('tumblr_client', '~> 0.8.5')  # tumblr
 
   # development gems

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7.pre1
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -179,20 +179,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: tumblr_client
   requirement: !ruby/object:Gem::Requirement
@@ -382,15 +368,12 @@ files:
 - lib/lolcommits/installation.rb
 - lib/lolcommits/platform.rb
 - lib/lolcommits/plugin/base.rb
-- lib/lolcommits/plugin/dot_com.rb
 - lib/lolcommits/plugin/lol_flowdock.rb
 - lib/lolcommits/plugin/lol_hipchat.rb
 - lib/lolcommits/plugin/lol_protonet.rb
 - lib/lolcommits/plugin/lol_tumblr.rb
 - lib/lolcommits/plugin/lol_yammer.rb
-- lib/lolcommits/plugin/lolsrv.rb
 - lib/lolcommits/plugin/term_output.rb
-- lib/lolcommits/plugin/uploldz.rb
 - lib/lolcommits/plugin_manager.rb
 - lib/lolcommits/runner.rb
 - lib/lolcommits/test_helpers/fake_io.rb
@@ -438,14 +421,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - imagemagick
 - a webcam
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.

data/lib/lolcommits/plugin/dot_com.rb

@@ -1,50 +0,0 @@
-require 'httmultiparty'
-
-module Lolcommits
-  module Plugin
-    class DotCom < Base
-      BASE_URL = 'http://lolcommits-dot-com.herokuapp.com'.freeze
-
-      def initialize(runner: nil, config: nil)
-        super
-        options.concat(%w(api_key api_secret repo_id))
-      end
-
-      def run_capture_ready
-        t = Time.now.to_i.to_s
-        HTTMultiParty.post(
-          "#{BASE_URL}/git_commits.json",
-          body: {
-            git_commit: {
-              sha: runner.sha,
-              repo_external_id: configuration['repo_id'],
-              image: File.open(runner.main_image),
-              raw: File.open(runner.snapshot_loc)
-            },
-
-            key: configuration['api_key'],
-            t: t,
-            token: Digest::SHA1.hexdigest(configuration['api_secret'] + t)
-          }
-        )
-      rescue => e
-        log_error(e, "ERROR: HTTMultiParty POST FAILED #{e.class} - #{e.message}")
-      end
-
-      def configured?
-        !configuration['enabled'].nil? &&
-          configuration['api_key'] &&
-          configuration['api_secret'] &&
-          configuration['repo_id']
-      end
-
-      def self.name
-        'dot_com'
-      end
-
-      def self.runner_order
-        :capture_ready
-      end
-    end
-  end
-end

data/lib/lolcommits/plugin/lolsrv.rb

@@ -1,58 +0,0 @@
-require 'rest_client'
-require 'pp'
-require 'json'
-
-module Lolcommits
-  module Plugin
-    class Lolsrv < Base
-      def initialize(runner: nil, config: nil)
-        super
-        options << 'server'
-      end
-
-      def run_capture_ready
-        fork { sync }
-      end
-
-      def configured?
-        !configuration['enabled'].nil? && configuration['server']
-      end
-
-      def sync
-        existing = existing_lols
-        return unless existing.nil?
-        Dir[runner.config.loldir + '/*.{jpg,gif}'].each do |item|
-          sha = File.basename(item, '.*')
-          upload(item, sha) unless existing.include?(sha) || sha == 'tmp_snapshot'
-        end
-      end
-
-      def existing_lols
-        lols = JSON.parse(RestClient.get(configuration['server'] + '/lols'))
-        lols.map { |lol| lol['sha'] }
-      rescue => e
-        log_error(e, "ERROR: existing lols could not be retrieved #{e.class} - #{e.message}")
-        return nil
-      end
-
-      def upload(file, sha)
-        RestClient.post(configuration['server'] + '/uplol',
-                        lol: File.new(file),
-                        url: runner.vcs_info.url + sha,
-                        repo: runner.vcs_info.repo,
-                        date: File.ctime(file),
-                        sha: sha)
-      rescue => e
-        log_error(e, "ERROR: Upload of lol #{sha} FAILED #{e.class} - #{e.message}")
-      end
-
-      def self.name
-        'lolsrv'
-      end
-
-      def self.runner_order
-        :capture_ready
-      end
-    end
-  end
-end

data/lib/lolcommits/plugin/uploldz.rb

@@ -1,65 +0,0 @@
-require 'rest_client'
-require 'base64'
-
-module Lolcommits
-  module Plugin
-    class Uploldz < Base
-      attr_accessor :endpoint
-
-      def initialize(runner: nil, config: nil)
-        super
-        options.concat(
-          %w(
-            endpoint
-            optional_key
-            optional_http_auth_username
-            optional_http_auth_password
-          )
-        )
-      end
-
-      def run_capture_ready
-        if !runner.vcs_info || runner.vcs_info.repo.empty?
-          puts 'Repo is empty, skipping upload'
-        else
-          debug "Posting capture to #{configuration['endpoint']}"
-          RestClient.post(
-            configuration['endpoint'],
-            {
-              file: File.new(runner.main_image),
-              message: runner.message,
-              repo: runner.vcs_info.repo,
-              author_name: runner.vcs_info.author_name,
-              author_email: runner.vcs_info.author_email,
-              sha: runner.sha,
-              key: configuration['optional_key']
-            },
-            Authorization: authorization_header
-          )
-        end
-      rescue => e
-        log_error(e, "ERROR: RestClient POST FAILED #{e.class} - #{e.message}")
-      end
-
-      def configured?
-        !configuration['enabled'].nil? && configuration['endpoint']
-      end
-
-      def authorization_header
-        user     = configuration['optional_http_auth_username']
-        password = configuration['optional_http_auth_password']
-        return unless user || password
-
-        'Basic ' + Base64.encode64("#{user}:#{password}").chomp
-      end
-
-      def self.name
-        'uploldz'
-      end
-
-      def self.runner_order
-        :capture_ready
-      end
-    end
-  end
-end