tracker-client 1.1.1 → 1.1.2

data/bin/tracker

@@ -14,7 +14,7 @@ opts = Trollop::options do
   opt :config, "Tracker config file location", :short => 'c', :default => "#{File.join(ENV['HOME'], '.trackerrc')}"
   opt :obsolete, "Used when recording new revision of patchset", :short => 'o', :type => :int
   opt :message, "Add short message to actions", :short => 'm', :type => :string
-  opt :id, "Patchset ID used by download action", :short => 'i', :type => :string
+  opt :id, "Set identifier used by download, ack, push or nack", :short => 'i', :type => :string
   opt :upload, 'Upload current branch patches after record', :short => 'u', :type => :flag
   opt :branch, 'Create specified branch when downloading patches', :short => 'b', :type => :string
 end
@@ -41,7 +41,7 @@ def print_usage
   puts 'Examples:'
   puts
   puts '$ tracker record -o 45           # Record current branch and obsolete patchset 45 (bump revision)'
-  puts '$ tracker record -u              # Record current branch and upload all patches'
+  puts '$ tracker download 45 -b review  # Download set 45, create branch "review" and apply the downloaded patches'
   puts '$ tracker list new               # Display all new or open sets'
   puts '$ tracker list mfojtik -i author # Display all sets that were recorded by %mfojtik%'
   ''

data/lib/command.rb

@@ -79,7 +79,7 @@ module Tracker
         )
         response = JSON::parse(response)
         output = "#{number_of_commits} patches were recorded to the tracker server"+
-          " [\e[1m%s#{config[:url]}set/#{response['id']}\e[0m] [revision #{response['revision']}]"
+          " [\e[1m#{config[:url]}set/#{response['id']}\e[0m] [revision #{response['revision']}]"
         output += "\n" + upload(directory) if opts[:upload]
         output
       rescue => e
@@ -179,7 +179,16 @@ module Tracker
         patch_filename = File.join(directory, "#{counter}-#{commit}.patch")
         File.open(patch_filename, 'w') { |f| f.puts download_patch_body(commit) }
         if !branch.nil?
-          puts git_cmd("git am #{patch_filename}", directory)
+          begin
+            puts git_cmd("git am #{patch_filename}", directory)
+          rescue ChildCommandError => e
+            puts git_cmd "git am --abort", directory
+            puts git_cmd "git checkout master", directory
+            puts git_cmd "git branch -D #{branch}", directory
+            puts "ERROR: #{e.message}. Reverting back to 'master' branch."
+            puts "Downloaded patch saved to :#{patch_filename}"
+            exit 1
+          end
           FileUtils.rm_f(patch_filename)
         end
         counter += 1
@@ -327,6 +336,8 @@ module Tracker
       ''
     end
 
+    class ChildCommandError < StandardError; end
+
     private
 
     # Execute GIT command ('git') in the specified directory. Method will then
@@ -340,7 +351,9 @@ module Tracker
       begin
         Dir.chdir(directory)
         result = %x[#{cmd}]
+        raise ChildCommandError.new("Child process returned #{$?}") if $? != 0
       rescue => e
+        raise e if e.kind_of? ChildCommandError
         puts "ERROR: #{e.message}"
         exit(1)
       ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracker-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client