git-hack 0.0.2 → 0.0.3

data/bin/git-goto

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

data/bin/git-redo

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

data/bin/git-undo

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

data/lib/core_ext/git_patch.rb

@@ -23,5 +23,8 @@ module Git
 			# putsrocess_commit_data(full_log)
 			process_commit_data(full_log,"commit")
 		end
+		def command_lines_patch(command,opt = [],chdir = true,redirect = '')
+			command_lines(command,opt,chdir,redirect)
+		end
 	end
 end

data/lib/core_ext/line_builder.rb

@@ -8,13 +8,16 @@ class LineBuilder
 		@data = data
 		@index = index
 		@object = nil
+		@is_parse = false
 	end
 	def parse
+		@is_parse = true
+		return nil if is_over?
 		begin
 			next unless in?
 			process_line 
-		end until ( out? )
-		@object
+		end until (  out? || is_over?)
+		self
 	end
 	# 行处理函数,必须被重写
 	def process_line
@@ -29,4 +32,24 @@ class LineBuilder
 	def out?
 		@index += 1
 	end
+	# 是否数据结构
+	def is_over?
+		@index >= @data.size
+	end
+	def get_next
+		return nil if is_over?
+		return self.class.new(@data,@index).parse
+	end
+	# 得出剩下的
+	def rest
+		return [] if is_over?
+		next_b = get_next
+		return [next_b] + ( next_b.is_over? ? [] : next_b.rest)
+	end
+	# 找出全部的
+	def find_all
+		return [] if is_over? && @object == nil
+		parse unless @is_parse
+		[self] + rest
+	end
 end

data/lib/git-hack.rb

@@ -1,6 +1,6 @@
 require "git-hack/version"
-Dir["#{File.dirname(__FILE__)}/**/*.rb"].each { |f| require f }
 require "git"
+Dir["#{File.dirname(__FILE__)}/**/*.rb"].each { |f| require f }
 
 module GitHack
 	def self.current

data/lib/git-hack/commit_line_builder.rb

@@ -1,34 +1,55 @@
 
 require_relative "../core_ext/line_builder"
+class String
+	def uncolorize
+		self.gsub(/\e\[(\d+)*m/,"")	
+	end
+end
 
 
 module GitHack
 	class CommitLineBuilder < LineBuilder
+		attr_accessor :commit
 		def initialize(data,index)
 			super(data,index)
 			@is_message = false
-			@commit = { 'masseg' => '', parent => []}
+			@commit = { 'sha'=>nil, 'message' => '', 'parent' => [] }
+			@is_next_commit = false
 		end
 		def process_line
 			@is_message
 			line = @data[@index]		
-			line = line.chomp
+			line = line.chomp.uncolorize
 			if line == ""
 				@is_message = !@is_message
-			elsif is_message
-				@commit.message << line+"\n"
+			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
+				@key = key = data.shift
+				@value = data.join(" ")
+
+				if @key == "commit"
+				 	if @commit['sha']
+						@is_next_commit = true
+					else
+						@commit['sha'] = @value
+					end
+				elsif @key == 'parent'
+					@commit[@key] << @value
 				else
+					@commit[@key] = @value
 				end
 			end
+			@object = @commit
+		end
+		def out?
+			if @is_next_commit
+				return true
+			else
+				@index += 1
+				return false
+			end
 		end
 	end
 end

data/lib/git-hack/git_repo.rb

@@ -13,7 +13,7 @@ module GitHack
 	#
 	class GitRepo < Git::Path
 		include PathCommon
-		attr_accessor :git,:commits,:work,:remote
+		attr_accessor :git,:commits,:work,:remote,:current_commit
 		def initialize(path)
 			@workingdirectory = get_gitdir(path)	
 			@commits = []
@@ -22,8 +22,11 @@ module GitHack
 			@git ||= Git.open(@workingdirectory ,:log => Logger.new(STDOUT)) 
 		end
 		def commits
-			@commits if !@commits.empty?
-			@commits = git.log
+			return @commits if !@commits.empty?
+			l = Git::Lib.new(git)
+			opts = ["--pretty=raw"]
+			@data = l.command_lines_patch('log',opts)
+			return @commits = CommitLineBuilder.new(@data,0).find_all
 		end
 		# 得到本身或是上层目录中.git文件的路经
 		def get_gitdir(path)
@@ -67,32 +70,72 @@ module GitHack
 		def auto_commit_msg
 			"auto commit" # TODO: 需要完成
 		end
-		# undo 如果有修改,保存,然后回到上一次提交
+		# undo 回到上一次提交
 		def undo
-			git_save if working_directory_change?
-			checkout(1)    # check_out 0.当前1.上一个.2.上上个....
+			git_goto(1)
 		end
-		# check out 出前第number个保存
-		def checkout(number,options={})
+		# redo 到当前提交的下一个提交
+		def redo
 			ready_to_execute
 			return self if not_git_directory?
-			puts "commits:".colorize(:red)
-			ap commits
-			git.reset(commits[1])
+			next_commit = get_next_commit
+			return self if !next_commit
+			git.reset_hard(next_commit)
 			execute_success
 			self
+		end
+		def git_goto(number,options={})
+			number = number.to_i
+			goto(number,options)
 			
 		end
+		# 回到前第number个保存
+		#
+		def goto(number,options={})
+			ready_to_execute
+			return self if not_git_directory?
+			git.reset_hard(commits[number].commit['sha'])
+			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"
+				puts "Not a git directory ,run `git init` first"
 				return true
 			end
 			return false
 		end
+		def get_next_commit 
+			file = File.open("#{@workingdirectory}/.git/logs/HEAD")
+			data = []
+			file.each { |line|
+				data << line
+			}
+			commit_data = SimpleLineBuilder.new(data,0).find_all
+			commit = commit_data.find do |c| 
+				c.object == current_commit 
+			end
+			commit_sha = commit ?  commit.value : nil
+		end
+		def current_commit
+			@current_commit if @current_commit
+			data = data_from_file("#{@workingdirectory}/.git/HEAD")
+			commit_file_data = SimpleLineBuilder.new(data,0).parse
+			commit_file = commit_file_data.value
+			@current_commit = data_from_file("#{@workingdirectory}/.git/#{commit_file}")
+			@current_commit = @current_commit[0].chomp
+		end
+		def data_from_file(path)
+			file = File.open(path)
+			data = []
+			file.each { |line|
+				data << line
+			}
+			data 
+		end
 	end
 end

data/lib/git-hack/simple_line_builder.rb

@@ -0,0 +1,19 @@
+
+require_relative "../core_ext/line_builder"
+
+module GitHack
+	class SimpleLineBuilder < LineBuilder
+		attr_accessor :value
+		def initialize(data,index)
+			super(data,index)
+		end
+		def process_line
+			line = @data[@index]
+			line = line.chomp.split
+			@object = line.shift
+			@value = line.shift
+		end
+	end
+end
+
+

data/lib/git-hack/version.rb

@@ -1,3 +1,3 @@
 module GitHack
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

data/spec/commit_line_builder_spec.rb

@@ -5,10 +5,47 @@ describe CommitLineBuilder do
 		g = Git.open(".")
 		l = Git::Lib.new(g)
 		opts = ["--pretty=raw"]
-		@data = l.command_lines('log',opts)
+		@data = l.command_lines_patch('log',opts)
 		@linebuilder = CommitLineBuilder.new(@data,0)
 		@linebuilder.parse
 	end
 	specify { @data.size.should be > 1 }
 	specify { @linebuilder.object.should_not be nil }
+	specify { @linebuilder.is_over?.should_not be true }
+	specify { @linebuilder.get_next.should_not be nil }
+	specify { @linebuilder.rest.size.should be > 0 }
+	specify { @linebuilder.find_all.size.should be > 0 }
+	it "Show Some data" do
+		puts @linebuilder.index
+		puts @data.size
+		puts "find_all.size: #{@linebuilder.find_all.size}"
+		
+	end
+	context "When come to the last " do
+		before do
+			@last = CommitLineBuilder.new(@data,@data.size-1)
+			@last.parse
+		end
+		specify { @last.should be_is_over }	
+
+		specify { @last.get_next.should be  nil }	
+		specify { @last.rest.size.should be  0 }
+		specify { @last.find_all.size.should be  1 }
+	end
+	context "When is over" do
+		before do
+			@over = CommitLineBuilder.new(@data,@data.size)
+			@over.parse
+		end
+		specify { @over.should be_is_over }	
+
+		specify { @over.get_next.should be  nil }	
+		specify { @over.rest.size.should be  0 }
+		specify { @over.find_all.size.should be  0 }
+		it "Show Find_all" do
+		#	puts "lash find_all"
+		#	ap @over.find_all
+		end
+	end
+
 end

data/spec/git_repo_spec.rb

@@ -65,25 +65,72 @@ describe GitRepo do
 			after { del_dir(@dir) }
 		end
 	end #  end of #git_save est
-	describe "#checkout " do
+	describe "#goto " do
 		before (:each) do
 			@dir = dir_no_git
 			refresh_dir(@dir)
 			Git.init(@dir) 
 			@gitrepo = GitRepo.new(@dir)
 			@gitrepo.get_gitdir(@dir)
+			add_for_commit("#{@dir}/file.txt")
+			@gitrepo.git_save("init")
+			add_for_commit("#{@dir}/newfile.txt")
+			@gitrepo.git_save("commit second")
 		end
-		context "When given 1,checkout to previous commitish" do
+		context "When given 1" 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
+				@gitrepo.goto(1).should be_success
+				File.exist?("#{@dir}/newfile.txt").should be false
+			end
+			it "Should still get 2 commit" do
+				@gitrepo.commits.size.should == 2
+				@gitrepo.goto(1).should be_success
+				@gitrepo.commits.size.should == 2
+				@gitrepo.goto(0).should be_success
+				File.exist?("#{@dir}/newfile.txt").should be true
+			end
+		end
+		context "When given 2," do
+			it "Should goto the last commit" do
+				@gitrepo.goto(1).should be_success
+				File.exist?("#{@dir}/newfile.txt").should be false
+				@g = GitRepo.new(@dir)
+				@g.get_gitdir(@dir)
+				@gitrepo.goto(0).should be_success
+				File.exist?("#{@dir}/newfile.txt").should be true
 			end
 		end
 		after { del_dir(@dir) }
 	end     #--end of #checkout
+	describe "#redo" do
+		before (:each) do
+			@dir = dir_no_git
+			refresh_dir(@dir)
+			Git.init(@dir) 
+			@gitrepo = GitRepo.new(@dir)
+			@gitrepo.get_gitdir(@dir)
+			add_for_commit("#{@dir}/file.txt")
+			@gitrepo.git_save("init")
+			add_for_commit("#{@dir}/newfile.txt")
+			@gitrepo.git_save("commit second")
+		end
+		context "When no undo" do
+			it "Should be failed" do
+				@gitrepo.redo.should_not be_success
+			end
+		end
+		context "When undo first" do
+			it "Should be success" do
+				File.exist?("#{@dir}/newfile.txt").should be true
+				@gitrepo.undo
+				File.exist?("#{@dir}/newfile.txt").should be false
+				@g = GitRepo.new(@dir)
+				@g.get_gitdir(@dir)
+				@g.redo.should be_success
+				File.exist?("#{@dir}/newfile.txt").should be true
+			end
+		end
+		after{ del_dir(@dir) }
+	end
+		
 end

data/spec/line_builder_spec.rb

@@ -4,12 +4,47 @@ describe LineBuilder do
 	before do
 		g = Git.open(".")
 		l = Git::Lib.new(g)
+		@lib = l
 		opts = ["--pretty=raw"]
-		@data = l.command_lines('log',opts)
+		@data = l.command_lines_patch('log',opts)
 		@linebuilder = LineBuilder.new(@data,0)
 		@linebuilder.parse
 	end
 	specify { @data.size.should be > 1 }
 	specify { @linebuilder.object.should_not be nil }
+	specify { @linebuilder.is_over?.should_not be true }
+	specify { @linebuilder.get_next.should_not be nil }
+	specify { @linebuilder.rest.size.should be > 0 }
+	specify { @linebuilder.find_all.size.should be > 0 }
+	it "Show Some data" do
+		puts @linebuilder.index
+		puts @data.size
+		
+	end
+	context "When is come to the last" do
+		before do
+			@last = LineBuilder.new(@data,@data.size-1)
+			@last.parse
+		end
+		specify { @last.should be_is_over }	
+
+		specify { @last.get_next.should be  nil }	
+		specify { @last.rest.size.should be  0 }
+		specify { @last.find_all.size.should be  1 }
+	end
+	context "When is over" do
+		before do
+			@over = LineBuilder.new(@data,@data.size)
+			@over.parse
+		end
+		specify { @over.should be_is_over }	
 
+		specify { @over.get_next.should be  nil }	
+		specify { @over.rest.size.should be  0 }
+		specify { @over.find_all.size.should be  0 }
+		it "Show Find_all" do
+		#	puts "lash find_all"
+		#	ap @over.find_all
+		end
+	end
 end

data/tmp/classtest.rb

@@ -0,0 +1,16 @@
+class A
+	def selfclass
+		self.class
+	end
+	def get_next
+		selfclass.new
+	end
+end
+class B < A
+end
+a = A.new
+b = B.new
+puts a.class
+puts a.selfclass.new
+puts b.class
+puts b.get_next

data/tmp/cli.rb

@@ -0,0 +1,3 @@
+require "./coretest"
+
+

data/tmp/cli2.rb

@@ -0,0 +1,3 @@
+require "./cli"
+
+puts "llllllllllll".hello

data/tmp/coretest.rb

@@ -0,0 +1,8 @@
+
+class String
+	def hello
+		puts "hello"	
+	end
+end
+
+

data/tmp/hello

@@ -0,0 +1 @@
+dlfdfld

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-hack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &79618330 !ruby/object:Gem::Requirement
+  requirement: &22140160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79618330
+  version_requirements: *22140160
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &79618070 !ruby/object:Gem::Requirement
+  requirement: &22139340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,12 +32,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79618070
+  version_requirements: *22139340
 description: A more smart tools of git. Come from git-smart
 email:
 - azhao.1981@gmail.com
 executables:
+- git-goto
+- git-redo
 - git-save
+- git-undo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -46,7 +49,10 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- bin/git-goto
+- bin/git-redo
 - bin/git-save
+- bin/git-undo
 - commit test
 - git-hack.gemspec
 - lib/core_ext/git_patch.rb
@@ -56,14 +62,20 @@ files:
 - lib/git-hack/commit.rb
 - lib/git-hack/commit_line_builder.rb
 - lib/git-hack/git_repo.rb
+- lib/git-hack/simple_line_builder.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/classtest.rb
+- tmp/cli.rb
+- tmp/cli2.rb
 - tmp/colorize_example.rb
+- tmp/coretest.rb
 - tmp/gittest.rb
+- tmp/hello
 - tmp/hello_for_rspec
 homepage: ''
 licenses: []