tracker-client 0.1 → 0.2

data/bin/tracker

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'rest-client'
 require 'trollop'
+require 'pp'
 
 $:.unshift File::expand_path(File.join(File.dirname(__FILE__), '..'))
 
@@ -11,14 +12,33 @@ require 'lib/command.rb'
 opts = Trollop::options do
   opt :dir, "GIT directory to use", :short => 'd', :default => '.'
   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
 end
 
 Tracker::Cmd.config(:set, :file => opts[:config])
 
+def print_usage
+  puts 'Usage:'
+  puts
+  puts 'tracker record    -   Record current patchset to tracker'
+  puts 'tracker ack       -   ACK all patches in current branch'
+  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
+  system("#{__FILE__} --help")
+  puts
+  puts 'Examples:'
+  puts
+  puts '$ tracker record -o 45    # Record current branch and obsolete patchset 45 (bump revision)'
+  ''
+end
+
 puts case ARGV[0]
-  when 'record' then Tracker::Cmd.record(opts[:dir])
+  when 'record' then Tracker::Cmd.record(opts[:dir], opts[:obsolete])
   when 'ack' then Tracker::Cmd.ack(opts[:dir])
   when 'nack' then Tracker::Cmd.nack(opts[:dir])
   when 'push' then Tracker::Cmd.push(opts[:dir])
-  else 'Nothing to do here.'
+  when 'status' then Tracker::Cmd.status(opts[:dir])
+  else print_usage
 end

data/lib/command.rb

@@ -18,54 +18,101 @@ module Tracker
       }
     end
 
+    # Set/Get configuration for the command-line client
+    #
+    # * +conf+ - Set configuration:
+    #
+    # * +:url+          - Tracker server URL (default: http://localhost:9292)
+    # * +:user+         - Tracker username
+    # * +:password+*    - Tracker password
+    #
     def self.configuration(conf=nil); @configuration ||= conf; end
 
+    # Retrieve/Set the configuration from YAML file, if YAML file does not
+    # exists, use the +default_configuration+ instead
+    #
+    # * +action+       - If action :set then overide the default_configuration (default: :get)
+    # * +:opts+        - Read YAML file from opts[:file]
+    #
     def self.config(action=:get, opts={})
-      if action == :set
-        if File.exists?(opts[:file])
-          configuration(YAML.load_file(opts[:file]))
-        else
-        end
-      end
+      configuration(YAML.load_file(opts[:file])) if (action == :set) && File.exists?(opts[:file])
       configuration || configuration(default_configuration)
     end
 
+    # Read commits between origin/master..HEAD and convert them to JSON string
+    #
+    # * +directory+   - If given, cmd app will 'chdir' into that directory (default: nil)
+    #
     def self.patches_to_json(directory=nil)
       patches_in_json = git_cmd(GIT_CMD, directory)
       commit_messages_raw = git_cmd('git log --pretty=oneline origin/master..HEAD', directory)
-      commit_messages = {}
-      commit_messages_raw.each_line { |line|
+      commit_messages = commit_messages_raw.each_line.map.inject({}) do |result, line|
         hash, message = line.split(' ', 2)
-        commit_messages.merge!({ hash => message.strip })
-      }
+        result[hash] = message.strip
+        result
+      end
       "[#{patches_in_json}#{JSON::dump(commit_messages)}]"
     end
 
-    def self.record(directory)
+    # Method will call +patches_to_json+ and POST the JSON array to Tracker
+    # server. Authentication stored in +config+ is used.
+    #
+    # * +directory+ - If given, cmd app will 'chdir' into that directory (default: nil)
+    #
+    def self.record(directory, obsolete=nil)
+      number_of_commits = JSON::parse(patches_to_json(directory)).pop.size
+      begin
+        response = RestClient.post(
+          config[:url] + '/patches',
+          patches_to_json(directory),
+          {
+            :content_type => 'application/json',
+            'Authorization' => "Basic #{basic_auth}",
+            'X-Obsoletes' => obsolete || 'no'
+          }
+        )
+        response = JSON::parse(response)
+        "#{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.obsolete_patchset(patchset_id)
       RestClient.post(
-        config[:url] + '/patches',
-        patches_to_json(directory),
+        config[:url] + ('/patchset/%s/obsolete' % patchset_id), '',
         {
           :content_type => 'application/json',
           'Authorization' => "Basic #{basic_auth}"
         }
       )
-      "Patches recorded to server [#{config[:url]}]"
+      puts 'This record marked patchset [#%s] as obsoleted.'
     end
 
+    # Method perform given action on GIT branch with recorded commits.
+    # The patches **need** to be recorded on Tracker server to perfom any
+    # action. 
+    #
+    # * +name+  - Action name (:ack, :nack, :push)
+    # * +directory+ - If given, cmd app will 'chdir' into that directory (default: nil)
+    #
     def self.action(name, directory)
       patches = JSON::parse(patches_to_json(directory))
       messages = patches.pop
       puts
       patches.each do |p|
-        RestClient.post(
-          config[:url] + ('/patches/%s/%s' % [p['hashes']['commit'], name]), '',
-          {
-            :content_type => 'application/json',
-            'Authorization' => "Basic #{basic_auth}"
-          }
-        )
-        puts '[%s] %s' % [name.to_s.upcase, messages[p['hashes']['commit']]]
+        begin
+          RestClient.post(
+            config[:url] + ('/patches/%s/%s' % [p['hashes']['commit'], name]), '',
+            {
+              :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
       "  |\n  |--------> [%s]\n\n" % config[:url]
     end
@@ -74,8 +121,36 @@ module Tracker
     def self.nack(directory); action(:nack, directory); end
     def self.push(directory); action(:push, directory); end
 
+    def self.status(directory)
+      patches = JSON::parse(patches_to_json(directory))
+      # Remove messages from Array
+      patches.pop
+      puts
+      patches.each do |p|
+        begin
+          response = RestClient.get(
+            config[:url] + ('/patches/%s' % p['hashes']['commit']),
+            {
+              :content_type => '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']]
+        rescue => e
+          puts '[ERR][%s] %s' % [p['hashes']['commit'][-8, 8], e.message]
+        end
+      end
+      "  |\n  |--------> [%s]\n\n" % config[:url]
+    end
+
     private
 
+    # Execute GIT command ('git') in the specified directory. Method will then
+    # revert pwd to its original value and return command output in string.
+    #
+    # * +cmd+ - GIT command to perform (eg. 'git log')
+    #
     def self.git_cmd(cmd, directory)
       old_pwd = Dir.pwd
       result = ''

metadata

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