git-maintain 0.5.0.pre.2.g67ac144 → 0.5.0.pre.6.g620b2a1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37459a0823f1386afbc6d3f756f8e92760bd096aa6e0ad7608820df4ecfb6d64
-  data.tar.gz: abdb7db87ba388e5b46a55f3271ad51626a66ea030c5acf072dd259590dfb196
+  metadata.gz: ca89d2ef60ac7697cb91186612f7cba958845e4a2df3c14893618970948bae34
+  data.tar.gz: c0cad6eeedad0b4865dd60d67a1d79d459bb770bea08a3d3901621d323762fbf
 SHA512:
-  metadata.gz: be6186cebcd42e1c6c2d05c2065845c6a1cd348094a85051300f711123162555b51c36a7dfa96e35b38bfd0e9a40a3d0d5ffcd1a65bce88bbf243c23400cb619
-  data.tar.gz: bbabbba9ec3b17ccc46cc73f73ebe7cd65f77ad167f9a9f1ee48c15289e60c6d7d92b42aff99046600b68940c2784dc5ce78883987ddf4917993d0d6fb030f73
+  metadata.gz: 676b512dd985dda34b26ded1ba46ccba2fde0c4162660437375dd5675ab586705db964fb9a78da7880e3604e83b5dd3e4c9cd2e26506de24efc10d90ce4575ce
+  data.tar.gz: b57d536d54ed3193ea2acaf3689d0c98d253b991259477a6f909437dc5ea00f62d5299a81bb4be2c2edf489ee5dc5740a3376f3a6dd3dc5f6628fa714c08baf9

data/CHANGELOG

@@ -1,5 +1,7 @@
 * Speed up push_stable
 * Add --check option for push_stable
+* Add --no-fetch option
+* Cleanup release email
 
 ------------------
 0.5.0  (2019-02-05)

data/lib/branch.rb

@@ -46,6 +46,9 @@ module GitMaintain
             opts[:do_merge] = false
             opts[:push_force] = false
             opts[:no_travis] = false
+            opts[:all] = false
+            opts[:check_only] = false
+            opts[:no_fetch] = false
 
             optsParser.on("-v", "--base-version [MIN_VER]", Integer, "Older release to consider.") {
                 |val| opts[:base_ver] = val}
@@ -56,6 +59,12 @@ module GitMaintain
                 optsParser.on("-B", "--manual-branch <branch name>", "Work on a specific (non-stable) branch.") {
                     |val| opts[:manual_branch] = val}
             end
+
+            if NO_FETCH_ACTIONS.index(action) == nil
+                optsParser.on("--no-fetch", "Skip fetch of stable repo.") {
+                    |val| opts[:no_fetch] = true}
+            end
+
             case action
             when :cp
                 optsParser.banner += "-c <sha1> [-c <sha1> ...]"
@@ -96,7 +105,7 @@ module GitMaintain
             repo   = Repo::load()
             travis = TravisChecker::load(repo)
 
-            if NO_FETCH_ACTIONS.index(action) == nil  then
+            if NO_FETCH_ACTIONS.index(action) == nil && opts[:no_fetch] == false then
                 repo.stableUpdate()
             end
 
@@ -118,11 +127,11 @@ module GitMaintain
                 branchList = [ Branch::load(repo, opts[:manual_branch], travis, opts[:br_suff]) ]
             end
             branchList.each(){|branch|
-                puts "###############################"
-                puts "# Working on #{branch.verbose_name}"
-                puts "###############################"
-
                 if NO_CHECKOUT_ACTIONS.index(action) == nil  then
+                    puts "###############################"
+                    puts "# Working on #{branch.verbose_name}"
+                    puts "###############################"
+
                     branch.checkout()
                 end
                 branch.send(action, opts)

data/lib/repo.rb

@@ -143,11 +143,27 @@ module GitMaintain
                           " <" + 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"
+
+                if new_tags.length > 4 then
+                    mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + ": new stable releases"
+                    mail.puts ""
+                    mail.puts "These version were tagged/released:\n * " +
+                              new_tags.join("\n * ")
+                    mail.puts ""
+                else
+                    mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + " " +
+                              (new_tags.length > 1 ?
+                                   (new_tags[0 .. -2].join(", ") + " and " + new_tags[-1] + " have ") :
+                                   (new_tags.join(" ") + " has ")) +
+                              " been tagged/released"
+                    mail.puts ""
+                end
+                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.puts ""
+                mail.puts "---"
                 mail.puts ""
                 mail.puts "Here's the information from the tags:"
                 new_tags.sort().each(){|tag|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.2.g67ac144
+  version: 0.5.0.pre.6.g620b2a1
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release