tdreyno-s6search 1.0.1 → 1.1.0

data/bin/s6search

@@ -1,64 +1,53 @@
 #!/usr/bin/env ruby
 require 'readline'
+require File.join(File.dirname(__FILE__), '../lib', 's6search')
 
-class SpinSix
-  CONFIG = '~/.s6search'
-  PATHS  = ["~/Desktop", "~/Desktop/*",         # Local
-            "/Volumes/Shared/Clients/*/Active"] # Remote
-  
-  def self.locate_single(number)
-    matching_directories = paths.map do |path|
-      Dir["#{File.expand_path(path)}/#{number}*"]
-    end.flatten.select do |path|
-      File.directory? path
-    end
-    
-    case matching_directories.length
-    when 0:
-      puts "Could not find project #{number}"
-    when 1:
-      open_dirs matching_directories[0]
-    else
-      puts "Found multiple projects:"
-      matching_directories.each_with_index do |dir, i|
-        parts = dir.split('/').last(2)
-        print (i+1).to_s.rjust(5) + ": "
-        print parts[0].rjust(7) + "/"
-        puts parts[1]
-      end
-      puts "    *: Open all, s: Skip"
+class SpinSixSearch
+  class << self
+    def locate_single(number)
+      matching_directories = search(number)
+
+      case matching_directories.length
+      when 0:
+        puts "Could not find project #{number}"
+      when 1:
+        open_dirs matching_directories[0]
+      else
+        puts "Found multiple projects:"
+        matching_directories.each_with_index do |dir, i|
+          parts = dir.split('/').last(2)
+          print (i+1).to_s.rjust(5) + ": "
+          print parts[0].rjust(7) + "/"
+          puts parts[1]
+        end
+        puts "    *: Open all, s: Skip"
 
-      print "Action: "
-      response = Readline.readline
-      if response.to_i > 0
-        open_dirs matching_directories[response.to_i-1]
-      elsif !%w(s q).include? response
-        open_dirs *matching_directories
+        print "Action: "
+        response = Readline.readline
+        if response.to_i > 0
+          open_dirs matching_directories[response.to_i-1]
+        elsif !%w(s q).include? response
+          open_dirs *matching_directories
+        end
       end
     end
-  end
-  
-  def self.locate(numbers)
-    numbers.uniq.each { |n| locate_single(n) }
-  end
-  
-  def self.paths
-    @@paths ||= begin
-      config_file = File.expand_path(CONFIG)
-      return PATHS unless File.exists?(config_file)
-      
-      File.open(config_file) do |f|
-        @@paths = f.readlines.map { |line| line.chomp }.select{ |path| !path.empty? }
-      end
-      @@paths
+
+    def locate(numbers)
+      numbers.uniq.each { |n| locate_single(n) }
+    end
+
+    def search(number)
+      Spinsix.search(number).map do |id|
+        Spinsix.index[id][:path]
+      end.uniq
+    end
+
+  protected
+    def open_dirs(*paths)
+      paths = paths.map { |p| %Q{"#{p}"} }.join(" ")
+      `open #{paths}`
     end
-  end
-  
-protected
-  def self.open_dirs(*paths)
-    paths = paths.map { |p| %Q{"#{p}"} }.join(" ")
-    `open #{paths}`
   end
 end
 
-SpinSix.locate(ARGV)
+SpinSixSearch.locate(ARGV)

data/bin/s6search-index

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), '../lib', 's6search')
+
+Spinsix.paths.map do |path|
+  Dir["#{path}/[0-9][0-9][0-9][0-9]*"]
+end.flatten.select do |path|
+  File.directory? path
+end.each do |path|
+  results = []
+  Spinsix.index.search_each('path:"' + path + '"') do |id, score|
+    results << id
+  end
+  results.uniq!
+  
+  (2..results.length).each do |i|
+    puts "Removing from index #{i}"
+    Spinsix.index.delete(results[i-1])
+  end
+  
+  next if (results.length > 0)
+  
+  puts "Adding to index: #{path.split('/').last}"
+  Spinsix.index << { :path => path, :number => path.split('/').last.split('-').first }
+end

data/lib/s6search.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'ferret'
+
+class Spinsix
+  CONFIG = '~/.s6search'
+  PATHS  = ["~/Desktop", "~/Desktop/*",         # Local
+            "/Volumes/Shared/Clients/*/Active"] # Remote
+    
+  class << self
+
+    def paths
+      @@paths ||= begin
+        config_file = file_path('conf')
+        return PATHS unless File.exists?(config_file)
+
+        File.open(config_file) do |f|
+          @@paths = f.readlines.map { |line| line.chomp }.select{ |path| !path.empty? }
+        end
+
+        @@paths
+      end
+    end
+
+    def index
+      @@index ||= Ferret::I.new(:path => file_path('index'))
+    end
+
+    def search(number)
+      results = []
+      index.search_each('number:"' + number + '"') do |id, score|
+        results << id
+      end
+      results
+    end
+
+    def file_path(name)
+      @@files ||= {}
+      @@files[name] ||= begin
+        config_dir = File.expand_path(CONFIG)
+        File.mkdir_p(config_dir) if !File.exists?(config_dir)
+        File.join(config_dir, name)
+      end
+    end
+  end
+end

data/s6search.gemspec

@@ -2,15 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{s6search}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2008-09-25}
-  s.default_executable = %q{s6search}
+  s.date = %q{2008-10-06}
   s.email = %q{thomas.reynolds@spinsix.com}
-  s.executables = ["s6search"]
-  s.files = ["bin/s6search", "s6search.gemspec"]
+  s.executables = ["s6search", "s6search-index"]
+  s.files = ["bin/s6search", "bin/s6search-index", "lib/s6search.rb", "s6search.gemspec"]
   s.homepage = %q{http://github.com/tdreyno/s6search}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.0}
@@ -21,11 +20,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<ferret>, [">= 0"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<ferret>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<ferret>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-s6search
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-25 00:00:00 -07:00
-default_executable: s6search
+date: 2008-10-06 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: ferret
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -25,12 +25,15 @@ description:
 email: thomas.reynolds@spinsix.com
 executables: 
 - s6search
+- s6search-index
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/s6search
+- bin/s6search-index
+- lib/s6search.rb
 - s6search.gemspec
 has_rdoc: false
 homepage: http://github.com/tdreyno/s6search