github-nippou 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f0f13ef8692fd47c64b7406283ad0aa0fc38591
-  data.tar.gz: 567ff11a390184d4e85e1c7ca04f02d74d25a7d7
+  metadata.gz: 9226aa472c621921b5a31036c2c7df5fc78911d9
+  data.tar.gz: f0e559b4e138f8d3c789792d90278caa5bd574a2
 SHA512:
-  metadata.gz: 7173ae0ab09b35cff1bc6529f231fc1d6ddff2605134d591409493fef445d231932ee2b5ceb3b0fd50acbf792e2353040d216860ceac7ae733f2c9fa4816549a
-  data.tar.gz: 4e234ec0584549fb6eaa188f73acbf8037db618730d845a66e4cac520c48cf6acad5b98467c9599e0111fa604ed560c49733136ef80c690d63ee732b83b0c056
+  metadata.gz: 1403f8e1db52980bd63ec5b0a2d55a5f65a43492c7467227be79c7aee80694bedf922e33420c52cd0107dab18f02e208c38cfa75be71ac3754e8023dd8d71f51
+  data.tar.gz: dea8ac039f0e9e499cebf089fc74621fcc301f0512cf6fc47d97c531c71fb849f6d999d6cdd6d60a8e7619c4876285d47d5ee465f3e3c4fe27a997f2ce45d43a

data/Gemfile.lock

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

data/README.md

@@ -35,9 +35,22 @@ Commands:
   github-nippou list            # Displays today's GitHub events formatted for Nippou
 
 Options:
-  a, [--all], [--no-all]  # Also displays GitHub events before today
-  n, [--num=N]            # GitHub event numbers that retrieve from GitHub
-                          # Default: 50
+  s, [--since-date=SINCE_DATE]  # Retrieves GitHub user_events since the date
+                                # Default: 20160326
+  u, [--until-date=UNTIL_DATE]  # Retrieves GitHub user_events until the date
+                                # Default: 20160326
+```
+
+You can get your GitHub Nippou on today.
+
+```
+$ github-nippou list
+* [Bundle Update on 2016-03-24 - masutaka/awesome-github-feed](https://github.com/masutaka/awesome-github-feed/pull/38) by deppbot **merged!**
+* [Fix performance - masutaka/github-nippou](https://github.com/masutaka/github-nippou/pull/44) by masutaka **merged!**
+* [Bundle Update on 2016-03-24 - masutaka/masutaka-29hours](https://github.com/masutaka/masutaka-29hours/pull/19) by deppbot **merged!**
+* [Bundle Update on 2016-03-24 - masutaka/masutaka-metrics](https://github.com/masutaka/masutaka-metrics/pull/34) by deppbot **merged!**
+* [bundle update at 2016-03-25 18:32:43 JST - masutaka/masutaka.net](https://github.com/masutaka/masutaka.net/pull/52) by masutaka **merged!**
+* [bundle update at 2016-03-25 10:02:02 UTC - masutaka/server-masutaka.net](https://github.com/masutaka/server-masutaka.net/pull/211) by masutaka **merged!**
 ```
 
 You can omit the sub command `list`.

data/lib/github/nippou/commands.rb

@@ -17,6 +17,9 @@ module Github
       class_option :since_date, type: :string,
                    default: Time.now.strftime('%Y%m%d'),
                    aliases: :s, desc: 'Retrieves GitHub user_events since the date'
+      class_option :until_date, type: :string,
+                   default: Time.now.strftime('%Y%m%d'),
+                   aliases: :u, desc: 'Retrieves GitHub user_events until the date'
 
       desc 'list', "Displays today's GitHub events formatted for Nippou"
       def list
@@ -52,7 +55,7 @@ module Github
 
       def user_events
         @user_events ||= UserEvents.new(
-          client, user, options[:since_date]
+          client, user, options[:since_date], options[:until_date]
         ).retrieve
       end
 
@@ -106,7 +109,7 @@ MESSAGE
           title: issue.title.markdown_escape,
           repo_basename: repo_name,
           username: issue.user.login,
-          merged: client.pull_merged?(repo_name, issue.number),
+          merged: issue.merged,
           state: issue.state,
         }
       end
@@ -118,7 +121,7 @@ MESSAGE
           title: pr.title.markdown_escape,
           repo_basename: repo_name,
           username: pr.user.login,
-          merged: client.pull_merged?(repo_name, pr.number),
+          merged: pr.merged,
           state: pr.state,
         }
       end

data/lib/github/nippou/user_events.rb

@@ -4,17 +4,18 @@ require 'octokit'
 module Github
   module Nippou
     class UserEvents
-      def initialize(client, user, since_date)
+      def initialize(client, user, since_date, until_date)
         @client = client
         @user = user
-        @range = Time.parse(since_date)..Time.now.end_of_day
+        @since_date = Time.parse(since_date).beginning_of_day
+        @until_date = Time.parse(until_date).end_of_day
       end
 
       def retrieve
-        user_events = @client.user_events(@user)
+        user_events = @client.user_events(@user, per_page: 100)
         last_response = @client.last_response
 
-        while last_response.rels[:next] && in_range?(user_events.last)
+        while continue?(last_response, user_events)
           last_response = last_response.rels[:next].get
           user_events.concat(last_response.data)
         end
@@ -24,8 +25,13 @@ module Github
 
       private
 
+      def continue?(last_response, user_events)
+        last_response.rels[:next] &&
+          user_events.last.created_at.getlocal >= @since_date
+      end
+
       def in_range?(user_event)
-        @range.include?(user_event.created_at.getlocal)
+        (@since_date..@until_date).include?(user_event.created_at.getlocal)
       end
     end
   end

data/lib/github/nippou/version.rb

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

metadata

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