github-nippou 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c0359c1b0c93e33e07c49a4642968c84af8eb4a
-  data.tar.gz: aeee0e7c9a0732b7a237785c83862033e357d003
+  metadata.gz: 79390fbd81c7c4d4b3d1fe9443f882ab52f8d894
+  data.tar.gz: 10a6ee01658bf337a39f8599e018536e8c0593a9
 SHA512:
-  metadata.gz: da2634a1fb6c171d8f9e6ed5d557458576b44971322d4ebf1c6bf07ba8eb692d35733ab17fd4cb7bff7af49a854bf7e8024f191b1a2946c1e88d5967aedbd189
-  data.tar.gz: 0ec755b2b786478253bcca2b613faaf98bb9c43830eb081316ac9ab9059b031f0f5984a314522a3595949507007f8b8961136131796f20ca00f57f480a84ff3e
+  metadata.gz: 63d33966ebd8cd63886832a68f0c490845cb1e896942c807fe2ef5a1c196684385bbdc4786d188608ccb1df87f9f27dbbc3262d0c21a253a4e50a26751edb0e4
+  data.tar.gz: eb3430e7111a0750764415f258196e8331b7f7ee5699e08f23d06f0f09ce4f122fdc5167cc104a09ebca9a40d0936a0d0462f4c0be71039a5a3a2e34e75d72bd

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    github-nippou (2.0.0.beta5)
+    github-nippou (2.0.0.beta6)
       activesupport
       octokit
+      parallel
       thor
 
 GEM
@@ -24,6 +25,7 @@ GEM
     multipart-post (2.0.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    parallel (1.8.0)
     rake (11.1.1)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)

data/github-nippou.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'octokit'
+  spec.add_dependency 'parallel'
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler'

data/lib/github/nippou/commands.rb

@@ -1,3 +1,4 @@
+require 'parallel'
 require 'thor'
 
 module Github
@@ -17,19 +18,12 @@ module Github
       desc 'list', "Displays today's GitHub events formatted for Nippou"
       def list
         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
+        mutex = Mutex::new
+
+        Parallel.each_with_index(user_events, in_threads: thread_num) do |user_event, i|
+          line = format_line(user_event, i)
+          mutex.synchronize { lines << line }
         end
-        threads.each(&:join)
 
         puts sort(lines)
       end
@@ -48,7 +42,7 @@ module Github
       end
 
       def format_line(user_event, i)
-        puts "#{i} : #{user_event.html_url}" if ENV['GITHUB_NIPPOU_DEBUG']
+        puts "#{i % thread_num} : #{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]
@@ -63,16 +57,20 @@ module Github
       end
 
       def issue(user_event)
-        if user_event.issue?
-          client.issue(user_event.repo.name, user_event.payload.issue.number)
-        else
+        case
+        when user_event.payload.pull_request
           client.pull_request(user_event.repo.name, user_event.payload.pull_request.number)
+        when user_event.payload.issue.pull_request
+          # a pull_request like an issue
+          client.pull_request(user_event.repo.name, user_event.payload.issue.number)
+        else
+          client.issue(user_event.repo.name, user_event.payload.issue.number)
         end
       end
 
       def sort(lines)
         lines.sort do |a, b|
-          a.html_url_as_nippou <=> b.html_url_as_nippou
+          a.markdown_html_url <=> b.markdown_html_url
         end
       end
 

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

@@ -3,22 +3,11 @@ require 'octokit'
 module SawyerResourceGithub
   refine Sawyer::Resource do
     def html_url
-      case
-      when self.issue?
-        self.payload.issue.html_url
-      when self.pull_request?
+      if self.payload.pull_request
         self.payload.pull_request.html_url
+      else
+        self.payload.issue.html_url
       end
     end
-
-    def issue?
-      self.type == 'IssuesEvent' ||
-        self.type == 'IssueCommentEvent'
-    end
-
-    def pull_request?
-      self.type == 'PullRequestEvent' ||
-        self.type == 'PullRequestReviewCommentEvent'
-    end
   end
 end

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

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

data/lib/github/nippou/user_events.rb

@@ -42,8 +42,11 @@ module Github
       end
 
       def filter(user_events)
+        elements = %w(IssuesEvent IssueCommentEvent
+                      PullRequestEvent PullRequestReviewCommentEvent)
+
         user_events.select do |user_event|
-          user_event.issue? || user_event.pull_request?
+          elements.include?(user_event.type)
         end
       end
 

data/lib/github/nippou/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-nippou
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement