github-nippou 2.0.1 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb50931c5196a3030d97920f992dbd0af7212a57
-  data.tar.gz: c1c8fd70dde75fdf2e022397ef9fecf1df6d84d5
+  metadata.gz: 0ef358687064ffbca6c80ab96136c0a81c36e154
+  data.tar.gz: adddcb9ff77d0afddfa4da8c177d10e0f8cb7bab
 SHA512:
-  metadata.gz: 0c19ba1b9b71c6de198b437d89aa34e9c16e45b2aee201b690c9df559bf22912bc4e6d6baf0538eed9f348dce2a0da2163bc402ee7f99c4103143f8da22cc7d3
-  data.tar.gz: 6d10d77b9724a27964da34d757347694fa98d0d1581aa4633747cb1e077e3f5e0879eec5733e1277701d21391469f196493fd4b5e0b0d2a820e26c290cfe5d9a
+  metadata.gz: 1ff50591fd5d01d3c6ca25fcc5818e6ece3576f907ab92e671f8a96294840cfa1bab5f9ed6a562532ee6c803dec0c2af1134710febc1514aa4e68aa2950a73ed
+  data.tar.gz: b5461b0c1b574930aa9b3add56abd818292a38f55a7def443c96fe8483f47db9595bfc0fd04a20191bc15a05f49a083e8de6ceb7bc1c25d497767042f78d3c53

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-nippou (2.0.1)
+    github-nippou (2.1.0.beta1)
       activesupport
       octokit
       parallel
@@ -10,23 +10,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
+    concurrent-ruby (1.0.2)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.4)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    parallel (1.8.0)
-    rake (11.1.1)
+    parallel (1.9.0)
+    rake (11.2.2)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
@@ -44,4 +43,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/github/nippou.rb

@@ -2,5 +2,6 @@ require 'github/nippou/concerns/sawyer_resource_github'
 require 'github/nippou/concerns/string_markdown'
 
 require 'github/nippou/commands'
+require 'github/nippou/format'
 require 'github/nippou/user_events'
 require 'github/nippou/version'

data/lib/github/nippou/commands.rb

@@ -4,9 +4,6 @@ require 'thor'
 module Github
   module Nippou
     class Commands < Thor
-      using SawyerResourceGithub
-      using StringMarkdown
-
       default_task :list
       class_option :since_date, type: :string,
                    default: Time.now.strftime('%Y%m%d'),
@@ -20,13 +17,16 @@ module Github
       def list
         lines = []
         mutex = Mutex::new
+        format = Format.new(client, thread_num, debug)
 
         Parallel.each_with_index(user_events, in_threads: thread_num) do |user_event, i|
-          line = format_line(user_event, i)
+          # Contain GitHub access.
+          # So should not put into the mutex block.
+          line = format.line(user_event, i)
           mutex.synchronize { lines << line }
         end
 
-        puts sort(lines)
+        puts format.all(lines)
       end
 
       desc 'version', 'Displays version'
@@ -42,39 +42,6 @@ module Github
         ).collect
       end
 
-      def format_line(user_event, i)
-        STDERR.puts "#{i % thread_num} : #{user_event.html_url}\n" if 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)
-        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.markdown_html_url <=> b.markdown_html_url
-        end
-      end
-
       def client
         @client ||= Octokit::Client.new(login: user, access_token: access_token)
       end

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

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

data/lib/github/nippou/format.rb

@@ -0,0 +1,84 @@
+module Github
+  module Nippou
+    class Format
+      using SawyerResourceGithub
+      using StringMarkdown
+
+      def initialize(client, thread_num, debug)
+        @client = client
+        @thread_num = thread_num
+        @debug = debug
+      end
+
+      def line(user_event, i)
+        STDERR.puts "#{i % @thread_num} : #{user_event.html_url}\n" if @debug
+        issue = issue(user_event)
+
+        line = {
+          title: issue.title,
+          repo_name: user_event.repo.name,
+          url: user_event.html_url,
+          user: issue.user.login,
+        }
+
+        line[:status] =
+          if issue.merged
+            :merged
+          elsif issue.state == 'closed'
+            :closed
+          end
+
+        line
+      end
+
+      def all(lines)
+        result = ""
+        prev_repo_name = nil
+        curr_repo_name = nil
+
+        sort(lines).each do |line|
+          current_repo_name = line[:repo_name]
+
+          unless current_repo_name == prev_repo_name
+            prev_repo_name = current_repo_name
+            result << "\n### #{current_repo_name}\n\n"
+          end
+
+          result << "* [%s](%s) by %s%s\n" %
+            [line[:title].markdown_escape, line[:url], line[:user], format_status(line[:status])]
+        end
+
+        result
+      end
+
+      private
+
+      def issue(user_event)
+        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 { |a, b| a[:url] <=> b[:url] }
+      end
+
+      def format_status(status)
+        case status
+        when :merged
+          ' **merged!**'
+        when :closed
+          ' **closed!**'
+        else
+          ''
+        end
+      end
+    end
+  end
+end

data/lib/github/nippou/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Nippou
-    VERSION = '2.0.1'
+    VERSION = '2.1.0.beta1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-nippou
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ files:
 - lib/github/nippou/commands.rb
 - lib/github/nippou/concerns/sawyer_resource_github.rb
 - lib/github/nippou/concerns/string_markdown.rb
+- lib/github/nippou/format.rb
 - lib/github/nippou/user_events.rb
 - lib/github/nippou/version.rb
 homepage: https://github.com/masutaka/github-nippou
@@ -133,9 +134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1