git_awesome_diff 0.0.2

data/.gitignore

@@ -0,0 +1,3 @@
+.bundle
+.yard
+vendor

data/.rspec

@@ -0,0 +1 @@
+--color

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    git_awesome_diff (0.0.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    colorize (0.5.8)
+    commander (4.1.2)
+      highline (~> 1.6.11)
+    diff-lcs (1.1.3)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
+    highline (1.6.14)
+    i18n (0.6.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    posix-spawn (0.3.6)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    yard (0.8.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  colorize
+  commander
+  git_awesome_diff!
+  grit
+  rake
+  rspec
+  yard

data/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2012 Max Prokopiev, Timur Vafin, FlatStack, LLC
+
+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/README.md

@@ -0,0 +1,48 @@
+git-awesome-diff
+================
+
+Object Oriented Diffing for Git
+
+Installation
+------------
+
+Add this line to your application's Gemfile:
+
+    gem 'git-awesome-diff'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git-awesome-diff
+
+Usage
+-----
+
+    git awesome-diff ref1 ref2
+
+For example:
+
+    git awesome-diff HEAD~1 master
+
+Specs
+-----
+
+    bundle exec rake
+
+Contributing
+------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+Credits
+-------
+
+Made by [Max Prokopiev](https://github.com/juggler), [Timur Vafin](https://github.com/timurvafin)
+in terms of HackDay @[FlatStack, LLC](http://www.flatstack.com)

data/Rakefile

@@ -0,0 +1,11 @@
+#!/usr/bin/env rake
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+desc 'Run specs'
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+end
+
+task :default => :spec

data/bin/git_awesome_diff

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'commander/import'
+require 'git_awesome_diff'
+
+program :version, '1.0'
+program :description, 'Git awesome diff tool'
+
+default_command :make_diff
+
+command :make_diff do |c|
+  c.syntax = 'git awesome-diff [ref1] [ref2]'
+  c.summary = 'prints diff'
+  c.description = ''
+  c.example 'description', 'command example'
+  c.option '--format TYPE', 'Some switch that does something'
+  c.option '--path PATH', 'Path to the repo'
+  c.option '--exclude REGEXP', 'Exclude files from processing'
+
+  c.action do |args, options|
+    options.default \
+      :path    => Dir.pwd,
+      :format  => 'pretty'
+
+    gad = GitAwesomeDiff::Diff.new(File.expand_path(options.path), options.exclude)
+
+    if gad.valid?
+      gad.diff!(*args)
+      GitAwesomeDiff::Formatter.new(gad.added_objects, gad.removed_objects).print(options.format, *args)
+    else
+      puts gad.errors.join("\n")
+    end
+  end
+end

data/git_awesome_diff.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/git_awesome_diff/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Max Prokopiev", "Timur Vafin", "FlatStack, LLC"]
+  gem.email         = ["max-prokopiev@yandex.ru", "me@timurv.ru"]
+  gem.description   = %q{Object Oriented Diffing for Git}
+  gem.summary       = %q{Object Oriented Diffing for Git}
+  gem.homepage      = "https://github.com/fs/git-awesome-diff"
+
+  gem.add_development_dependency "grit"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "yard"
+  gem.add_development_dependency "activesupport"
+  gem.add_development_dependency "commander"
+  gem.add_development_dependency "colorize"
+  gem.add_development_dependency "rspec"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "git_awesome_diff"
+  gem.require_paths = ["lib"]
+  gem.version       = GitAwesomeDiff::VERSION
+end

data/lib/git_awesome_diff.rb

@@ -0,0 +1,10 @@
+require 'grit'
+require 'yard'
+require 'active_support/all'
+require 'colorize'
+
+module GitAwesomeDiff
+  autoload :VERSION, 'git_awesome_diff/version'
+  autoload :Diff, 'git_awesome_diff/diff'
+  autoload :Formatter, 'git_awesome_diff/formatter'
+end

data/lib/git_awesome_diff/diff.rb

@@ -0,0 +1,86 @@
+module GitAwesomeDiff
+  class Diff
+    attr_reader :path, :exclude_paths, :repo, :head, :errors, :added_objects, :removed_objects
+
+    def initialize(path, exclude_paths = '')
+      @path, @exclude_paths = path, exclude_paths
+
+      load_repo
+
+      validate!
+      return false unless valid?
+
+      save_head
+    end
+
+    def valid?
+      errors.blank?
+    end
+
+    def diff!(*refs)
+      ref1 = parse_rev(refs.shift || 'HEAD~1')
+      ref2 = parse_rev(refs.shift || 'master')
+      registry = []
+
+      @added_objects, @removed_objects = [], []
+
+      begin
+        checkout(ref1)
+        registry << generate_yardoc
+
+        checkout(ref2)
+        registry << generate_yardoc
+
+        @added_objects = (registry[1] - registry[0]).sort
+        @removed_objects = (registry[0] - registry[1]).sort
+      ensure
+        checkout(head)
+      end
+
+      self
+    end
+
+    private
+
+    def load_repo
+      Dir.chdir(path)
+      @repo = Grit::Repo.new(path)
+    end
+
+    def validate!
+      @errors = []
+      @errors << 'Repository should be clean' unless repo_clean?
+      @errors << 'HEAD is unknown' unless head_present?
+    end
+
+    def repo_clean?
+      repo.status.changed.merge(repo.status.added).merge(repo.status.deleted).blank?
+    end
+
+    def head_present?
+     repo.head.present?
+    end
+
+    def save_head
+      @head = repo.head.name
+    end
+
+    def parse_rev(rev)
+      (repo.git.native 'rev-parse', {verify: true}, rev).chop
+    end
+
+    def checkout(rev)
+      repo.git.native :checkout, {}, rev
+    end
+
+    def generate_yardoc
+      options = ['--no-output', '--no-stats', '--no-save', '--quiet']
+      options << "--exclude=#{exclude_paths}" if exclude_paths.present?
+      options << path
+
+      YARD::Registry.clear
+      YARD::CLI::Yardoc.run(*options)
+      YARD::Registry.all.map {|o| o.path}
+    end
+  end
+end

data/lib/git_awesome_diff/formatter.rb

@@ -0,0 +1,35 @@
+module GitAwesomeDiff
+  class Formatter
+    def initialize(added_objects, removed_objects)
+      @added = added_objects
+      @removed = removed_objects
+    end
+
+    def print(format, *args)
+      puts "Showing diff between #{args[0]} and #{args[1]}\n".colorize(:black)
+      case format
+      when /pretty/ then pretty_print
+      when /simple/ then simple_print
+      end
+    end
+
+    private
+
+    def pretty_print
+      if @added.present?
+        puts "Added objects:"
+        puts "\t" + @added.join("\n\t").colorize(:green)
+      end
+      puts
+      if @removed.present?
+        puts "Removed objects:"
+        puts "\t" + @removed.join("\n\t").colorize(:red)
+      end
+    end
+
+    def simple_print
+      puts "+#{@added.join("\n+")}\n\n" if @added.present?
+      puts "-#{@removed.join("\n-")}\n\n" if @removed.present?
+    end
+  end
+end

data/lib/git_awesome_diff/version.rb

@@ -0,0 +1,3 @@
+module GitAwesomeDiff
+  VERSION = '0.0.2'
+end

data/spec/fixtures/initial.rb

@@ -0,0 +1,2 @@
+class TestClass
+end

data/spec/fixtures/step1.rb

@@ -0,0 +1,5 @@
+class TestClass
+  def first_method
+    foobar
+  end
+end

data/spec/fixtures/step2.rb

@@ -0,0 +1,8 @@
+class TestClass
+  def first_method
+    foobar
+  end
+  def second_method(arg)
+    test
+  end
+end

data/spec/fixtures/step3.rb

@@ -0,0 +1,14 @@
+class SecondClass
+
+  def another_method
+    foobar
+  end
+
+  def second_method(arg)
+    test
+  end
+
+  def test_method(t)
+    puts
+  end
+end

data/spec/git_awesome_diff/diff_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper.rb'
+
+describe GitAwesomeDiff::Diff do
+
+  before :all do
+    @repo_path = create_test_repo
+  end
+
+  let(:awesome_diff) { GitAwesomeDiff::Diff.new(@repo_path) }
+  subject { awesome_diff }
+
+  its(:head) { should match 'master' }
+  its(:repo) { should be_kind_of Grit::Repo }
+
+  describe '#valid' do
+    context 'when there is no errors' do
+      it { should be_valid }
+    end
+
+    context 'when repo is not clean' do
+      before do
+        File.rename('test.rb', '1.rb')
+      end
+
+      after do
+        File.rename('1.rb', 'test.rb')
+      end
+
+      it { should_not be_valid }
+
+      describe 'errors' do
+        subject { awesome_diff.errors }
+
+        it { should_not be_empty }
+        its(:first) { should match 'Repository should be clean' }
+      end
+    end
+
+    context 'when there is no HEAD' do
+      before do
+        File.rename('.git/HEAD', '.git/HEAD_')
+        `touch .git/HEAD`
+      end
+
+      after do
+        File.rename('.git/HEAD_', '.git/HEAD')
+      end
+
+      it { should_not be_valid }
+
+      describe 'errors' do
+        subject { awesome_diff.errors }
+
+        it { should_not be_empty }
+        its(:first) { should match 'HEAD is unknown' }
+      end
+    end
+  end
+
+  describe '#diff!' do
+    context 'when there are only added objects' do
+      let(:diff) { awesome_diff.diff!('HEAD~3', 'HEAD~2') }
+
+      describe 'added object' do
+        subject { diff.added_objects }
+
+        it { should_not be_empty }
+        its(:first) { should match 'TestClass#first_method' }
+      end
+
+      describe 'removed objects' do
+        subject { diff.removed_objects }
+
+        it { should be_empty }
+      end
+    end
+
+    context 'when there are both added and removed objects' do
+      let(:diff) { awesome_diff.diff!('HEAD~1', 'master') }
+
+      describe 'added objects' do
+        subject { diff.added_objects }
+
+        it { should_not be_empty }
+        it { should == ['SecondClass', 'SecondClass#another_method', 'SecondClass#second_method', 'SecondClass#test_method'] }
+      end
+
+      describe 'removed objects' do
+        subject { diff.removed_objects }
+
+        it { should_not be_empty }
+        it { should == ["TestClass", "TestClass#first_method", "TestClass#second_method"] }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'git_awesome_diff'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
+  require f
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+end

data/spec/support/helpers.rb

@@ -0,0 +1,18 @@
+require 'tmpdir'
+
+def create_test_repo
+  repo_dir = Dir.mktmpdir
+  repo_full_path = "#{repo_dir}/.git"
+  `git --git-dir=#{repo_full_path} init`
+  @repo = Grit::Repo.new(repo_full_path)
+
+  fixtures = Dir[File.expand_path(File.dirname(__FILE__) + '/../fixtures/*.rb')]
+  Dir.chdir(repo_dir)
+  fixtures.each_with_index do |file, index|
+    FileUtils.cp(file, 'test.rb')
+    @repo.add 'test.rb'
+    @repo.commit_all "commit #{index}"
+  end
+
+  repo_dir
+end

metadata

@@ -0,0 +1,196 @@
+--- !ruby/object:Gem::Specification
+name: git_awesome_diff
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
+platform: ruby
+authors:
+- Max Prokopiev
+- Timur Vafin
+- FlatStack, LLC
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Object Oriented Diffing for Git
+email:
+- max-prokopiev@yandex.ru
+- me@timurv.ru
+executables:
+- git_awesome_diff
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rspec
+- .rvmrc
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- bin/git_awesome_diff
+- git_awesome_diff.gemspec
+- lib/git_awesome_diff.rb
+- lib/git_awesome_diff/diff.rb
+- lib/git_awesome_diff/formatter.rb
+- lib/git_awesome_diff/version.rb
+- spec/fixtures/initial.rb
+- spec/fixtures/step1.rb
+- spec/fixtures/step2.rb
+- spec/fixtures/step3.rb
+- spec/git_awesome_diff/diff_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers.rb
+homepage: https://github.com/fs/git-awesome-diff
+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'
+      segments:
+      - 0
+      hash: 545746365725136601
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 545746365725136601
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
+summary: Object Oriented Diffing for Git
+test_files:
+- spec/fixtures/initial.rb
+- spec/fixtures/step1.rb
+- spec/fixtures/step2.rb
+- spec/fixtures/step3.rb
+- spec/git_awesome_diff/diff_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers.rb
+has_rdoc: