git-hack 0.0.1

data/.gitignore

@@ -0,0 +1,8 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+doc
+tmp_git_hack_test
+.idea
+TAGS

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://ruby.taobao.org"
+
+gem 'colorize'
+gem 'git'
+gem 'awesome_print'
+
+group :development,:test do
+  gem 'rspec'
+  gem 'guard'
+  gem 'guard-rspec'
+  #gem 'libnotify' gname3的notify不太好用，先去掉
+  gem 'rspec-mocks'
+end

data/Guardfile

@@ -0,0 +1,15 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :cli=>"--color",:version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/commands/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/git-hack/(.+)\.rb$})     { |m| ["spec/#{m[1]}_spec.rb",
+	  											"*.rb"] }
+  watch(%r{^lib/core_ext/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+	  											
+  watch('spec/spec_helper.rb')  { "spec" }
+  
+end
+

data/README.md

@@ -0,0 +1,26 @@
+# git-hack
+
+I don't known why logic of git is sooooo horrible!! And I make this tools for people to say "WOW,This is git !!!"
+
+0. git-save git-redo git-undo git-backto They look easy to understand? Wow,This is git. 
+1. 
+
+
+## Installing
+
+All you need to do is grab the gem:
+
+    gem install git-hack
+
+
+### save
+
+### undo
+
+### redo
+
+### backto
+
+## Copyright
+
+Copyright (c) 2012 weizhao mailto: azhao.1981@gmail.com

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/bin/git-save

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require (File.expand_path('../../lib/git-hack', __FILE__))
+
+GitHack::GitRepo.new(".").git_save(ARGV.first)

data/commit test

@@ -0,0 +1 @@
+test for commit

data/git-hack.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "git-hack/version"
+
+Gem::Specification.new do |s|
+  s.name        = "git-hack"
+  s.version     = GitHack::VERSION
+  s.authors     = ["weizhao"]
+  s.email       = ["azhao.1981@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Facade of git. Make git easy to use.}
+  s.description = %q{A more smart tools of git. Come from git-smart}
+
+  s.rubyforge_project = "git-hack"
+
+  s.files         = `git ls-files`.split("\n")
+  s.executables = `git ls-files -- bin`.split("\n").map{|f| File.basename(f) }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "colorize"
+  s.add_runtime_dependency "git"
+end

data/lib/core_ext/git_patch.rb

@@ -0,0 +1,27 @@
+# 
+# ruby-git 库有一些错误,这是补丁
+#
+
+
+module Git
+	class Lib
+		def full_log_commits(opts = {})
+			arr_opts = ['--pretty=raw']
+			arr_opts << "-#{opts[:count]}" if opts[:count]
+			arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
+			arr_opts << "--since=#{opts[:since]}" if opts[:since].is_a? String
+			arr_opts << "--until=#{opts[:until]}" if opts[:until].is_a? String
+			arr_opts << "--grep=#{opts[:grep]}" if opts[:grep].is_a? String
+			arr_opts << "--author=#{opts[:author]}" if opts[:author].is_a? String
+			arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
+			arr_opts << opts[:object] if opts[:object].is_a? String
+			arr_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
+			puts arr_opts.to_s_s
+
+			full_log = command_lines('log', arr_opts, true)
+			# modify by weizhao. commit must be specify
+			# putsrocess_commit_data(full_log)
+			process_commit_data(full_log,"commit")
+		end
+	end
+end

data/lib/core_ext/line_builder.rb

@@ -0,0 +1,32 @@
+#
+# 把文本转化成对象的Build模式
+#
+#
+class LineBuilder
+	attr_accessor :data,:index,:object
+	def initialize(data,index=0)
+		@data = data
+		@index = index
+		@object = nil
+	end
+	def parse
+		begin
+			next unless in?
+			process_line 
+		end until ( out? )
+		@object
+	end
+	# 行处理函数,必须被重写
+	def process_line
+		line = @data[@index]
+		@object = line
+	end
+	# 进入条件,默认直接进入
+	def in?
+		true
+	end
+	# 退出条件,默认为读完本行直接退出,重写要设置@index的新值
+	def out?
+		@index += 1
+	end
+end

data/lib/core_ext/path.rb

@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+require 'pathname'
+
+module PathCommon
+	# 给定相对项目根目录路径，返回绝对路径
+	def project_file(path)
+		join(project_dir,path)
+	end
+	# 返回项目绝对目录
+  def project_dir
+    absolute_path("#{File.dirname(__FILE__)}/../../")
+  end
+  def absolute_path(path,dir=Dir.pwd)
+  	Pathname.new(path).relative? ? File.expand_path(path,dir) : File.expand_path(path,"/")
+  end
+  # require file from project dir
+  def require_p(path)
+    require join(project_dir,path)
+  end
+  def join(path,file=".")
+	  File.join(path,file)
+  end
+end
+

data/lib/git-hack.rb

@@ -0,0 +1,25 @@
+require "git-hack/version"
+Dir["#{File.dirname(__FILE__)}/**/*.rb"].each { |f| require f }
+require "git"
+
+module GitHack
+	def self.current
+		@current || get_dir('.')
+	end
+	def self.commit
+		current.commit	
+	end
+	private
+	# get_dir(path) 检查给定目录是否在git受控目录中
+	# 本身是git目录返回 GitProject
+	# 本身不是，但上层是返回GitProject，并设置dir
+	# 本身不是，上层也不是则返回RawDir
+	def self.get_dir(path)
+		return GitRepo.new(path) if is_git(path)		
+		return get_dir(File.join(path,"/../"))
+	end
+	def self.is_git(path)
+		File.directory?(File.join(path,"/.git"))
+	end
+end
+

data/lib/git-hack/commit.rb

@@ -0,0 +1,11 @@
+
+require_relative "../git-hack"
+
+
+module GitHack
+	class Commit
+		attr_accessor :message,:sha
+	end
+end
+
+

data/lib/git-hack/commit_line_builder.rb

@@ -0,0 +1,35 @@
+
+require_relative "../git-hack"
+
+
+module GitHack
+	class CommitLineBuilder < LineBuilder
+		def initialize(data,index)
+			super(data,index)
+			@is_message = false
+			@commit = { 'masseg' => '', parent => []}
+		end
+		def process_line
+			@is_message
+			line = @data[@index]		
+			line = line.chomp
+			if line = ""
+				@is_message = !@is_message
+			elsif is_message
+				@commit.message << line+"\n"
+			else
+				data = line.split
+				key = data.shift
+				value = data.join(" ")
+				if key == 'commit'
+					@commit['sha'] = value
+				end
+				if key == 'parent'
+					@commit[key] << value
+				else
+			end
+		end
+	end
+end
+
+

data/lib/git-hack/git_repo.rb

@@ -0,0 +1,98 @@
+require "git"
+require 'logger'
+require 'colorize'  
+require "ap"
+
+require_relative "../core_ext/path"
+
+module GitHack
+	# GitRepo类拥有git的所有
+	# 包括.git文件下所有的文件的功能的@git ,GitHack::Git类
+	#     work，即工作目录及文件 GitHack::WorkingDirectory类
+	#     remote，对应远程库信息 GitHack::Remote类
+	#
+	class GitRepo < Git::Path
+		include PathCommon
+		attr_accessor :git,:commits,:work,:remote
+		def initialize(path)
+			@workingdirectory = get_gitdir(path)	
+			@commits = []
+		end
+		def git
+			@git ||= Git.open(@workingdirectory ,:log => Logger.new(STDOUT)) 
+		end
+		def commits
+			@commits if !@commits.empty?
+			@commits = git.log
+		end
+		# 得到本身或是上层目录中.git文件的路经
+		def get_gitdir(path)
+			git_path = absolute_path(path)
+			return nil if git_path == "/"
+			return git_path if is_gitdir?(git_path) 
+			return get_gitdir(join(git_path,"/../"))
+		end
+		def is_gitdir?(path)
+			File.directory?(join(path,".git")) ? true : false
+		end
+		# 把工作目录的文件添加到git仓库并提交 
+		def git_save(msg,options={})
+			ready_to_execute
+			return self if not_git_directory?
+			add_workingdirectory
+			commit(msg)
+			execute_success
+			self
+		end
+		def ready_to_execute
+			@is_success = false
+		end
+		def execute_success
+			@is_success = true
+		end
+		def success?
+			@is_success
+		end
+		def add_workingdirectory
+			git.add(@workingdirectory)	
+		end
+		def commit(msg)
+			msg ||= auto_commit_msg 
+			begin
+				git.commit(msg,:add_all=>true)	
+			rescue Git::GitExecuteError => e
+				puts e.to_s.colorize(:green)
+			end
+		end
+		def auto_commit_msg
+			"auto commit" # TODO: 需要完成
+		end
+		# undo 如果有修改,保存,然后回到上一次提交
+		def undo
+			git_save if working_directory_change?
+			checkout(1)    # check_out 0.当前1.上一个.2.上上个....
+		end
+		# check out 出前第number个保存
+		def checkout(number,options={})
+			ready_to_execute
+			return self if not_git_directory?
+			puts "commits:".colorize(:red)
+			ap commits
+			git.reset(commits[1])
+			execute_success
+			self
+			
+		end
+		def init(dir)
+			@git = Git.init(dir)
+			@workingdirectory = dir
+		end
+		def not_git_directory?
+			if @workingdirectory == nil
+				puts "Init first,run git init"
+				return true
+			end
+			return false
+		end
+	end
+end

data/lib/git-hack/version.rb

@@ -0,0 +1,3 @@
+module GitHack
+    VERSION = "0.0.1"
+end

data/spec/commit_line_builder_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe CommitLineBuilder do
+	before do
+		g = Git.open(".")
+		l = Git::Lib.new(g)
+		opts = ["--pretty=raw"]
+		@data = l.command_lines('log',opts)
+		@linebuilder = CommitLineBuilder.new(@data,0)
+		@linebuilder.parse
+	end
+	specify { @data.size.should be > 1 }
+	specify { @linebuilder.object.should_not be nil }
+end

data/spec/git_repo_spec.rb

@@ -0,0 +1,89 @@
+# 测试GitRepo类
+#
+
+require "spec_helper"
+
+
+describe GitRepo do
+	# test data
+	let(:dir_with_git) { project_dir }
+	let(:dir_under_git) { join(project_dir,"tmp_git_hack_test") }
+	let(:dir_no_git) { "#{ENV["HOME"]}/tmp_git_hack_test" }
+
+	describe	"#get_gitdir " do
+		context "When given a .git directory" do
+			specify { GitRepo.new(dir_with_git).get_gitdir(dir_with_git).should == dir_with_git }
+		end
+		context "When given directory that parent have one .git" do
+			before do
+				@dir = dir_under_git
+				refresh_dir(@dir)
+			end
+			specify { GitRepo.new(@dir).get_gitdir(@dir).should == project_dir  }
+			after { del_dir(@dir) }
+		end
+		context "When given  no .git directory" do
+			before do
+				@dir = dir_no_git
+				refresh_dir(@dir)
+			end
+			#specify {GitRepo.new(@dir).get_gitdir(@dir).should be nil}
+			after { del_dir(@dir) }
+		end
+	end  # end of #get_gitdir test
+	describe '#git_save' do
+		context "When given a gitworking directory " do
+			before do
+				@dir = dir_under_git
+				refresh_dir(@dir)
+				Git.init(@dir) 
+				@gitrepo = GitRepo.new(@dir)
+				@gitrepo.get_gitdir(@dir)
+				@msg = "test commit "
+			end
+			it "Should be success " do
+				add_for_commit("#{@dir}/test")
+				@gitrepo.git_save(@msg).should be_success
+				# commit without change.
+				@gitrepo.git_save(@msg).should be_success
+			end
+			after { del_dir(@dir) }
+		end
+		context "When given a nogitworking directory" do
+			before do
+				@dir = dir_no_git
+				refresh_dir(@dir)
+				@gitrepo = GitRepo.new(@dir)
+				@gitrepo.get_gitdir(@dir)
+			end
+			it "Should execute false  " do
+				@gitrepo.git_save("false test commit").should_not be_success
+				#expect {  not raise a error any more
+		 		#	@gitrepo.git_save(@dir)
+				#}.to raise_error(SystemExit)  
+			end
+			after { del_dir(@dir) }
+		end
+	end #  end of #git_save est
+	describe "#checkout " do
+		before (:each) do
+			@dir = dir_no_git
+			refresh_dir(@dir)
+			Git.init(@dir) 
+			@gitrepo = GitRepo.new(@dir)
+			@gitrepo.get_gitdir(@dir)
+		end
+		context "When given 1,checkout to previous commitish" do
+			it "Should be success and no file newfile.txt" do
+				puts "Now begin test checkou :#{@dir}"
+				add_for_commit("#{@dir}/file.txt")
+				@gitrepo.git_save("init")
+				add_for_commit("#{@dir}/newfile.txt")
+				@gitrepo.git_save("commit second")
+				#@gitrepo.checkout(1).should be_success
+				#File.exist?("#{@dir}/newfile.txt").should be false
+			end
+		end
+		after { del_dir(@dir) }
+	end     #--end of #checkout
+end

data/spec/line_builder_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe LineBuilder do
+	before do
+		g = Git.open(".")
+		l = Git::Lib.new(g)
+		opts = ["--pretty=raw"]
+		@data = l.command_lines('log',opts)
+		@linebuilder = LineBuilder.new(@data,0)
+		@linebuilder.parse
+	end
+	specify { @data.size.should be > 1 }
+	specify { @linebuilder.object.should_not be nil }
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require_relative "../lib/git-hack"
+
+include GitHack
+include PathCommon
+require "fileutils"
+require "colorize"
+
+# 对目录进行刷新，如果有就删除之，新建
+# 没有则新建
+def refresh_dir(path)
+	del_dir(path)
+	Dir.mkdir(path)
+end
+def del_dir(path)
+	FileUtils.rm_r(path,:force=>true) if File.directory?(path)
+end
+def add_for_commit(path)
+	File.open(path,"a") do |file|
+		file.puts "test for commit"	
+	end
+	puts "Add file #{path}".colorize(:green)
+end

data/tmp/colorize_example.rb

@@ -0,0 +1,18 @@
+require 'colorize'
+
+
+puts "This is blue".colorize( :blue )
+puts "This is light blue".colorize( :light_blue )
+puts "This is also blue".colorize( :color => :blue )
+puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
+puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
+puts "This is blue text on red".blue.on_red
+puts "This is red on blue".colorize( :red ).on_blue
+puts "This is red on blue and underline".colorize( :red ).on_blue.underline
+puts "This is blue text on red".blue.on_red.blink
+puts "This is uncolorized".blue.on_red.uncolorize
+
+String.colors # return array of all possible colors names
+String.modes  # return array of all possible modes
+String.color_matrix # displays color matrix with color names
+String.color_matrix( "FOO" ) # display color matrix with "FOO" text

data/tmp/gittest.rb

@@ -0,0 +1,65 @@
+# test Git
+#
+require "git"
+require "ap"
+
+g = Git.open(".")
+
+l = Git::Lib.new(g)
+
+
+class Builder
+	
+end
+class LineParser
+	
+end
+
+
+
+
+
+#l.full_log_commits
+def process_commit_data(data, sha = nil, indent = 4)
+	in_message = false
+	#hsh = nil
+	#hsh_array = []
+	if sha
+		hsh = {'sha' => sha, 'message' => '', 'parent' => []}
+	else
+		hsh_array = []        
+	end
+	data.each do |line|
+		line = line.chomp
+		if line == ''
+			in_message = !in_message
+		elsif in_message
+			hsh['message'] << line[indent..-1] << "\n"
+		else
+			data = line.split
+			key = data.shift
+			value = data.join(' ')
+			if key == 'commit'
+				sha = value
+				hsh_array << hsh if hsh
+				hsh = {'sha' => sha, 'message' => '', 'parent' => []}
+			end
+			if key == 'parent'
+				hsh[key] << value
+			else
+				hsh[key] = value
+			end
+		end
+	end
+
+	if hsh_array
+		hsh_array << hsh if hsh
+		hsh_array
+	else
+		hsh
+	end
+end
+data = l.command_lines('log',["--pretty=raw"])
+puts "data:"
+ap data
+log =  process_commit_data(data,"commit")

metadata

@@ -0,0 +1,92 @@
+--- !ruby/object:Gem::Specification
+name: git-hack
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- weizhao
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: &74853510 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *74853510
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &74853280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *74853280
+description: A more smart tools of git. Come from git-smart
+email:
+- azhao.1981@gmail.com
+executables:
+- git-save
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- Guardfile
+- README.md
+- Rakefile
+- bin/git-save
+- commit test
+- git-hack.gemspec
+- lib/core_ext/git_patch.rb
+- lib/core_ext/line_builder.rb
+- lib/core_ext/path.rb
+- lib/git-hack.rb
+- lib/git-hack/commit.rb
+- lib/git-hack/commit_line_builder.rb
+- lib/git-hack/git_repo.rb
+- lib/git-hack/version.rb
+- spec/commit_line_builder_spec.rb
+- spec/git_repo_spec.rb
+- spec/line_builder_spec.rb
+- spec/spec_helper.rb
+- spec/tmp/hello_for_rspec
+- tmp/colorize_example.rb
+- tmp/gittest.rb
+- tmp/hello_for_rspec
+homepage: ''
+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: git-hack
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 3
+summary: Facade of git. Make git easy to use.
+test_files: []