tracker-client 0.6 → 0.7

data/bin/tracker

@@ -14,6 +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 => :int
 end
 
 Tracker::Cmd.config(:set, :file => opts[:config])
@@ -26,6 +27,8 @@ def print_usage
   puts 'tracker nack      -   NACK all patches in current branch'
   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
   system("#{__FILE__} --help")
   puts
@@ -40,6 +43,8 @@ puts case ARGV[0]
   when 'ack' then Tracker::Cmd.ack(opts[:dir], :message => opts[:message])
   when 'nack' then Tracker::Cmd.nack(opts[:dir], :message => opts[:message])
   when 'push' then Tracker::Cmd.push(opts[:dir], :message => opts[:message])
+  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])
   else print_usage
 end

data/lib/command.rb

@@ -5,7 +5,10 @@ module Tracker
     require 'json'
     require 'base64'
 
-    GIT_JSON_FORMAT = '{ "hashes":{ "commit":"%H", "tree":"%T", "parents":"%P" }, "author":{ "date": "%ai", "name": "%an", "email":"%ae" }, "committer":{ "date": "%ci", "name": "%cn", "email":"%ce" } },'
+    GIT_JSON_FORMAT = '{ "hashes":'+
+      '{ "commit":"%H", "tree":"%T",'+' "parents":"%P" },'+
+      '"author":{ "date": "%ai", "name": "%an", "email":"%ae" },'+
+      '"committer":{ "date": "%ci", "name": "%cn", "email":"%ce" } },'
 
     GIT_OPTS = "--format='#{GIT_JSON_FORMAT}'"
 
@@ -64,7 +67,7 @@ module Tracker
       number_of_commits = JSON::parse(patches_to_json(directory)).pop.size
       begin
         response = RestClient.post(
-          config[:url] + '/patches',
+          config[:url] + '/set',
           patches_to_json(directory),
           {
             :content_type => 'application/json',
@@ -73,12 +76,85 @@ module Tracker
           }
         )
         response = JSON::parse(response)
-        "#{number_of_commits} patches were recorded to the tracker server [#{config[:url]}][##{response['id']}][rev#{response['revision']}]"
+        "#{number_of_commits} patches were recorded to the tracker server"+
+          " [#{config[:url]}][##{response['id']}][rev#{response['revision']}]"
       rescue => e
         e.message
       end
     end
 
+    def self.upload(directory)
+      diffs = git_cmd('git format-patch --stdout master', directory)
+      patches = {}
+      current_patch_commit = ''
+      diffs.each_line do |line|
+        if line =~ %r[^From (\w{40}) ]
+          current_patch_commit = $1
+          patches[current_patch_commit] = line
+        else
+          patches[current_patch_commit] += line
+        end
+      end
+      begin
+        patches.each do |commit, body|
+          puts '[^] %s' % commit
+          upload_patch_body(commit, body)
+        end
+        '%i patches were uploaded to tracker [%s]' % [patches.size, config[:url]]
+      rescue => e
+        e.message
+      end
+    end
+
+    def self.upload_patch_body(commit_id, body)
+      RestClient.put(
+        config[:url] + ('/patch/%s/body' % commit_id),
+        body,
+        {
+          :content_type => 'application/json',
+          'Authorization' => "Basic #{basic_auth}"
+        }
+      )
+    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}"
+        }
+      )
+    end
+
+    def self.download(directory, patchset_id)
+      patches = []
+      begin
+        response = RestClient.get(
+          config[:url] + ('/set/%s' % patchset_id),
+          {
+            'Accept' => 'application/json',
+            'Authorization' => "Basic #{basic_auth}"
+          }
+        )
+        patches = JSON::parse(response)['patches'].map { |p| p['commit'] }
+      rescue => e
+        puts "ERR: #{e.message}"
+        exit
+      end
+      counter = 0
+      puts
+      patches.each do |commit|
+        File.open(File.join(directory, "#{counter}-#{commit}.patch"), 'w') { |f|
+          f.puts download_patch_body(commit)
+        }
+        puts '[v] %s-%s.patch' % [counter, commit]
+        counter += 1
+      end
+      puts "\n -> #{counter} patches downloaded."
+      ''
+    end
+
     def self.obsolete_patchset(patchset_id)
       RestClient.post(
         config[:url] + ('/patchset/%s/obsolete' % patchset_id), '',
@@ -104,7 +180,7 @@ module Tracker
       patches.each do |p|
         begin
           RestClient.post(
-            config[:url] + ('/patches/%s/%s' % [p['hashes']['commit'], name]),
+            config[:url] + ('/patch/%s/%s' % [p['hashes']['commit'], name]),
             {
               :message => options[:message]
             },
@@ -134,14 +210,19 @@ module Tracker
       patches.each do |p|
         begin
           response = RestClient.get(
-            config[:url] + ('/patches/%s' % p['hashes']['commit']),
+            config[:url] + ('/patch/%s' % p['hashes']['commit']),
             {
-              :content_type => 'application/json',
+              'Accept' => 'application/json',
               'Authorization' => "Basic #{basic_auth}"
             }
           )
           response = JSON::parse(response)
-          puts '[%s][%s][rev%s] %s' % [response['commit'][-8, 8], response['status'].upcase, response['revision'], response['message']]
+          puts '[%s][%s][rev%s] %s' % [
+            response['commit'][-8, 8],
+            response['status'].upcase,
+            response['revision'],
+            response['message']
+          ]
           counter+=1
         rescue => e
           next if response == 'null'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracker-client
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client