lolcommits 0.5.3 → 0.5.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGUzMzkwYmFhNGQyYjE3ZDY3ZjhjZDlhOGZhZTIzMzYzMGMyYzAxYw==
+    OTgyMzJkN2VlNzkyODQ1NDdkMWQwM2U3ZjY3NTdmZGNhNDQxNDY1OQ==
   data.tar.gz: !binary |-
-    NzE4NTQ1Y2E3ZDM4NTQzYzIyMjYzNzI0NGViMjQ2ZDU0ZDEwZjcxNg==
+    ZmM0OTJjZmY5MDY2OGNjNzYxNDZjYTM0NzFlZmY4NjkwN2Y4ZGI3MA==
 SHA512:
   metadata.gz: !binary |-
-    N2NlZTFiMGJmOGU0NTk3ZTdiMDVlNTI1ZTY4ZWFlNGJjZDIwYzI3MTk4NDVl
-    Y2UxZWM2N2Y0MjE1OGE4YWZmMWMxMjYxNzIxMzVkZTJkNzQ1ZDVmZWExNDM3
-    M2JjZmFjODUyMjU4Y2I5NWM1N2NmNTIzMWIxNWI0ZDJlNGFmNzA=
+    YTVhNDFhYTE5NzZlMTM1ZGNmNmM2YzI1NTY0Nzk5NWI1ZjU1NGE3MTRjZmVm
+    NTdhMmQyYzI2NTQ0NzIwMGU4ODc3YjMxOGQ4MTA0MTYzYzZmOThmMTljMDcx
+    OTE2ZThlZWQ3ZjExMmVlNmIzNWE1OWQ5MjNiZTdhNjIyZTY3ZDU=
   data.tar.gz: !binary |-
-    N2RjMjRhYWQwOWVjZThhNzg5OTMwNmJiNDY0Njk2ZWM0M2M2Y2YyMDQ3MDcz
-    MjU4MzU1OTJlNzEyYjg4ZTdiNmI4NGI1ZGYyYTA5NjRiMzE0OGNmOGY3MmE3
-    ZjMwYmMxMGYxMjgyMjBjMmUzZjViMmMzNmYyYjZmYjNlY2Y2ODc=
+    MjVhZDM2ZGU3OGE3MzdkNzE0NmMyNzJmZWVkYTRhMjNjNGYyM2JiNDQ3YjUy
+    NzljMmQ0NDE3MGI2ZmVmMDdkZDE4MWViZTljODczZTU3YjlhMGQ2ODNiNjU3
+    YzFkNGQxMzJhMzRhMTBhYjMyMDE4NjM3ZTE0ZjVhYmNiMGU5Mjc=

data/.rubocop.yml

@@ -1,5 +1,10 @@
+AllCops:
+  Excludes:
+    - vendor/bundle/**
+
 inherit_from: rubocop-todo.yml
 
 # Enforce Ruby 1.8.7 compatible syntax
 HashSyntax:
   EnforcedStyle: hash_rockets
+

data/CHANGELOG

@@ -1,6 +1,13 @@
 0.x.x (in development)
   * TODO: figure out problems with GUI clients
 
+0.5.4 (13 April 2014)
+  * Excluded vendor/bundle from rubocop cops (@matthutchinson)
+  * Peg fivemat gem to ~> 1.2.1 (@mroth)
+  * Fix lolsrv log file issue (@matthutchinson #202)
+  * Yammer Plugin added (@mrclmvn #160)
+  * Refactor on capture options (@mroth)
+
 0.5.3 (30 March 2014)
   * Fixed permissions on CommandCam (755) for cygwin (@matthutchinson)
   * Added `--devices` option, mac only for now (@matthutchinson #183, #174)

data/bin/lolcommits

@@ -96,31 +96,32 @@ def do_capture
   capture_device  = Choice.choices[:device]   || ENV['LOLCOMMITS_DEVICE']   || nil
   capture_font    = Choice.choices[:font]     || ENV['LOLCOMMITS_FONT']     || nil
 
+  capture_options = {
+    :capture_delay   => capture_delay,
+    :capture_stealth => capture_stealth,
+    :capture_device  => capture_device,
+    :font            => capture_font,
+    :capture_animate => capture_animate,
+    :config          => configuration
+  }
+
   fork_me? do
     if Choice.choices[:test]
       info '*** Capturing in test mode.'
-      runner = Lolcommits::Runner.new(
-        :capture_delay   => capture_delay,
-        :capture_stealth => capture_stealth,
-        :capture_device  => capture_device,
-        :capture_animate => capture_animate,
-        :message         => Choice.choices[:msg],
-        :sha             => Choice.choices[:sha],
-        :config          => configuration,
-        :font            => capture_font
-      )
+
+      # get optional fake commit msg and sha from command line
+      override_text = {
+        :message => Choice.choices[:msg],
+        :sha     => Choice.choices[:sha]
+      }
+
+      runner = Lolcommits::Runner.new(capture_options.merge override_text)
       runner.run
 
+      # automatically open so the user can see the test image results immediately
       Launchy.open(runner.main_image)
     else
-      runner = Lolcommits::Runner.new(
-        :capture_delay   => capture_delay,
-        :capture_stealth => capture_stealth,
-        :capture_device  => capture_device,
-        :capture_animate => capture_animate,
-        :config          => configuration,
-        :font            => capture_font
-      )
+      runner = Lolcommits::Runner.new(capture_options)
       runner.run
     end
   end

data/lib/lolcommits.rb

@@ -30,6 +30,7 @@ require 'lolcommits/plugins/tranzlate'
 require 'lolcommits/plugins/lol_twitter'
 require 'lolcommits/plugins/uploldz'
 require 'lolcommits/plugins/lolsrv'
+require 'lolcommits/plugins/lol_yammer'
 
 # require runner after all the plugins have been required
 require 'lolcommits/runner'

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -0,0 +1,85 @@
+# -*- encoding : utf-8 -*-
+require 'yammer'
+require 'rest_client'
+
+# https://developer.yammer.com/oauth2-quickstart/
+YAMMER_CLIENT_ID        = 'bgORyeKtnjZJSMwp8oln9g'
+YAMMER_CLIENT_SECRET    = 'oer2WdGzh74a5QBbW3INUxblHK3yg9KvCZmiBa2r0'
+YAMMER_ACCESS_TOKEN_URL = 'https://www.yammer.com/oauth2/access_token.json'
+YAMMER_RETRY_COUNT      = 2
+
+module Lolcommits
+  class LolYammer < Plugin
+    def self.name
+      'yammer'
+    end
+
+    def configured?
+      !configuration['access_token'].nil?
+    end
+
+    def configure_access_token
+      print "Open the URL below and copy the `code` param from query after redirected, enter it as `access_token`:\n"
+      print "https://www.yammer.com/dialog/oauth?client_id=#{YAMMER_CLIENT_ID}&response_type=code\n"
+      print 'Enter code param from the redirected URL, then press enter: '
+      code = STDIN.gets.to_s.strip
+
+      url = "#{YAMMER_ACCESS_TOKEN_URL}"
+      debug "access_token url: #{url}"
+      params = {
+        'client_id' => YAMMER_CLIENT_ID,
+        'client_secret' => YAMMER_CLIENT_SECRET,
+        'code' => code
+      }
+      debug "params : #{params.inspect}"
+      result = JSON.parse(RestClient.post(url, params))
+      debug "response : #{result.inspect}"
+      # no need for 'return', last line is always the return value
+      { 'access_token' => result['access_token']['token'] }
+    end
+
+    def configure_options!
+      options = super
+      if options['enabled'] == true
+        auth_config = configure_access_token
+        if auth_config
+          options.merge!(auth_config)
+        else
+          return
+        end
+      end
+      options
+    end
+
+    def run
+      return unless valid_configuration?
+
+      commit_msg = self.runner.message
+      post = "#{commit_msg} #lolcommits"
+      puts "Yammer post: #{post}" unless self.runner.capture_stealth
+
+      Yammer.configure do |c|
+        c.client_id = YAMMER_CLIENT_ID
+        c.client_secret = YAMMER_CLIENT_SECRET
+      end
+
+      client = Yammer::Client.new(:access_token  => configuration['access_token'])
+
+      retries = YAMMER_RETRY_COUNT
+      begin
+        lolimage = File.new(self.runner.main_image)
+        response = client.create_message(post, :attachment1 => lolimage)
+        debug response.body.inspect
+        if response
+          puts "\t--> Status posted!" unless self.runner.capture_stealth
+        end
+      rescue => e
+        retries -= 1
+        retry if retries > 0
+        puts "Status not posted - #{e.message}"
+        puts 'Try running config again:'
+        puts "\tlolcommits --config --plugin yammer"
+      end
+    end
+  end
+end

data/lib/lolcommits/plugins/lolsrv.rb

@@ -2,16 +2,12 @@
 require 'rest_client'
 require 'pp'
 require 'json'
-require 'logger'
 
 module Lolcommits
   class Lolsrv < Plugin
     def initialize(runner)
       super
       self.options << 'server'
-      if self.runner
-        @logger = Logger.new(File.new(self.runner.config.loldir + '/lolsrv.log', 'a+'))
-      end
     end
 
     def run
@@ -63,8 +59,7 @@ module Lolcommits
 
     def log_error(e, message)
       debug message
-      @logger.info message
-      @logger.info e.backtrace
+      debug e.backtrace
     end
 
     def self.name

data/lib/lolcommits/runner.rb

@@ -18,6 +18,7 @@ module Lolcommits
     set_callback :run, :after,  :execute_lolcommits_lolsrv
     set_callback :run, :after,  :execute_lolcommits_lol_twitter
     set_callback :run, :after,  :execute_lolcommits_dot_com
+    set_callback :run, :after,  :execute_lolcommits_lol_yammer
     set_callback :run, :after,  :execute_lolcommits_loltext
     # Executed First
 

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   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')
+  s.add_development_dependency('fivemat', '~> 1.2.1')
   s.add_development_dependency('faker')
   s.add_development_dependency('travis')
   s.add_development_dependency('coveralls')
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
 
   # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Matthew Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -154,16 +154,16 @@ dependencies:
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.8.1
+- !ruby/object:Gem::Dependency
+  name: yam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +391,7 @@ files:
 - lib/lolcommits/plugin.rb
 - lib/lolcommits/plugins/dot_com.rb
 - lib/lolcommits/plugins/lol_twitter.rb
+- lib/lolcommits/plugins/lol_yammer.rb
 - lib/lolcommits/plugins/lolsrv.rb
 - lib/lolcommits/plugins/loltext.rb
 - lib/lolcommits/plugins/tranzlate.rb