git_helpers 0.1.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d50a9fc84a8451a75811aed19d8d5763114dbddda62abb44a2f32ee9784b60
-  data.tar.gz: 2cec1efd8ac009542d1cc883dc94c8f56b2f0326434cbbea8e59a916b03eb6a0
+  metadata.gz: 7dff08d8485cf3609ef9a5c6a2d536f2b0536a32a310aaebfd526dbad0906f54
+  data.tar.gz: 69a45f7f856411b80b44d998725c31022dbdf3721afce6034be8560e696eddb1
 SHA512:
-  metadata.gz: f4a638373b1051726dab1a69543347cea204aa63b3241499d911485f3448b65da34c7f6a42b5934b7e63bdd80dfa06e1f949de007cefca932db57d679dfb05b9
-  data.tar.gz: 24577fa3a75b6a422bbb584a95519d9c269261161919e36c7e98f8d6b390541922d2775e00b796a3b0d7d99532052c598064fd7113c64c4730e4168cf9811f0b
+  metadata.gz: 98f579ba175ca949eadeab277fac7d115f6c6ec758e2497cba64ba26ce3490cfabd5116ea03a8b2041faa55bf3639ffa53e76e3e888a02b7ed797b5dd71ae25a
+  data.tar.gz: 12f6d9ea6bad79977fd4a40eef28a2dd81d811bb7669493fa8b0a4d704736f912d4a8e4f91e669b12327ee236c2cd85770e9fc6ef833e5d8a5eae54ecb9a1491

data/ChangeLog.md

@@ -1,4 +1,101 @@
-### 0.1.0 / 2016-06-03
+== Release v0.2 (2020-02-18) ==
 
-* Initial release:
+	* Bump version
+	* Copyright
+	* sumdate is now a standard git format proposal (cf the ml)
+	* Small bugfixes
+	* Fixes for ruby 2.7 warnings
+	* branch_infos: better log options handling
+	* branch_infos: show logs
+	* branch_infos.rb: rework case @{u}=@{push}
+	* format_branch_infos: show when @{push}=@{u}
+	* branch: warn if upstream is nil
+	* Add todo
+	* status.rb: deleted or type change for submodules
+	* rescue if the dir does not exist
+	* Activate GIT_OPTIONAL_CLOCKS
+	* submodule: recursive foreach
+	* submodules foreach
+	* status.rb: show when status is shortened
+	* Update Rakefile
+	* Update Rakefile
+	* Bug fixes
+	* status.rb: more infos in sequencer
+	* status: max_length
+	* gitstatus: sequencer formatting
+	* status: extra infos optional in sequencer
+	* name: can specify several methods
+	* sequencer: show onto
+	* detached_infos
+	* Bug fixes
+	* sequencer
+	* branch#full_name
+	* detached infos
+	* branch_infos: cherry log
+	* status: Show submodules commited vs submodules changed
+	* infos: detached_name
+	* status.rb: ignored symbol
+	* Bug fix
+	* gitstatus.rb: more options
+	* status: full branch infos
+	* status.rb: branch infos
+	* gitstatus.rb options
+	* Branch#checkout
+	* recursive_upstream
+	* status: add 'T' type (= type change)
+	* diff-fancy.rb: integrate as library
+	* Fix --prompt
+	* Move gitstatus2.rb to gitstatus.rb
+	* gitstatus2: more options
+	* status: only show in a git repo
+	* Sequencer status
+	* status: minimal status when not in worktree
+	* status when not in a worktree
+	* More wrapping into run_simple
+	* Use run helpers
+	* git_helpers: reset cache and run wrappers
+	* sequencer: read extra informations
+	* branch: raw calls
+	* git_dir: use rev-parse to get all infos at once
+	* git_helpers.rb: split into multiple files
+	* sequencer + stash infos
+	* gitstatus2: bug fixes
+	* New version of gitstatus.rb
+	* git: status
+	* git_helpers.rb: status
+	* format_branch_infos
+	* branch infos: upstream and push branch names
+
+== Release v0.1.0 (2019-04-08) ==
+
+	* branch infos
+	* extra_helpers: now can handle a repository
+	* extra_helpers: force --no-pager
+	* Add extra branch and stats helpers
+	* Bug fixes
+	* Add #head
+	* Import git_helpers from drain and improve the api
+	* Desactivate pattern for now
+	* diff-fancy: add default patterns to less
+	* Last commit checked date
+	* Readme + Commits checked
+	* GitDiff.output as a convenience class method
+	* Fix gemspec
+	* Add git versions in Gemfile
+	* Add .travis.yml
+	* Update gemspec
+	* Streamline rake and test files
+	* Copyright
+	* TODO--
+	* Update README
+	* gitstatus: check if folder exists
+	* Also handle the case of a binary removal
+	* Clean up 'binary file differ' in file creation
+	* Set default column to 80 if `tput col` fails
+	* scrub non utf-8 strings
+	* Better detection of submoldules boundaries
+	* diff-fancy: can specify diff-highlight location through an ENV variable
+	* Add standalone executables
+	* Copyright
+	* Initial commit.
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2016–2017 Damien Robert
+Copyright © 2016–2020 Damien Robert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,15 +1,5 @@
 require 'rake'
 
-begin
-  require 'rubygems/tasks'
-  Gem::Tasks.new(sign: {checksum: true, pgp: true}, 
-    scm: {status: true}) do |tasks|
-  tasks.console.command = 'pry'
-end
-rescue LoadError => e
-  warn e.message
-end
-
 require 'rake/testtask'
 Rake::TestTask.new do |test|
   test.libs << 'test'
@@ -27,3 +17,10 @@ rescue LoadError => e
 end
 task :doc => :yard
 
+begin
+  require 'dr/rake_gems'
+  Gem::MyTasks.new
+rescue LoadError => e
+  warn e.message
+end
+

data/bin/diff-fancy.rb

@@ -0,0 +1 @@
+../lib/git_helpers/diff.rb

data/bin/gitstatus.old.rb

@@ -0,0 +1,349 @@
+#!/usr/bin/env ruby
+# Inspired by https://github.com/olivierverdier/zsh-git-prompt
+# [commit: 350be32093d0585f395413253536d891c247f538,
+#  last commit checked: 0a6c8b610e799040b612db8888945f502a2ddd9d (2016-02-14)]
+#Inspired by the contrib git script
+
+require "open3"
+require "pathname"
+require "shellwords"
+require "optparse"
+require "simplecolor"
+#require "dr/git" #TODO merge the two implems
+SimpleColor.mix_in_string
+
+module GitStatus
+	module Run
+		extend(self)
+		#if we get interrupted once, we don't want to launch any more commands
+		@interrupted=false
+		def runstatus(*args)
+			if !@interrupted
+				begin
+					if Open3.respond_to?(:capture3) then
+						out, error, status=Open3.capture3(*args)
+						return out, status.success?
+					else
+						out = `#{args} 2>/dev/null`
+						status=$?
+						return out, status.success?
+					end
+				rescue Interrupt #interruption
+					@interrupted=true
+					return "", false
+				end
+			else
+				return "", false
+			end
+		end
+		def run(*args)
+			msg,_=runstatus(*args)
+			return msg
+		end
+	end
+
+	class Git
+		include GitStatus::Run
+		attr_reader :msg
+
+		def git?
+			if @git.nil?
+				_,@git=runstatus "git rev-parse"
+			end
+			return @git
+		end
+		def getgitdir
+			return Pathname.new((run "git rev-parse --git-dir").chomp)
+		end
+		def ingitdir?
+			return (run "git rev-parse --is-inside-git-dir") == "true\n"
+		end
+		def worktree?
+			return (run "git rev-parse --is-inside-work-tree") == "true\n"
+		end
+		def bare?
+			return (run "git rev-parse --is-bare-repository") == "true\n"
+		end
+
+		def cd_and_exec(*args)
+			if @path.nil? then
+				yield(*args)
+			else
+				if File.directory?(@path)
+					Dir.chdir(@path) do
+						yield(*args)
+					end
+				else
+					warn "#{@path} is not a directory"
+				end
+			end
+		end
+
+		def initialize(path=nil)
+			#a nil path means we want information on the current directory
+			if !path.nil?
+				@path=Pathname.new(path).expand_path
+			end
+			cd_and_exec {git?}
+		end
+
+		def get_msg
+			#gitst="git status --porcelain --branch"
+			#too many git are too old to mix --porcelain with --branch
+			gitm=git="git"
+			gitm="#{git} -c color.ui=always" if $opts[:color]
+			gitm="#{gitm} status --short --branch"
+			@msg=run(gitm)
+		end
+
+		def describe_detached_head
+			case $opts[:describe]
+			when "sha1"
+				describe=(run "git rev-parse --short HEAD").chomp
+			when "describe"
+				describe=(run "git describe HEAD").chomp
+			when "contains"
+				describe=(run "git describe --contains HEAD").chomp
+			when "branch"
+				describe=(run "git describe --contains --all HEAD").chomp
+			when "match"
+				describe=(run "git describe --tags --exact-match HEAD").chomp
+			when "all" #try --contains all, then --all
+				describe=(run "git describe --contains --all HEAD").chomp
+				describe=(run "git describe --all HEAD").chomp if describe.nil? or describe.empty?
+			when "magic"
+				describe1=(run "git describe --contains --all HEAD").chomp
+				describe2=(run "git describe --all HEAD").chomp
+				describe= describe1.length < describe2.length ? describe1 : describe2
+				describe=describe1 if describe2.empty?
+				describe=describe2 if describe1.empty?
+			else
+				describe=(run($opts[:describe])).chomp
+			end
+			if describe.empty?
+				describe=(run "git rev-parse --short HEAD").chomp
+			end
+			@branch=":#{describe}"
+		end
+
+		def parse_head(head)
+			@ahead=@behind=0
+			if (head =~ /## Initial commit on (\S*)/) then
+			 @branch=$1
+			 if @branch =~ /(\S*)\.\.\./
+				 @branch=$1
+			 end
+			 @branch+="…"
+			elsif (head =~ /## (\S*) \(no branch\)/) then
+				describe_detached_head
+			elsif (head =~ /## (\S*)(.*)/) then
+				branchs=$1
+				rest=$2
+				if (branchs =~ /(\S*)\.\.\.(\S*)/) then
+					@branch=$1
+					remote=$2
+				else
+					@branch=branchs
+				end
+				if (rest =~ /.*\[ahead\s+(\d*)(.*)/) then
+					@ahead=$1.to_i
+					rest=$2
+				end
+				if (rest =~ /.*behind\s+(\d*)\]/) then
+					@behind=$1.to_i
+				end
+			end
+		end
+
+		def parse_msg
+			msg=@msg
+			#find the branch name, and if we are behind/ahead of upstream
+			lines=msg.uncolor.lines.to_a
+			return if lines.empty?
+			head=lines.shift
+			parse_head(head)
+
+			#get status of files
+			@changed=@staged=@untracked=@conflicts=0
+			lines.each do |line|
+				index = line[0];
+				workdir = line[1];
+				#puts "index: #{index}, workdir: #{workdir}"
+				if index=~/[DRAMTC]/ then
+					@staged+=1
+				end
+				if workdir=~ /[DMT]/ then
+					@changed+=1
+				end
+				if workdir=='?' || index=='?' then
+					@untracked+=1
+				end
+				if workdir=='U' || index=='U' then
+					@conflicts+=1
+				end
+			end
+			@clean=true
+			@clean=false if @staged != 0 || @changed !=0 ||
+											@untracked !=0 || @conflicts !=0
+		end
+
+		def get_status
+			if worktree?
+				get_msg
+				parse_msg
+				if $opts[:sequencer] and !@msg.empty?
+					@sequencer=""
+					gitdir=getgitdir
+					if (gitdir+"rebase-merge").directory?
+						if (gitdir+"rebase-merge/interactive").file?
+							@sequencer<<" rb-i " #REBASE-i
+						else
+							@sequencer<<" rb-m " #REBASE-m
+						end
+						@sequencer<<(gitdir+"rebase-merge/head-name").read.chomp.sub(/^refs\/heads\//,"")
+					end
+					if (gitdir+"rebase-apply").directory?
+						if (gitdir+"rebase-apply/rebasing").file?
+							@sequencer<<" rb" #RB
+						elsif (gitdir+"rebase-apply/applying").file?
+							@sequencer<<" am" #AM
+						else
+							@sequencer<<" am/rb" #AM/REBASE
+						end
+					end
+					if (gitdir+"MERGE_HEAD").file?
+						@sequencer<<" mg" #MERGING
+					end
+					if (gitdir+"CHERRY_PICK_HEAD").file?
+						@sequencer<<" ch" #CHERRY-PICKING
+					end
+					if (gitdir+"BISECT_LOG").file?
+						@sequencer<<" bi" #BISECTING
+					end
+					_,stashstatus=runstatus "git rev-parse --verify refs/stash"
+					if stashstatus
+						stashs=run "git rev-list -g refs/stash"
+						@sequencer<<" $#{stashs.lines.to_a.length}" #Stash
+					end
+				end
+				return !@msg.empty?
+			else
+				if $opts[:sequencer]
+					if ingitdir?
+						if bare?
+							@branch="|bare|"
+						else
+							@branch="|.git|"
+						end
+					end
+				end
+			end
+			return false
+		end
+
+		def status
+			cd_and_exec { get_status } if git?
+		end
+
+		def prompt
+			if status
+				return "(" <<
+				 @branch.color(:magenta,:bold) <<
+				(@ahead==0 ? "" : "↑"<<@ahead.to_s ) <<
+				(@behind==0 ? "" : "↓"<<@behind.to_s ) <<
+				"|" <<
+				(@staged==0 ? "" : ("●"+@staged.to_s).color(:red) ) <<
+				(@conflicts==0 ? "" : ("✖"+@conflicts.to_s).color(:red) ) <<
+				(@changed==0 ? "" : ("✚"+@changed.to_s).color(:blue) ) <<
+				(@untracked==0 ? "" : "…" ) <<
+				(@clean ? "✔".color(:green,:bold) : "" ) <<
+				(@sequencer.empty? ? "" : @sequencer.color(:yellow) ) <<
+				")"
+			else
+				return "(" << @branch.color(:magenta,:bold) << ")" if @branch
+			end
+		end
+
+		def porcelain
+			if git?
+				return "#{@branch}\n#{@ahead}\n#{@behind}\n#{@staged}\n#{@conflicts}\n#{@changed}\n#{@untracked}\n#{@clean?1:0}\n#{@sequencer}\n"
+			else
+				return ""
+			end
+		end
+	end
+end
+
+$opts={:color => true, :indent => nil, :sequencer => true, :describe => "magic"}
+optparse = OptionParser.new do |opt|
+	opt.banner= "#{File.basename($0)} [options] git_dirs"
+	opt.on("-p", "--[no-]prompt", "To be used in shell prompt", "This ensure that color ansi sequence are escaped so that they are not counted as text by the shell") do |v|
+		$opts[:prompt]=v
+	end
+	opt.on("--[no-]porcelain", "Don't format the status but output it in a machine convenient format") do |v|
+		$opts[:porcelain]=v
+	end
+	opt.on("-s", "--[no-]status", "List file", "Print the output of git status additionally of what this program parse") do |v|
+		$opts[:status]=v
+	end
+	opt.on("-c", "--[no-]color", "Color output", "on by default") do |v|
+		$opts[:color]=v
+	end
+	opt.on("--[no-]sequencer", "Show sequencer data (and also look for bare directory)", "on by default") do |v|
+		$opts[:sequencer]=v
+	end
+	opt.on("--indent spaces", Integer, "Indent to use if showing git status", "2 by default, 0 for empty ARGV") do |v|
+		$opts[:indent]=v
+	end
+	opt.on("--describe sha1/describe/contains/branch/match/all/magic", "How to describe a detached HEAD", "'magic' by default") do |v|
+		$opts[:describe]=v
+	end
+	opt.on("--sm", "Recurse on each submodules") do |v|
+		$opts[:submodules]=v
+	end
+end
+optparse.parse!
+
+if !$opts[:color]
+	SimpleColor.enabled=false
+end
+
+def prettify_dir(dir)
+	return dir.sub(/^#{ENV['HOME']}/,"~")
+end
+
+def gs_output(dir)
+	g=GitStatus::Git.new(dir)
+	puts "#{prettify_dir(dir)+": " if dir}#{g.prompt}"
+	if $opts[:status] and g.git?
+		g.msg.lines.each do |line|
+			print " "*$opts[:indent] + line
+		end
+	end
+end
+
+if $opts[:porcelain]
+	puts GitStatus::Git.new.porcelain
+elsif $opts[:prompt]
+	SimpleColor.enabled=:shell
+	prompt=GitStatus::Git.new.prompt
+	puts prompt if prompt #in ruby1.8, puts nil output nil...
+else
+	args=ARGV
+	if args.empty?
+		$opts[:indent]=0 unless $opts[:indent]
+		args=[nil]
+	else
+		$opts[:indent]=2 unless $opts[:indent]
+	end
+	args.each do |dir|
+		gs_output(dir)
+		if $opts[:submodules]
+			Dir.chdir(dir||".") do
+				%x/git submodule status/.each_line.map { |l| l.split[1] }.each do |dir|
+					gs_output(dir)
+				end
+			end
+		end
+	end
+end