git-maintain 0.2.2.pre.5.g8e0f945 → 0.2.2.pre.13.gd8c159e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f57ed0d8c6ebb69d17e821f8ff90b327e7845c1fa436c505a7932e346eca0aa
-  data.tar.gz: 5402564d86247ed0bc0c186a934accc69b3df0b6278131b61f025d4afc2c86a1
+  metadata.gz: 7378594cddd98d880305ebeaffb40ab8e035d858902475e3338b3496023ce5e6
+  data.tar.gz: ee2afb10e4deb3288f7051d892e225bb9a70d96a232712945d48b799b209110c
 SHA512:
-  metadata.gz: 4037fb9fadef07fff3ab3a66f14b805300565899c1c77f5d1dafb8b9848bd5df64223d6913bb017c24b4f0de139e5105681b41b44982a504765e6729268bf13e
-  data.tar.gz: 8226b4cfe8eb7f2b6885327eb34b4cb516ea495b905aa2b7609c80e67560b16ac7b88b2e67b7ddaa2458a4b50e14fb5779d2fe630eadff4586d545e8f65f6431
+  metadata.gz: b917954dc36f6e9996c6b54753642e9cc6fbf62622b2998f4cb8e521d3e5c7f59abc6b9226846fd13b5bf024a55272ce4a9eb135b1b54a8cf106f5cf84491fae
+  data.tar.gz: a15089ca11769891cc645415af31f7ac0e41dbd13e8d908bbf7fc3d39a83b012a8f07e28a0afadb2552f105665bbf23f66feabc14007d145c2415a92e63f7876

data/CHANGELOG

@@ -1,11 +1,11 @@
-------------------
-0.2.3
-------------------
-
 * 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/lib/branch.rb

@@ -51,7 +51,8 @@ module GitMaintain
                 |val| opts[:base_ver] = val}
             optsParser.on("-V", "--version [regexp]", Regexp, "Regexp to filter versions.") {
                 |val| opts[:version] = val}
-
+            optsParser.on("-B", "--manual-branch <branch name>", "Work on a specific (non-stable) branch.") {
+                |val| opts[:manual_branch] = val}
             case action
             when :cp
                 optsParser.banner += "-c <sha1> [-c <sha1> ...]"
@@ -89,17 +90,24 @@ 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 "###############################"
@@ -115,21 +123,27 @@ 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}"
+            else
+                @remote_branch = @local_branch = version
+            end
 
-            @remote_branch ="stable-v#{@version}"
+            @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
 
         def is_targetted?(opts)
+            return true if @version !~ /^[0-9]$/
             if @version.to_i < opts[:base_ver] then
                 return :too_old
             end
@@ -216,7 +230,7 @@ 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

data/lib/repo.rb

@@ -110,7 +110,7 @@ module GitMaintain
             return @suffix_list
         end
 
-        def submitReleases()
+        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,39 +124,41 @@ 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
@@ -164,7 +166,7 @@ module GitMaintain
         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 +178,7 @@ module GitMaintain
             puts getSuffixList()
         end
         def submit_release(opts)
-            submitReleases()
+            submitReleases(opts)
         end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre.5.g8e0f945
+  version: 0.2.2.pre.13.gd8c159e
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin