github-nippou 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04ff32f953611852d55ee08062486083beda4c6
-  data.tar.gz: 678f97c55b3b566e561c97b903fac0f517edea6e
+  metadata.gz: 5c0359c1b0c93e33e07c49a4642968c84af8eb4a
+  data.tar.gz: aeee0e7c9a0732b7a237785c83862033e357d003
 SHA512:
-  metadata.gz: 73d1e69a9dd7ca65092a4e6b58d8194fcb1057c4b024eb69e3cf459cb1dc3a1fc5620159b6e25ea79368aeed818ccee5eb0343bb7c32870c30a4255da787a6f4
-  data.tar.gz: db8c91944b4d351c16c75263e89d66a5c7a92ef17acffd61edc576100cc748d336be022426c738d13011e589e82db5b95829d8bb0964e2af34bb30567ca86183
+  metadata.gz: da2634a1fb6c171d8f9e6ed5d557458576b44971322d4ebf1c6bf07ba8eb692d35733ab17fd4cb7bff7af49a854bf7e8024f191b1a2946c1e88d5967aedbd189
+  data.tar.gz: 0ec755b2b786478253bcca2b613faaf98bb9c43830eb081316ac9ab9059b031f0f5984a314522a3595949507007f8b8961136131796f20ca00f57f480a84ff3e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-nippou (2.0.0.beta4)
+    github-nippou (2.0.0.beta5)
       activesupport
       octokit
       thor

data/lib/github/nippou/commands.rb

@@ -16,17 +16,22 @@ module Github
 
       desc 'list', "Displays today's GitHub events formatted for Nippou"
       def list
-        user_events.each do |user_event|
-          issue = user_event.issue(client)
-          line = "* [%s - %s](%s) by %s" %
-                 [issue.title.markdown_escape, user_event.repo.name, user_event.html_url, issue.user.login]
-          if issue.merged
-            line << ' **merged!**'
-          elsif issue.state == 'closed'
-            line << ' **closed!**'
+        lines = []
+        threads = []
+        mutex1 = Mutex::new
+        mutex2 = Mutex::new
+
+        thread_num.times do |i|
+          threads << Thread.start do
+            while user_event = mutex1.synchronize { user_events.pop } do
+              line = format_line(user_event, i)
+              mutex2.synchronize { lines << line }
+            end
           end
-          puts line
         end
+        threads.each(&:join)
+
+        puts sort(lines)
       end
 
       desc 'version', 'Displays version'
@@ -42,6 +47,35 @@ module Github
         ).collect
       end
 
+      def format_line(user_event, i)
+        puts "#{i} : #{user_event.html_url}" if ENV['GITHUB_NIPPOU_DEBUG']
+        issue = issue(user_event)
+        line = "* [%s - %s](%s) by %s" %
+               [issue.title.markdown_escape, user_event.repo.name, user_event.html_url, issue.user.login]
+
+        if issue.merged
+          line << ' **merged!**'
+        elsif issue.state == 'closed'
+          line << ' **closed!**'
+        end
+
+        line
+      end
+
+      def issue(user_event)
+        if user_event.issue?
+          client.issue(user_event.repo.name, user_event.payload.issue.number)
+        else
+          client.pull_request(user_event.repo.name, user_event.payload.pull_request.number)
+        end
+      end
+
+      def sort(lines)
+        lines.sort do |a, b|
+          a.html_url_as_nippou <=> b.html_url_as_nippou
+        end
+      end
+
       def client
         @client ||= Octokit::Client.new(login: user, access_token: access_token)
       end
@@ -84,6 +118,18 @@ MESSAGE
             exit!
           end
       end
+
+      def thread_num
+        @thread_num ||=
+          case
+          when ENV['GITHUB_NIPPOU_THREAD_NUM']
+            ENV['GITHUB_NIPPOU_THREAD_NUM']
+          when !`git config github-nippou.thread-num`.chomp.empty?
+            `git config github-nippou.thread-num`.chomp
+          else
+            5
+          end.to_i
+      end
     end
   end
 end

data/lib/github/nippou/concerns/sawyer_resource_github.rb

@@ -2,15 +2,6 @@ require 'octokit'
 
 module SawyerResourceGithub
   refine Sawyer::Resource do
-    def issue(client)
-      case
-      when self.issue?
-        client.issue(self.repo.name, self.payload.issue.number)
-      when self.pull_request?
-        client.pull_request(self.repo.name, self.payload.pull_request.number)
-      end
-    end
-
     def html_url
       case
       when self.issue?

data/lib/github/nippou/concerns/string_markdown.rb

@@ -3,5 +3,10 @@ module StringMarkdown
     def markdown_escape
       self.gsub(/([`<>])/, '\\\\\1')
     end
+
+    def html_url_as_nippou
+      self =~ /^\* \[.+\]\((.+)\)/
+      $1
+    end
   end
 end

data/lib/github/nippou/user_events.rb

@@ -15,7 +15,7 @@ module Github
       end
 
       def collect
-        uniq(sort(filter(retrieve)))
+        uniq(filter(retrieve))
       end
 
       private
@@ -47,12 +47,6 @@ module Github
         end
       end
 
-      def sort(user_events)
-        user_events.sort do |a, b|
-          a.html_url <=> b.html_url
-        end
-      end
-
       def uniq(user_events)
         user_events.uniq do |user_event|
           user_event.html_url

data/lib/github/nippou/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Nippou
-    VERSION = '2.0.0.beta4'
+    VERSION = '2.0.0.beta5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-nippou
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport