pry-git 0.2.2 → 0.2.3

data/CHANGELOG

@@ -0,0 +1,3 @@
+* 19/7/2011 version 0.2.2
+
+Gem release

data/README.md

@@ -12,7 +12,7 @@ pry-git enables you to diff an individual _method_ , it can show you
 the blame for a method  and ultimately allow you to commit 'methods' (rather than amorphous
 'hunks' of code).
 
-pry-git is a plugin for the [pry](http://github.com/pry/pry)
+pry-git is a plugin for the [pry](http://pry.github.com)
 REPL.
 
 pry-git is very much proof of concept right now, stay tuned!

data/Rakefile

@@ -26,7 +26,7 @@ def apply_spec_defaults(s)
   s.files = Dir["lib/**/*.rb", "test/*.rb", "CHANGELOG", "README.md", "Rakefile"]
   s.add_dependency("diffy")
   s.add_dependency("grit")
-  s.add_dependency("pry", ">=0.9.2")
+  s.add_dependency("pry", ">=0.9.8")
 end
 
 desc "run pry with plugin enabled"
@@ -39,6 +39,9 @@ task :test do
   sh "bacon -Itest -rubygems -a"
 end
 
+desc "generate a gemspec"
+task :gemspec => "ruby:gemspec"
+
 namespace :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
@@ -49,6 +52,12 @@ namespace :ruby do
     pkg.need_zip = false
     pkg.need_tar = false
   end
+
+  task :gemspec do
+    File.open("#{spec.name}.gemspec", "w") do |f|
+      f << spec.to_ruby
+    end
+  end
 end
 
 desc "build all platform gems at once"

data/lib/pry-git.rb

@@ -8,110 +8,124 @@ require 'diffy'
 require 'tempfile'
 
 module PryGit
-  GitCommands = Pry::CommandSet.new do
-    command "git blame", "Show blame for a method (for method in HEAD)" do |meth_name|
-      if (meth = get_method_object(meth_name, target, {})).nil?
-        output.puts "Invalid method name: #{meth_name}."
-        next
-      end
-
-      file_name = meth.source_location.first
-      code, start_line = method_code_from_head(meth)
-
-      git_root = find_git_root(File.dirname(file_name))
-
+  module GitHelpers
+    def get_file_from_commit(path)
+      git_root = find_git_root(File.dirname(path))
       repo = Grit::Repo.new(git_root)
-      num_lines = code.lines.count
-      authors = repo.blame(relative_path(git_root, file_name), repo.head.commit).lines.select do |v|
-        v.lineno >= start_line && v.lineno <= start_line + num_lines
-      end.map do |v|
-        v.commit.author.output(Time.new).split(/</).first.strip
-      end
+      head = repo.commits.first
+      tree_names = relative_path(git_root, path).split("/")
+      start_tree = head.tree
+      blob_name = tree_names.last
+      tree = tree_names[0..-2].inject(start_tree)  { |a, v|  a.trees.find { |t| t.basename == v } }
+      blob = tree.blobs.find { |v| v.basename == blob_name }
+      blob.data
+    end
 
-      lines_with_blame = []
-      code.lines.zip(authors) { |line, author| lines_with_blame << ("#{author}".ljust(10) + colorize_code(line)) }
-      output.puts lines_with_blame.join
+    def method_code_from_head(meth)
+      code = get_file_from_commit(meth.source_location.first)
+      search_line = meth.source.lines.first.strip
+      _, start_line = code.lines.to_a.each_with_index.find { |v, i| v.strip == search_line }
+      start_line
+      [Pry.new(:input => StringIO.new(code.lines.to_a[start_line..-1].join)).r(target), start_line + 1]
     end
 
-    command "git diff", "Show the diff for a method (working directory vs HEAD)" do |meth_name|
+    def relative_path(root, path)
+      path =~ /#{root}\/(.*)/
+      $1
+    end
 
-      if (meth = get_method_object(meth_name, target, {})).nil?
-        output.puts "Invalid method name: #{meth_name}."
-        next
+    # return the git top level for a give directory
+    def find_git_root(dir)
+      git_root = "."
+      Dir.chdir dir do
+        git_root =  `git rev-parse --show-toplevel`.chomp
       end
 
-      output.puts colorize_code(Diffy::Diff.new(method_code_from_head(meth).first, meth.source))
+      raise "No associated git repository found!" if git_root =~ /fatal:/
+      git_root
     end
+  end
 
-    command "git add", "Add a method to index" do |meth_name|
-      if (meth = get_method_object(meth_name, target, {})).nil?
-        output.puts "Invalid method name: #{meth_name}."
-        next
-      end
-
-      file_name = meth.source_location.first
+  Commands = Pry::CommandSet.new do
 
-      git_root = find_git_root(File.dirname(file_name))
-      repo = Grit::Repo.new(git_root)
+    create_command "git blame", "Show blame for a method (for method in HEAD)" do
+      include GitHelpers
 
-      rel_file_name = relative_path(git_root, meth.source_location.first)
-      file_data = get_file_from_commit(file_name)
-      code, start_line = method_code_from_head(meth)
-      end_line = start_line + code.lines.count
+      def options(opt)
+        method_options(opt)
+      end
 
-      before_code = file_data.lines.to_a[0..(start_line - 2)]
-      after_code = file_data.lines.to_a[end_line - 1..-1]
+      def process
+        raise CommandError, "Could not find method source" unless method_object.source
 
-      final_code = before_code << meth.source.lines.to_a << after_code
+        meth = method_object
 
-      t = Tempfile.new("tmp")
-      t.write final_code.join
-      t.close
+        file_name = meth.source_location.first
+        code, start_line = method_code_from_head(meth)
 
-      sha1 = `git hash-object -w #{t.path}`.chomp
-      system("git update-index --cacheinfo 100644 #{sha1} #{rel_file_name}")
-    end
+        git_root = find_git_root(File.dirname(file_name))
 
-    helpers do
-      def get_file_from_commit(path)
-        git_root = find_git_root(File.dirname(path))
         repo = Grit::Repo.new(git_root)
-        head = repo.commits.first
-        tree_names = relative_path(git_root, path).split("/")
-        start_tree = head.tree
-        blob_name = tree_names.last
-        tree = tree_names[0..-2].inject(start_tree)  { |a, v|  a.trees.find { |t| t.basename == v } }
-        blob = tree.blobs.find { |v| v.basename == blob_name }
-        blob.data
+        num_lines = code.lines.count
+        authors = repo.blame(relative_path(git_root, file_name), repo.head.commit).lines.select do |v|
+          v.lineno >= start_line && v.lineno <= start_line + num_lines
+        end.map do |v|
+          v.commit.author.output(Time.new).split(/</).first.strip
+        end
+
+        lines_with_blame = []
+        code.lines.zip(authors) { |line, author| lines_with_blame << ("#{author}".ljust(20) + colorize_code(line)) }
+        output.puts lines_with_blame.join
       end
+    end
 
-      def method_code_from_head(meth)
-        code = get_file_from_commit(meth.source_location.first)
-        search_line = meth.source.lines.first.strip
-        _, start_line = code.lines.to_a.each_with_index.find { |v, i| v.strip == search_line }
-        start_line
-        [Pry.new(:input => StringIO.new(code.lines.to_a[start_line..-1].join)).r(target), start_line + 1]
+    create_command "git diff", "Show the diff for a method (working directory vs HEAD)" do
+      include GitHelpers
+
+      def options(opt)
+        method_options(opt)
       end
 
-      def relative_path(root, path)
-        path =~ /#{root}\/(.*)/
-        $1
+      def process
+        output.puts colorize_code(Diffy::Diff.new(method_code_from_head(method_object).first, method_object.instance_variable_get(:@method).source))
       end
+    end
 
-      # return the git top level for a give directory
-      def find_git_root(dir)
-        git_root = "."
-        Dir.chdir dir do
-          git_root =  `git rev-parse --show-toplevel`.chomp
-        end
+    create_command "git add", "Add a method to index" do
+      include GitHelpers
 
-        raise "No associated git repository found!" if git_root =~ /fatal:/
-        git_root
+      def options(opt)
+        method_options(opt)
       end
 
+      def process
+        meth = method_object.instance_variable_get(:@method)
+
+        file_name = meth.source_location.first
+
+        git_root = find_git_root(File.dirname(file_name))
+        repo = Grit::Repo.new(git_root)
+
+        rel_file_name = relative_path(git_root, meth.source_location.first)
+        file_data = get_file_from_commit(file_name)
+        code, start_line = method_code_from_head(meth)
+        end_line = start_line + code.lines.count
+
+        before_code = file_data.lines.to_a[0..(start_line - 2)]
+        after_code = file_data.lines.to_a[end_line - 1..-1]
+
+        final_code = before_code << meth.source.lines.to_a << after_code
+
+        t = Tempfile.new("tmp")
+        t.write final_code.join
+        t.close
+
+        sha1 = `git hash-object -w #{t.path}`.chomp
+        system("git update-index --cacheinfo 100644 #{sha1} #{rel_file_name}")
+      end
     end
 
   end
 end
 
-Pry.commands.import PryGit::GitCommands
+Pry.commands.import PryGit::Commands

data/lib/pry-git/version.rb

@@ -1,3 +1,3 @@
 module PryGit
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,59 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry-git
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: diffy
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70186494544180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70186494544180
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &70186494543760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70186494543760
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70186494543260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70186494543260
 description: A Ruby-aware git layer
 email: jrmair@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/pry-git/version.rb
 - lib/pry-git.rb
 - test/test.rb
@@ -62,30 +58,26 @@ files:
 - Rakefile
 homepage: http://github.com/pry/pry-git
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A Ruby-aware git layer
 test_files: []
-