motomike-bnr_tools 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 3
+:patch: 4
 :major: 0

data/lib/bnr_tools/mergeinator.rb

@@ -38,7 +38,7 @@ class Mergeinator
       candidateVersions = preExistingVersions.find_all { |version| version.major == self.releaseBranchVersion.major && version.minor == self.releaseBranchVersion.minor }
       highestCandidateVersion = candidateVersions.sort.last
       puts "Highest existing version: #{highestCandidateVersion}"
-      ask("LOL{z,cat} version to tag?") { |q| 
+      ask("LOL{z,cat} version to tag? ") { |q| 
         q.default = highestCandidateVersion.next_after_patchlevel_increment.to_s
         q.validate = /#{self.releaseBranchVersion.major}\.#{self.releaseBranchVersion.minor}\.\d+/ 
       }
@@ -47,11 +47,11 @@ class Mergeinator
   
   def tagLOLCat
     ref_msg = self.ticketsToMerge ? "Refs #{(self.ticketsToMerge.map {|t| "#{t}"}).join(", ")}" : "No tickets referenced"
-    if agree("References: #{ref_msg}\nOkay to tag branch #{self.releaseBranch} as version #{self.version}?")
+    if agree("Tagging version #{self.version}. #{ref_msg}\nOkay to proceed? (NB: This will commit to SVN) ")
       SvnCommands.copy("LOLcat/branches/#{self.releaseBranch}","LOLcat/tags/#{version}", nil, nil, "Tagged LOLcat-#{version}. #{ref_msg}")
       SvnCommands.copy("LOLz/branches/#{self.releaseBranch}","LOLz/tags/#{version}", nil, nil, "Tagged LOLz-#{version}. #{ref_msg}")
     else
-      exit(1) unless agree("Oh. Well, would you like to keep going anyway, even though we can't commit anything?")
+      exit(1) unless agree("Oh. Well, would you like to keep going anyway? ")
     end
     SvnCommands::Update.new("LOLcat/tags/#{version}",nil,true,true,self.wcPath) # shallowly checkout the new tag to ~/diggRepository/, no extra args for svn, force update
     t = Tempfile.new("svn_externals").open { |tempfile|
@@ -63,10 +63,6 @@ class Mergeinator
     puts IO.popen(cmd).readlines
   end
 
-  def svnMergeCommand(project, changeset)
-    "svn merge -c #{changeset.revision} svn+ssh://svn.digg.internal/repository/#{project}/trunk"
-  end
-
   def mergeStuff
     modules = Set.new
     allChangesets = Set.new
@@ -75,9 +71,7 @@ class Mergeinator
       allChangesets.merge(ticket.changesets)
       modules.merge(ticket.affectedModules)
     }
-    puts "Affected modules: #{modules.to_a.join(", ")}."
-    commitMessage = "Refs #{(ticketsToMerge.sort.map {|ticket| ticket.to_s(false)}).join(", ")} : Merged #{(allChangesets.sort.map {|c| c.to_s }).join(", ")} from trunk"
-    puts "Commit message = #{commitMessage}"
+    #puts "Affected modules: #{modules.to_a.join(", ")}."
     allChangesets.sort.each { |changeset|
       # We could check paths and such, but that's just an extra step for the cat ...
       SvnCommands.merge("LOLcat/trunk",self.catPath,changeset.revision,nil,nil,self.wcPath)
@@ -99,25 +93,28 @@ class Mergeinator
     Dir.chdir(self.branchWorkingDir) { |cwd|
       puts IO.popen(%Q{ svn st && svn diff . modules }).readlines
       @module_upload_cmds.each { |cmd| puts cmd }
-      puts "Before I commit - does everything look okay?"
-      if agree("Commit message: #{commitMessage}")
+      commitMessage = "Refs #{(ticketsToMerge.sort.map {|ticket| ticket.to_s(true)}).join(", ")}"
+      unless modules.empty?
+        commitMessage += ", updated modules : #{(modules.map {|m| "#{m.moduleName}-#{m.getVersion}"}).join(", ")}"
+      end
+      if agree("Commit message: #{commitMessage}\nOkay to proceed? (NB: This will commit to SVN) ")
         system %Q{ svn st | awk '/^\s?[MAD]/ { print $NF } ' | xargs svn commit -m'#{commitMessage}' }
       else
-        exit(1) unless agree("Oh. Well, would you like to keep going anyway, even though we can't commit anything?")
+        exit(1) unless agree("Oh. Well, would you like to keep going anyway? ")
       end
     }
     tagLOLCat
-    if agree("Upload modified modules now?")
+    if agree("Upload modified modules now? ")
       @module_upload_cmds.each { |cmd|
         puts IO.popen(cmd).readlines
       }
     else
-      exit(1) unless agree("Oh. Well, would you like to keep going anyway, even though we can't commit anything?")
+      exit(1) unless agree("Oh. Well, would you like to keep going anyway? ")
     end
   end
   
   def cleanWorkingCopy(force=false)
-    if (force || agree("Clean working copy now?")) then
+    if (force || agree("Clean working copy now? ")) then
       SvnCommands::Update.new(self.catPath, nil, true, false, self.wcPath) # update the current working copy to be sure the dir is there
       Dir.chdir(branchWorkingDir) {
         puts IO.popen(%Q{ svn revert -R . && svn revert -R modules && svn stat | grep "^\?" | cut -c8- | xargs rm -rf }).readlines

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: motomike-bnr_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Ashmore