reditor 0.0.4 → 0.1.0

data/bin/reditor

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
 require 'reditor'
 
 $PROGRAM_NAME = File.basename(__FILE__)

data/lib/reditor.rb

@@ -3,7 +3,8 @@ require 'rubygems'
 module Reditor
   class LibraryNotFound < LoadError; end
 
-  autoload :LibraryLocator, 'reditor/library_locator'
-  autoload :Command,        'reditor/command'
-  autoload :VERSION,        'reditor/version'
+  autoload :LibraryLocator,    'reditor/library_locator'
+  autoload :CandidatesLocator, 'reditor/candidates_locator'
+  autoload :Command,           'reditor/command'
+  autoload :VERSION,           'reditor/version'
 end

data/lib/reditor/candidates_locator.rb

@@ -0,0 +1,44 @@
+require 'pathname'
+require 'bundler'
+
+module Reditor
+  class CandidatesLocator
+    def self.detect(keyword)
+      new(keyword.to_s).detect
+    end
+
+    attr_reader :pattern
+
+    def initialize(keyword)
+      tokens = keyword.split(/[_\-]/).map {|keyword|
+        keyword.length > 4 ? keyword[0...-3] : keyword
+      }
+
+      @pattern = /#{tokens.map {|t| Regexp.quote(t) }.join('|')}/i
+    end
+
+    def detect
+      (detect_from_bundler + detect_from_loadpath + detect_from_gem).sort.uniq
+    end
+
+    def detect_from_bundler
+      Bundler.load.specs.select {|spec| spec.name =~ pattern }.map(&:name)
+    rescue NameError, Bundler::GemfileNotFound
+      []
+    end
+
+    def detect_from_loadpath
+      $LOAD_PATH.map {|path|
+        pathname = Pathname.new(File.expand_path(path))
+
+        pathname.entries.select {|entry|
+          entry.extname == '.rb' && entry.to_path =~ pattern
+        }.map {|entry| entry.basename('.*').to_path }
+      }.flatten
+    end
+
+    def detect_from_gem
+      Gem::Specification.each.select {|spec| spec.name =~ pattern }.map(&:name)
+    end
+  end
+end

data/lib/reditor/command.rb

@@ -24,6 +24,7 @@ module Reditor
     desc :sh, 'Open a shell and move to the library'
     def sh(name)
       detect_exec name do |dir, _|
+        say "Moving to #{dir}", :green
         Dir.chdir dir do
           exec shell_command
         end
@@ -43,9 +44,35 @@ module Reditor
     private
 
     def detect_exec(name, &block)
-      block.call *LibraryLocator.detect(name)
+      path = LibraryLocator.detect(name)
+
+      return choose_exec name, &block unless path
+
+      dir, file =
+        if path.file?
+          [path.dirname.to_path, path.basename.to_path]
+        else
+          [path.to_path, '.']
+        end
+
+      block.call dir, file
     rescue LibraryNotFound => e
-      say e.message, :red
+      warn e.message
+    end
+
+    def choose_exec(name, &block)
+      candidates = CandidatesLocator.detect(name)
+
+      raise LibraryNotFound, "Library #{name} not found" if candidates.empty?
+
+      candidates.each.with_index do |candidate, i|
+        say "[#{i}] #{candidate}"
+      end
+      print "Choose number of library [0]> "
+
+      chosen = Integer($stdin.gets.strip) rescue 0
+
+      detect_exec candidates[chosen], &block
     end
 
     def editor_command

data/lib/reditor/library_locator.rb

@@ -1,12 +1,11 @@
 require 'pathname'
 require 'bundler'
 
-# TODO: care multi candidates
 # TODO: care version specification
 module Reditor
   class LibraryLocator
     def self.detect(name)
-      new(name).detect
+      new(name.to_s).detect
     end
 
     attr_reader :name
@@ -16,22 +15,18 @@ module Reditor
     end
 
     def detect
-      path = detect_library_path or raise LibraryNotFound, 'No library found'
-
-      if path.file?
-        [path.dirname.to_path, path.basename.to_path]
-      else
-        [path.to_path, '.']
-      end
+      detect_from_bundler || detect_from_loadpath || detect_from_gem
     end
 
-    def detect_library_path
-      detect_library_path_from_bundler    ||
-        detect_library_path_from_loadpath ||
-        detect_library_path_from_gem
+    def detect_from_bundler
+      return nil unless spec = Bundler.load.specs.find {|spec| spec.name == name }
+
+      Pathname.new(spec.full_gem_path)
+    rescue NameError # ensure enviroments that bundler isn't installed
+    rescue Bundler::GemNotFound, Bundler::GemfileNotFound
     end
 
-    def detect_library_path_from_loadpath
+    def detect_from_loadpath
       basename = "#{name}.rb"
 
       $LOAD_PATH.map {|path|
@@ -41,20 +36,12 @@ module Reditor
       }.detect(&:exist?)
     end
 
-    def detect_library_path_from_gem
-      spec = Gem::Specification.find_by_name(name.to_s)
+    def detect_from_gem
+      spec = Gem::Specification.find_by_name(name)
 
       Pathname.new(spec.full_gem_path)
     rescue Gem::LoadError
       nil
     end
-
-    def detect_library_path_from_bundler
-      return nil unless spec = Bundler.load.specs.find {|spec| spec.name == name.to_s }
-
-      Pathname.new(spec.full_gem_path)
-    rescue Bundler::GemNotFound, Bundler::GemfileNotFound
-      nil
-    end
   end
 end

data/lib/reditor/version.rb

@@ -1,3 +1,3 @@
 module Reditor
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/spec/command_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 require 'open3'
 
 describe 'reditor command' do
-  def capture_reditor(library_name, options)
+  def capture_reditor(library_name, options = {})
     options = {editor: 'echo', where: nil}.merge(options)
     command = PROJECT_ROOT.join('bin/reditor').to_path
     project = PROJECT_ROOT.join("spec/samples/#{options[:where]}").to_path
 
-    Open3.capture2(
+    Open3.capture2e(
       {'EDITOR' => options[:editor]},
       command,
       library_name,
@@ -15,6 +15,8 @@ describe 'reditor command' do
     ).first
   end
 
+  let(:thor_in_bundler_project) { /thor-0\.14\.6/ }
+
   describe '#open' do
     context 'Standard library in non-bundler broject (happy case)' do
       subject { capture_reditor('thread', where: 'blank_project') }
@@ -25,7 +27,7 @@ describe 'reditor command' do
     context 'Standard library in non-bundler broject (no library found)' do
       subject { capture_reditor('3600645b1f28d73e9cd0384b5b9664d6ceeabe7e', where: 'blank_project') }
 
-      it { should match 'No library found' }
+      it { should match 'Library 3600645b1f28d73e9cd0384b5b9664d6ceeabe7e not found' }
     end
 
     context 'rubygems library in non-bundler project' do
@@ -34,7 +36,7 @@ describe 'reditor command' do
       it { should match /thor-/m }
 
       specify 'global gem should be used' do
-        subject.should_not match /thor-0\.14\.6/
+        subject.should_not match thor_in_bundler_project
       end
     end
 
@@ -42,14 +44,22 @@ describe 'reditor command' do
       subject { capture_reditor('thor', where: 'bundler_project') }
 
       specify 'bundler gem should be used' do
-        subject.should match /thor-0\.14\.6/
+        subject.should match thor_in_bundler_project
       end
     end
 
     context 'rubygems library in bundler project (not yet installed)' do
       subject { capture_reditor('thor', where: 'bundler_project_without_lockfile') }
 
-      it { should match /thor-0\.14\.6/ }
+      it { should match thor_in_bundler_project }
+    end
+
+    context 'with incorrect name' do
+      subject { capture_reditor('thief') }
+
+      it { should match /\[\d+\]\sthread/ }
+      it { should match /\[\d+\]\sthor/ }
+      it { should match /Choose number of library/ }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reditor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - bin/reditor
 - lib/reditor.rb
+- lib/reditor/candidates_locator.rb
 - lib/reditor/command.rb
 - lib/reditor/library_locator.rb
 - lib/reditor/version.rb