tracker-client 0.7 → 0.8

data/bin/tracker

@@ -28,7 +28,8 @@ def print_usage
   puts 'tracker push      -   Mark all patches in current branch as PUSHED'
   puts 'tracker status    -   Display review status for current branch'
   puts 'tracker upload    -   Upload current patches (diffs) to tracker'
-  puts 'tracker download  -   Download whole patchset from tracker'
+  puts 'tracker download  -   Download whole patchset from tracker (-i PATCHSET_ID)'
+  puts 'tracker apply     -   Apply patch with specified commit (-i COMMIT_ID)'
   puts
   system("#{__FILE__} --help")
   puts
@@ -46,5 +47,6 @@ puts case ARGV[0]
   when 'upload' then Tracker::Cmd.upload(opts[:dir])
   when 'download' then Tracker::Cmd.download(opts[:dir], opts[:id])
   when 'status' then Tracker::Cmd.status(opts[:dir])
+  when 'apply' then Tracker::Cmd.apply(opts[:dir], ARGV[1])
   else print_usage
 end

data/lib/command.rb

@@ -83,6 +83,18 @@ module Tracker
       end
     end
 
+    def self.apply(directory, commit_id)
+      unless commit_id =~ /(\w{40})/
+        puts 'You must provide GIT commit hash (40 characters).'
+        exit 1
+      end
+      patch_body = download_patch_body(commit_id)
+      File.open(File.join(directory, "#{commit_id}.patch"), 'w') { |f| f.puts patch_body }
+      print 'Are you sure you want to apply patch to current branch? [Y/n]'
+      exit if (STDIN.gets.chomp) == 'n'
+      git_cmd("git am #{commit_id}.patch", directory)
+    end
+
     def self.upload(directory)
       diffs = git_cmd('git format-patch --stdout master', directory)
       patches = {}
@@ -118,13 +130,17 @@ module Tracker
     end
 
     def self.download_patch_body(commit_id)
-      RestClient.get(
-        config[:url] + ('/patch/%s/download' % commit_id),
-        {
-          :content_type => 'application/json',
-          'Authorization' => "Basic #{basic_auth}"
-        }
-      )
+      begin
+        RestClient.get(
+          config[:url] + ('/patch/%s/download' % commit_id),
+          {
+            :content_type => 'text/plain',
+            'Authorization' => "Basic #{basic_auth}"
+          }
+        )
+      rescue => e
+        puts "[ERR] #{e.message}"
+      end
     end
 
     def self.download(directory, patchset_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracker-client
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors: