nicorepo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa463841c71be718b4908e77b2450805fdfa8b9
-  data.tar.gz: 3801987c1e20a697ea4638693aba1f2705074d64
+  metadata.gz: e69cda5670a0c001d0683c3879ec4a513d399e69
+  data.tar.gz: 632dd4545dd0798eb7067f95ff76cd2b989f2f2a
 SHA512:
-  metadata.gz: b1ecf7b7d40f706f3237ea39374c19c02b32784c13557abd134583d75964c964c99ec289d177e642667d49ea4cfc063fcbc83f1417689b3e184f84263657c233
-  data.tar.gz: 174b50aa05f1f9a73e84acbcda0d32284daa98095a7540f11352cd37ce9c6b8577fa3efe1abba120d2c54ea74d081ba0f5d24ac4befd6e2c16fb1fa482771c85
+  metadata.gz: ab7793b6f85e1567274ab1605b849116518af0dff0f4ecf4316004930b3cfebb100c05dc1b221490194d8c76c83264be02ae696837b41d3c28dc19a3fa196c99
+  data.tar.gz: 5b7c1a4f70748ddd4dd9f7272cb78174f3bb098b0dce617f1d20b4193fa3637ade902864dd93398e94b1581aee0580259c9acd3e2442374d4e589e0a2cc4cb4f

data/CHANGELOG.md

@@ -1,7 +1,23 @@
+## 0.0.5 (2014/05/11)
+
+### Features
+
+#### CLI
+* Add options `--latest`, `--hours=N`, `days=N` for fetch command
+* Reports is cached and it can recalled by `show` command
+  * `show` command recalls recent reports by default
+  * You can specify `--more` option and it shows all report caches
+  * Caches are cleared when you exit the cli
+* Reports will be colorfully decorated
+
+### API
+* Enable to fetch since specific time
+
 ## 0.0.4 (2014-05-04)
 
-CLI Features:
+### Features
 
+#### CLI
 * Add thor and reconstruct CLI
 * Simplify CLI by removing exec modes without interactive mode
   * Now you can launch interaction cli without any exec options

data/README.md

@@ -36,11 +36,24 @@ machine nicovideo.jp
   password your-password
 ```
 
-### Start nicorepo cli as interactive mode
+### Start nicorepo cli
 
-    $ nicorepo i
+    $ nicorepo
 
 You can use following commands in interactive cli to fetch nicorepos.
+
+command               | alias | description
+----------------------|-------|---------------------------------------------------------
+  all                 | a     | fetch all reports
+  videos              | v     | fetch only video reports
+  lives               | li    | fetch only live reports
+  show                | s     | show current reports
+  open REPORT-NUMBER  | o     | open the report url specified by number in your browser
+  help [COMMAND]      | h     | Describe available commands or one specific command
+  login               | lo    | re-login if your session is expired
+  exit                | e     | exit interactive prompt
+
+Some commands have specific options `-n, --request-num=N`, `-p, --limit-page=N`.
 For example, if you want 20 video reports by searcing over 5 pages, the command will be,
 
     > video -n20 -p5
@@ -59,22 +72,10 @@ You can omit it as you like then each commad uses default value.
     > v -p5
     # => `video -n20 -p5`
 
-**Commands**
-
-command               | alias | description
-----------------------|-------|---------------------------------------------------------
-  all                 | a     | fetch all reports
-  videos              | v     | fetch only video reports
-  lives               | li    | fetch only live reports
-  show                | s     | show current reports
-  open REPORT-NUMBER  | o     | open the report url specified by number in your browser
-  help [COMMAND]      | h     | Describe available commands or one specific command
-  login               | lo    | re-login if your session is expired
-  exit                | e     | exit interactive prompt
-
-Some commands have specific options `-n, --request-num=N`, `-p, --limit-page=N`.
-Please check it out using `help [COMMAND]`.
+And also, you can use `-l, --latest`, `-h, --hours`, `-d, --days` options to find reports by the specific period.
 
+    > all -l
+    > lives -h 1
 
 ### Configuration
 

data/lib/nicorepo/cli/cli.rb

@@ -21,16 +21,8 @@ class Nicorepo
       class ReportExistenceError < StandardError; end
 
       class << self
-        attr_accessor :reports
-        attr_reader   :repo, :conf
-
         def start(*)
-          @repo ||= Nicorepo.new
-          @conf ||= Nicorepo::Cli::Configuration.new
-          @reports ||= []
-
-          login unless logined?
-
+          login unless repo.logined?
           super
         end
 
@@ -43,16 +35,22 @@ class Nicorepo
           mail, pass = Netrc.read["nicovideo.jp"]
           raise LoginAccountError, "machine nicovideo.jp is not defined in .netrc" if mail.nil? || pass.nil?
           begin
-            @repo.login(mail, pass)
+            repo.login(mail, pass)
           rescue
             raise LoginAccountError, "invalid mail or pass: mail = #{mail}"
           end
-          @logined = true
         end
 
-        # TODO: Nicorepo側に持たせる
-        def logined?
-          @logined
+        def repo
+          @repo ||= Nicorepo.new
+        end
+
+        def conf
+          @conf ||= Nicorepo::Cli::Configuration.new
+        end
+
+        def cache
+          @cache ||= {}
         end
       end
 
@@ -63,38 +61,54 @@ class Nicorepo
 
       desc "all", "fetch all reports"
       option :"request-num", type: :numeric, aliases: :n
+      option :"latest", type: :boolean, aliases: :l
+      option :"days", type: :numeric, aliases: :d
+      option :"hours", type: :numeric, aliases: :h
       def all
         request_num = options[:"request-num"] || conf.request_num("all")
-        cache(repo.all(request_num))
+        request_options = { since: parse_since_options(options) }
+        cache(repo.all(request_num, request_options))
         show
       end
 
       desc "videos", "fetch only video reports"
       option :"request-num", type: :numeric, aliases: :n
       option :"limit-page", type: :numeric, aliases: :p
+      option :"latest", type: :boolean, aliases: :l
+      option :"days", type: :numeric, aliases: :d
+      option :"hours", type: :numeric, aliases: :h
       def videos
         request_num = options[:"request-num"] || conf.request_num("videos")
         limit_page  = options[:"limit-page"]  || conf.limit_page("videos")
-        cache(repo.videos(request_num, limit_page))
+        request_options = { since: parse_since_options(options) }
+        cache(repo.videos(request_num, limit_page, request_options))
         show
       end
 
       desc "lives", "fetch only live reports"
       option :"request-num", type: :numeric, aliases: :n
       option :"limit-page", type: :numeric, aliases: :p
+      option :"latest", type: :boolean, aliases: :l
+      option :"days", type: :numeric, aliases: :d
+      option :"hours", type: :numeric, aliases: :h
       def lives
         request_num = options[:"request-num"] || conf.request_num("lives")
         limit_page  = options[:"limit-page"]  || conf.limit_page("lives")
-        cache(repo.lives(request_num, limit_page))
+        request_options = { since: parse_since_options(options) }
+        cache(repo.lives(request_num, limit_page, request_options))
         show
       end
 
       desc "show", "show current reports"
+      option :more, type: :boolean, aliases: :m
       def show
-        current_reports.each.with_index(1) do |report, i|
-          puts "[#{i}] #{report.body} on #{report.date.to_s}"
-          puts "    '#{report.title}' (#{report.url})"
+        showed_reports = options[:more] ? cached_reports : cached_reports[0, recent_tail]
+        showed_reports.each.with_index(1) do |report, i|
+          say "--- MORE ---", :blue if i == recent_tail + 1
+          say "[#{i}] #{report.body} at #{report.date.to_s}"
+          say "     #{report.title} (#{report.url})", :green
         end
+        say "* last fetch time: #{cached_at}", :blue
       end
 
       desc "open REPORT-NUMBER", "open the report url specified by number in your browser"
@@ -117,16 +131,39 @@ class Nicorepo
         self.class.conf
       end
 
-      def current_reports
-        self.class.reports
+      def cached_reports
+        self.class.cache[:reports] ||= []
+      end
+
+      def recent_tail
+        self.class.cache[:recent_tail]
+      end
+
+      def cached_at
+        self.class.cache[:cached_at]
       end
 
       def cache(reports)
-        self.class.reports = reports
+        cached_reports.unshift(reports).flatten!
+        self.class.cache[:recent_tail] = reports.size
+        self.class.cache[:cached_at] = Time.now
+      end
+
+      def parse_since_options(options)
+        case
+        when options[:latest]
+          cached_at
+        when options[:days]
+          Time.now - options[:days] * 24 * 60 * 60
+        when options[:hours]
+          Time.now - options[:hours] * 60 * 60
+        else
+          nil
+        end
       end
 
       def open_numbered_link(request_num)
-        url = current_reports[request_num - 1].url
+        url = cached_reports[request_num - 1].url
         raise ReportExistenceError, "report existence error: please fetch reports" if url.nil?
 
         Launchy.open(url, options) do |exception|

data/lib/nicorepo/reports.rb

@@ -15,25 +15,42 @@ class Nicorepo
       @reports = []
     end
 
-    def fetch(request_num, limit_page)
-      @reports = fetch_recursively(request_num, limit_page)
-    end
-
-    def fetch_and_select_with(filter, request_num, limit_page)
+    def fetch(request_num, limit_page, since: nil)
+      filter = {}
+      filter[:kind] = selected_kind
+      filter[:since] =
+        case since
+        when String
+          Time.parse since
+        when Time
+          since
+        else
+          nil
+        end
       @reports = fetch_recursively(request_num, limit_page, filter)
     end
 
     private
 
-    def fetch_recursively(request_num, limit_page, filter = nil, url = TOP_URL)
+    def selected_kind
+      nil
+    end
+
+    def fetch_recursively(request_num, limit_page, filter = {}, url = TOP_URL)
       return [] unless limit_page > 0
 
       # fetch current page reports
       page = @parser.parse_page(url)
       reports = page[:reports_attrs].map { |attrs| Report.new(attrs) }
-      reports.select!{ |report| report.kind =~ /#{filter}/ } if filter
+
+      if filter[:since]
+        reach_oldest_page = (reports.last.date < filter[:since])
+        reports.reject! { |report| report.date < filter[:since] }
+      end
+      reports.select! { |report| report.kind =~ /#{filter[:kind]}/ } if filter[:kind]
 
       return reports[0, request_num] if reports.size >= request_num
+      return reports if filter[:since] && reach_oldest_page
 
       # recursively fetch next reports
       next_reports = fetch_recursively(request_num - reports.size, limit_page - 1, filter, page[:next_url])
@@ -43,14 +60,18 @@ class Nicorepo
   end
 
   class VideoReports < Reports
-    def fetch(request_num, limit_page)
-      fetch_and_select_with('video-upload', request_num, limit_page)
+    private
+
+    def selected_kind
+      'video-upload'
     end
   end
 
   class LiveReports < Reports
-    def fetch(request_num, limit_page)
-      fetch_and_select_with('live', request_num, limit_page)
+    private
+
+    def selected_kind
+      'live'
     end
   end
 end

data/lib/nicorepo/version.rb

@@ -1,3 +1,3 @@
 class Nicorepo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/nicorepo.rb

@@ -15,24 +15,35 @@ class Nicorepo
     @agent.ssl_version = 'SSLv3'
     @agent.request_headers = { 'accept-language' => 'ja-JP', 'content-language' => 'ja-JP' }
     @parser = Parser.new(@agent)
+    @logined = false
   end
 
   def login(mail, pass)
     page = @agent.post(LOGIN_URL, mail: mail, password: pass)
-    raise LoginError, "Failed to login" if page.header["x-niconico-authflag"] == '0'
+    if page.header["x-niconico-authflag"] == '0'
+      raise LoginError, "Failed to login"
+    else
+      @logined = true
+    end
   end
 
-  def all(request_num = PER_PAGE)
+  def logined?
+    # TODO: page.header["x-niconico-auth-flag"] をチェックする？
+    #       現状一度ログインしたらfalseにならない
+    @logined
+  end
+
+  def all(request_num = PER_PAGE, since: nil)
     limit_page = request_num / PER_PAGE + 1
-    Reports.new(@parser).fetch(request_num, limit_page)
+    Reports.new(@parser).fetch(request_num, limit_page, since: since)
   end
 
-  def videos(request_num = 3, limit_page = 5)
-    VideoReports.new(@parser).fetch(request_num, limit_page)
+  def videos(request_num = 3, limit_page = 5, since: nil)
+    VideoReports.new(@parser).fetch(request_num, limit_page, since: since)
   end
 
-  def lives(request_num = 3, limit_page = 5)
-    LiveReports.new(@parser).fetch(request_num, limit_page)
+  def lives(request_num = 3, limit_page = 5, since: nil)
+    LiveReports.new(@parser).fetch(request_num, limit_page, since: since)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicorepo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - upinetree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize