ruby_do_plugin_filesearch 0.0.0 → 0.0.1

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "ruby_do", ">= 0.0.0"
+gem "knjrbfw"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -56,6 +56,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   jeweler (~> 1.8.4)
+  knjrbfw
   rcov
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/ruby_do_plugin_filesearch.rb

@@ -34,11 +34,9 @@ class Ruby_do_plugin_filesearch < Ruby_do::Plugin::Base
   
   def on_search(args)
     return Enumerator.new do |yielder|
-      words = args[:text].split(/\s+/).map{|ele| ele.downcase}
-      
-      if !words.empty?
+      if !args[:words].empty?
         @ob.list(:Plugin_filesearch_folder) do |folder|
-          files = self.scan_dir(folder[:path], :words => words, :depth => 0, :max_depth => folder[:search_depth].to_i) do |file|
+          files = self.scan_dir(folder[:path], :words => args[:words], :depth => 0, :max_depth => folder[:search_depth].to_i) do |file|
             title = sprintf(_("Open '%s'."), file[:name])
             
             yielder << Ruby_do::Plugin::Result.new(
@@ -54,8 +52,8 @@ class Ruby_do_plugin_filesearch < Ruby_do::Plugin::Base
     end
   end
   
-  def execute_result(res)
-    Knj::Os.subproc("xdg-open \"#{res.args[:path]}\"")
+  def execute_result(args)
+    Knj::Os.subproc("xdg-open \"#{args[:res].args[:path]}\"")
     return :close_win_main
   end
   
@@ -63,26 +61,26 @@ class Ruby_do_plugin_filesearch < Ruby_do::Plugin::Base
     depth = args[:depth] + 1
     
     Dir.foreach(path) do |file|
-      next if file[0, 1] == "."
-      fp = "#{path}/#{file}"
-      filel = file.downcase
-      
-      if File.directory?(fp)
-        begin
+      begin
+        next if file[0, 1] == "."
+        fp = "#{path}/#{file}"
+        filel = file.downcase
+        
+        if File.directory?(fp)
           self.scan_dir(fp, args.merge(:depth => depth), &block) if depth < args[:max_depth]
-        rescue => e
-          $stderr.puts "Error while searching folder: '#{e.message}' for '#{fp}'."
-        end
-      else
-        all_found = true
-        args[:words].each do |word|
-          if file.index(word) == nil
-            all_found = false
-            break
+        else
+          all_found = true
+          args[:words].each do |word|
+            if filel.index(word) == nil
+              all_found = false
+              break
+            end
           end
+          
+          block.call(:name => file, :path => fp) if all_found
         end
-        
-        block.call(:name => file, :path => fp) if all_found
+      rescue => e
+        $stderr.puts "Error while searching item: '#{e.message}' for '#{fp}'."
       end
     end
   end

data/ruby_do_plugin_filesearch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_do_plugin_filesearch}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby_do>, [">= 0.0.0"])
+      s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<ruby_do>, [">= 0.0.0"])
+      s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -62,6 +64,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<ruby_do>, [">= 0.0.0"])
+    s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: ruby_do_plugin_filesearch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -25,8 +25,19 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: knjrbfw
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,10 +45,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +78,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,7 +89,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 description: A plugin for Ruby-Do that allows searching for and executing files.
 email: k@spernj.org
 executables: []
@@ -121,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -403522318111538229
+      hash: -1666545148604119211
       segments: 
       - 0
       version: "0"