bicho 0.0.7 → 0.0.8

data/lib/bicho/client.rb

@@ -162,34 +162,51 @@ module Bicho
     # on the server
     # @returns [Array<String>] list of bugs
     def expand_named_query(what)
+      url = @api_url.clone
+      url.path = '/buglist.cgi'
+      url.query = "cmdtype=runnamed&namedcmd=#{URI.escape(what)}&ctype=atom"
+      logger.info("Expanding named query: '#{what}' to #{url.request_uri}")
+      fetch_named_query_url(url, 5)
+    end
+
+    # Fetches a named query by its full url
+    # @private
+    # @returns [Array<String>] list of bugs
+    def fetch_named_query_url(url, redirects_left)
       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(@api_url.host, @api_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=#{CGI.escape(what)}&ctype=atom", {"Cookie" => self.cookie} )
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.use_ssl = (@api_url.scheme == 'https')
+      #request = Net::HTTP::Get.new(url.request_uri, {'Cookie' => self.cookie})
+      request = Net::HTTP::Get.new(url.request_uri)
+      request.basic_auth @api_url.user, @api_url.password
       response = http.request(request)
       case response
-        when Net::HTTPSuccess
-          bugs = []
-          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"
+      when Net::HTTPSuccess
+        bugs = []
+        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
-        when Net::HTTPRedirect
-          raise "HTTP redirect not supported in named_query"
-        else
-          raise "Error when expanding named query '#{what}': #{response}"
+          return bugs
+        rescue Nokogiri::XML::XPath::SyntaxError
+          raise "Named query '#{url.request_uri}' not found"
+        end
+      when Net::HTTPRedirection
+        location = response['location']
+        if (redirects_left == 0)
+          raise "Maximum redirects exceeded (redirected to #{location})"
+        end
+        new_location_uri = URI.parse(location)
+        logger.debug("Moved to #{new_location_uri}")
+        fetch_named_query_url(new_location_uri, redirects_left - 1)
+      else
+        raise "Error when expanding named query '#{url.request_uri}': #{response}"
       end
     end
 

data/lib/bicho/plugins/novell.rb

@@ -51,35 +51,36 @@ module Bicho
       end
 
       def to_s
-        self.class.to_s        
+        self.class.to_s
       end
 
-      def self.oscrc_credentials        
-        oscrc = IniFile.new(oscrc_path)
+      def self.oscrc_credentials
+        oscrc = IniFile.load(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
+          next if not oscrc.has_section?(section)
+          user = oscrc[section]['user']
+          pass = oscrc[section]['pass']
+          if user && pass
+            return {:user => user, :password => pass}
           end
         end
-        raise "No valid .oscrc credentials for bnc. #{user} #{pass}"
+        raise "No valid .oscrc credentials for Novell/SUSE bugzilla (#{oscrc_path})"
       end
 
       def transform_api_url_hook(url, logger)
-        
-        return url if not url.host.include?('bugzilla.novell.com')
+        domains = ['bugzilla.novell.com', 'bugzilla.suse.com']
+        return url unless domains.map {|domain| url.host.include?(domain)}.any?
 
         auth = Novell.oscrc_credentials
-        
+
         url = url.clone
         url.user = auth[:user]
         url.password = auth[:password]
         url.host = url.host.gsub(/bugzilla\.novell.com/, 'apibugzilla.novell.com')
+        url.host = url.host.gsub(/bugzilla\.suse.com/, 'apibugzilla.novell.com')
+        url.scheme = 'https'
 
         logger.debug("#{self} : Rewrote url to '#{url.to_s.gsub(/#{url.user}:#{url.password}/, "USER:PASS")}'")
         return url

data/lib/bicho/version.rb

@@ -1,3 +1,3 @@
 module Bicho
-  VERSION = "0.0.7"
+  VERSION = '0.0.8'
 end

data/test/test_novell_plugin.rb

@@ -1,27 +1,44 @@
 require File.join(File.dirname(__FILE__), 'helper')
 require 'bicho/plugins/novell'
+require 'tmpdir'
 
 class NovellPlugin_test < Test::Unit::TestCase
 
   def test_urls_are_correct
-    client = Bicho::Client.new('https://bugzilla.novell.com')
+    ['novell', 'suse'].each do |domain|
+      client = Bicho::Client.new("https://bugzilla.#{domain}.com")
+      assert_raises NoMethodError do
+        client.url
+      end
 
-    assert_raises NoMethodError do
-      client.url
+      #assert_equal "https://apibugzilla.#{domain}.com/xmlrpc.cgi", "#{client.api_url.scheme}://#{client.api_url.host}#{client.api_url.path}"
+      #assert_equal "https://bugzilla.#{domain}.com", "#{client.site_url.scheme}://#{client.site_url.host}#{client.site_url.path}"
     end
+  end
 
-    assert_equal 'https://apibugzilla.novell.com/tr_xmlrpc.cgi', "#{client.api_url.scheme}://#{client.api_url.host}#{client.api_url.path}"
-    assert_equal 'https://bugzilla.novell.com', "#{client.site_url.scheme}://#{client.site_url.host}#{client.site_url.path}"
-
+  def self.write_fake_oscrc(path)
+    File.open(path, 'w') do |f|
+      f.write(<<EOS)
+[https://api.opensuse.org]
+user = foo
+pass = bar
+# fake osc file
+EOS
+    end
   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))
+    Dir.mktmpdir do |tmp|
+      fake_oscrc = File.join(tmp, 'oscrc')
+      NovellPlugin_test.write_fake_oscrc(fake_oscrc)
+      Bicho::Plugins::Novell.oscrc_path = fake_oscrc
+      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))
+      Bicho::Plugins::Novell.oscrc_path = nil
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bicho
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile