method_match 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3fc86a651ea860312b1d9bcec96db5c356197a
-  data.tar.gz: 566b680a41969a6ae1506238ad4822ba616021bd
+  metadata.gz: ee873555b2c027ef3eec2bbd005abd93a019bd66
+  data.tar.gz: 07b5159a0c193903aa91aa2a3472b8e9418e144d
 SHA512:
-  metadata.gz: 35b69ccc2e703d25e2573b54234fd945107c786f6b92c76f32757e58445633756fdd2cdff37eb9acabefcd7e3b06f5fe413d9d4847632c0ca65d6dd9904d0dc0
-  data.tar.gz: 8df004f9944e29c71ca1a65ade83764f95acae8942b3dd97a55565e054c13e64da383963fe383677e3e4249a4da81525df1dfcf647c7b0a71d506b2a03d92eaa
+  metadata.gz: 081500d42959a52e57eca26a67374509f954d663cb00301ac6d5a92d4c60de3044dc02a7559bb5181bb8af52dfcec799156ab3cedd67beef34292d35d0c33287
+  data.tar.gz: f9d6e1bc2fb5683f36e718ea5598da8cd86239cc8d746be72301603f36557022e1d70bef2f91c240a72c15f58848d658e1bbe949ce919326ab4269d68b979564

data/.watchr

@@ -1,7 +1,7 @@
 watch("spec/.*/*_spec.rb") do |match|
-  system "bundle exec rspec spec"
+  system "rspec spec"
 end
 
 watch("lib/(.*/.*).rb") do |match|
-  system "bundle exec rspec spec"
+  system "rspec spec"
 end

data/lib/method_match.rb

@@ -1,9 +1,9 @@
 require "method_match/version"
 
 module MethodMatch
-  autoload :Matcher,       'method_match/matcher'
-  autoload :Pry,           'method_match/pry'
-  autoload :CommandRunner, 'method_match/command_runner'
-  autoload :NameExtractor, 'method_match/name_extractor'
-  Pry.setup
+  require 'method_match/matcher'
+  require 'method_match/pry'
+  require 'method_match/command_runner'
+  require 'method_match/name_extractor'
+  Pry.new.setup
 end

data/lib/method_match/command_runner.rb

@@ -9,9 +9,10 @@ module MethodMatch
       require 'pathname'
       if Pathname.new(@matcher.spec_name).file?
         ::Pry.run_command rspec_command
-      else
-        puts "Spec #{@matcher.spec_name} does not exist"
+        return true
       end
+      puts "Spec #{@matcher.spec_name} does not exist"
+      false
     end
 
     def rspec_command

data/lib/method_match/matcher.rb

@@ -3,52 +3,61 @@ module MethodMatch
     attr_accessor :name, :line, :spec_name
     SPEC_MODE = 'spec'
     CODE_MODE = 'code'
+    RUBY_FILETYPE = ".rb"
+    SPEC_FILE_ENDING = '_spec.rb'
+    METHOD_NAME_REGEX = /def\s(self\.(\w+)|\w+).*/
 
     def initialize name, line
-      @name = NameExtractor.new( name ).name
+      @name = NameExtractor.new( name ).final_name
       @line = line
       create_spec_name
     end
 
     def mode
-      is_spec unless @mode
+      set_mode unless @mode
       @mode
     end
 
     def method_name
-      return nil if mode == SPEC_MODE
+      return nil if spec?
       @match = get_method_match
       return nil unless @match
-      @match.match(/def\s(self\.(\w+)|\w+).*/)[1]
+      @match.match(METHOD_NAME_REGEX)[1]
     end
 
     def spec?
       mode == SPEC_MODE
     end
 
-    def is_spec
-      if @spec_name[0] == SPEC_MODE
-        @mode = SPEC_MODE
-        return true
+    def create_spec_name
+      @spec_name = name.split(File::SEPARATOR)
+      @spec_name = if spec?
+        name
+      else
+        convert_code_to_spec name.split(File::SEPARATOR)
       end
-      @mode = CODE_MODE
-      return false
     end
 
-    def create_spec_name
-      @spec_name = @name.split('/')
-      if is_spec
-        return @spec_name = @name
-      end
-      @spec_name[0] = SPEC_MODE
-      @spec_name[-1].sub!('.rb', '_spec.rb')
-      @spec_name = @spec_name.join('/')
+    def convert_code_to_spec name
+      name[0] = SPEC_MODE
+      name.last.sub!(RUBY_FILETYPE, SPEC_FILE_ENDING)
+      name.join File::SEPARATOR
     end
 
     def get_method_match
-      File.readlines(name).first(line).reverse.grep(/\sdef\s/).first
+      File.readlines(name).first(line).reverse.grep(METHOD_NAME_REGEX).first
     rescue LoadError
       return nil
     end
+
+    private
+
+    def set_mode
+      @mode = if spec_name.first == SPEC_MODE
+        SPEC_MODE
+      else
+        CODE_MODE
+      end
+    end
   end
 end

data/lib/method_match/name_extractor.rb

@@ -1,18 +1,33 @@
 module MethodMatch
   class NameExtractor
 
+    attr_accessor :name
+
+    PWD = "pwd"
+
     def initialize name
       @name = name
     end
 
-    def name
-      pw = pwd.chomp
-      return @name.sub "#{pw}/", '' if @name.index( pw ) == 0
-      @name
+    def final_name
+      @name.slice! base_directory if project_path?
+      name
+    end
+
+    def project_path?
+      name.index( full_path ) && name.index( full_path ).zero?
     end
 
     def pwd
-      `pwd`
+      `#{PWD}`
+    end
+
+    def full_path
+      pwd.chomp
+    end
+
+    def base_directory
+      full_path + File::SEPARATOR
     end
   end
 end

data/lib/method_match/pry.rb

@@ -1,17 +1,28 @@
 module MethodMatch
   class Pry
-    def self.setup
-      require 'pry'
-      ::Pry::CommandSet.new do
-        create_command "rspec_method", "runs " do
-          group "Testing"
-          def process(*args)
-            CommandRunner.new(
-              Matcher.new(args[0], Integer(args[1]))
-            ).run_command
-          end
+    PRY_PACKAGE = 'pry'
+    COMMAND_NAME = "rspec_method"
+    COMMAND_DESCRIPTION = "runs spec given name and line number"
+
+    def rspec_method
+      Proc.new do
+        create_command COMMAND_NAME, COMMAND_DESCRIPTION, &MethodMatch::Pry.new.command_proc
+      end
+    end
+
+    def command_proc
+      Proc.new do
+        def process(*args)
+          CommandRunner.new(
+            Matcher.new(args[0], Integer(args[1]))
+          ).run_command
         end
-      end.tap { |cmd| ::Pry::Commands.import cmd }
+      end
+    end
+
+    def setup
+      require PRY_PACKAGE
+      ::Pry::CommandSet.new(&rspec_method).tap { |cmd| ::Pry::Commands.import cmd }
     end
   end
 end

data/lib/method_match/version.rb

@@ -1,3 +1,3 @@
 module MethodMatch
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.11".freeze
 end

data/spec/method_match/command_runner_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require 'spec_helper'
+
 describe MethodMatch::CommandRunner do
   let(:matcher){MethodMatch::Matcher.new 'data/test_data/matcher.rb', 13}
   let(:command_runner){MethodMatch::CommandRunner.new matcher}
@@ -11,4 +12,13 @@ describe MethodMatch::CommandRunner do
       it { should eq('rspec spec/test_data/matcher_spec.rb -e \'.some_class_method\'')}
     end
   end
+
+  describe '#run_command' do
+    it 'requires pathname' do
+      require 'pathname'
+      command_runner.should_receive(:require).with('pathname')
+      command_runner.should_receive(:puts).with('Spec spec/test_data/matcher_spec.rb does not exist')
+      expect(command_runner.run_command).to be_false
+    end
+  end
 end

data/spec/method_match/matcher_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require 'spec_helper'
+
 describe MethodMatch::Matcher do
   let(:matcher){MethodMatch::Matcher.new 'data/test_data/matcher.rb', 13}
   subject {matcher}

data/spec/method_match/name_extractor_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require 'spec_helper'
+
 describe MethodMatch::NameExtractor do
   let(:extractor) do
     e = MethodMatch::NameExtractor.new filename
@@ -6,16 +7,84 @@ describe MethodMatch::NameExtractor do
     e
   end
 
-  describe '#name' do
-    subject { extractor.name }
+  subject { MethodMatch::NameExtractor.new filename }
+
+  describe "#pwd" do
+    let(:filename) { '/home/othername/project/file.rb'}
+    it "executes pwd" do
+      subject.should_receive(:`).with 'pwd'
+      subject.pwd
+    end
+  end
+
+  describe '#final_name' do
+    subject { extractor.final_name }
     context 'project dir' do
       let(:filename) { '/home/name/project/file.rb'}
       it { should eq( 'file.rb')}
     end
 
-    context 'somwhere else' do
+    context 'somewhere else' do
       let(:filename) { '/home/othername/project/file.rb'}
       it { should eq( '/home/othername/project/file.rb')}
     end
   end
+
+  describe "#full_path" do
+    let(:extractor) do
+      e = MethodMatch::NameExtractor.new ''
+      e.stub(:pwd) { "/home/name/project\n"}
+      e
+    end
+
+    subject { extractor.full_path }
+
+    it "cleans line breaks of pwd" do
+      expect(subject).to eq('/home/name/project')
+
+    end
+  end
+
+  describe "#project_path?" do
+    subject { extractor.project_path? }
+
+    context "matching" do
+      let(:extractor) do
+        e = MethodMatch::NameExtractor.new ''
+        e.stub(:full_path) { "a" }
+        e.stub(:name) { "aaa" }
+        e
+      end
+
+      it "cleans line breaks of pwd" do
+        expect(subject).to be_true
+      end
+    end
+
+    context "not matching" do
+      let(:extractor) do
+        e = MethodMatch::NameExtractor.new ''
+        e.stub(:full_path) { "a" }
+        e.stub(:name) { "bbb" }
+        e
+      end
+
+      it "cleans line breaks of pwd" do
+        expect(subject).to be_false
+      end
+    end
+
+    context "not on start" do
+      let(:extractor) do
+        e = MethodMatch::NameExtractor.new ''
+        e.stub(:full_path) { "a" }
+        e.stub(:name) { "bba" }
+        e
+      end
+
+      it "cleans line breaks of pwd" do
+        expect(subject).to be_false
+      end
+    end
+  end
 end

data/spec/method_match/pry_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe MethodMatch::Pry do
+  subject { MethodMatch::Pry.new }
+  describe "#setup" do
+
+  end
+
+  describe '#rspec_method' do
+    it "returns proc creating rspec_method command" do
+      expect(subject.rspec_method).to be_instance_of Proc
+      expect(subject.rspec_method.lambda?).to be_false
+    end
+  end
+
+  describe '#command_proc' do
+    it "returns proc passed to create_command" do
+      expect(subject.command_proc).to be_instance_of Proc
+      expect(subject.command_proc.lambda?).to be_false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_match
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Tomasz Tokarski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -91,6 +91,7 @@ files:
 - spec/method_match/command_runner_spec.rb
 - spec/method_match/matcher_spec.rb
 - spec/method_match/name_extractor_spec.rb
+- spec/method_match/pry_spec.rb
 - spec/spec_helper.rb
 homepage: http://tomasztokarski.com/method_match
 licenses: []
@@ -120,4 +121,5 @@ test_files:
 - spec/method_match/command_runner_spec.rb
 - spec/method_match/matcher_spec.rb
 - spec/method_match/name_extractor_spec.rb
+- spec/method_match/pry_spec.rb
 - spec/spec_helper.rb