git-maintain 0.2.2 → 0.3.0.pre.1.g1a642bd

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde61f3ac980a295c32bbb076a99176d6d93cd82972d7ce8da69954958bfc056
-  data.tar.gz: 266b8df2a5de8795850c70a9b89dbac008d613ac688ee4e3cfd41c4a90895d01
+  metadata.gz: 3736d70d8ba754254761b261f65238c26320df32f499c971e62d5f7acd842a08
+  data.tar.gz: 207d7dee75515e33f0d037e07ddc201c79e5569c1b89ae9eae71ab0cb7a462f6
 SHA512:
-  metadata.gz: f62502f4308c146bbb87411e3fdb9c397b38f23b5c8e206e836b971e518d0670173af4682d17f4fd96bdac2aa02875c63fb9cf8ae093782bc114712d6cc2f764
-  data.tar.gz: 63e7f063e94f6586dbb5d2c1d747ba16851b58a17c7c095e132e520c8a56b439ac9a857731a0e6d3c22c8c0fe8db472f830fa3ea09df9cb569a07e293c5a6bf3
+  metadata.gz: 1a7470336d22ffa4d07fe1c7f11a2b4ff106a9998ace56651357ac668f8c1c7d841f35bf4677a22362b3c70e2b445f387a76329a40cf191a6c383bb329160e9a
+  data.tar.gz: ed6431e72b31d0a6853e8044db92d7380d59d1c088f83ec93eb622eab579c6092a46003c088559d45a2b0754bbd8e0522fca5e6f8525a478488168eb4815adf0

data/CHANGELOG

@@ -1,7 +1,18 @@
+* Fix gemspec generation date
+
 ------------------
-0.2.3
+0.3.0  (2018-10-09)
 ------------------
 
+* Fix support for commit messages containing double quotes
+* Fix --base-version and --branch-suffix
+* Add completion support for --version
+* Fix --no-travis
+* Customizable behaviour for travis/emails in Addons
+* Allow branch action to be run on user-specified branches (instead of the stable pattern)
+* Add hpc-testing addon
+* Add git-maintain addon
+
 ------------------
 0.2.2  (2018-07-13)
 ------------------

data/README.md

@@ -27,9 +27,11 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 - Load git-maintain-completion.sh for shell completion
 
 ## Remote setup
-- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo
+- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo.
+  Also know as the 'Validation' repo. It can be switched to another remote by setting maintain.valid-repo=xxx in your gitconfig
 - the 'origin' remote should be the official repo in read-only mode to avoid any accidental pushes
 - the 'stable' remote should be the official repo in RW mode
+  Also know as the 'Stable' repo. It can be switched to another remote by setting maintain.stable-repo=xxx in your gitconfig
 
 ## Stealing commits
 

data/git-maintain-completion.sh

@@ -22,6 +22,10 @@ _complete_git_maintain_branch(){
 			BRANCHES=
 			__gitcomp_nl "$(git maintain list_branches)"
 			;;
+		-V|--version)
+			# Extra arg expected but not completable
+			__gitcomp_nl ""
+			;;
 	esac
 }
 
@@ -88,6 +92,9 @@ _git_maintain(){
 			 case "$prev" in
 				 *)
 					__gitcomp_nl "$OPT_LIST"
+					# Override default completion with specific branch completion (if it matches)
+					_complete_git_maintain_branch
+
 			 esac
 		 fi
 	fi

data/lib/branch.rb

@@ -52,6 +52,10 @@ module GitMaintain
             optsParser.on("-V", "--version [regexp]", Regexp, "Regexp to filter versions.") {
                 |val| opts[:version] = val}
 
+            if action != :merge
+                optsParser.on("-B", "--manual-branch <branch name>", "Work on a specific (non-stable) branch.") {
+                    |val| opts[:manual_branch] = val}
+            end
             case action
             when :cp
                 optsParser.banner += "-c <sha1> [-c <sha1> ...]"
@@ -68,7 +72,7 @@ module GitMaintain
             when :push_stable
                 optsParser.banner += "[-T]"
                 optsParser.on("-T", "--no-travis", "Ignore Travis build status and push anyway.") {
-                    |val| opts[:no_travis] = val}
+                    |val| opts[:no_travis] = true}
             end
         end
 
@@ -89,19 +93,26 @@ module GitMaintain
                 repo.stableUpdate()
             end
 
-            repo.getStableList(opts[:br_suff]).each(){|br|
-                branch = Branch::load(repo, br, travis, opts[:br_suff])
-                case branch.is_targetted?(opts)
-                when :too_old
-                    puts "# Skipping older v#{branch.version}"
-                    next
-                when :no_match
-                    puts "# Skipping v#{branch.version} not matching #{opts[:version].to_s()}"
-                    next
-                end
-
+            branchList=[]
+            if opts[:manual_branch] == nil then
+                branchList = repo.getStableList(opts[:br_suff]).map(){|br|
+                    branch = Branch::load(repo, br, travis, opts[:br_suff])
+                    case branch.is_targetted?(opts)
+                    when :too_old
+                        puts "# Skipping older v#{branch.version}"
+                        next
+                    when :no_match
+                        puts "# Skipping v#{branch.version} not matching #{opts[:version].to_s()}"
+                        next
+                    end
+                    branch
+                }.compact()
+            else
+                branchList = [ Branch::load(repo, opts[:manual_branch], travis, opts[:br_suff]) ]
+            end
+            branchList.each(){|branch|
                 puts "###############################"
-                puts "# Working on v#{branch.version}"
+                puts "# Working on #{branch.verbose_name}"
                 puts "###############################"
 
                 if NO_CHECKOUT_ACTIONS.index(action) == nil  then
@@ -115,21 +126,31 @@ module GitMaintain
             GitMaintain::checkDirectConstructor(self.class)
 
             @repo          = repo
-            @version       = version
             @travis        = travis
+            @version       = version
             @branch_suff   = branch_suff
 
-            @local_branch  = "dev/stable-v#{@version}/#{@branch_suff}"
-            @head          = @repo.runGit("rev-parse #{@local_branch}")
+            if version =~ /^[0-9]+$/
+                @local_branch  = "dev/stable-v#{@version}/#{@branch_suff}"
+                @remote_branch ="stable-v#{@version}"
+                @branch_type = :std
+                @verbose_name = "v"+version
+            else
+                @remote_branch = @local_branch = version
+                @branch_type = :user_specified
+                @verbose_name = version
+            end
 
-            @remote_branch ="stable-v#{@version}"
-            @remote_ref    = "#{Repo::STABLE_REPO}/#{@remote_branch}"
+            @head          = @repo.runGit("rev-parse #{@local_branch}")
+            @remote_ref    = "#{@repo.stable_repo}/#{@remote_branch}"
             @stable_head   = @repo.runGit("rev-parse #{@remote_ref}")
             @stable_base   = @repo.findStableBase(@local_branch)
+
         end
-        attr_reader :version, :local_branch, :head, :remote_branch, :remote_ref, :stable_head
+        attr_reader :version, :local_branch, :head, :remote_branch, :remote_ref, :stable_head, :verbose_name
 
         def is_targetted?(opts)
+            return true if @branch_type == :user_specified
             if @version.to_i < opts[:base_ver] then
                 return :too_old
             end
@@ -188,7 +209,7 @@ module GitMaintain
 
         # Push the branch to the validation repo
         def push(opts)
-           @repo.runGit("push #{opts[:push_force] == true ? "-f" : ""} #{Repo::VALID_REPO} #{@local_branch}")
+           @repo.runGit("push #{opts[:push_force] == true ? "-f" : ""} #{@repo.valid_repo} #{@local_branch}")
         end
 
         # Monitor the build status on Travis
@@ -216,14 +237,14 @@ module GitMaintain
 
         # Push branch to the stable repo
         def push_stable(opts)
-            if opts[:no_travis] != true &&
+            if (opts[:no_travis] != true && @NO_TRAVIS != true) &&
                @travis.checkValidState(@head) != true then
                 puts "Build is not passed on travis. Skipping push to stable"
                 return
             end
             rep = GitMaintain::checkLog(opts, @local_branch, @remote_ref, "submit")
             if rep == "y" then
-                @repo.runGit("push #{Repo::STABLE_REPO} #{@local_branch}:#{@remote_branch}")
+                @repo.runGit("push #{@repo.stable_repo} #{@local_branch}:#{@remote_branch}")
             else
                 puts "Skipping push to stable"
                 return
@@ -404,6 +425,7 @@ module GitMaintain
 
         def steal_one(opts, commit)
 		    subj=@repo.runGit("log -1 --format=\"%s\" #{commit}")
+            subj.gsub!(/"/, '\"')
 		    msg=''
 
 		    # Let's grab the mainline commit id, this is useful if the version tag

data/lib/repo.rb

@@ -1,8 +1,8 @@
 module GitMaintain
     class Repo
-        VALID_REPO = "github"
-        STABLE_REPO = "stable"
-        SUBMIT_BINARY="git-release"
+        @@VALID_REPO = "github"
+        @@STABLE_REPO = "stable"
+        @@SUBMIT_BINARY="git-release"
 
         ACTION_LIST = [
             :list_branches,
@@ -47,10 +47,16 @@ module GitMaintain
             if path == nil
                 @path = Dir.pwd()
             end
-            @remote_valid=runGit("remote -v | egrep '^#{VALID_REPO}' | grep fetch |
-                                awk '{ print $2}' | sed -e 's/.*://' -e 's/\.git//'")
-            @remote_stable=runGit("remote -v | egrep '^#{STABLE_REPO}' | grep fetch |
-                                      awk '{ print $2}' | sed -e 's/.*://' -e 's/\.git//'")
+
+            @valid_repo = runGit("config maintain.valid-repo 2> /dev/null").chomp()
+            @valid_repo = @@VALID_REPO if @valid_repo == ""
+            @stable_repo = runGit("config maintain.stable-repo 2>/dev/null").chomp()
+            @stable_repo = @@STABLE_REPO if @stable_repo == ""
+
+            @remote_valid=runGit("remote -v | egrep '^#{@valid_repo}' | grep fetch |
+                                awk '{ print $2}' | sed -e 's/.*://' -e 's/\\.git//'")
+            @remote_stable=runGit("remote -v | egrep '^#{@stable_repo}' | grep fetch |
+                                      awk '{ print $2}' | sed -e 's/.*://' -e 's/\\.git//'")
             @stable_base_patterns=
                 runGit("config --get-regexp   stable-base | egrep '^stable-base\.' | "+
                        "sed -e 's/stable-base\.//' -e 's/---/\\//g'").split("\n").inject({}){ |m, x|
@@ -59,7 +65,7 @@ module GitMaintain
                 m
                 }
         end
-        attr_reader :path, :remote_valid, :remote_stable
+        attr_reader :path, :remote_valid, :remote_stable, :valid_repo, :stable_repo
 
         def run(cmd)
             return `cd #{@path} && #{cmd}`
@@ -86,7 +92,7 @@ module GitMaintain
 
         def stableUpdate()
             puts "# Fetching stable updates..."
-            runGit("fetch #{STABLE_REPO}")
+            runGit("fetch #{@stable_repo}")
         end
         def getStableList(br_suff)
             return @stable_list if @stable_list != nil
@@ -110,8 +116,8 @@ module GitMaintain
             return @suffix_list
         end
 
-        def submitReleases()
-            remote_tags=runGit("ls-remote --tags #{STABLE_REPO} |
+        def submitReleases(opts)
+            remote_tags=runGit("ls-remote --tags #{@stable_repo} |
                                  egrep 'refs/tags/v[0-9.]*$'").split("\n").map(){
                 |x| x.gsub(/.*refs\/tags\//, '')
             }
@@ -124,47 +130,49 @@ module GitMaintain
             end
 
             puts "This will officially release these tags: #{new_tags.join(", ")}"
-            rep = GitMaintain::confirm("release them")
+            rep = GitMaintain::confirm(opts, "release them")
             if rep != 'y' then
                 raise "Aborting.."
             end
 
-            mail_path=`mktemp`.chomp()
-            mail = File.open(mail_path, "w+")
-            mail.puts "From " + runGit("rev-parse HEAD") + " " + `date`.chomp()
-            mail.puts "From: " + runGit("config user.name") +
-                      " <" + runGit("config user.email") +">"
-            mail.puts "To: " + runGit("config patch.target")
-            mail.puts "Date: " + `date -R`.chomp()
-            mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + " " +
-                      (new_tags.length > 1 ?
-                           (new_tags[0 .. -2].join(", ") + " and " + new_tags[-1]) :
-                           new_tags.join(" ")) +
-                      " has been tagged/released"
-            mail.puts ""
-            mail.puts "Here's the information from the tags:"
-            new_tags.sort().each(){|tag|
-                mail.puts `git show #{tag} --no-decorate -q | awk '!p;/^-----END PGP SIGNATURE-----/{p=1}'`
+            if @NOTIFY_RELEASE != false
+                mail_path=`mktemp`.chomp()
+                mail = File.open(mail_path, "w+")
+                mail.puts "From " + runGit("rev-parse HEAD") + " " + `date`.chomp()
+                mail.puts "From: " + runGit("config user.name") +
+                          " <" + runGit("config user.email") +">"
+                mail.puts "To: " + runGit("config patch.target")
+                mail.puts "Date: " + `date -R`.chomp()
+                mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + " " +
+                          (new_tags.length > 1 ?
+                               (new_tags[0 .. -2].join(", ") + " and " + new_tags[-1]) :
+                               new_tags.join(" ")) +
+                          " has been tagged/released"
                 mail.puts ""
-            }
-            mail.puts "It's available at the normal places:"
-            mail.puts ""
-            mail.puts "git://github.com/#{@remote_stable}"
-            mail.puts "https://github.com/#{@remote_stable}/releases"
-            mail.close()
+                mail.puts "Here's the information from the tags:"
+                new_tags.sort().each(){|tag|
+                    mail.puts `git show #{tag} --no-decorate -q | awk '!p;/^-----END PGP SIGNATURE-----/{p=1}'`
+                    mail.puts ""
+                }
+                mail.puts "It's available at the normal places:"
+                mail.puts ""
+                mail.puts "git://github.com/#{@remote_stable}"
+                mail.puts "https://github.com/#{@remote_stable}/releases"
+                mail.close()
 
-            puts runGitImap("< #{mail_path}; rm -f #{mail_path}")
+                puts runGitImap("< #{mail_path}; rm -f #{mail_path}")
+            end
 
             puts "Last chance to cancel before submitting"
-            rep= GitMaintain::confirm("submit these releases")
+            rep= GitMaintain::confirm(opts, "submit these releases")
             if rep != 'y' then
                 raise "Aborting.."
             end
-            puts `#{SUBMIT_BINARY}`
+            puts `#{@@SUBMIT_BINARY}`
         end
         def findStableBase(branch)
             @stable_base_patterns.each(){|pattern, base|
-                return base if branch =~ /#{pattern}\//
+                return base if branch =~ /#{pattern}\// || branch =~ /#{pattern}$/
             }
             raise("Could not a find a stable base for branch #{branch}")
         end
@@ -176,7 +184,7 @@ module GitMaintain
             puts getSuffixList()
         end
         def submit_release(opts)
-            submitReleases()
+            submitReleases(opts)
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.pre.1.g1a642bd
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release
@@ -58,9 +58,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7