findrr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f482ac9128560b5bb2556532a0449ed61eca3dcd
-  data.tar.gz: e7dd172941adeb0e3d9a30dd6d8390f19a42716e
+  metadata.gz: d2cb6a4afbb32672bb8839699faa0b34df06a6fc
+  data.tar.gz: b784af3d8c7d48e43abfd7029827c905cf8220b7
 SHA512:
-  metadata.gz: fd0e53778525a66c47d2bbfd41522a4d064593909051d22381eff0f22cf285308dd8bb49ff2471d45ffc023de76ddf5958ae3c93b85d04270c874bfefc57d3e8
-  data.tar.gz: fcc1e54642e02d7879ec02d26e8a326cf0897e424ac11ea03b634e15f01103ef4e13d3d79df46e5f090bd9b165cc1cd947cacc3fe0ddbc10622623ed1079a036
+  metadata.gz: 050142118bba1a8bec3b8729f0ed1f3eb1ec011eea9e3df8cfd89fe85674d8d7004a3acf67102489d36dcfb1f64479530c8151099fd1bf8419b8815861d73b46
+  data.tar.gz: ced6a3e9deaa11df5f8e4c7f9eab89d94d6a1e0ccc8723e4aa4dec52b02cb7ccd42f40a0ffd301b4c2aa90b35a23f6ba3fbddf62aace87259da539ef62827900

data/NEWS.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.0.4: 2013-12-15
+
+### Changes
+
+  * Improvements
+    * Added version command.
+    * Skip collecting of a path when an error occurred.
+    * Use plane-text for history manager.
+    * Make update when already having the key.
+
 ## 0.0.3: 2013-12-13
 
 ### Changes

data/lib/findrr/command.rb

@@ -1,10 +1,18 @@
 require "thor"
+require "findrr/version"
 require "findrr/database"
+require "findrr/config"
 
 module Findrr
   class Command < Thor
+    desc "version", "Show version number"
+    def version
+      puts VERSION
+    end
+
     desc "collect PATH", "Collect filenames (take a few minutes)"
     def collect(path)
+      Config.new.save(path)
       begin
         Database.new.collect(path)
       rescue => e

data/lib/findrr/config.rb

@@ -0,0 +1,40 @@
+require "yaml"
+
+module Findrr
+  class Config
+    attr_accessor :base_dir
+    def initialize(base_dir=default_base_dir)
+      @base_dir = base_dir
+      @config = read
+    end
+
+    def save(target)
+      FileUtils.mkdir_p(@base_dir)
+      @config["history"] << target
+      write
+    end
+
+    private
+    def default_base_dir
+      File.join(File.expand_path("~"), ".findrr")
+    end
+
+    def config_path
+      File.join(@base_dir, "config.yml")
+    end
+
+    def read
+      if File.exist?(config_path)
+        YAML.load(File.read(config_path))
+      else
+        {"history" => []}
+      end
+    end
+
+    def write
+      File.open(config_path, "w") do |file|
+        YAML.dump(@config, file)
+      end
+    end
+  end
+end

data/lib/findrr/database.rb

@@ -14,14 +14,20 @@ module Findrr
       create_database_dir
       create_database
       Groonga::Database.open(database_path) do
-        Groonga["Registers"].add(File.expand_path(target))
         files = Groonga["Files"]
         Find.find(File.expand_path(target)) do |path|
           begin
-            files.add(path, :basename => File.basename(path),
-                            :mtime    => File.mtime(path))
+            if files.has_key?(path)
+              files[path] = {:mtime => File.mtime(path)}
+            else
+              files.add(path, :basename => File.basename(path),
+                              :mtime    => File.mtime(path))
+            end
           rescue Errno::ENOENT
             next
+          rescue => e
+            $stderr.puts("Skip: #{e.class}: #{e.message} (#{path})")
+            next
           end
         end
         files.size
@@ -42,7 +48,8 @@ module Findrr
     end
 
     def destroy
-      FileUtils.rm_rf(database_dir)
+      FileUtils.rm(Dir.glob(File.join(database_dir, "findrr.db*")))
+      FileUtils.rmdir(database_dir)
     end
 
     private
@@ -68,8 +75,6 @@ module Findrr
 
       Groonga::Database.create(:path => database_path)
 
-      Groonga::Schema.create_table("Registers", :type => :patricia_trie)
-
       Groonga::Schema.create_table("Files", :type => :patricia_trie) do |table|
         table.short_text("basename")
         table.time("mtime")

data/lib/findrr/version.rb

@@ -1,3 +1,3 @@
 module Findrr
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test-config.rb

@@ -0,0 +1,24 @@
+require "fileutils"
+require "findrr/config"
+
+class ConfigTest < Test::Unit::TestCase
+  def setup
+    @tmp_dir = File.join(File.dirname(__FILE__), "tmp")
+    @config_path = File.join(@tmp_dir, "config.yml")
+    FileUtils.rm_f(@config_path)
+    @config = Findrr::Config.new(@tmp_dir)
+  end
+
+  def teardown
+    FileUtils.rm_f(@config_path)
+  end
+
+  def test_save
+    @config.save("foo")
+    assert_equal({"history" => ["foo"]},
+                 YAML.load(File.read(@config_path)))
+    @config.save("bar")
+    assert_equal({"history" => ["foo", "bar"]},
+                 YAML.load(File.read(@config_path)))
+  end
+end

data/test/test-database.rb

@@ -5,16 +5,27 @@ class DatabaseTest < Test::Unit::TestCase
   def setup
     @tmp_dir = File.join(File.dirname(__FILE__), "tmp")
     @tmp_db_dir = File.join(@tmp_dir, "db")
-    FileUtils.rm_rf(@tmp_db_dir)
+    FileUtils.rm(Dir.glob(File.join(@tmp_db_dir, "findrr.db*")))
+    FileUtils.rmdir(@tmp_db_dir)
     @database = Findrr::Database.new(@tmp_dir)
   end
 
   def teardown
-    FileUtils.rm_rf(@tmp_db_dir)
+    FileUtils.rm(Dir.glob(File.join(@tmp_db_dir, "findrr.db*")))
+    FileUtils.rmdir(@tmp_db_dir)
   end
 
-  def test_collect_and_search
+  def test_collect
     assert_true(0 < @database.collect(File.dirname(__FILE__)))
+  end
+
+  def test_collect_update
+    size = @database.collect(File.dirname(__FILE__))
+    assert_equal(size, @database.collect(File.dirname(__FILE__)))
+  end
+
+  def test_search
+    @database.collect(File.dirname(__FILE__))
     assert_true(0 < @database.search("test"))
   end
 

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: findrr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A search tool for filenames in your directories.
@@ -116,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - NEWS.md
 - README.md
@@ -126,11 +126,13 @@ files:
 - findrr.gemspec
 - lib/findrr.rb
 - lib/findrr/command.rb
+- lib/findrr/config.rb
 - lib/findrr/database.rb
 - lib/findrr/version.rb
 - license/lgpl-3.0.txt
 - test/run-test.rb
 - test/test-command.rb
+- test/test-config.rb
 - test/test-database.rb
 homepage: https://github.com/myokoym/findrr
 licenses:
@@ -142,21 +144,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A filenames search tool
 test_files:
 - test/run-test.rb
 - test/test-command.rb
+- test/test-config.rb
 - test/test-database.rb