feedcellar 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90de9f0e20628fe9c0296ceb73a55e068124996b
-  data.tar.gz: 35318c5da10ecd18d85c37f0e00c2dcf10c907ad
+  metadata.gz: 9478a7d588e3f1c7be9402dfcf37e49b112452cd
+  data.tar.gz: bb63a40e9fd82a57c69e618a3a1c985b1c672399
 SHA512:
-  metadata.gz: dc398b74be7d927be4cdb120878ce6b556099d01ca675c18fd1e39c08ee61fe7ff7a278870b1af7a57db6210beda04e3c7265b94305d9e5df472e080847ce426
-  data.tar.gz: 3d92d30d502af29ccb90a1347ea7bf1463d26ad9635683cd8d0eb655733302c77dbc256862f03dcdc67bed8c7e2ef44f261935d9f053d3de7dcab9bd6d50ce33
+  metadata.gz: d83937efa958d9357fa558d759c189d43b45a34a8c5c10527f5b0282e2ae1bae35bd8e1f1f9fa0382d4e0f68ac20d351e382e819fd98d21d3e66de4760157079
+  data.tar.gz: 7086249c6bee9a405b9aa4dc9bf0518ba6c80aa50a1985c78dc51d906232f9ac2c4b109a4b1077ec4364c88b817ce9f58e841e8557f4eb45a7b3091795097698

data/NEWS.md

@@ -1,5 +1,19 @@
 # NEWS
 
+## 0.3.1: 2013-07-04
+
+The release that supported a rich view by curses.
+
+### Changes
+
+  * Improvements
+    * Removed browser option.
+    * Supported rich view by curses.
+    * Extracted groonga_searcher for use with API.
+
+  * Fixes
+    * Fixed default order.
+
 ## 0.3.0: 2013-06-23
 
 Database schema improved release!

data/README.md

@@ -48,6 +48,16 @@ Word search from titles and descriptions
 
     $ feedcellar search ruby
 
+Rich view by curses (set as default since 0.4.0)
+
+    $ feedcellar search ruby --curses
+
+    Keybind:
+      j: down
+      k: up
+      f, ENTER: open link on firefox
+      q: quit
+
 Delete database
 
     $ rm -r ~/.feedcellar

data/lib/feedcellar/command.rb

@@ -1,6 +1,7 @@
 require "thor"
 require "feedcellar/version"
 require "feedcellar/groonga_database"
+require "feedcellar/groonga_searcher"
 require "feedcellar/opml"
 require "feedcellar/feed"
 require "feedcellar/resource"
@@ -105,11 +106,11 @@ module Feedcellar
     end
 
     desc "search WORD", "Search feeds from local database."
-    option :browser, :type => :boolean, :desc => "open *ALL* links in browser"
     option :long, :type => :boolean, :aliases => "-l", :desc => "use a long listing format"
     option :reverse, :type => :boolean, :aliases => "-r", :desc => "reverse order while sorting"
     option :mtime, :type => :numeric, :desc => "feed's data was last modified n*24 hours ago."
     option :resource, :type => :string, :desc => "search of partial match by feed's resource url"
+    option :curses, :type => :boolean, :desc => "rich view for easy web browse"
     def search(*words)
       if words.empty? &&
          (options["resource"].nil? || options["resource"].empty?)
@@ -117,65 +118,24 @@ module Feedcellar
         return 1
       end
 
-      if options[:browser]
-        unless GUI.available?
-          $stderr.puts "WARNING: browser option required \"gtk2\"."
-        end
-      end
-
       GroongaDatabase.new.open(@database_dir) do |database|
-        feeds = database.feeds
-        feeds = feeds.select do |feed|
-          expression = nil
-          words.each do |word|
-            sub_expression = (feed.title =~ word) |
-                             (feed.description =~ word)
-            if expression.nil?
-              expression = sub_expression
-            else
-              expression &= sub_expression
-            end
-          end
-
-          if options[:mtime]
-            base_date = (Time.now - (options[:mtime] * 60 * 60 * 24))
-            mtime_expression = feed.date > base_date
-            if expression.nil?
-              expression = mtime_expression
-            else
-              expression &= mtime_expression
-            end
-          end
-
-          if options[:resource]
-            resource_expression = feed.resource =~ options[:resource]
-            if expression.nil?
-              expression = resource_expression
+        sorted_feeds = GroongaSearcher.search(database, words, options)
+
+        if options[:curses]
+          require "feedcellar/curses_view"
+          CursesView.run(sorted_feeds)
+        else
+          sorted_feeds.each do |feed|
+            title = feed.title.gsub(/\n/, " ")
+            if options[:long]
+              date = feed.date.strftime("%Y/%m/%d %H:%M")
+              resource = feed.resource.title
+              puts "#{date} #{title} - #{resource} / #{feed.link}"
             else
-              expression &= resource_expression
+              date = feed.date.strftime("%Y/%m/%d")
+              puts "#{date} #{title}"
             end
           end
-
-          expression
-        end
-
-        order = options[:reverse] ? "descending" : "ascending"
-        sorted_feeds = feeds.sort([{:key => "date", :order => order}])
-
-        sorted_feeds.each do |feed|
-          title = feed.title.gsub(/\n/, " ")
-          if options[:long]
-            date = feed.date.strftime("%Y/%m/%d %H:%M")
-            resource = feed.resource.title
-            puts "#{date} #{title} - #{resource} / #{feed.link}"
-          else
-            date = feed.date.strftime("%Y/%m/%d")
-            puts "#{date} #{title}"
-          end
-
-          if options[:browser]
-            GUI.show_uri(feed.link)
-          end
         end
       end
     end

data/lib/feedcellar/curses_view.rb

@@ -0,0 +1,42 @@
+require "curses"
+
+module Feedcellar
+  module CursesView
+    module_function
+    def run(feeds)
+      Curses.init_screen
+      Curses.noecho
+      Curses.nonl
+
+      feeds.each_with_index do |feed, i|
+        Curses.setpos(i, 0)
+        title = feed.title.gsub(/\n/, " ")
+        date = feed.date.strftime("%Y/%m/%d")
+        Curses.addstr("#{date} #{title}")
+      end
+      Curses.setpos(0, 0)
+
+      pos = 0
+      begin
+        loop do
+          case Curses.getch
+          when "j"
+            pos += 1 if pos < Curses.lines - 1
+            Curses.setpos(pos, 0)
+          when "k"
+            pos -= 1 if pos > 0
+            Curses.setpos(pos, 0)
+          when "f", 13
+            spawn("firefox",
+                  feeds[pos + 1].link,
+                  [:out, :err] => "/dev/null")
+          when "q"
+            break
+          end
+        end
+      ensure
+        Curses.close_screen
+      end
+    end
+  end
+end

data/lib/feedcellar/groonga_searcher.rb

@@ -0,0 +1,47 @@
+module Feedcellar
+  class GroongaSearcher
+    class << self
+      def search(database, words, options)
+        feeds = database.feeds
+        feeds = feeds.select do |feed|
+          expression = nil
+          words.each do |word|
+            sub_expression = (feed.title =~ word) |
+                             (feed.description =~ word)
+            if expression.nil?
+              expression = sub_expression
+            else
+              expression &= sub_expression
+            end
+          end
+
+          if options[:mtime]
+            base_date = (Time.now - (options[:mtime] * 60 * 60 * 24))
+            mtime_expression = feed.date > base_date
+            if expression.nil?
+              expression = mtime_expression
+            else
+              expression &= mtime_expression
+            end
+          end
+
+          if options[:resource]
+            resource_expression = feed.resource =~ options[:resource]
+            if expression.nil?
+              expression = resource_expression
+            else
+              expression &= resource_expression
+            end
+          end
+
+          expression
+        end
+
+        order = options[:reverse] ? "ascending" : "descending"
+        sorted_feeds = feeds.sort([{:key => "date", :order => order}])
+
+        sorted_feeds
+      end
+    end
+  end
+end

data/lib/feedcellar/version.rb

@@ -1,3 +1,3 @@
 module Feedcellar
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test-command.rb

@@ -5,42 +5,50 @@ require "feedcellar/command"
 require "feedcellar/groonga_database"
 
 class CommandTest < Test::Unit::TestCase
-  def setup
-    @tmpdir = File.join(File.dirname(__FILE__), "tmp", "database")
-    FileUtils.mkdir_p(@tmpdir)
-    @command = Feedcellar::Command.new
-    @command.instance_variable_set(:@database_dir, @tmpdir)
+  class << self
+    def startup
+      @@tmpdir = File.join(File.dirname(__FILE__), "tmp", "database")
+      FileUtils.rm_rf(@@tmpdir)
+      FileUtils.mkdir_p(@@tmpdir)
+      @@command = Feedcellar::Command.new
+      @@command.instance_variable_set(:@database_dir, @@tmpdir)
+    end
+
+    def shutdown
+      FileUtils.rm_rf(@@tmpdir)
+    end
   end
 
-  def test_command
-    # confirm version command
+  def test_version
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @command.version
+    @@command.version
     assert_equal("#{Feedcellar::VERSION}\n", s)
     $stdout = STDOUT
+  end
 
+  def test_command
     # confirm register command if invalid URL
     s = ""
     io = StringIO.new(s)
     $stderr = io
-    assert_equal(1, @command.register("hoge"))
+    assert_equal(1, @@command.register("hoge"))
     assert_equal("ERROR: Invalid URL\n", s)
     $stderr = STDERR
 
     # confirm register command
-    @command.register("http://myokoym.github.io/entries.rss")
-    @command.register("https://rubygems.org/gems/mister_fairy/versions.atom")
-    Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
+    @@command.register("http://myokoym.github.io/entries.rss")
+    @@command.register("https://rubygems.org/gems/mister_fairy/versions.atom")
+    Feedcellar::GroongaDatabase.new.open(@@tmpdir) do |database|
       assert_equal(2, database.resources.size)
     end
 
     # confirm import command
     file = File.join(File.dirname(__FILE__), "fixtures", "subscriptions.xml")
-    @command.import(file)
-    @command.collect
-    Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
+    @@command.import(file)
+    @@command.collect
+    Feedcellar::GroongaDatabase.new.open(@@tmpdir) do |database|
       # NOTE: a tag of outline is not register.
       assert_equal(3, database.resources.size)
       assert_true(database.feeds.count > 0)
@@ -50,7 +58,7 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @command.export
+    @@command.export
     assert_equal(1, s.scan(/<opml/).size)
     assert_equal(3, s.scan(/<outline/).size)
     $stdout = STDOUT
@@ -59,17 +67,17 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @command.search("ruby")
+    @@command.search("ruby")
     assert_true(s.size > 100)
     $stdout = STDOUT
 
     # confirm unregister command
-    @command.unregister("my_letter")
-    Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
+    @@command.unregister("my_letter")
+    Feedcellar::GroongaDatabase.new.open(@@tmpdir) do |database|
       assert_equal(2, database.resources.size)
     end
-    @command.unregister("https://rubygems.org/gems/mister_fairy/versions.atom")
-    Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
+    @@command.unregister("https://rubygems.org/gems/mister_fairy/versions.atom")
+    Feedcellar::GroongaDatabase.new.open(@@tmpdir) do |database|
       assert_equal(1, database.resources.size)
     end
 
@@ -77,12 +85,8 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @command.latest
+    @@command.latest
     assert_true(s.size > 0)
     $stdout = STDOUT
   end
-
-  def teardown
-    FileUtils.rm_rf(@tmpdir)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -127,9 +127,10 @@ files:
 - feedcellar.gemspec
 - lib/feedcellar.rb
 - lib/feedcellar/command.rb
+- lib/feedcellar/curses_view.rb
 - lib/feedcellar/feed.rb
 - lib/feedcellar/groonga_database.rb
-- lib/feedcellar/gui.rb
+- lib/feedcellar/groonga_searcher.rb
 - lib/feedcellar/opml.rb
 - lib/feedcellar/resource.rb
 - lib/feedcellar/version.rb

data/lib/feedcellar/gui.rb

@@ -1,27 +0,0 @@
-module Feedcellar
-  class GUI
-    class << self
-      def available?
-        gtk_available?
-      end
-
-      def show_uri(uri)
-        Gtk.show_uri(uri) if gtk_available?
-      end
-
-      private
-      def gtk_available?
-        if @gtk_available.nil?
-          begin
-            require "gtk2"
-          rescue LoadError
-            @gtk_available = false
-          else
-            @gtk_available = true
-          end
-        end
-        @gtk_available
-      end
-    end
-  end
-end