bicho 0.0.5 → 0.0.6

data/lib/bicho/client.rb

@@ -176,12 +176,16 @@ module Bicho
       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]
+          begin
+            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
+          rescue Nokogiri::XML::XPath::SyntaxError
+            raise "Named query '#{what}' not found"
           end
-          return bugs
         when Net::HTTPRedirect
           raise "HTTP redirect not supported in named_query"
         else

data/lib/bicho/plugins/novell.rb

@@ -1,6 +1,6 @@
 #--
 # Copyright (c) 2011 SUSE LINUX Products GmbH
-#
+# => 
 # Author: Duncan Mac-Vicar P. <dmacvicar@suse.de>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -40,22 +40,34 @@ module Bicho
     class Novell
 
       OSCRC_CREDENTIALS = "https://api.opensuse.org"
+      DEFAULT_OSCRC_PATH = File.join(ENV['HOME'], '.oscrc')
+
+      def self.oscrc_path=(path)
+        @oscrc_path = path
+      end
+
+      def self.oscrc_path
+        @oscrc_path ||= DEFAULT_OSCRC_PATH
+      end
 
       def to_s
-        self.class.to_s
+        self.class.to_s        
       end
 
-      def self.oscrc_credentials
-        oscrc = IniFile.new(File.join(ENV['HOME'], '.oscrc'))
-        if oscrc.has_section?(OSCRC_CREDENTIALS)
-          user = oscrc[OSCRC_CREDENTIALS]['user']
-          pass = oscrc[OSCRC_CREDENTIALS]['pass']
-          if user && pass
-            return {:user => user, :password => pass}
-          else
-            raise "No .oscrc credentials for bnc"
+      def self.oscrc_credentials        
+        oscrc = IniFile.new(oscrc_path)
+        urls = [OSCRC_CREDENTIALS]
+        urls << "#{OSCRC_CREDENTIALS}/" if not OSCRC_CREDENTIALS.end_with?('/')
+        urls.each do |section|
+          if oscrc.has_section?(section)
+            user = oscrc[section]['user']
+            pass = oscrc[section]['pass']
+            if user && pass
+              return {:user => user, :password => pass}
+            end
           end
         end
+        raise "No valid .oscrc credentials for bnc. #{user} #{pass}"
       end
 
       def transform_api_url_hook(url, logger)

data/lib/bicho/query.rb

@@ -32,6 +32,8 @@ module Bicho
   #
   class Query
 
+    include Enumerable
+
     # Iterates through the result of the current query.
     #
     # @note Requires Bicho.client to be set

data/lib/bicho/version.rb

@@ -1,3 +1,3 @@
 module Bicho
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/test_novell_plugin.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'helper')
+require 'bicho/plugins/novell'
 
 class NovellPlugin_test < Test::Unit::TestCase
 
@@ -14,4 +15,13 @@ class NovellPlugin_test < Test::Unit::TestCase
 
   end
 
+  def test_oscrc_parsing
+    Bicho::Plugins::Novell.oscrc_path = "/space/tmp/oscrc-uwe"
+    plugin = Bicho::Plugins::Novell.new
+    credentials = Bicho::Plugins::Novell.oscrc_credentials
+    assert_not_nil(credentials)
+    assert(credentials.has_key?(:user))
+    assert(credentials.has_key?(:password))
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bicho
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Duncan Mac-Vicar P.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 +01:00
+date: 2012-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bicho
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Library to access bugzilla