ruby-bugzilla 0.2.1 → 0.3.0

data/Rakefile

@@ -14,6 +14,7 @@ begin
     #gem.rubyforge_project = "ruby-bugzilla"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "gruff"
+    gem.add_development_dependency "highline"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.version = Bugzilla::VERSION
     gem.files = FileList['bin/*', 'lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a.reject{|x| x =~ /~\Z|#\Z|swp\Z/}

data/bin/bzconsole

@@ -27,6 +27,7 @@ require 'rubygems'
 require 'pp'
 require 'gruff'
 require 'uri'
+require 'highline/import'
 
 
 $KCODE = 'u'
@@ -61,6 +62,12 @@ module BzConsole
       parser.order(argv)
     end # def parse
 
+    def do(argv)
+      raise RuntimeError, sprintf("No implementation for %s", self.class)
+    end # def do
+
+    protected
+
     def read_config(opts)
       fname = opts[:config].nil? ? @defaultyamlfile : opts[:config]
       begin
@@ -69,16 +76,23 @@ module BzConsole
         conf = {}
       end
       conf.each do |k, v|
-        if v.include?(:Plugin) then
+        if v.kind_of?(Hash) && v.include?(:Plugin) then
           load(v[:Plugin])
         end
       end
       conf
     end # def read_config
 
-    def do(argv)
-      raise RuntimeError, sprintf("No implementation for %s", self.class)
-    end # def do
+    def save_config(opts, conf)
+      fname = opts[:config].nil? ? @defaultyamlfile : opts[:config]
+      if File.exist?(fname) then
+        st = File.lstat(fname)
+        if st.mode & 0600 != 0600 then
+          raise RuntimeError, sprintf("The permissions of %s has to be 0600", fname)
+        end
+      end
+      File.open(fname, "w") {|f| f.chmod(0600); f.write(conf.to_yaml)}
+    end # def save_config
 
   end # class CommandTemplate
 
@@ -149,6 +163,58 @@ module BzConsole
 
   end # class Setup
 
+  class Login < CommandTemplate
+
+    def initialize(plugin)
+      super
+
+      @n_args = 1
+    end # def initialize
+
+    def parse(parser, argv, opts)
+      opts[:output] = File.join(ENV['HOME'], '.ruby-bugzilla-cookie.yml')
+      parser.banner = sprintf("Usage: %s [global options] login [command options] <prefix> ...", File.basename(__FILE__))
+      parser.separator ""
+      parser.separator "Command options:"
+      parser.on('-o', '--output=FILE', 'FILE to store the cookie') {|v| opts[:output] = v}
+
+      super
+    end # def parse
+
+    def do(argv, opts)
+      conf = read_config(opts)
+      conf.freeze
+      cconf = read_config({:config=>opts[:command][:output]})
+      argv.each do |prefix|
+        if prefix.nil? then
+          raise ArgumentError, "No prefix to log in"
+        end
+        unless conf.include?(prefix) then
+          raise RuntimeError, sprintf("No host information for %s", prefix)
+        end
+
+        info = conf[prefix]
+        uri = URI.parse(info[:URL])
+        host = uri.host
+        port = uri.port
+        path = uri.path.empty? ? nil : uri.path
+        login = info[:User].nil? ? ask("Bugzilla ID: ") : info[:User]
+        pass = info[:Password].nil? ? ask("Bugzilla password: ") {|q| q.echo = false} : info[:Password]
+
+        xmlrpc = Bugzilla::XMLRPC.new(host, port, path)
+        user = Bugzilla::User.new(xmlrpc)
+        begin
+          result = user.login({'login'=>login, 'password'=>pass, 'remember'=>true})
+          cconf[host] = xmlrpc.cookie
+          save_config({:config=>opts[:command][:output]}, cconf)
+        rescue XMLRPC::FaultException => e
+          printf("E: %s\n", e.message)
+        end
+      end
+    end # def do
+
+   end # class Login
+
   class Getbug < CommandTemplate
 
     def initialize(plugin)
@@ -380,11 +446,12 @@ module BzConsole
     def parse(parser, argv, opts)
       opts[:show] ||= {}
       opts[:show][:mode] = :component
+      opts[:show][:field] = []
       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('--field-name=NAME', 'Displays NAME field information') {|v| opts[:show][:field] << v.split(',')}
       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}
@@ -429,7 +496,7 @@ module BzConsole
           if opts[:command][:show][:mode] == :field then
             bug = Bugzilla::Bug.new(xmlrpc)
 
-            result = bug.fields(opts[:command][:show][:field])
+            result = bug.fields(opts[:command][:show][:field].flatten)
 
             @plugin.run(:post, host, :show, result)
 

data/lib/bugzilla.rb

@@ -30,7 +30,7 @@ require 'xmlrpc/client'
 
 module Bugzilla
 
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
 =begin rdoc
 
@@ -122,6 +122,26 @@ module Bugzilla
       @xmlrpc.call(cmd, params)
     end # def call
 
+=begin rdoc
+
+==== Bugzilla::XMLRPC#cookie
+
+=end
+
+    def cookie
+      @xmlrpc.cookie
+    end # def cookie
+
+=begin rdoc
+
+==== Bugzilla::XMLRPC#cookie=(val)
+
+=end
+
+    def cookie=(val)
+      @xmlrpc.cookie = val
+    end # def cookie
+
   end # class XMLRPC
 
 =begin rdoc
@@ -733,6 +753,19 @@ Keeps the bugzilla session during doing something in the block.
 =end
 
     def session(user, password)
+      fname = File.join(ENV['HOME'], '.ruby-bugzilla-cookie.yml')
+      if File.exist?(fname) && File.lstat(fname).mode & 0600 == 0600 then
+        conf = YAML.load(File.open(fname).read)
+        host = @iface.instance_variable_get(:@xmlrpc).instance_variable_get(:@host)
+        cookie = conf[host]
+        unless cookie.nil? then
+          @iface.cookie = cookie
+          print "Using cookie\n"
+          yield
+          conf[host] = @iface.cookie
+          File.open(fname, 'w') {|f| f.chmod(0600); f.write(conf.to_yaml)}
+        end
+      end
       if user.nil? || password.nil? then
         yield
       else
@@ -740,6 +773,7 @@ Keeps the bugzilla session during doing something in the block.
         yield
         logout
       end
+      
     end # def session
 
 =begin rdoc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-bugzilla
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Akira TAGOH
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +09:00
+date: 2010-09-08 00:00:00 +09:00
 default_executable: bzconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: This aims to provide similar features to access to Bugzilla through WebService APIs in Ruby.
 email: akira@tagoh.org
 executables: