git-stash-commit 1.0.0

data/lib/git/stash/commit/version.rb

@@ -0,0 +1,7 @@
+module Git
+  module Stash
+    module Commit
+      VERSION = "1.0.0"
+    end
+  end
+end

data/lib/git/stash/sclib/branch.rb

@@ -0,0 +1,164 @@
+# ブランチ操作クラス
+# 通常/detachedを等価的に扱えるラッパークラスを提供する
+
+$:.unshift File.dirname(__FILE__)
+require 'command.rb' # namespace cmd
+
+module BranchFactory
+  extend self
+
+  # ブランチ名をもとに、通常/detachedブランチどちらかを判断し、返す
+  def find(name)
+    if Cmd::branchExist? name
+      Branch.new name
+    elsif Cmd::branchRefExist? name
+      DetachBranch.new name
+    else
+      nil
+    end
+  end
+
+end
+
+module BranchCommon
+  module CommitMode
+    ALL   = '--all'
+    PATCH = '--patch'
+  end
+
+  def initialize(name, maketarget='')
+    @name = name
+    if exist?
+      # no-op
+    elsif maketarget != ''
+      make maketarget
+    else
+      raise 'Branch instanced failed'
+    end
+  end
+
+  def name
+    @name
+  end
+
+  def cherryPickNoCommit(target)
+    checkout
+    puts "[#{@name}]: git cherry-pick --no-commit \"#{target}\""
+    Cmd::exec "git cherry-pick --no-commit \"#{target}\""
+  end
+
+  attr_reader :name
+end
+
+# 通常ブランチ
+class Branch
+  include BranchCommon
+
+  def checkout
+    Cmd::execQuiet "git checkout \"#{@name}\""
+  end
+  def delete(deletedBranch='', force=false)
+    if deletedBranch != ''
+      Cmd::execQuiet "git checkout \"#{deletedBranch}\""
+    end
+    opt = (force == true) ? '-D' : '-d'
+    revision = Cmd::revision @name
+    Cmd::execQuiet "git branch #{opt} \"#{@name}\""
+    puts "Deleted detached branch #{@name} (was #{revision})"
+  end
+  def rebase(upstream)
+    puts "[#{@name}]: git rebase \"#{upstream}\""
+    Cmd::execForRebase @name, "git rebase \"#{upstream}\" \"#{@name}\""
+  end
+  def rebaseOnto(newbase, upstream)
+    puts "[#{@name}]: git rebase --onto \"#{newbase}\" \"#{upstream}\" <SELF>"
+    Cmd::execForRebase @name, "git rebase --onto \"#{newbase}\" \"#{upstream}\" \"#{@name}\""
+  end
+  def reset(target='')
+    if target != ''
+      checkout
+      puts "[#{@name}]: git reset \"#{target}\""
+      Cmd::exec "git reset \"#{target}\""
+    else
+      puts "[#{@name}]: git reset"
+      Cmd::exec 'git reset'
+    end
+  end
+  def commit(mode=CommitMode::ALL, _msg='', &onFail)
+    msg = (_msg != '') ? "-m \"#{_msg}\"" : ''
+    begin
+      checkout
+      puts "[#{@name}]: git commit #{mode} ..."
+      Cmd::exec "git commit #{mode} #{msg}"
+    rescue => e
+      onFail.call if block_given?
+      raise e
+    end
+  end
+
+  private
+    def exist?
+      Cmd::branchExist? @name
+    end
+    def make(target)
+      Cmd::execQuiet "git branch \"#{@name}\" \"#{target}\""
+      puts "Maked branch #{@name} (was #{Cmd::revision @name})"
+    end
+end
+
+# detachedブランチ
+class DetachBranch
+  include BranchCommon
+
+  def checkout
+    Cmd::execQuiet "git checkout --detach \"#{@name}\""
+  end
+  def delete(deletedBranch='', dummy=false)
+    if deletedBranch != ''
+      Cmd::execQuiet "git checkout \"#{deletedBranch}\""
+    end
+    revision = Cmd::revision @name
+    Cmd::execQuiet "git update-ref -d refs/#{@name}"
+    puts "Deleted detached branch #{@name} (was #{revision})"
+  end
+  def rebase(upstream)
+    puts "[#{@name}]: git rebase \"#{upstream}\""
+    Cmd::execForRebase @name, "git rebase \"#{upstream}\" \"#{@name}\" --exec \"git update-ref refs/#{@name} HEAD\""
+  end
+  def rebaseOnto(newbase, upstream)
+    puts "[#{@name}]: git rebase --onto \"#{newbase}\" \"#{upstream}\" <SELF>"
+    Cmd::execForRebase @name, "git rebase --onto \"#{newbase}\" \"#{upstream}\" \"#{@name}\" --exec \"git update-ref refs/#{@name} HEAD\""
+  end
+  def reset(target='')
+    if target != ''
+      checkout
+      puts "[#{@name}]: git reset \"#{target}\""
+      Cmd::exec "git reset \"#{target}\""
+      Cmd::execQuiet "git update-ref refs/#{@name} HEAD"
+    else
+      puts "[#{@name}]: git reset"
+      Cmd::exec 'git reset'
+    end
+  end
+  def commit(mode=CommitMode::ALL, _msg='', &onFail)
+    msg = (_msg != '') ? "-m \"#{_msg}\"" : ''
+    begin
+      checkout
+      puts "[#{@name}]: git commit #{mode} ..."
+      Cmd::exec "git commit #{mode} #{msg}"
+      Cmd::execQuiet "git update-ref refs/#{@name} HEAD"
+    rescue => e
+      onFail.call if block_given?
+      raise e
+    end
+  end
+
+  private
+    def exist?
+      Cmd::branchRefExist? @name
+    end
+    def make(target)
+      Cmd::execQuiet "git update-ref refs/#{@name} \"#{target}\""
+      puts "Maked detached branch #{@name} (was #{Cmd::revision @name})"
+    end
+end

data/lib/git/stash/sclib/command.rb

@@ -0,0 +1,227 @@
+# ラッパーコマンド群
+
+$:.unshift File.dirname(__FILE__)
+require 'define.rb'
+require 'open3'
+
+module Cmd
+  extend self
+
+  # 成否を戻り値か例外で知らせる
+  def exec(cmd)
+    raise "failed, cmd:#{cmd}" if !execRet cmd
+  end
+
+  def execRet(cmd)
+    Kernel.system(cmd)
+    $?.success?
+  end
+
+  def execQuiet(cmd)
+    raise "failed, cmd:#{cmd}" if !execRetQuiet cmd
+  end
+
+  def execRetQuiet(cmd)
+    execRet "#{cmd} > /dev/null 2>&1"
+  end
+
+  # 他のコマンド
+
+  def gitdirExist?
+    execRetQuiet 'git rev-parse --git-dir'
+  end
+  private
+    _memo_gitdir = nil
+    def gitdir
+      @_memo_gitdir = @_memo_gitdir || `git rev-parse --git-dir`.chomp
+    end
+  public
+
+  def revision(target='HEAD')
+    `git rev-parse --short #{target}`.chomp
+  end
+  def title
+    `git log -1 --pretty=format:\"%s\"`
+  end
+  def branchName
+    `git branch`.each_line do |line|
+      return line[1..-1].strip if line[0] == '*'
+    end
+  end
+
+  # 引数のブランチは存在してるか?
+  def branchExist?(branch)
+    `git branch`.each_line do |_line|
+      line = _line
+      line = line[1..-1] if line[0] == '*'
+      line = line.strip
+      return true if line == branch
+    end
+
+    return false
+  end
+  # 引数のdetached branchは存在してるか?
+  def branchRefExist?(branch)
+    execRetQuiet "test -f \"#{gitdir}/refs/#{branch}\""
+  end
+  # ----------------
+  # stash-commit ---
+  # stash-commmitのbranch一覧
+  def listup(_branchName, all)
+    preCmd = "git branch | sed -E 's/^\\*/ /' | awk '{print $1}' | grep -E '^#{PREFIX}/'"
+    if all
+      print `#{preCmd}`
+    else
+      # グループ表示
+      rootBranch = _branchName.match(/^(#{PREFIX}\/)?(.+?)(@.+)?$/)[2]
+      print `#{preCmd} | grep "#{rootBranch}"`
+    end
+  end
+  def getTmp
+    findFirstCommitStashRef(){|line| line.match(/#{TMP_SUFFIX}$/)}
+  end
+  def getPatchRemain
+    findFirstCommitStashRef(){|line| line.match(/#{PATCH_REMAIN_SUFFIX}$/)}
+  end
+  def getBackup
+    findFirstCommitStashRef(){|line| line.match(/#{BACKUP_SUFFIX}$/)}
+  end
+  private
+    def findFirstCommitStashRef(&pred)
+      `find #{gitdir}/refs/#{PREFIX} -type f 2> /dev/null`.each_line do |_line|
+        line = _line.strip
+        line = line.sub(/^.*\.git\/refs\//, '')
+        return line if pred.call line
+      end
+      return ''
+    end
+  public
+  def stashName(branch, no)
+    "#{PREFIX}/#{branch}@#{no}"
+  end
+  def stashCommitRename(renameOld, renameNew)
+    # NOTE : 利用頻度低いので未tuning
+
+    # 名前被りチェック
+    preCmd = "#{stashCommitListAllString} | sed -E 's/^#{PREFIX}\\/(.+)@.+$/\\1/g' | sort | uniq"
+
+    # renameOldの存在チェック
+    if `#{preCmd} | grep -w \"#{renameOld}\" | wc -l | tr -d '\n'` == '0'
+      puts "'#{renameOld}' name is not found"
+      return false
+    end
+
+    beforeCount = `#{preCmd} | wc -l | tr -d '\n'`
+    afterCount = `#{preCmd} | sed 's/#{renameOld}/#{renameNew}/' | sort | uniq | wc -l | tr -d '\n'`
+
+    # 数が減っている(= 名前が被ってる)
+    if beforeCount != afterCount
+      puts 'name is overlap'
+      return false
+    end
+
+    # ここまでくれば安心
+    # rename処理
+    execRet <<-EOS
+#{stashCommitListAllString} | \
+  grep -E "^.+#{renameOld}@.+$" | \
+  awk '{old=$0; new=$0; sub("#{renameOld}", "#{renameNew}", new); print old; print new;}' | \
+  xargs -L 2 git branch -m
+EOS
+  end
+  private
+    def stashCommitListAllString
+      "git branch | sed -E 's/^\\*/ /' | awk '{print $1}' | grep -E '^#{PREFIX}/'"
+    end
+  public
+  # ----------------
+
+  # trackedファイルの変更数
+  def changesCount
+    count = 0
+    `git status --untracked-files=no --short`.each_line {count += 1}
+    "#{count}"
+  end
+  # rebase中?
+	# http://stackoverflow.com/questions/3921409/how-to-know-if-there-is-a-git-rebase-in-progress
+	# rebase-apply : rebase
+	# rebase-merge : rebase -i
+  def rebaseInProgress?
+		git_dir = gitdir
+    execRetQuiet "test -d \"#{git_dir}/rebase-merge\" -o -d \"#{git_dir}/rebase-apply\""
+  end
+  # 引数のブランチは親子?
+  def parentChildBranch?(a, b='HEAD')
+    hashs = `git rev-parse \"#{a}\" \"#{b}\" \"#{a}~\" \"#{b}~\"`.split
+
+    hash_a_parent = hashs[0] || ''
+    hash_b_parent = hashs[1] || ''
+    hash_a_child  = hashs[2] || ''
+    hash_b_child  = hashs[3] || ''
+
+		if hash_a_parent == ''
+      puts 'illegal branch'
+      return false
+    end
+    if hash_b_parent == ''
+      puts 'illegal branch'
+      return false
+    end
+
+    hash_a_parent == hash_b_child or hash_b_parent == hash_a_child
+  end
+  # 引数のブランチは同じ?
+  def sameBranch?(a, b='HEAD')
+    hashs = `git rev-parse \"#{a}\" \"#{b}\"`.split
+
+    hash_a = hashs[0] || ''
+    hash_b = hashs[1] || ''
+
+		if hash_a == ''
+      puts 'illegal branch'
+      return false
+    end
+    if hash_b == ''
+      puts 'illegal branch'
+      return false
+    end
+
+    hash_a == hash_b
+  end
+  # 2つのブランチの交差点をcommit hashで返す
+  def mergeBaseHash(a, b)
+    `git show-branch --merge-base \"#{a}\" \"#{b}\"`.chomp[0...7] # [0...7]: --short
+  end
+
+  # ----------
+
+  # rebase専用コマンド
+  def execForRebase(name, rebaseCmd)
+    o, e, s = Open3::capture3 rebaseCmd
+    puts o if o != ''
+    if !s.success?
+      # NOTE : コンフリクト時、
+      #        標準出力にコンフリクトメッセージ
+      #        標準エラー出力に--continue | --skip | --abortについて
+      if o.match('CONFLICT') and o.match('Merge conflict')
+        STDERR.puts <<-EOS
+error: could not apply #{revision name}...
+
+problem resolved, run "git stash-commit --continue".
+skip this patch, run "git stash-commit --skip".
+cancel this time, run "git stash-commit --abort".
+EOS
+      else
+        STDERR.puts e
+      end
+      raise "failed, cmd:#{rebaseCmd}"
+    end
+  end
+
+  # ----------
+
+  def tuneLimit
+    # 一番軽いと思われる外部コマンド
+    `echo tuneLimit`
+  end
+end

data/lib/git/stash/sclib/define.rb

@@ -0,0 +1,7 @@
+# 定数
+
+PREFIX = 'stash-commit'
+TMP_SUFFIX = 'progresstmp'
+PATCH_REMAIN_SUFFIX = 'patch-remain'
+BACKUP_SUFFIX = 'backup'
+

metadata

@@ -0,0 +1,91 @@
+--- !ruby/object:Gem::Specification
+name: git-stash-commit
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- wordi
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2016-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: when have the change files, commit to 'stash-commit' branch, and restore
+  it. this command is instead of the 'git stash'
+email:
+- wordijp@gmail.com
+executables:
+- git-stash-commit
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- CODE_OF_CONDUCT.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/console
+- bin/git-stash-commit
+- bin/rake
+- bin/setup
+- exe/git-stash-commit
+- git-stash-commit.gemspec
+- lib/git/stash/commit.rb
+- lib/git/stash/commit/version.rb
+- lib/git/stash/sclib/branch.rb
+- lib/git/stash/sclib/command.rb
+- lib/git/stash/sclib/define.rb
+homepage: https://github.com/wordijp/git-stash-commit
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
+specification_version: 4
+summary: git sub command, stash change files as commit of branch
+test_files: []