octospy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e08f9448c067f8b3f4574259fef52f9f8aaeeda
-  data.tar.gz: 2756eab8a7094619951b83abc0ea326a9db3586b
+  metadata.gz: 66a3c3615824ecfbdef2e8a16a9f3e635176583b
+  data.tar.gz: 98a7bc1a73bcc382107a29d8832bf71228ec3fca
 SHA512:
-  metadata.gz: 8f359f1433beeba18c9d37fca46afe892042897e6309581e43c7964b5f4009e16838ce39127c5aad2091b42284cd1a2b703f8459725dc21aeab06957ff4e96a9
-  data.tar.gz: 8b0ff9a217cdff09975808e77185931538b8344ad1cd139df0c330dc7dd04808731e6a7077bd77312c76732b9671d4ec17f245949666ba14f41842bebf9346de
+  metadata.gz: e08504e4ee353010971d1ecae483b1cccf477ce6dea702d32442d9393eafef8cbbd5b5fe240f57e0b8e85bf227b2aeda1c69a9e82fa79c1807e12c44907fca19
+  data.tar.gz: 3c964b19e168d43521c57778aa86708ba6a4f88f0324d8bd1bde0285ac3a9a388259a21d1ed3a834e47b28c03649ae51da9a7d132905c4b859996c44acb5971e

data/.env.example

@@ -1,14 +1,17 @@
-# Required
+## Required
 SERVER=irc.yourserver.net
 CHANNELS=yourchannel
-GITHUB_LOGIN=yourusername
+# OAuth access token
 GITHUB_TOKEN=e17e1c6caa3e452433ab55****************
+# Basic Authentication
+# GITHUB_LOGIN=yourusername
+# GITHUB_PASSWORD=************
 
-# Options
+## Options
 # HOST=6668
 # SSL=true
 # PASSWORD=*****************
 
-# GitHub Enterprise
+## GitHub Enterprise
 # GITHUB_API_ENDPOINT=http://your.enterprise.domain/api/v3
 # GITHUB_WEB_ENDPOINT=http://your.enterprise.domain

data/README.md

@@ -53,7 +53,6 @@ edit `.env`:
 ```sh
 SERVER=irc.yourserver.net
 CHANNELS=yourchannel
-GITHUB_LOGIN=yourusername
 GITHUB_TOKEN=e17e1c6caa3e452433ab55****************
 ```
 

data/lib/octospy/configurable.rb

@@ -7,6 +7,7 @@ module Octospy
         ssl
         password
         nick
+        worker_interval
         cinch_config_block
         github_api_endpoint
         github_web_endpoint
@@ -44,6 +45,7 @@ module Octospy
       @port                = ENV['PORT']
       @ssl                 = !!ENV['SSL']
       @password            = ENV['PASSWORD']
+      @worker_interval     = ENV['WORKER_INTERVAL'] || 30 #sec
       @github_login        = ENV['GITHUB_LOGIN']
       @github_token        = ENV['GITHUB_TOKEN']
       @channels            = ENV['CHANNELS'] ?

data/lib/octospy/parser/issue.rb

@@ -18,7 +18,7 @@ module Octospy
           status: "#{@event.payload.action} issue ##{@event.payload.issue.number}",
           title: @event.payload.issue.title,
           body: body,
-          link: @event.payload.issue.html_url
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}/issues/#{@event.payload.issue.number}"
         }
       end
 
@@ -35,7 +35,7 @@ module Octospy
           status: status,
           title: title,
           body: "#{@event.payload.comment.body}".split_lfbl,
-          link: @event.payload.comment.html_url
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}/issues/#{@event.payload.issue.number}#issuecomment-#{@event.payload.comment.id}"
         }
       end
     end

data/lib/octospy/parser/organization.rb

@@ -14,7 +14,7 @@ module Octospy
         {
           status: "#{@event.payload.action} member",
           title: user.login,
-          link: "#{Octokit.web_endpoint}/#{user.login}"
+          link: "#{Octokit.web_endpoint}#{user.login}"
         }
       end
     end

data/lib/octospy/parser/pull_request.rb

@@ -6,7 +6,7 @@ module Octospy
           status: "#{@event.payload.action} pull request ##{@event.payload.number}",
           title: @event.payload.pull_request.title,
           body: "#{@event.payload.pull_request.body}".split_lfbl,
-          link: @event.payload.pull_request.html_url
+          link: @event.payload.pull_request._links.html.attrs[:href]
         }
       end
 

data/lib/octospy/parser/release.rb

@@ -0,0 +1,14 @@
+module Octospy
+  class Parser
+    module Release
+      def parse_release_event
+        {
+          status: "#{@event.payload.release.draft ? 'published' : 'saved draft'} release",
+          title: "#{@event.payload.release.name}",
+          body: "#{@event.payload.release.body}".split_lfbl,
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}/releases/#{@event.payload.release.tag_name}"
+        }
+      end
+    end
+  end
+end

data/lib/octospy/parser/repository.rb

@@ -15,7 +15,7 @@ module Octospy
         @event.payload.commits.each do |commit|
           verbose_commit = Octokit.commit(@event.repo.name, commit.sha)
           name = "#{verbose_commit.author ? verbose_commit.author.login : commit.author.name}"
-          link = "#{Octokit.web_endpoint}/#{@event.repo.name}/commit/#{commit.sha}"
+          link = "#{Octokit.web_endpoint}#{@event.repo.name}/commit/#{commit.sha}"
           line = "#{name.colorize_for_irc.silver}: #{commit.message}"
           line << " - #{link.shorten.colorize_for_irc.blue}"
           body = body + "#{line}".split_lfbl
@@ -24,7 +24,7 @@ module Octospy
         {
           status: "pushed to #{@event.payload.ref.gsub('refs/heads/', '')}",
           body: body,
-          link: "#{Octokit.web_endpoint}/#{@event.repo.name}",
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}",
           notice_body: true
         }
       end
@@ -36,14 +36,14 @@ module Octospy
           {
             status: "created repository",
             title: title,
-            link: "#{Octokit.web_endpoint}/#{@event.repo.name}",
+            link: "#{Octokit.web_endpoint}#{@event.repo.name}",
             repository: nil
           }
         else
           {
             status: "created #{@event.payload.ref_type}:#{@event.payload.ref}",
             title: @event.payload.description,
-            link: "#{Octokit.web_endpoint}/#{@event.repo.name}"
+            link: "#{Octokit.web_endpoint}#{@event.repo.name}"
           }
         end
       end
@@ -51,7 +51,7 @@ module Octospy
       def parse_delete_event
         {
           status: "deleted #{@event.payload.ref_type}:#{@event.payload.ref}",
-          link: "#{Octokit.web_endpoint}/#{@event.repo.name}"
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}"
         }
       end
 
@@ -68,7 +68,7 @@ module Octospy
       def parse_public_event
         {
           status: "published #{@event.repo.name}",
-          link: "#{Octokit.web_endpoint}/#{@event.repo.name}"
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}"
         }
       end
 

data/lib/octospy/parser/user.rb

@@ -5,7 +5,7 @@ module Octospy
         {
           status: "#{@event.payload.action} repository",
           title: @event.repo.name,
-          link: "#{Octokit.web_endpoint}/#{@event.repo.name}",
+          link: "#{Octokit.web_endpoint}#{@event.repo.name}",
           repository: nil
         }
       end
@@ -27,7 +27,7 @@ module Octospy
           status: "followed",
           title: title,
           body: profile.join(', '),
-          link: "#{Octokit.web_endpoint}/#{user.login}",
+          link: "#{Octokit.web_endpoint}#{user.login}",
           repository: nil,
           notice: true
         }

data/lib/octospy/parser.rb

@@ -7,6 +7,7 @@ require 'octospy/parser/pull_request'
 require 'octospy/parser/wiki'
 require 'octospy/parser/download'
 require 'octospy/parser/gist'
+require 'octospy/parser/release'
 
 module Octospy
   class Parser
@@ -18,6 +19,7 @@ module Octospy
     include Wiki
     include Download
     include Gist
+    include Release
 
     def initialize(event)
       @event = event
@@ -99,7 +101,8 @@ module Octospy
         edited: :green,
         published: :blue,
         started: :rainbow,
-        followed: :seven_eleven
+        followed: :seven_eleven,
+        saved: :cyan
       }
     end
 

data/lib/octospy/version.rb

@@ -1,3 +1,3 @@
 module Octospy
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/octospy/worker.rb

@@ -14,10 +14,10 @@ module Octospy
         loop do
           begin
             watch_repositories
-            sleep 30
+            sleep Octospy.worker_interval
           rescue => e
-            puts e.message
-            sleep 30
+            @block.call e.message
+            sleep Octospy.worker_interval
           end
         end
       end
@@ -25,22 +25,33 @@ module Octospy
 
     def events
       @repositories.each_with_object([]) do |repo, arr|
+        if Octokit.rate_limit.remaining.zero?
+          @block.call "ヾ(;´Д`)ﾉ #{::Octokit.rate_limit}"
+          break
+        end
+
         arr.concat ::Octokit.repository_events(repo)
       end
     end
 
+    def while_ago
+      Time.now.utc - (60 * 30)
+    end
+
     def watch_repositories
-      events.sort_by(&:id).reverse_each { |event|
-        if @last_event_id.nil?
-          next if Time.now.utc - (60*60) >= event.created_at
-        else
-          next if @last_event_id >= event.id
+      # ascending by event.id
+      events.sort_by(&:id).each { |event|
+        case
+        when @last_event_id.nil? && while_ago >= event.created_at
+          next
+        when !@last_event_id.nil? && @last_event_id >= event.id.to_i
+          next
         end
 
         parsed_event = Octospy.parse(event)
         next unless parsed_event
 
-        @last_event_id = event.id
+        @last_event_id = event.id.to_i
         parsed_event.each { |p| @block.call p[:message] }
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octospy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -265,6 +265,7 @@ files:
 - lib/octospy/parser/issue.rb
 - lib/octospy/parser/organization.rb
 - lib/octospy/parser/pull_request.rb
+- lib/octospy/parser/release.rb
 - lib/octospy/parser/repository.rb
 - lib/octospy/parser/user.rb
 - lib/octospy/parser/wiki.rb