reditor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35bee5c62877ca050e26ad2d340b1db648ab3ee9
-  data.tar.gz: c54e40dde0e6f8fe6a6c60b040d02fe38f8fd247
+  metadata.gz: 08dc51f8ec9fddc219f8e5a0237593bb66ec6a16
+  data.tar.gz: 4ecdd9976fc3a8373015ef3458ae344048f50298
 SHA512:
-  metadata.gz: 7096bb557e3cfe6aac7fc7632c5aa533cae42bddff69cafb1b4065cc7eea0f8750b3f75bf2ef2f51538d0fd8c06667973ff39c4e5a341d68624fd85f6b137381
-  data.tar.gz: a7e4cddc1c9701a4380ad1257e73d24829a3f08998e7bd775814e9ac36fdf162e235f9579022201f7ae94a520c4ecfdec308f6b999a42e83307af0dbbde3ba9d
+  metadata.gz: 161cca83d6088e6492df71b7714280c9c59f20b7f477f4750366ad69a1e0da998873a751e6e9198a48288afaf61a8e5cd5a8d56af97b88d9532222e55604df80
+  data.tar.gz: fef80fba2bb1fbef96fbe53e5c594d5c5770fd4558337872f2784916f2baa95f9207b6eaf6a126a2486e27fb138f6c26cd4e917e0288cee5d271566dc2b60a44

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - '1.9.3'
+  - '2.0.0'

data/README.md

@@ -1,4 +1,4 @@
-# Reditor
+# Reditor [![Build Status](https://travis-ci.org/hibariya/reditor.png?branch=master)](https://travis-ci.org/hibariya/reditor)
 
 Reditor provides `reditor` command.
 

data/lib/reditor.rb

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

data/lib/reditor/command.rb

@@ -36,9 +36,8 @@ module Reditor
       say "Reditor version #{VERSION}"
     end
 
-    # XXX FIXME: a more better implementation
     def method_missing(name, *args, &block)
-      send :open, name
+      open name
     end
 
     private
@@ -59,16 +58,16 @@ module Reditor
     end
 
     def choose_exec(name, &block)
-      candidates = CandidatesLocator.detect(name)
+      names = LibrarySearchQuery.search(name)
 
-      candidates.each.with_index do |candidate, i|
-        say "[#{i}] #{candidate}"
+      names.each.with_index do |name, i|
+        say "[#{i}] #{name}"
       end
-      print "Choose number of library [0]> "
+      print 'Choose number of library [0]> '
 
       abort_reditor unless num = $stdin.gets
 
-      detect_exec candidates[num.to_i], &block
+      detect_exec names[num.to_i], &block
     rescue Interrupt
       abort_reditor
     end

data/lib/reditor/library_locator.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'bundler'
 
 # TODO: care version specification
 module Reditor
@@ -18,12 +19,11 @@ module Reditor
     end
 
     def detect_from_bundler
-      require 'bundler'
-
       return nil unless spec = Bundler.load.specs.find {|spec| spec.name == name }
 
-      Pathname.new(spec.full_gem_path)
+      Pathname(spec.full_gem_path)
     rescue NameError, Bundler::GemNotFound, Bundler::GemfileNotFound
+      # NOP (probably it's not available bundler project)
     end
 
     def detect_from_loadpath
@@ -32,15 +32,16 @@ module Reditor
       $LOAD_PATH.map {|path|
         full_path = File.expand_path(path + '/' + basename)
 
-        Pathname.new(full_path)
+        Pathname(full_path)
       }.detect(&:exist?)
     end
 
     def detect_from_gem
       spec = Gem::Specification.find_by_name(name)
 
-      Pathname.new(spec.full_gem_path)
+      Pathname(spec.full_gem_path)
     rescue Gem::LoadError
+      # NOP (Gem couldn't find #{name} gem)
     end
   end
 end

data/lib/reditor/library_search_query.rb

@@ -0,0 +1,67 @@
+require 'pathname'
+require 'hotwater'
+require 'bundler'
+
+module Reditor
+  class LibrarySearchQuery
+    def self.search(query, limit = 20)
+      new(query).search(limit)
+    end
+
+    def initialize(query)
+      @query = query.to_s
+
+      quoted = Regexp.quote(@query)
+      @substr_pattern  = /^#{quoted}|#{quoted}$/i
+      @partial_pattern = /#{quoted}/i
+    end
+
+    def search(limit)
+      available_libraries.sort_by {|name|
+        indexes_with_match(name) + indexes_with_distance(name)
+      }.take(limit)
+    end
+
+    def available_libraries
+      @available_libraries ||= (
+        availables_from_loadpath +
+        availables_from_gem      +
+        availables_from_bundler
+      ).uniq
+    end
+
+    private
+
+    def indexes_with_match(name)
+      words         = name.split(/-_/)
+      substr_count  = words.grep(@substr_pattern).count
+      partial_count = words.grep(@partial_pattern).count
+
+      [-substr_count, -partial_count]
+    end
+
+    def indexes_with_distance(name)
+      [Hotwater.damerau_levenshtein_distance(@query, name)]
+    end
+
+    def availables_from_bundler
+      Bundler.load.specs.map(&:name)
+    rescue NameError, Bundler::GemNotFound, Bundler::GemfileNotFound
+      []
+    end
+
+    def availables_from_gem
+      Gem::Specification.map(&:name)
+    rescue Gem::LoadError
+      []
+    end
+
+    def availables_from_loadpath
+      $LOAD_PATH.each_with_object([]) {|path, availables|
+        Pathname(File.expand_path(path)).entries.each do |entry|
+          availables << entry.basename('.rb').to_s if entry.extname == '.rb'
+        end
+      }
+    end
+  end
+end

data/lib/reditor/version.rb

@@ -1,3 +1,3 @@
 module Reditor
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/reditor.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/reditor/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['hibariya']
   gem.email         = ['celluloid.key@gmail.com']
-  gem.description   = %q{Open a ruby library with your editor. Reditor supports gem, bundler, and stdlib(pure ruby).}
+  gem.description   = %q{Open a ruby library with your editor. Reditor supports gem, bundler, and stdlib (pure ruby).}
   gem.summary       = %q{Open a ruby library with your editor}
   gem.homepage      = 'https://github.com/hibariya/reditor'
 
@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
   gem.version       = Reditor::VERSION
 
   gem.add_runtime_dependency 'hotwater', '~> 0.1.2'
-  gem.add_runtime_dependency 'thor',     '~> 0.17.0'
-  gem.add_runtime_dependency 'rake',     '~> 10.0.3' # workaround for `WARN: Unresolved specs during Gem::Specification.reset: rake (>= 0)' on ruby-2.0.0
+  gem.add_runtime_dependency 'thor',     '~> 0.18.1'
+  gem.add_runtime_dependency 'rake',     '~> 10.1.0' # workaround for `WARN: Unresolved specs during Gem::Specification.reset: rake (>= 0)' on ruby-2.0.0
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
   gem.add_development_dependency 'tapp'
 end

data/spec/command_spec.rb

@@ -7,16 +7,24 @@ describe 'reditor command' do
     command = PROJECT_ROOT.join('bin/reditor').to_path
     project = PROJECT_ROOT.join("spec/samples/#{options[:where]}").to_path
 
-    Open3.capture2e(
-      {'EDITOR' => options[:editor]},
-      command,
-      library_name,
-      chdir: project
-    ).first
+    Bundler.with_clean_env {
+      Open3.capture2e(
+        {'EDITOR' => options[:editor]},
+        command,
+        library_name,
+        chdir: project
+      ).first
+    }
   end
 
   let(:thor_in_bundler_project) { /thor-0\.14\.6/ }
 
+  before :all do
+    Bundler.with_clean_env do
+      system 'bundle', chdir: PROJECT_ROOT.join('spec/samples/bundler_project').to_path
+    end
+  end
+
   describe '#open' do
     context 'Standard library in non-bundler broject (happy case)' do
       subject { capture_reditor('thread', where: 'blank_project') }

data/spec/library_search_query_spec.rb

@@ -0,0 +1,51 @@
+require 'reditor'
+require 'spec_helper'
+
+describe Reditor::LibrarySearchQuery do
+  describe '.search(query, limit)' do
+    before do
+      Reditor::LibrarySearchQuery.any_instance.stub(:available_libraries) {
+        %w(
+          rails_admin
+          railtie
+          activemodel
+          active_decorator
+          action
+          jquery-atwho-rails
+          itwho
+          csv
+        )
+      }
+    end
+
+    describe 'rails' do
+      subject { Reditor::LibrarySearchQuery.search('rails', 3) }
+
+      it { should == %w(rails_admin jquery-atwho-rails railtie) }
+    end
+
+    describe 'rails_' do
+      subject { Reditor::LibrarySearchQuery.search('rails_', 2) }
+
+      it { should == %w(rails_admin railtie) }
+    end
+
+    describe 'cvs' do
+      subject { Reditor::LibrarySearchQuery.search('cvs', 1) }
+
+      it { should == %w(csv) }
+    end
+
+    describe 'atwho' do
+      subject { Reditor::LibrarySearchQuery.search('atwho', 2) }
+
+      it { should == %w(jquery-atwho-rails itwho) }
+    end
+
+    describe 'active' do
+      subject { Reditor::LibrarySearchQuery.search('active', 3) }
+
+      it { should == %w(activemodel active_decorator action) }
+    end
+  end
+end

data/spec/samples/bundler_project/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'thor', '0.14.6'

data/spec/samples/bundler_project_without_lockfile/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'thor', '0.14.6'

data/spec/spec_helper.rb

@@ -9,8 +9,4 @@ PROJECT_ROOT = Pathname.new(__FILE__).dirname.join('..').realpath
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-
-  config.before :suite do
-    system 'bundle', chdir: PROJECT_ROOT.join('spec/samples/bundler_project').to_path
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reditor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - hibariya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hotwater
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: tapp
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Open a ruby library with your editor. Reditor supports gem, bundler,
-  and stdlib(pure ruby).
+  and stdlib (pure ruby).
 email:
 - celluloid.key@gmail.com
 executables:
@@ -118,18 +118,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/reditor
 - lib/reditor.rb
-- lib/reditor/candidates_locator.rb
 - lib/reditor/command.rb
 - lib/reditor/library_locator.rb
+- lib/reditor/library_search_query.rb
 - lib/reditor/version.rb
 - reditor.gemspec
 - spec/command_spec.rb
+- spec/library_search_query_spec.rb
 - spec/samples/blank_project/.gitkeep
 - spec/samples/bundler_project/Gemfile
 - spec/samples/bundler_project_without_lockfile/Gemfile
@@ -153,14 +155,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Open a ruby library with your editor
 test_files:
 - spec/command_spec.rb
+- spec/library_search_query_spec.rb
 - spec/samples/blank_project/.gitkeep
 - spec/samples/bundler_project/Gemfile
 - spec/samples/bundler_project_without_lockfile/Gemfile
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/reditor/candidates_locator.rb

@@ -1,52 +0,0 @@
-require 'pathname'
-require 'hotwater'
-
-module Reditor
-  class CandidatesLocator
-    def self.detect(keyword)
-      new(keyword.to_s).detect
-    end
-
-    attr_reader :keyword, :limit
-
-    def initialize(keyword, limit = 20)
-      @keyword, @limit = keyword, limit
-    end
-
-    def detect
-      available_libraries.sort_by {|name|
-        Hotwater.damerau_levenshtein_distance(@keyword, name)
-      }.take(@limit)
-    end
-
-    def available_libraries
-      (availables_from_loadpath +
-       availables_from_gem      +
-       availables_from_bundler).uniq
-    end
-
-    private
-
-    def availables_from_bundler
-      require 'bundler'
-
-      Bundler.load.specs.map(&:name)
-    rescue NameError, Bundler::GemNotFound, Bundler::GemfileNotFound
-      []
-    end
-
-    def availables_from_gem
-      Gem::Specification.map(&:name)
-    rescue Gem::LoadError
-      []
-    end
-
-    def availables_from_loadpath
-      $LOAD_PATH.each_with_object([]) {|path, availables|
-        Pathname.new(File.expand_path(path)).entries.each do |entry|
-          availables << entry.basename('.rb').to_s if entry.extname == '.rb'
-        end
-      }
-    end
-  end
-end