reditor 0.0.3 → 0.0.4

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 ## Usage
 
-### Open Standard Library
+### Open Standard Library (pure ruby only)
 
 ```
   $ reditor set

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/bin/reditor

@@ -5,4 +5,5 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'reditor'
 
+$PROGRAM_NAME = File.basename(__FILE__)
 Reditor::Command.start

data/lib/reditor.rb

@@ -1,58 +1,9 @@
-require 'pathname'
 require 'rubygems'
 
-def gemfile_found?
-  if File.exists? 'Gemfile'
-    true
-  elsif (Dir.getwd != '/')
-    Dir.chdir('..')
-    gemfile_found?
-  end
-end
-
-if (gemfile_found?)
-  require 'bundler'
-  Bundler.setup
-end
-
 module Reditor
   class LibraryNotFound < LoadError; end
 
-  extend self
-
-  def detect(name)
-    path = detect_library_path(name) or raise LibraryNotFound, 'No library found'
-
-    if path.file?
-      [path.dirname.to_path, path.basename.to_path]
-    else
-      [path.to_path, '.']
-    end
-  end
-
-  def detect_library_path(name)
-    detect_library_path_from_loadpath(name) || detect_library_path_from_gem(name)
-  end
-
-  def detect_library_path_from_loadpath(name)
-    basename = "#{name}.rb"
-
-    $LOAD_PATH.map {|path|
-      full_path = File.expand_path(path + '/' + basename)
-
-      Pathname.new(full_path)
-    }.detect(&:exist?)
-  end
-
-  # TODO: care version specification
-  def detect_library_path_from_gem(name)
-    spec = Gem::Specification.find_by_name(name.to_s)
-
-    Pathname.new(spec.full_gem_path)
-  rescue Gem::LoadError
-    nil
-  end
-
-  autoload :Command, 'reditor/command'
-  autoload :VERSION, 'reditor/version'
+  autoload :LibraryLocator, 'reditor/library_locator'
+  autoload :Command,        'reditor/command'
+  autoload :VERSION,        'reditor/version'
 end

data/lib/reditor/command.rb

@@ -4,8 +4,6 @@ require 'thor'
 
 module Reditor
   class Command < Thor
-    include Reditor
-
     map '-v' => :version,
         '-h' => :help,
         '--version' => :version,
@@ -13,24 +11,22 @@ module Reditor
 
     desc :open, 'Open the library'
     def open(name)
-      dir, file = *detect(name)
-
-      say "Moving to #{dir}", :green
-      Dir.chdir dir do
-        say "Opening #{file}", :green
+      detect_exec name do |dir, file|
+        say "Moving to #{dir}", :green
+        Dir.chdir dir do
+          say "Opening #{file}", :green
 
-        exec editor_command, file
+          exec editor_command, file
+        end
       end
-    rescue LibraryNotFound => e
-      say e.message, :red
     end
 
     desc :sh, 'Open a shell and move to the library'
     def sh(name)
-      dir, _ = *detect(name)
-
-      Dir.chdir dir do
-        exec shell_command
+      detect_exec name do |dir, _|
+        Dir.chdir dir do
+          exec shell_command
+        end
       end
     end
 
@@ -46,6 +42,12 @@ module Reditor
 
     private
 
+    def detect_exec(name, &block)
+      block.call *LibraryLocator.detect(name)
+    rescue LibraryNotFound => e
+      say e.message, :red
+    end
+
     def editor_command
       ENV['EDITOR'] or raise '$EDITOR is not provided.'
     end

data/lib/reditor/library_locator.rb

@@ -0,0 +1,60 @@
+require 'pathname'
+require 'bundler'
+
+# TODO: care multi candidates
+# TODO: care version specification
+module Reditor
+  class LibraryLocator
+    def self.detect(name)
+      new(name).detect
+    end
+
+    attr_reader :name
+
+    def initialize(name)
+      @name  = name
+    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
+    end
+
+    def detect_library_path
+      detect_library_path_from_bundler    ||
+        detect_library_path_from_loadpath ||
+        detect_library_path_from_gem
+    end
+
+    def detect_library_path_from_loadpath
+      basename = "#{name}.rb"
+
+      $LOAD_PATH.map {|path|
+        full_path = File.expand_path(path + '/' + basename)
+
+        Pathname.new(full_path)
+      }.detect(&:exist?)
+    end
+
+    def detect_library_path_from_gem
+      spec = Gem::Specification.find_by_name(name.to_s)
+
+      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.3'
+  VERSION = '0.0.4'
 end

data/reditor.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Reditor::VERSION
 
-  gem.add_runtime_dependency 'thor',    '>= 0.14.6'
-  gem.add_runtime_dependency 'bundler', '>= 1.1.4'
+  gem.add_runtime_dependency 'thor', '>= 0.15.4'
+
+  gem.add_development_dependency 'tapp',  '>= 1.3.1'
+  gem.add_development_dependency 'rspec', '>= 2.10.0'
 end

data/spec/command_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'open3'
+
+describe 'reditor command' do
+  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(
+      {'EDITOR' => options[:editor]},
+      command,
+      library_name,
+      chdir: project
+    ).first
+  end
+
+  describe '#open' do
+    context 'Standard library in non-bundler broject (happy case)' do
+      subject { capture_reditor('thread', where: 'blank_project') }
+
+      it { should match /thread\.rb$/ }
+    end
+
+    context 'Standard library in non-bundler broject (no library found)' do
+      subject { capture_reditor('3600645b1f28d73e9cd0384b5b9664d6ceeabe7e', where: 'blank_project') }
+
+      it { should match 'No library found' }
+    end
+
+    context 'rubygems library in non-bundler project' do
+      subject { capture_reditor('thor', where: 'blank_project') }
+
+      it { should match /thor-/m }
+
+      specify 'global gem should be used' do
+        subject.should_not match /thor-0\.14\.6/
+      end
+    end
+
+    context 'rubygems library in bundler project (installed)' do
+      subject { capture_reditor('thor', where: 'bundler_project') }
+
+      specify 'bundler gem should be used' do
+        subject.should match /thor-0\.14\.6/
+      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/ }
+    end
+  end
+end

data/spec/samples/bundler_project/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'thor', '0.14.6'

data/spec/samples/bundler_project_without_lockfile/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'thor', '0.14.6'

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+require 'pathname'
+
+Dir[File.dirname(__FILE__) + '/support/*'].each {|f| require f }
+
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reditor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: tapp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :runtime
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.10.0
 description: Open a ruby library by your editor
 email:
 - celluloid.key@gmail.com
@@ -59,8 +75,13 @@ files:
 - bin/reditor
 - lib/reditor.rb
 - lib/reditor/command.rb
+- lib/reditor/library_locator.rb
 - lib/reditor/version.rb
 - reditor.gemspec
+- spec/command_spec.rb
+- spec/samples/bundler_project/Gemfile
+- spec/samples/bundler_project_without_lockfile/Gemfile
+- spec/spec_helper.rb
 homepage: https://github.com/hibariya/reditor
 licenses: []
 post_install_message: 
@@ -85,4 +106,8 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Open a ruby library by your editor
-test_files: []
+test_files:
+- spec/command_spec.rb
+- spec/samples/bundler_project/Gemfile
+- spec/samples/bundler_project_without_lockfile/Gemfile
+- spec/spec_helper.rb