githat 0.0.6

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -0,0 +1,2 @@
+--format nested
+--color

data/Gemfile

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+group :development do
+  gem "rspec"
+  gem "bundler"
+  gem "jeweler", "~> 1.8.3"
+  gem "pygments.rb"
+end

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    posix-spawn (0.3.6)
+    pygments.rb (0.3.1)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jeweler (~> 1.8.3)
+  pygments.rb
+  rspec

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Bernardo B. Marques
+
+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.mkd

@@ -0,0 +1,27 @@
+githat
+======
+
+Git diff with code syntax highlight
+
+Example with ruby code:
+
+![githat](https://raw.github.com/bernardofire/githat/master/githat.png)
+
+
+Contributing to githat
+----------------------
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+Copyright
+---------
+
+Copyright (c) 2012 Bernardo B. Marques. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "githat"
+  gem.homepage = "http://github.com/bernardofire/githat"
+  gem.license = "MIT"
+  gem.description = %Q{git diff with code syntax highlight}
+  gem.email = "bernardo.fire@gmail.com"
+  gem.authors = ["Bernardo B. Marques"]
+  gem.executables = ["git-hat"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "githat #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.6

data/bin/git-hat

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require "githat"
+
+include Diff
+
+puts main(ARGV)

data/githat.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "githat"
+  s.version = "0.0.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bernardo B. Marques"]
+  s.date = "2012-10-24"
+  s.description = "git diff with code syntax highlight"
+  s.email = "bernardo.fire@gmail.com"
+  s.executables = ["git-hat"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.mkd"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.mkd",
+    "Rakefile",
+    "VERSION",
+    "bin/git-hat",
+    "githat.gemspec",
+    "githat.png",
+    "lib/githat.rb",
+    "spec/githat_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/bernardofire/githat"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = nil
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<pygments.rb>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<pygments.rb>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<pygments.rb>, [">= 0"])
+  end
+end
+

data/lib/githat.rb

@@ -0,0 +1,97 @@
+require 'pygments.rb'
+
+module Diff
+  def main(argv=nil)
+    output = ''
+    infos = files_infos(argv)
+    infos.each do |file|
+      output << parse_diff(file)
+    end
+    output
+  end
+
+  def files_infos(argv)
+    files = []
+    names = argv == [] ? files_names : argv
+    names.map do |name|
+      files << { name: name, diff: file_diff(name) }
+    end
+    files
+  end
+
+  def parse_diff(file_info)
+    extension = file_extension(file_info[:name])
+    splited = split_diff(file_info[:diff])
+    heads, codes = splited[:heads], splited[:codes]
+    complete_file_diff = ''
+
+    (0...heads.size).each do |i|
+      parsed_head = parse_with_diff(heads[i])
+      parsed_code = parse_with_lang(codes[i], extension)
+      parsed_code = parse_with_diff(parsed_code)
+      complete_file_diff << (parsed_head + parsed_code + "\n")
+    end
+
+    complete_file_diff
+  end
+
+  def file_extension(file_name)
+    extension = file_name.gsub /(.+\.)/, ''
+    if extension.empty? || file_name == extension
+      extension = files_with_no_extension[file_name]
+      extension ||= 'text'
+    end
+    extension.to_sym
+  end
+
+  def split_diff(diff)
+    { heads: split_heads(diff),
+      codes: split_codes(diff) }
+  end
+
+  def split_codes(diff)
+    codes = diff.split(/^@@ .* @@/)
+    codes[1..codes.size]
+  end
+
+  def split_heads(diff)
+    heads = diff.scan(/^diff --git(?:.*\n){4}@@ .* @@/)
+    heads << diff.scan(/^@@ .* @@/).tap(&:shift)
+    heads.flatten
+  end
+
+  def file_diff(file)
+    `git diff #{file}`
+  end
+
+  def files_names
+    git_status.scan(/modified: .*/).map { |n| n.gsub(/modified: */, '') }
+  end
+
+  def git_status
+    `git status`
+  end
+
+  def parse_with_lang(code, lang)
+    process(code, lang)
+  end
+
+  def parse_with_diff(code)
+    process(code, :diff)
+  end
+
+  def files_with_no_extension
+    {
+      'Gemfile' => :rb,
+      'Gemfile.lock' => :rb,
+      'Rakefile' => :rb,
+      'Makefile' => :makefile
+    }
+    # TODO: support it: .*rake == rb
+  end
+
+  def process(code, lexer)
+    Pygments.highlight code, formatter: 'terminal', lexer: lexer
+  end
+end
+

data/spec/githat_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Githat" do
+  before(:each) { extend Diff }
+
+  describe Diff do
+    describe "ensure some methods are mocked" do
+      it "files_names" do
+        files_names.should == ['.gitignore', 'lib/githat.rb']
+      end
+
+      it "file_diff" do
+        file_diff('githat_spec.rb').should == _1_file_2_heads
+      end
+    end
+
+    it "file_extension" do
+      file_extension('Makefile').should == :makefile
+      file_extension('.gitignore').should == :text
+      file_extension('foo.rb').should == :rb
+      file_extension('bar.js').should == :js
+      file_extension('foobar').should == :text
+    end
+
+    it "files_infos (with argv)" do
+      gh_spec = files_infos(['spec/githat_spec.rb']).should == _1_file_2_heads_diff
+    end
+
+    it "files_names" do
+      files_names.should == ['.gitignore', 'lib/githat.rb']
+    end
+
+    it "split_heads" do
+      split_heads(_1_file_2_heads).should == _1_file_2_heads_splited[:heads]
+    end
+
+    it "split_codes" do
+      split_codes(_1_file_2_heads).should == _1_file_2_heads_splited[:codes]
+    end
+
+    it "split_diff" do
+      split_diff(_1_file_2_heads).should == _1_file_2_heads_splited
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,131 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'githat'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+module Diff
+  def file_diff(name)
+    _1_file_2_heads
+  end
+
+  def git_status
+    git_status_modified_files
+  end
+end
+
+def git_status_modified_files
+  "# modified:   .gitignore\n" +
+  "# deleted:    foo\n" +
+  "# modified:   lib/githat.rb"
+end
+
+def _1_file_2_heads_diff
+   [{:name=>"spec/githat_spec.rb",
+    :diff=>
+    "diff --git a/spec/githat_spec.rb b/spec/githat_spec.rb\n" +
+    "index 0c55061..217f540 100644\n--- a/spec/githat_spec.rb\n" +
+    "+++ b/spec/githat_spec.rb\n@@ -1,11 +1,5 @@\nrequire " +
+    "File.expand_path(File.dirname(__FILE__) + '/spec_helper')\n\n" +
+    "-module Diff\n-  def files_names\n-    ['bar.rb', 'foo.rb']\n" +
+    "-  end\n-end\n-\ndescribe \"Githat\" do\n  before(:each) " +
+    "{ extend Diff }\n\n@@ -19,12 +13,12 @@ describe \"Githat\" do\n    " +
+    "end\n\n    it \"files_names\" do\n+      files_names.should == " +
+    "['bar.rb', 'foo.rb'] # mocked\n    end\n\n-    it \"files_info\" do\n" +
+    "-    end\n-\n-    it \"file_diff\" do\n+    it \"split_heads\" do\n+      " +
+    "puts _1_file_2_heads\n+      split_heads(_1_file_2_heads).should == []\n    " +
+    "end\n  end\nend"}]
+end
+
+def _1_file_2_heads_splited
+  { codes: ["\nrequire File.expand_path(File.dirname(__FILE__) + '/spec_helper')" +
+    "\n\n-module Diff\n-  def files_names\n-    ['bar.rb', 'foo.rb']\n" +
+    "-  end\n-end\n-\ndescribe \"Githat\" do\n  before(:each) { extend Diff }\n\n",
+    " describe \"Githat\" do\n    end\n\n    it \"files_names\" do\n+      " +
+    "files_names.should == ['bar.rb', 'foo.rb'] # mocked\n    end\n\n-    " +
+    "it \"files_info\" do\n-    end\n-\n-    it \"file_diff\" do\n+    " +
+    "it \"split_heads\" do\n+      puts _1_file_2_heads\n+      " +
+    "split_heads(_1_file_2_heads).should == []\n    end\n  end\nend"],
+
+    heads: ["diff --git a/spec/githat_spec.rb b/spec/githat_spec.rb\n" +
+    "index 0c55061..217f540 100644\n--- a/spec/githat_spec.rb\n" +
+    "+++ b/spec/githat_spec.rb\n@@ -1,11 +1,5 @@",
+    "@@ -19,12 +13,12 @@"] }
+end
+
+def _2_files
+  %{diff --git a/lib/githat.rb b/lib/githat.rb
+index fdc7d30..c912bca 100644
+--- a/lib/githat.rb
++++ b/lib/githat.rb
+@@ -26,7 +26,7 @@ module Diff
+     (0...heads.size).each do |i|
+       parsed_head = parse_with_diff(prepare_head_for_output(heads[i]))
+       parsed_code = parse_with_lang(codes[i], extension)
+-      parsed_code = parse_with_diff(parsed_code)
++      foo
+       complete_file_diff << (parsed_head + parsed_code)
+     end
+
+diff --git a/spec/githat_spec.rb b/spec/githat_spec.rb
+index 13edd0f..2c6b9d1 100644
+--- a/spec/githat_spec.rb
++++ b/spec/githat_spec.rb
+@@ -1,5 +1,5 @@
+ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+-
++foo
+ describe "Githat" do
+   before(:each) { extend Diff }}
+end
+
+def _2_heads_file
+  ["diff --git a/spec/githat_spec.rb b/spec/githat_spec.rb" +
+  "index 0c55061..217f540 100644" +
+  "--- a/spec/githat_spec.rb" +
+  "+++ b/spec/githat_spec.rb" +
+  "@@ -1,11 +1,5 @@",
+  "@@ -19,12 +13,12 @@"]
+end
+
+def _1_file_2_heads
+  %{diff --git a/spec/githat_spec.rb b/spec/githat_spec.rb
+index 0c55061..217f540 100644
+--- a/spec/githat_spec.rb
++++ b/spec/githat_spec.rb
+@@ -1,11 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+-module Diff
+-  def files_names
+-    ['bar.rb', 'foo.rb']
+-  end
+-end
+-
+describe "Githat" do
+  before(:each) { extend Diff }
+
+@@ -19,12 +13,12 @@ describe "Githat" do
+    end
+
+    it "files_names" do
++      files_names.should == ['bar.rb', 'foo.rb'] # mocked
+    end
+
+-    it "files_info" do
+-    end
+-
+-    it "file_diff" do
++    it "split_heads" do
++      puts _1_file_2_heads
++      split_heads(_1_file_2_heads).should == []
+    end
+  end
+end}
+end
+
+RSpec.configure do |config|
+end

metadata

@@ -0,0 +1,129 @@
+--- !ruby/object:Gem::Specification
+name: githat
+version: !ruby/object:Gem::Version
+  version: 0.0.6
+  prerelease: 
+platform: ruby
+authors:
+- Bernardo B. Marques
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-10-24 00:00:00.000000000 Z
+dependencies:
+- !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'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  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: git diff with code syntax highlight
+email: bernardo.fire@gmail.com
+executables:
+- git-hat
+extensions: []
+extra_rdoc_files:
+- LICENSE.txt
+- README.mkd
+files:
+- .document
+- .rspec
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.mkd
+- Rakefile
+- VERSION
+- bin/git-hat
+- githat.gemspec
+- githat.png
+- lib/githat.rb
+- spec/githat_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/bernardofire/githat
+licenses:
+- MIT
+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: 3780487490032562861
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
+summary: ''
+test_files: []