clipcellar 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803db9c5bcf45ecf932632fab71ed464df055009
-  data.tar.gz: acfa00b12c77e33fc8bf12b8e6947e4fd73836ba
+  metadata.gz: 3334556a4ade285c592621dbfabda41354f6e4af
+  data.tar.gz: 4fb743564c2d596b3fd0f37db0cbb060584a0c44
 SHA512:
-  metadata.gz: aa2653faa857c7ab99ef2121553a1d3ad43c7678b1e38311f71d9d812f38d1fd3f2105dd63616f97c4444ddf1f208e2c17b722c7656d713f7a2bb3a91c4f8370
-  data.tar.gz: cf639f117ef1d91e8bccb16a961e0604504358fc4d4fa6707a2d2afd3712014237ba47fa351a43d16e75525cde0650bc5d7e0a45ecde75c33f1ad49adcec4f5f
+  metadata.gz: a77254d551eccb63a6369ef2b53714b583fdec3520fb7d9ffcd585bd3d4e568fdaaf470708b1c048207893f46271a60b72c1957c114eabb44c473bf811e52145
+  data.tar.gz: 0f53223f6bbbe6cb4e821cea6b9230d9d4e455ac360522933dd518c5fd41ad56adb48835d282b84c14472bdfcc1ad6ad899b152bcbc74af8e99d0420c22eb30e

data/NEWS.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.0.2: 2014-07-30
+
+### Changes
+
+  * Improvements
+    * Add --lines option for show command
+    * Add an alias -g for GUI mode option
+    * Support sorting on GUI
+
+  * Fixes
+    * Fix the search order
+    * Fix an error to try to remove when not selected
+
 ## 0.0.1: 2014-07-29
 
 Initial release!

data/README.md

@@ -39,7 +39,7 @@ Or install it yourself as:
 
 ### Show added texts in data store
 
-    $ clipcellar show [--gui]
+    $ clipcellar show [--lines=N] [--gui]
 
 ### Full-text search (and set a text to clipboard)
 

data/lib/clipcellar/command.rb

@@ -72,7 +72,8 @@ module Clipcellar
     end
 
     desc "show [--gui]", "Show added texts in data store"
-    option :gui, :type => :boolean, :desc => "GUI mode"
+    option :gui, :type => :boolean, :aliases => "-g", :desc => "GUI mode"
+    option :lines, :type => :numeric, :aliases => "-n", :desc => "Number of lines"
     def show
       records = []
       GroongaDatabase.new.open(@database_dir) do |database|
@@ -89,6 +90,12 @@ module Clipcellar
         record[:time]
       end
 
+      if options[:lines]
+        records.reverse!
+        records = records.take(options[:lines])
+        records.reverse!
+      end
+
       if options[:gui]
         records.reverse!
         window = Window.new(records)
@@ -104,7 +111,7 @@ module Clipcellar
     end
 
     desc "search WORD... [--gui]", "Search texts from data store"
-    option :gui, :type => :boolean, :desc => "GUI mode"
+    option :gui, :type => :boolean, :aliases => "-g", :desc => "GUI mode"
     def search(required_word, *optional_words)
       words = [required_word]
       words += optional_words

data/lib/clipcellar/groonga_searcher.rb

@@ -43,7 +43,7 @@ module Clipcellar
           expression
         end
 
-        order = options[:reverse] ? "ascending" : "descending"
+        order = options[:reverse] ? "descending" : "ascending"
         sorted_clipboards = selected_clipboards.sort([{
                                                         :key => "created_at",
                                                         :order => order,

data/lib/clipcellar/tree_view.rb

@@ -83,6 +83,7 @@ module Clipcellar
       renderer = Gtk::CellRendererText.new
       column.pack_start(renderer, :expand => false)
       column.add_attribute(renderer, :text, STRFTIME_COLUMN)
+      column.set_sort_column_id(STRFTIME_COLUMN)
 
       column = Gtk::TreeViewColumn.new
       column.title = "Part of a Text (the Full Text appears in a Tooltip)"
@@ -90,6 +91,7 @@ module Clipcellar
       renderer = Gtk::CellRendererText.new
       column.pack_start(renderer, :expand => false)
       column.add_attribute(renderer, :text, LINE_COLUMN)
+      column.set_sort_column_id(LINE_COLUMN)
 
       expand_all
     end

data/lib/clipcellar/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Clipcellar
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/clipcellar/window.rb

@@ -103,11 +103,14 @@ module Clipcellar
       when Gdk::Keyval::GDK_KEY_p
         10.times { @tree_view.prev }
       when Gdk::Keyval::GDK_KEY_d
-        # TODO: don't want to use Command class.
-        GroongaDatabase.new.open(Command.new.database_dir) do |database|
-          database.delete(@tree_view.selected_key)
+        key = @tree_view.selected_key
+        if key
+          # TODO: don't want to use Command class.
+          GroongaDatabase.new.open(Command.new.database_dir) do |database|
+            database.delete(key)
+          end
+          @tree_view.remove_selected_record
         end
-        @tree_view.remove_selected_record
       else
         return false
       end

data/test/test-command.rb

@@ -20,34 +20,68 @@ require "clipcellar/version"
 require "clipcellar/command"
 
 class CommandTest < Test::Unit::TestCase
-  class << self
-    def startup
-      @@tmpdir_base = File.join(File.dirname(__FILE__), "tmp")
-      @@tmpdir = File.join(@@tmpdir_base, "database")
-      FileUtils.rm_rf(@@tmpdir)
-      FileUtils.mkdir_p(@@tmpdir)
-      @@command = Clipcellar::Command.new
-      @@command.instance_variable_set(:@base_dir, @@tmpdir_base)
-      @@command.instance_variable_set(:@database_dir, @@tmpdir)
-    end
-
-    def shutdown
-      FileUtils.rm_rf(@@tmpdir)
-    end
+  def setup
+    @command = Clipcellar::Command.new
   end
 
   def test_version
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @@command.version
+    @command.version
     assert_equal("#{Clipcellar::VERSION}\n", s)
     $stdout = STDOUT
   end
 
-  def test_destroy
-    assert_true(File.exist?(@@tmpdir))
-    @@command.destroy
-    assert_false(File.exist?(@@tmpdir))
+  class DatabaseTest < self
+    def setup
+      @tmpdir_base = File.join(File.dirname(__FILE__), "tmp")
+      @tmpdir = File.join(@tmpdir_base, "database")
+      FileUtils.rm_rf(@tmpdir)
+      FileUtils.mkdir_p(@tmpdir)
+      super
+      @command.instance_variable_set(:@base_dir, @tmpdir_base)
+      @command.instance_variable_set(:@database_dir, @tmpdir)
+    end
+
+    def teardown
+      FileUtils.rm_rf(@tmpdir)
+    end
+
+    def test_set
+      # TODO
+      assert_nothing_raised do
+        @command.set("text")
+      end
+    end
+
+    def test_input
+      # TODO
+      assert_nothing_raised do
+        ARGV.push("input")
+        ARGV.push(__FILE__)
+        @command.input
+      end
+    end
+
+    def test_show
+      # TODO
+      assert_nothing_raised do
+        @command.show
+      end
+    end
+
+    def test_search
+      # TODO
+      assert_nothing_raised do
+        @command.search("word")
+      end
+    end
+
+    def test_destroy
+      assert_true(File.exist?(@tmpdir))
+      @command.destroy
+      assert_false(File.exist?(@tmpdir))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clipcellar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2