cgit 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f45fced1af51c1e42f4e3be4c21a7aab54dce3d3
-  data.tar.gz: e6fb4135b534cd47f290d353f4a9ef834e4dbb02
+SHA256:
+  metadata.gz: 1a754fd3e2c9bf61c8ec212036cc1c16d6989721a0db71a2576a94b87c50df52
+  data.tar.gz: a4b37f093920bb1fb3fd6e0ad2c3c82dcb6e8ddb723b1e49f5db898ed90442c4
 SHA512:
-  metadata.gz: d4abb3b3659b2ce7e5c8fb24654d6c7c3aa3ed63752cc927d8a507d6b406554ceb3cf0404e96b2b1167920e71eff94cbaf5b74e7c3c3f0e7ed26aee8dc40586c
-  data.tar.gz: ecae2e9cbf10960aeaab346eb5ccdd5d559d01cce6d2427840cb9fd9c0371f8a8c47d8b1ec24649d43aa7141b4f7289816038974330a7229803acf2ab50a9137
+  metadata.gz: 27f80ac94ed36775a82d2753213fa0d374bf0af780f82d7808d23a7bad523a5af45b3d7db4dd4575f79bf0af7f3e821e995ececc08d19799539adf6a9324a1c0
+  data.tar.gz: c240dc862bb748143256487b72e33ad339c742252cc4fc3cad15d126c3cb7631502023e622ef17c9f7d42d044e3711d92fa98bc70036108f3c821dbd2368a4cf

data/bin/cgit

@@ -3,7 +3,7 @@
 require 'Thor'
 
 class CGit < Thor
-	desc "put MESSAGE", "Adds and commits with a MESSAGE."
+	desc "put [MESSAGE]", "Adds and commits with a MESSAGE."
 	method_option :remote, :aliases => "-r", :desc => "Applies this remotely to the current branch."
 	def put(message)
 		system ("git add --a .")
@@ -20,7 +20,7 @@ class CGit < Thor
 		system ("git reset --soft HEAD^")
 	end
 
-	desc "retip COMMIT", "Moves the TIP of the current branch"
+	desc "retip [COMMIT]", "Moves the TIP of the current branch"
 	method_option :remote, :aliases => "-r", :desc => "Applies this remotely to the current branch."
 	def retip(commit)
 		system ("git reset --hard #{commit}")
@@ -37,13 +37,13 @@ class CGit < Thor
 			git log --pretty=format:\"%h %s\" --graph")
 	end
 
-	desc "valid", "Displays unpushed commits to remote in all branches."
+	desc "unpushed", "Displays unpushed commits to remote in all branches."
 	def valid
 		puts ("Non pushed commits:")
 		system ("git log --branches --not --remotes --decorate --oneline")
 	end
 
-	desc "merge DESTINATION_BRANCH SOURCE_BRANCH", "Pulls latest remote changes on both branches and then merges the SOURCE_BRANCH into the DESTINATION_BRANCH."
+	desc "merge [DESTINATION_BRANCH] [SOURCE_BRANCH]", "Pulls latest remote changes on both branches and then merges the SOURCE_BRANCH into the DESTINATION_BRANCH."
 	method_option :remote, :aliases => "-r", :desc => "Pushes the merge remotely to the current branch. Be aware that this will not work if there are conflicts."
 	def merge(destination_branch, source_branch)
 		system ("git checkout #{source_branch}")
@@ -62,6 +62,68 @@ class CGit < Thor
 		end
 	end
 
+	desc "squash [BASE_BRANCH]", "Squashes commits in the current branch and synchronizes with the remote BASE_BRANCH. Commits to squash are selected by comparing the up-to-date remote BASE_BRANCH with the current branch HEAD. Committing the squash may fail if there is a merge conflict. It's recommended to merge with the base branch beforehand if there is a chance of merge conflicts."
+	method_option :message, :aliases => "-m", :desc => "Message to override the default squash message. Cannot be used together with title(-t) parameter."
+	method_option :title, :aliases => "-t", :desc => "Title for the default squash commit message. Will be followed by a list of messages for each commit. If not specified, the title will be the default. Cannot be used together with message(-m) parameter."
+	method_option :remote, :aliases => "-r", :desc => "Pushes the merge remotely to the current branch"
+	def squash(base_branch)
+		message = options[:message]
+		title = options[:title]
+
+		if message && title
+			puts("Please specify only message or title.")
+			exit 1
+		end
+
+		system ("git fetch")
+		system ("git branch -D cgit_squash_backup")
+		system ("git branch cgit_squash_backup")
+		system ("git reset --hard origin/#{base_branch}")
+		system ("git merge --squash cgit_squash_backup")
+
+		if message
+			system ("git commit -m \"#{message}\"")
+		else
+			git_dir = `git rev-parse --git-dir`.delete("\n")
+			file_path = "#{git_dir}/SQUASH_MSG"
+			lines = File.readlines(file_path)
+			skip_count = 0
+			File.open(file_path, 'w') do |file|
+				if title
+					file.puts(title)
+				else
+					file.puts("Squashed commits")
+				end
+				file.puts("")
+
+				# Filter and write the commit messages only
+				lines.each_with_index do |line, i|
+					if skip_count > 0
+						skip_count -= 1
+						next
+					end
+					if line.empty? || line == "\n" || i == 0
+						next
+					end
+					if i + 2 < lines.size - 1 &&
+						line.start_with?("commit") &&
+						lines[i+1].start_with?("Author:") &&
+						lines[i+2].start_with?("Date:")
+						skip_count = 2
+						next
+					end
+					file.puts("* #{line.strip}")
+				end
+			end
+			system ("git commit --no-edit")
+		end
+
+		remote = options[:remote]
+		if remote
+			system ("git push origin HEAD")
+		end
+	end
+
 end
 
 CGit.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cgit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Kevin Wong
@@ -14,14 +14,14 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 description: Some useful git command line shortcuts
@@ -42,17 +42,16 @@ 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.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Some useful git command line shortcuts