ruby-bugzilla 0.1.1 → 0.2

data/bin/bzconsole

@@ -26,6 +26,7 @@ require 'yaml'
 require 'rubygems'
 require 'pp'
 require 'gruff'
+require 'uri'
 
 
 $KCODE = 'u'
@@ -101,7 +102,7 @@ module BzConsole
       template = {
         "rhbz"=>{
           :Name=>"Red Hat Bugzilla",
-          :URL=>"https://bugzilla.redhat.com/",
+          :URL=>"https://bugzilla.redhat.com",
           :User=>"account@example.com",
           :Password=>"blahblahblah",
           :ProductAliases=>{
@@ -114,19 +115,19 @@ module BzConsole
         },
         "gnbz"=>{
           :Name=>"GNOME Bugzilla",
-          :URL=>"https://bugzilla.gnome.org/",
+          :URL=>"https://bugzilla.gnome.org",
           :User=>"account@example.com",
           :Password=>"blahblahblah",
         },
         "fdobz"=>{
           :Name=>"FreeDesktop Bugzilla",
-          :URL=>"https://bugs.freedesktop.org/",
+          :URL=>"https://bugs.freedesktop.org",
           :User=>"account@example.com",
           :Password=>"blahblahblah",
         },
         "mzbz"=>{
           :Name=>"Mozilla Bugzilla",
-          :URL=>"https://bugzilla.mozilla.org/",
+          :URL=>"https://bugzilla.mozilla.org",
           :User=>"account@example.com",
           :Password=>"blahblahblah",
         }
@@ -225,14 +226,16 @@ module BzConsole
         end
 
         info = conf[prefix]
-        host = info[:URL].sub(/\Ahttps?:\/\//, '').sub(/\/\Z/, '')
-        port = info[:URL] =~ /\Ahttps:/ ? 443 : 80
+        uri = URI.parse(info[:URL])
+        host = uri.host
+        port = uri.port
+        path = uri.path.empty? ? nil : uri.path
         login = opts[:command][:anonymous] == true ? nil : info[:User]
         pass = opts[:command][:anonymous] == true ? nil : info[:Password]
 
         @plugin.run(:pre, host, :getbug, opts)
 
-        xmlrpc = Bugzilla::XMLRPC.new(host, port)
+        xmlrpc = Bugzilla::XMLRPC.new(host, port, path)
         user = Bugzilla::User.new(xmlrpc)
         user.session(login, pass) do
           bug = Bugzilla::Bug.new(xmlrpc)
@@ -335,14 +338,16 @@ module BzConsole
         end
 
         info = conf[prefix]
-        host = info[:URL].sub(/\Ahttps?:\/\//, '').sub(/\/\Z/, '')
-        port = info[:URL] =~ /\Ahttps:/ ? 443 : 80
+        uri = URI.parse(info[:URL])
+        host = uri.host
+        port = uri.port
+        path = uri.path.empty? ? nil : uri.path
         login = opts[:command][:anonymous] == true ? nil : info[:User]
         pass = opts[:command][:anonymous] == true ? nil : info[:Password]
 
         @plugin.run(:pre, host, :search, opts[:command][:query])
 
-        xmlrpc = Bugzilla::XMLRPC.new(host, port)
+        xmlrpc = Bugzilla::XMLRPC.new(host, port, path)
         user = Bugzilla::User.new(xmlrpc)
         user.session(login, pass) do
           bug = Bugzilla::Bug.new(xmlrpc)
@@ -378,6 +383,8 @@ module BzConsole
       parser.banner = sprintf("Usage: %s [global options] show [command options] <prefix> ...", File.basename(__FILE__))
       parser.separator ""
       parser.separator "Command options:"
+      parser.on('-f', '--field', 'Displays available field informations') {|v| opts[:show][:mode] = :field}
+      parser.on('--field-name=NAME', 'Displays NAME field information') {|v| opts[:show][:field] = v}
       parser.on('-p', '--product', 'Displays available product names') {|v| opts[:show][:mode] = :product}
       parser.on('-c', '--component', 'Displays available component names (default)') {|v| opts[:show][:mode] = :component}
       parser.on('--anonymous', 'Access to Bugzilla anonymously') {opts[:anonymous] = true}
@@ -407,28 +414,40 @@ module BzConsole
         end
 
         info = conf[prefix]
-        host = info[:URL].sub(/\Ahttps?:\/\//, '').sub(/\/\Z/, '')
-        port = info[:URL] =~ /\Ahttps:/ ? 443 : 80
+        uri = URI.parse(info[:URL])
+        host = uri.host
+        port = uri.port
+        path = uri.path.empty? ? nil : uri.path
         login = opts[:command][:anonymous] == true ? nil : info[:User]
         pass = opts[:command][:anonymous] == true ? nil : info[:Password]
 
         @plugin.run(:pre, host, :show, opts)
 
-        xmlrpc = Bugzilla::XMLRPC.new(host, port)
+        xmlrpc = Bugzilla::XMLRPC.new(host, port, path)
         user = Bugzilla::User.new(xmlrpc)
         user.session(login, pass) do
-          product = Bugzilla::Product.new(xmlrpc)
+          if opts[:command][:show][:mode] == :field then
+            bug = Bugzilla::Bug.new(xmlrpc)
 
-          result = product.selectable_products
+            result = bug.fields(opts[:command][:show][:field])
 
-          @plugin.run(:post, host, :show, result)
+            @plugin.run(:post, host, :show, result)
 
-          products = result.keys.sort
-          products.each do |p|
-            if opts[:command][:show][:mode] == :product then
-              yield p
-            elsif opts[:command][:show][:mode] == :component then
-              yield p, result[p][0].sort
+            pp result
+          else
+            product = Bugzilla::Product.new(xmlrpc)
+
+            result = product.selectable_products
+
+            @plugin.run(:post, host, :show, result)
+
+            products = result.keys.sort
+            products.each do |p|
+              if opts[:command][:show][:mode] == :product then
+                yield p
+              elsif opts[:command][:show][:mode] == :component then
+                yield p, result[p][0].sort
+              end
             end
           end
         end
@@ -449,6 +468,7 @@ module BzConsole
       opts[:metrics] = {}
       opts[:query] = {}
       opts[:metrics][:output] = 'bz-metrics.png'
+      opts[:metrics][:x_coordinate] = :monthly
 
       parser.banner = sprintf("Usage: %s [global options] metrics [command options] <prefix> ...", File.basename(__FILE__))
       parser.separator ""
@@ -474,6 +494,8 @@ module BzConsole
       parser.on('--end-date=DATE', 'generate the graph until the end of month of DATE.') {|v| x = Time.parse(v); opts[:metrics][:end_date] = Time.utc(x.year, x.month + 1, 1, 0, 0, 0) - 1}
       parser.on('-o', '--output=FILE', 'generate the graph to FILE') {|v| opts[:metrics][:output] = v}
       parser.on('--anonymous', 'access to Bugzilla anonymously') {|v| opts[:anonymous] = true}
+      parser.on('--weekly', 'genereate the graph with weekly X-coordinate') {|v| opts[:metrics][:x_coordinate] = :weekly}
+      parser.on('--monthly', 'genereate the graph with monthly X-coordinate (default)') {|v| opts[:metrics][:x_coordinate] = :monthly}
 
       super
     end # def parse
@@ -488,16 +510,23 @@ module BzConsole
         'CLOSED'=>[],
         'OPEN'=>[]
       }
+      last_label = nil
       real_do(argv, opts) do |t, new, assigned, modified, on_qa, closed, open|
         printf("%s, new: %d, assigned: %d, modified %d, on_qa %d, closed %d / open %d\n",
-               t.strftime("%Y-%m"), new, assigned, modified, on_qa, closed, open)
+               opts[:command][:metrics][:x_coordinate] == :weekly ? sprintf("week %d", Date.new(t.year, t.month, t.day).cweek) : t.strftime("%Y-%m"), new, assigned, modified, on_qa, closed, open)
         data['NEW'] << new
         data['ASSIGNED'] << assigned
         data['MODIFIED'] << modified
         data['ON_QA'] << on_qa
         data['CLOSED'] << closed
         data['OPEN'] << open
-        data[:label] << t.strftime("%Y/%m")
+        label = t.strftime("%Y/%m")
+        if last_label != label then
+          data[:label] << label
+          last_label = label
+        else
+          data[:label] << nil
+        end
       end
 
       timeline = data[:label]
@@ -505,7 +534,7 @@ module BzConsole
       def timeline.to_hash
 	ret = {}
         (0..self.length-1).each do |i|
-          ret[i] = self[i]
+          ret[i] = self[i] unless self[i].nil?
         end
         ret
       end # def timeline.to_hash
@@ -549,12 +578,14 @@ module BzConsole
         end
 
         info = conf[prefix]
-        host = info[:URL].sub(/\Ahttps?:\/\//, '').sub(/\/\Z/, '')
-        port = info[:URL] =~ /\Ahttps:/ ? 443 : 80
+        uri = URI.parse(info[:URL])
+        host = uri.host
+        port = uri.port
+        path = uri.path.empty? ? nil : uri.path
         login = opts[:command][:anonymous] == true ? nil : info[:User]
         pass = opts[:command][:anonymous] == true ? nil : info[:Password]
 
-        xmlrpc = Bugzilla::XMLRPC.new(host, port)
+        xmlrpc = Bugzilla::XMLRPC.new(host, port, path)
         user = Bugzilla::User.new(xmlrpc)
         user.session(login, pass) do
           bug = Bugzilla::Bug.new(xmlrpc)
@@ -563,13 +594,22 @@ module BzConsole
 
           ts = opts[:command][:metrics][:begin_date] || Time.utc(Time.new.year, 1, 1)
           te = opts[:command][:metrics][:end_date] || Time.utc(Time.new.year+1, 1, 1) - 1
+          if opts[:command][:metrics][:x_coordinate] == :weekly then
+            # align to the week
+            d = Date.new(ts.year, ts.month, ts.day)
+            ds = Date.commercial(d.year, d.cweek, 1)
+            d = Date.new(te.year, te.month, te.day)
+            de = Date.commercial(d.year, d.cweek, 7)
+            ts = Time.utc(ds.year, ds.month, ds.day)
+            te = Time.utc(de.year, de.month, de.day)
+          end
 
           searchopts = opts[:command][:query].clone
 
           @plugin.run(:pre, host, :metrics, searchopts, opts[:metrics])
 
           if searchopts == opts[:command][:query] then
-            raise NoMethodError, "No method to deal with the query monthly"
+            raise NoMethodError, "No method to deal with the query"
           end
 
           while ts < te do
@@ -577,7 +617,14 @@ module BzConsole
 
             # don't rely on the status to deal with NEW bugs.
             # unable to estimate the case bugs closed quickly
-            searchopts[:creation_time] = [ts, Time.utc(ts.year, ts.month + 1, 1) - 1]
+            if opts[:command][:metrics][:x_coordinate] == :weekly then
+              d = Date.new(ts.year, ts.month, ts.day)
+              de = Date.commercial(d.year, d.cweek, 7)
+              drange = [ts, Time.utc(de.year, de.month, de.day, 23, 59, 59)]
+            else
+              drange = [ts, Time.utc(ts.year, ts.month + 1, 1) - 1]
+            end
+            searchopts[:creation_time] = drange
 
             @plugin.run(:pre, host, :metrics, searchopts)
 
@@ -590,7 +637,7 @@ module BzConsole
             # for open bugs
             # what we are interested in here would be how many bugs still keeps open.
             searchopts = opts[:command][:query].clone
-            searchopts[:last_change_time] = [ts, Time.utc(ts.year, ts.month + 1, 1) - 1]
+            searchopts[:last_change_time] = drange
             searchopts[:status] = '__open__'
 
             @plugin.run(:pre, host, :metrics, searchopts)
@@ -608,7 +655,7 @@ module BzConsole
             # what we are interested in here would be how much bugs are
             # actually closed, but not how many closed bugs one worked on.
             searchopts = opts[:command][:query].clone
-            searchopts[:last_change_time] = [ts, Time.utc(ts.year, ts.month + 1, 1) - 1]
+            searchopts[:last_change_time] = drange
             searchopts[:status] = 'CLOSED'
 
             @plugin.run(:pre, host, :metrics, searchopts)
@@ -622,7 +669,7 @@ module BzConsole
             # obtain the information for open bugs that closed now
             searchopts = opts[:command][:query].clone
             searchopts[:status] = 'CLOSED'
-            searchopts[:metrics_closed_after] = Time.utc(ts.year, ts.month + 1, 1)
+            searchopts[:metrics_closed_after] = drange[1] + 1
 
             @plugin.run(:pre, host, :metrics, searchopts)
 
@@ -634,7 +681,7 @@ module BzConsole
 
             # obtain the information for open bugs
             searchopts = opts[:command][:query].clone
-            searchopts[:metrics_not_closed] = Time.utc(ts.year, ts.month + 1, 1) - 1
+            searchopts[:metrics_not_closed] = drange[1]
 
             @plugin.run(:pre, host, :metrics, searchopts)
 
@@ -646,7 +693,7 @@ module BzConsole
 
             yield ts, new, assigned, modified, on_qa, closed, open_bugs
 
-            ts = Time.utc(ts.year, ts.month + 1, 1)
+            ts = drange[1] + 1
           end
         end
       end

data/lib/bugzilla.rb

@@ -30,7 +30,7 @@ require 'xmlrpc/client'
 
 module Bugzilla
 
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 
 =begin rdoc
 
@@ -99,13 +99,14 @@ module Bugzilla
 
 =begin rdoc
 
-==== Bugzilla::XMLRPC#new(server, port = 443)
+==== Bugzilla::XMLRPC#new(host, port = 443, path = '/xmlrpc.cgi')
 
 =end
 
-    def initialize(server, port = 443)
+    def initialize(host, port = 443, path = '/xmlrpc.cgi')
+      path ||= '/xmlrpc.cgi'
       use_ssl = port == 443 ? true : false
-      @xmlrpc = ::XMLRPC::Client.new(server, '/xmlrpc.cgi', port, nil, nil, nil, nil, use_ssl, 60)
+      @xmlrpc = ::XMLRPC::Client.new(host, path, port, nil, nil, nil, nil, use_ssl, 60)
     end # def initialize
 
 =begin rdoc

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-bugzilla
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Akira TAGOH
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +09:00
+date: 2010-08-26 00:00:00 +09:00
 default_executable: bzconsole
 dependencies: 
 - !ruby/object:Gem::Dependency