motomike-bnr_tools 0.0.6 → 0.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 0

data/bin/taggit

@@ -22,13 +22,17 @@ end
 
 tickets = Set.new
 Array(opts[:release_branch]).each { |release_branch|
-  opts[:ticket].each { |ticketRefAndChangesets|
-    ticket, *changesets = *ticketRefAndChangesets
-    tickets << Ticket.new(ticket, changesets, opts[:wc_root_path], release_branch)
-  }
-  opts[:deticket].each { |ticketRefAndChangesets|
-    ticket, *changesets = *ticketRefAndChangesets
-    tickets << Ticket.new(ticket, changesets.map { |cs| -cs } , opts[:wc_root_path], release_branch)
-  }
+  if (opts[:ticket_given])
+    opts[:ticket].each { |ticketRefAndChangesets|
+      ticket, *changesets = *ticketRefAndChangesets
+      tickets << Ticket.new(ticket, changesets, opts[:wc_root_path], release_branch)
+    }
+  end
+  if (opts[:deticket_given])
+    opts[:deticket].each { |ticketRefAndChangesets|
+      ticket, *changesets = *ticketRefAndChangesets
+      tickets << Ticket.new(ticket, changesets.map { |cs| -cs } , opts[:wc_root_path], release_branch)
+    }
+  end
   Mergeinator.new(opts[:wc_root_path], release_branch, tickets).mergeStuff
 }

data/lib/bnr_tools/mergeinator.rb

@@ -55,10 +55,10 @@ class Mergeinator
         tempfile.puts "modules svn+ssh://svn.digg.internal/repository/LOLz/tags/#{version}"
         tempfile.puts "build svn+ssh://svn.digg.internal/repository/build/trunk"
       }
-      cmd = "svn ps svn:externals --file #{t.path} #{SvnCommands::DIGG_DEFAULT_WC_PATH}/LOLcat/tags/#{version}"
+      cmd = "svn ps svn:externals --file #{t.path} #{self.wcPath}/LOLcat/tags/#{version}"
       puts "Running command : #{cmd}"
       puts IO.popen(cmd).readlines
-      cmd = %Q{svn commit -m"Tagged LOLcat-#{version}. #{ref_msg}. Updated external links."}
+      cmd = %Q{svn commit #{self.wcPath}/LOLcat/tags/#{version} -m"Tagged LOLcat-#{version}. #{ref_msg}. Updated external links."}
       puts "Running command : #{cmd}"
       puts IO.popen(cmd).readlines
     else

metadata

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