github-nippou 1.2.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2fc65a5d317d5e2fb3eb3981317283b208ce4c3
-  data.tar.gz: 5dc2731edf57ac227fb2ac9945462c99149d0d36
+  metadata.gz: 7f0f13ef8692fd47c64b7406283ad0aa0fc38591
+  data.tar.gz: 567ff11a390184d4e85e1c7ca04f02d74d25a7d7
 SHA512:
-  metadata.gz: c605539e14192e274703a38b015ec784d13adf475e8809d400d81e605356858f347c9acb1413542d7e7dc0906297aee199fb9ffe48bb7d0523bc5c4c8c1dbb7d
-  data.tar.gz: 42f9b41d7ca288574f6bf553818fe07b6cf682da28eac025950588f22dce9af0763c83483f0ba230877b2917e8190d60710ca5b2e4310b64057a22b52f8f7319
+  metadata.gz: 7173ae0ab09b35cff1bc6529f231fc1d6ddff2605134d591409493fef445d231932ee2b5ceb3b0fd50acbf792e2353040d216860ceac7ae733f2c9fa4816549a
+  data.tar.gz: 4e234ec0584549fb6eaa188f73acbf8037db618730d845a66e4cac520c48cf6acad5b98467c9599e0111fa604ed560c49733136ef80c690d63ee732b83b0c056

data/Gemfile.lock

@@ -1,16 +1,26 @@
 PATH
   remote: .
   specs:
-    github-nippou (1.2.0)
+    github-nippou (2.0.0.beta1)
+      activesupport
       octokit
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.6)
+      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)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.4)
     multipart-post (2.0.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
@@ -19,6 +29,9 @@ GEM
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/github-nippou.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'octokit'
   spec.add_dependency 'thor'
 

data/lib/github/nippou.rb

@@ -1,2 +1,3 @@
 require 'github/nippou/commands'
+require 'github/nippou/user_events'
 require 'github/nippou/version'

data/lib/github/nippou/commands.rb

@@ -1,4 +1,3 @@
-require 'octokit'
 require 'thor'
 
 module StringExMarkdown
@@ -15,8 +14,9 @@ module Github
       using StringExMarkdown
 
       default_task :list
-      class_option :all, type: :boolean, aliases: :a, desc: 'Also displays GitHub events before today'
-      class_option :num, type: :numeric, default: 50, aliases: :n, desc: 'GitHub event numbers that retrieve from GitHub'
+      class_option :since_date, type: :string,
+                   default: Time.now.strftime('%Y%m%d'),
+                   aliases: :s, desc: 'Retrieves GitHub user_events since the date'
 
       desc 'list', "Displays today's GitHub events formatted for Nippou"
       def list
@@ -35,30 +35,25 @@ module Github
 
       def nippous
         result = {}
-        now = Time.now
 
-        client.user_events(user, per_page: options[:num]).each do |event|
-          break if skip?(event, now)
-
-          case event.type
+        user_events.each do |user_event|
+          case user_event.type
           when 'IssuesEvent', 'IssueCommentEvent'
-            issue = event.payload.issue
-            result[issue.html_url] ||= hash_for_issue(event.repo, issue)
+            issue = user_event.payload.issue
+            result[issue.html_url] ||= hash_for_issue(user_event.repo.name, issue.number)
           when 'PullRequestEvent', 'PullRequestReviewCommentEvent'
-            pr = event.payload.pull_request
-            result[pr.html_url] ||= hash_for_pr(event.repo, pr)
+            pr = user_event.payload.pull_request
+            result[pr.html_url] ||= hash_for_pr(user_event.repo.name, pr.number)
           end
         end
 
         result.sort
       end
 
-      def skip?(event, now)
-        if options[:all]
-          false
-        else
-          event.created_at.getlocal.to_date != now.to_date
-        end
+      def user_events
+        @user_events ||= UserEvents.new(
+          client, user, options[:since_date]
+        ).retrieve
       end
 
       def client
@@ -104,18 +99,28 @@ MESSAGE
           end
       end
 
-      def hash_for_issue(repo, issue)
-        title = issue.title.markdown_escape
-        merged = client.pull_merged?(repo.name, issue.number)
-        state = client.issue(repo.name, issue.number).state
-        {title: title, repo_basename: repo.name, username: issue.user.login, merged: merged, state: state}
+      def hash_for_issue(repo_name, issue_number)
+        issue = client.issue(repo_name, issue_number)
+
+        {
+          title: issue.title.markdown_escape,
+          repo_basename: repo_name,
+          username: issue.user.login,
+          merged: client.pull_merged?(repo_name, issue.number),
+          state: issue.state,
+        }
       end
 
-      def hash_for_pr(repo, pr)
-        title = pr.title.markdown_escape
-        merged = client.pull_merged?(repo.name, pr.number)
-        state = client.pull_request(repo.name, pr.number).state
-        {title: title, repo_basename: repo.name, username: pr.user.login, merged: merged, state: state}
+      def hash_for_pr(repo_name, pr_number)
+        pr = client.pull_request(repo_name, pr_number)
+
+        {
+          title: pr.title.markdown_escape,
+          repo_basename: repo_name,
+          username: pr.user.login,
+          merged: client.pull_merged?(repo_name, pr.number),
+          state: pr.state,
+        }
       end
     end
   end

data/lib/github/nippou/user_events.rb

@@ -0,0 +1,32 @@
+require 'active_support/time'
+require 'octokit'
+
+module Github
+  module Nippou
+    class UserEvents
+      def initialize(client, user, since_date)
+        @client = client
+        @user = user
+        @range = Time.parse(since_date)..Time.now.end_of_day
+      end
+
+      def retrieve
+        user_events = @client.user_events(@user)
+        last_response = @client.last_response
+
+        while last_response.rels[:next] && in_range?(user_events.last)
+          last_response = last_response.rels[:next].get
+          user_events.concat(last_response.data)
+        end
+
+        user_events.select { |user_event| in_range?(user_event) }
+      end
+
+      private
+
+      def in_range?(user_event)
+        @range.include?(user_event.created_at.getlocal)
+      end
+    end
+  end
+end

data/lib/github/nippou/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Nippou
-    VERSION = '1.2.0'
+    VERSION = '2.0.0.beta1'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: github-nippou
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,7 @@ files:
 - github-nippou.gemspec
 - lib/github/nippou.rb
 - lib/github/nippou/commands.rb
+- lib/github/nippou/user_events.rb
 - lib/github/nippou/version.rb
 homepage: https://github.com/masutaka/github-nippou
 licenses:
@@ -102,12 +117,12 @@ 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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Print today's your GitHub action.