bicho 0.0.1 → 0.0.3

data/.gitignore

@@ -4,4 +4,4 @@ Gemfile.lock
 pkg/*
 .yardoc
 *.rbc
-
+*~

data/README.rdoc

@@ -31,6 +31,12 @@ Plugins can be written to deal with specific bugzilla installations.
       puts bug.url
     end
 
+You can give more than one bug or a named query, or both:
+
+    server.get(127043, 432423) => [....]
+    server.get("Named list") => [....]
+    server.get("Named list", 4423443) => [....]
+
 === ActiveRecord-like API
 
 To use the ActiveRecord like interface over the +Bug+ class, you need first

data/bicho.gemspec

@@ -7,13 +7,14 @@ Gem::Specification.new do |s|
   s.version     = Bicho::VERSION
   s.authors     = ["Duncan Mac-Vicar P."]
   s.email       = ["dmacvicar@suse.de"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/dmacvicar/bicho"
   s.summary     = %q{Library to access bugzilla}
   s.description = %q{Library to access bugzilla}
 
   s.add_dependency("inifile", ["~> 0.4.1"])
   s.add_dependency("trollop", [">= 1.16"])
   s.add_dependency("highline", ["~> 1.6.2"])
+  s.add_dependency("nokogiri")
 
 
   s.rubyforge_project = "bicho"

data/lib/bicho/bug.rb

@@ -71,6 +71,12 @@ module Bicho
       "##{id} - #{summary} (#{url})"
     end
 
+    def [] name, subname = nil
+      v = @data[name.to_s]
+      v = v[subname.to_s] if subname # for 'internals' properties
+      v
+    end
+
     # URL where the bug can be viewed
     # Example: http://bugs.foo.com/2345
     def url

data/lib/bicho/cli/commands/show.rb

@@ -34,7 +34,7 @@ module Bicho::CLI::Commands
     def do(global_opts, opts, args)
       client = ::Bicho::Client.new(global_opts[:bugzilla])
       client.get_bugs(*args).each do |bug|
-        t.say("#{t.color(bug.id, :headline)} #{bug.summary}")
+        t.say("#{t.color(bug.id.to_s, :headline)} #{bug.summary}")
       end
       return 0
     end

data/lib/bicho/client.rb

@@ -25,6 +25,8 @@
 require 'inifile'
 require 'uri'
 require 'xmlrpc/client'
+require 'nokogiri'
+require 'net/https'
 
 require 'bicho/bug'
 require 'bicho/query'
@@ -59,12 +61,13 @@ module Bicho
 
     include Bicho::Logging
 
-    attr_reader :url
+    attr_reader :url, :userid
 
     def initialize(url)
-      url = URI.parse(url) if not url.is_a?(URI)
+      # Don't modify the original url
+      url = url.is_a?(URI) ? url.clone : URI.parse(url) 
       # save the unmodified (by plugins) url
-      @url = url.clone
+      @original_url = url.clone
 
       url.path = '/xmlrpc.cgi'
 
@@ -85,6 +88,20 @@ module Bicho
 
       @client = XMLRPC::Client.new_from_uri(url.to_s, nil, 900)
       @client.set_debug
+
+      # User.login sets the credentials cookie for subsequent calls
+      if @client.user && @client.password
+        ret = @client.call("User.login", { 'login' => @client.user, 'password' => @client.password, 'remember' => 0 } )
+        handle_faults(ret)
+        @userid = ret['id']
+      end
+
+      # Save modified url
+      @url = url
+    end
+
+    def cookie
+      @client.cookie
     end
 
     def handle_faults(ret)
@@ -114,10 +131,47 @@ module Bicho
       bugs
     end
 
+    # Given a named query's name, runs it
+    # on the server
+    # @returns [Array<String>] list of bugs
+    def expand_named_query(what)
+      if not @userid
+        raise "You need to be authenticated to use named queries"
+      end
+
+      logger.info("Expanding named query: '#{what}' with '#{cookie}'")
+      http = Net::HTTP.new(@url.host, @url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.set_debug_output(Bicho::LoggerIODevice.new)
+      request = Net::HTTP::Get.new("/buglist.cgi?cmdtype=runnamed&namedcmd=#{what}&ctype=atom", {"Cookie" => self.cookie} )
+      response = http.request(request)
+      case response
+        when Net::HTTPSuccess
+          bugs = []
+          xml = Nokogiri::XML.parse(response.body)
+          xml.root.xpath("//xmlns:entry/xmlns:link/@href", xml.root.namespace).each do |attr|
+            uri = URI.parse attr.value
+            bugs << uri.query.split("=")[1]
+          end
+          return bugs
+        when Net::HTTPRedirect
+          raise "HTTP redirect not supported in named_query"
+        else
+          raise "Error when expanding named query '#{what}': #{response}"
+      end
+    end
+
     # Retrieves one or more bugs by id
     def get_bugs(*ids)
       params = Hash.new
-      params[:ids] = ids.collect(&:to_s)
+      params[:ids] = ids.collect(&:to_s).map do |what|
+        if what =~ /^[0-9]+$/
+          next what.to_i
+        else
+          next expand_named_query(what)
+        end
+      end.flatten
 
       bugs = []
       ret = @client.call("Bug.get", params)

data/lib/bicho/query.rb

@@ -94,7 +94,7 @@ module Bicho
       if not @query_map.has_key?(param)
         @query_map[param] = Array.new
       end
-      @query_map[param] = value
+      @query_map[param] = [@query_map[param], value].flatten
     end
 
   end

data/lib/bicho/version.rb

@@ -1,3 +1,3 @@
 module Bicho
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/test/test_query.rb

@@ -16,5 +16,15 @@ class Query_test < Test::Unit::TestCase
     assert ret.collect(&:id).include?(645150)
 
   end
+  
+  def test_query_addition_of_attributes
+    ret = Bicho::Query.new.status("foo").status("bar")
+    assert_equal({"status" => ["foo", "bar"]}, ret.query_map)
+  end
+
+  def test_query_shortcuts
+    ret = Bicho::Query.new.open
+    assert_equal({"status" => [:new, :assigned, :needinfo, :reopened]}, ret.query_map)
+  end
 
 end

metadata

@@ -1,79 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bicho
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Duncan Mac-Vicar P.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: inifile
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &6670620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *6670620
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &6670000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *6670000
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &6669420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *6669420
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &6669020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *6669020
 description: Library to access bugzilla
-email: 
+email:
 - dmacvicar@suse.de
-executables: 
+executables:
 - bicho
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -95,39 +84,31 @@ files:
 - lib/bicho/version.rb
 - test/helper.rb
 - test/test_query.rb
-homepage: ""
+homepage: http://github.com/dmacvicar/bicho
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bicho
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library to access bugzilla
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_query.rb
+has_rdoc: