tracker-client 1.0 → 1.0.1

data/bin/tracker

@@ -16,6 +16,7 @@ opts = Trollop::options do
   opt :message, "Add short message to actions", :short => 'm', :type => :string
   opt :id, "Patchset ID used by download action", :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
 
 Tracker::Cmd.config(:set, :file => opts[:config])
@@ -42,11 +43,13 @@ end
 
 puts case ARGV[0]
   when 'record' then Tracker::Cmd.record(opts[:dir], { :obsolete => opts[:obsolete], :upload => opts[:upload]})
-  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 'ack' then Tracker::Cmd.ack(opts[:dir], { :message => opts[:message], :set => opts[:id] })
+  when 'nack' then Tracker::Cmd.nack(opts[:dir], { :message => opts[:message], :set => opts[:id] })
+  when 'push' then Tracker::Cmd.push(opts[:dir], { :message => opts[:message], :set => opts[:id] })
+
   when 'upload' then Tracker::Cmd.upload(opts[:dir])
-  when 'download' then Tracker::Cmd.download(opts[:dir], opts[:id])
+  when 'download' then Tracker::Cmd.download(opts[:dir], ARGV[1], opts[:branch])
   when 'status' then Tracker::Cmd.status(opts[:dir])
   when 'apply' then Tracker::Cmd.apply(opts[:dir], ARGV[1])
   else print_usage

data/lib/command.rb

@@ -157,7 +157,7 @@ module Tracker
       end
     end
 
-    def self.download(directory, patchset_id)
+    def self.download(directory, patchset_id, branch=nil)
       patches = []
       begin
         response = RestClient.get(
@@ -174,11 +174,15 @@ module Tracker
       end
       counter = 0
       puts
+      puts git_cmd("git checkout -b #{branch}", directory) if !branch.nil?
       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]
+        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)
+        else
+          puts '[v] %s-%s.patch' % [counter, commit]
+        end
         counter += 1
       end
       puts "\n -> #{counter} patches downloaded."
@@ -204,13 +208,11 @@ module Tracker
     # * +directory+ - If given, cmd app will 'chdir' into that directory (default: nil)
     #
     def self.action(name, directory, options={})
-      patches = JSON::parse(patches_to_json(directory))
-      messages = patches.pop
       puts
-      patches.each do |p|
+      if options[:set]
         begin
           RestClient.post(
-            config[:url] + ('/patch/%s/%s' % [p['hashes']['commit'], name]),
+            config[:url] + ('/set/%s/%s' % [options[:set], name]),
             {
               :message => options[:message]
             },
@@ -219,10 +221,30 @@ module Tracker
               'Authorization' => "Basic #{basic_auth}"
             }
           )
-          puts '[%s][%s] %s' % [name.to_s.upcase, p['hashes']['commit'][-8, 8], messages[p['hashes']['commit']]]
+          puts '[%s][%s] Status of all patches in set updated.' % [name, options[:set]]
         rescue => e
           puts '[ERR] %s' % e.message
         end
+      else
+        patches = JSON::parse(patches_to_json(directory))
+        messages = patches.pop
+        patches.each do |p|
+          begin
+            RestClient.post(
+              config[:url] + ('/patch/%s/%s' % [p['hashes']['commit'], name]),
+              {
+                :message => options[:message]
+              },
+              {
+                :content_type => 'application/json',
+                'Authorization' => "Basic #{basic_auth}"
+              }
+            )
+            puts '[%s][%s] %s' % [name.to_s.upcase, p['hashes']['commit'][-8, 8], messages[p['hashes']['commit']]]
+          rescue => e
+            puts '[ERR] %s' % e.message
+          end
+        end
       end
       "  |\n  |--------> [%s]\n\n" % config[:url]
     end

metadata

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