pry-git 0.2.0

data/README.md

@@ -0,0 +1,116 @@
+pry-git
+===========
+
+(C) John Mair (banisterfiend) 2011
+
+_ruby aware git_
+
+Retrieve blame, perform diffs, make commits using the natural units of
+Ruby code.
+
+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/banister/pry)
+REPL, a powerful IRB alternative.
+
+pry-git is very much proof of concept right now, stay tuned!
+
+* NOT AVAILABLE: Install the [gem](https://rubygems.org/gems/pry-git): `gem install pry-git`
+* NOT AVAILABLE: Read the [documentation](http://rdoc.info/github/banister/pry-git/master/file/README.md)
+* See the [source code](http://github.com/banister/pry-git)
+
+Example: blame
+--------
+
+    pry(main)> blame Pry#repl
+    John Mair   def repl(target=TOPLEVEL_BINDING)
+    John Mair     target = Pry.binding_for(target)
+    John Mair     target_self = target.eval('self')
+    John Mair
+    John Mair     repl_prologue(target)
+    Mon ouïe
+    John Mair     # cannot rely on nesting.level as
+    John Mair     # nesting.level changes with new sessions
+    John Mair     nesting_level = nesting.size
+    John Mair
+    John Mair     break_data = catch(:breakout) do
+    John Mair       nesting.push [nesting.size, target_self, self]
+    John Mair       loop do
+    John Mair         rep(target)
+    John Mair       end
+    John Mair     end
+    John Mair
+    John Mair     return_value = repl_epilogue(target, nesting_level, break_data)
+    Lee Jarvis    return_value || target_self
+    John Mair   end
+
+Example: diff
+--------
+
+    pry(main)> diff Pry#repl
+       def repl(target=TOPLEVEL_BINDING)
+    +
+    +    # hey baby
+         target = Pry.binding_for(target)
+         target_self = target.eval('self')
+
+    +    # bink
+         repl_prologue(target)
+
+         # cannot rely on nesting.level as
+         # nesting.level changes with new sessions
+         nesting_level = nesting.size
+
+         break_data = catch(:breakout) do
+           nesting.push [nesting.size, target_self, self]
+           loop do
+             rep(target)
+           end
+         end
+
+         return_value = repl_epilogue(target, nesting_level, break_data)
+         return_value || target_self
+       end
+    -
+    -  # Perform a read-eval-print.
+    -  # If no parameter is given, default to top-level (main).
+
+Features and limitations
+-------------------------
+
+* commit-method not yet implemented
+* BETA software, not guaranteed to work properly yet, stay tuned.
+
+Contact
+-------
+
+Problems or questions contact me at [github](http://github.com/banister)
+
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2011 John Mair (banisterfiend)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,68 @@
+$:.unshift 'lib'
+
+dlext = Config::CONFIG['DLEXT']
+direc = File.dirname(__FILE__)
+
+PROJECT_NAME = "pry-git"
+
+require 'rake/clean'
+require 'rake/gempackagetask'
+require "#{PROJECT_NAME}/version"
+
+CLOBBER.include("**/*~", "**/*#*", "**/*.log")
+CLEAN.include("**/*#*", "**/*#*.*", "**/*_flymake*.*", "**/*_flymake",
+              "**/*.rbc", "**/.#*.*")
+
+def apply_spec_defaults(s)
+  s.name = PROJECT_NAME
+  s.summary = "A Ruby-aware git layer"
+  s.version = PryGit::VERSION
+  s.date = Time.now.strftime '%Y-%m-%d'
+  s.author = "John Mair (banisterfiend)"
+  s.email = 'jrmair@gmail.com'
+  s.description = s.summary
+  s.require_path = 'lib'
+  s.homepage = "http://github.com/pry/pry-git"
+  s.files = Dir["lib/**/*.rb", "test/*.rb", "CHANGELOG", "README.md", "Rakefile"]
+  s.add_dependency("diffy")
+  s.add_dependency("grit")
+end
+
+desc "run pry with plugin enabled"
+task :pry do
+  exec("pry -I#{direc}/lib/ -r #{direc}/lib/#{PROJECT_NAME}")
+end
+
+desc "run tests"
+task :test do
+  sh "bacon -Itest -rubygems -a"
+end
+
+namespace :ruby do
+  spec = Gem::Specification.new do |s|
+    apply_spec_defaults(s)
+    s.platform = Gem::Platform::RUBY
+  end
+
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_zip = false
+    pkg.need_tar = false
+  end
+end
+
+desc "build all platform gems at once"
+task :gems => [:clean, :rmgems, "ruby:gem"]
+
+desc "remove all platform gems"
+task :rmgems => ["ruby:clobber_package"]
+
+desc "build and push latest gems"
+task :pushgems => :gems do
+  chdir("#{File.dirname(__FILE__)}/pkg") do
+    Dir["*.gem"].each do |gemfile|
+      sh "gem push #{gemfile}"
+    end
+  end
+end
+
+

data/lib/pry-git.rb

@@ -0,0 +1,117 @@
+# pry-git.rb
+# (C) John Mair (banisterfiend); MIT license
+
+require "pry-git/version"
+require "pry"
+require 'grit'
+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))
+
+      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
+
+      lines_with_blame = []
+      code.lines.zip(authors) { |line, author| lines_with_blame << ("#{author}".ljust(10) + colorize_code(line)) }
+      output.puts lines_with_blame.join
+    end
+
+    command "git diff", "Show the diff for a method (working directory vs HEAD)" do |meth_name|
+
+      if (meth = get_method_object(meth_name, target, {})).nil?
+        output.puts "Invalid method name: #{meth_name}."
+        next
+      end
+
+      output.puts colorize_code(Diffy::Diff.new(method_code_from_head(meth).first, meth.source))
+    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
+
+      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
+
+    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
+      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]
+      end
+
+      def relative_path(root, path)
+        path =~ /#{root}\/(.*)/
+        $1
+      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
+
+        raise "No associated git repository found!" if git_root =~ /fatal:/
+        git_root
+      end
+
+    end
+
+  end
+end
+
+Pry.commands.import PryGit::GitCommands

data/lib/pry-git/version.rb

@@ -0,0 +1,3 @@
+module PryGit
+  VERSION = "0.2.0"
+end     

data/test/test.rb

@@ -0,0 +1,12 @@
+direc = File.dirname(__FILE__)
+
+require 'rubygems'
+require "#{direc}/../lib/pry-git"
+require 'bacon'
+
+puts "Testing pry-git version #{PryGit::VERSION}..." 
+puts "Ruby version: #{RUBY_VERSION}"
+
+describe PryGit do
+end
+

metadata

@@ -0,0 +1,80 @@
+--- !ruby/object:Gem::Specification 
+name: pry-git
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.2.0
+platform: ruby
+authors: 
+- John Mair (banisterfiend)
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-07-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: diffy
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    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 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: A Ruby-aware git layer
+email: jrmair@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/pry-git/version.rb
+- lib/pry-git.rb
+- test/test.rb
+- CHANGELOG
+- README.md
+- Rakefile
+homepage: http://github.com/pry/pry-git
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.7.2
+signing_key: 
+specification_version: 3
+summary: A Ruby-aware git layer
+test_files: []
+