feedcellar 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca1aa81de6be510b032bdd1873c9a5d20c691bb
-  data.tar.gz: f95eb0515ced32e51dae2d726626036184376064
+  metadata.gz: 99485cd81b7d2ccc7e871f93c89f54d484c1a725
+  data.tar.gz: acf336156d13924926fe66805a457d7f6c574520
 SHA512:
-  metadata.gz: 4580cb6be3f40757e10f664b3e595d725a478c76aae834ab8b990a279a434463204a2d08d8ffdeb25686f5e37bf5ece2dc84bb2a6bff480e25494f35bf939e9c
-  data.tar.gz: 93c3d94eb452934dad54787d1437453f19fce4ae51de5dd07dac47655cebf9dd4fb6ffe58f64f729437f64b38a4dbcadb43c534ae24233ecb8ed70b121f10f77
+  metadata.gz: ce6bbda93db793f7c36e82f6461890128dbb01031a2759ca2d8491a7bcae746e71329a3b01a9eb6218b2e2dcc0508104112d8e8ea0cf0fbe3419877b844c0266
+  data.tar.gz: 05daf037e95a72d01b876f20a8830f38d361c1cbc99bd63dc435715d84d42113473f53017964c46afb77bf8059fd79fb287fa90f1f1e6a44a1d011dcabdd492b

data/NEWS.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.1.3: 2013-06-06
+
+Experimental functions release!
+
+### Changes
+
+  * Improvements
+    * Add browser option to search command
+    * Improve search order sort by date ascending
+    * Add simple format to search command
+    * gemspec: change homepage to myokoym.net
+    * Add version command
+
 ## 0.1.2: 2013-06-04
 
 Bug fixes release!

data/README.md

@@ -1,6 +1,8 @@
-# Feedcellar - Searchable Storage
+# feedcellar - Searchable Storage
 
-A searchable storage for RSS feed reader. Powered by rroonga.
+Searchable storage for RSS feed reader.
+
+Powered by rroonga with groonga!
 
 ## Installation
 

data/feedcellar.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Feedcellar::VERSION
   spec.authors       = ["Masafumi Yokoyama"]
   spec.email         = ["myokoym@gmail.com"]
-  spec.description   = %q{A searchable storage for RSS feed reader by rroonga.}
+  spec.description   = %q{Searchable storage for RSS feed reader by rroonga with groonga!}
   spec.summary       = %q{Searchable Storage for Feed Reader}
-  spec.homepage      = "https://github.com/myokoym/feedcellar"
+  spec.homepage      = "http://myokoym.net/feedcellar/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/feedcellar/command.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "rss"
+require "feedcellar/version"
 require "feedcellar/groonga_database"
 require "feedcellar/opml"
 
@@ -10,6 +11,11 @@ module Feedcellar
       @work_dir = File.join(File.expand_path("~"), ".feedcellar")
     end
 
+    desc "version", "Show version number."
+    def version
+      puts Feedcellar::VERSION
+    end
+
     desc "register URL", "Register a URL."
     def register(url)
       @database = GroongaDatabase.new
@@ -19,12 +25,12 @@ module Feedcellar
         rescue RSS::InvalidRSSError
           rss = RSS::Parser.parse(url, false)
         rescue
-          $stderr.puts "Warnning: #{$!} (#{url})"
+          $stderr.puts "WARNNING: #{$!} (#{url})"
           return 1
         end
 
         unless rss
-          $stderr.puts "Error: Invalid URL"
+          $stderr.puts "ERROR: Invalid URL"
           return 1
         end
 
@@ -83,11 +89,11 @@ module Feedcellar
             begin
               rss = RSS::Parser.parse(feed_url, false)
             rescue
-              $stderr.puts "Warnning: #{$!} (#{feed_url})"
+              $stderr.puts "WARNNING: #{$!} (#{feed_url})"
               next
             end
           rescue
-            $stderr.puts "Warnning: #{$!} (#{feed_url})"
+            $stderr.puts "WARNNING: #{$!} (#{feed_url})"
             next
           end
           next unless rss
@@ -106,7 +112,7 @@ module Feedcellar
             end
 
             unless link
-              $stderr.puts "Warnning: missing link (#{title})"
+              $stderr.puts "WARNNING: missing link (#{title})"
               next
             end
 
@@ -118,24 +124,57 @@ module Feedcellar
 
     desc "search WORD", "Search feeds."
     option :desc, :type => :boolean, :aliases => "-d", :desc => "show description"
+    option :simple, :type => :boolean, :desc => "simple format as one liner"
+    option :browser, :type => :boolean, :desc => "open *ALL* links in browser"
     def search(word)
       @database = GroongaDatabase.new
       @database.open(@work_dir) do |database|
         feeds = @database.feeds
         resources = @database.resources
 
-        feeds.select {|v| (v.title =~ word) |
-                          (v.description =~ word) }.each do |record|
+        records = feeds.select do |v|
+          (v.title =~ word) | (v.description =~ word)
+        end
+
+        records.sort([{:key => "date", :order => "ascending"}]).each do |record|
           feed_resources = resources.select {|v| v.xmlUrl =~ record.resource }
           next unless feed_resources
-          puts feed_resources.first.title
-          puts "  #{record.title}"
-          puts "    #{record.date}"
-          puts "      #{record.link}"
-          puts "        #{record.description}" if options[:desc]
-          puts
+          if options[:simple]
+            # TODO This format will be to default from 0.2.0
+            date = record.date.strftime("%Y/%m/%d")
+            title= record.title
+            resource = feed_resources.first.title
+            link = record.link
+            puts "#{date} #{title} - #{resource}"
+          else
+            puts feed_resources.first.title
+            puts "  #{record.title}"
+            puts "    #{record.date}"
+            puts "      #{record.link}"
+            puts "        #{record.description}" if options[:desc]
+            puts
+          end
+
+          if options[:browser]
+            Gtk.show_uri(record.link) if browser_available?
+          end
+        end
+      end
+    end
+
+    private
+    def browser_available?
+      if @browser.nil?
+        begin
+          require "gtk2"
+        rescue LoadError
+          $stderr.puts "WARNNING: Sorry, browser option required \"gtk2\"."
+          @browser = false
+        else
+          @browser = true
         end
       end
+      @browser
     end
   end
 end

data/lib/feedcellar/version.rb

@@ -1,3 +1,3 @@
 module Feedcellar
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/test-command.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "stringio"
+require "feedcellar/version"
 require "feedcellar/command"
 require "feedcellar/groonga_database"
 
@@ -12,11 +13,18 @@ class CommandTest < Test::Unit::TestCase
   end
 
   def test_command
+    s = ""
+    io = StringIO.new(s)
+    $stdout = io
+    @command.version
+    assert_equal("#{Feedcellar::VERSION}\n", s)
+    $stdout = STDOUT
+
     s = ""
     io = StringIO.new(s)
     $stderr = io
     assert_equal(1, @command.register("hoge"))
-    assert_equal("Error: Invalid URL\n", s)
+    assert_equal("ERROR: Invalid URL\n", s)
     $stderr = STDERR
 
     @command.register("http://myokoym.github.io/entries.rss")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -108,7 +108,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A searchable storage for RSS feed reader by rroonga.
+description: Searchable storage for RSS feed reader by rroonga with groonga!
 email:
 - myokoym@gmail.com
 executables:
@@ -134,7 +134,7 @@ files:
 - test/run-test.rb
 - test/test-command.rb
 - test/test-opml.rb
-homepage: https://github.com/myokoym/feedcellar
+homepage: http://myokoym.net/feedcellar/
 licenses:
 - MIT
 metadata: {}