bicho 0.0.10 → 0.0.12

data/lib/bicho/plugins/novell.rb

@@ -37,7 +37,7 @@ module Bicho
     # your oscrc.
     #
     class Novell
-      OSCRC_CREDENTIALS = 'https://api.opensuse.org' unless defined? OSCRC_CREDENTIALS
+      OSCRC_CREDENTIALS = 'https://api.opensuse.org'.freeze unless defined? OSCRC_CREDENTIALS
       DEFAULT_OSCRC_PATH = File.join(ENV['HOME'], '.oscrc') unless defined? DEFAULT_OSCRC_PATH
 
       class << self
@@ -60,11 +60,9 @@ module Bicho
           next unless oscrc.has_section?(section)
           user = oscrc[section]['user']
           pass = oscrc[section]['pass']
-          if user && pass
-            return { user: user, password: pass }
-          end
+          return { user: user, password: pass } if user && pass
         end
-        fail "No valid .oscrc credentials for Novell/SUSE bugzilla (#{oscrc_path})"
+        raise "No valid .oscrc credentials for Novell/SUSE bugzilla (#{oscrc_path})"
       end
 
       def transform_site_url_hook(url, _logger)
@@ -80,16 +78,20 @@ module Bicho
         domains = ['bugzilla.novell.com', 'bugzilla.suse.com']
         return url unless domains.map { |domain| url.host.include?(domain) }.any?
 
-        auth = Novell.oscrc_credentials
+        begin
+          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'
+          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.suse.com')
+          url.scheme = 'https'
 
-        logger.debug("#{self} : Rewrote url to '#{url.to_s.gsub(/#{url.user}:#{url.password}/, 'USER:PASS')}'")
+          logger.debug("#{self} : Rewrote url to '#{url.to_s.gsub(/#{url.user}:#{url.password}/, 'USER:PASS')}'")
+        rescue StandardError => e
+          logger.warn e
+        end
         url
       end
     end

data/lib/bicho/plugins/user.rb

@@ -2,9 +2,10 @@ require 'yaml'
 
 module Bicho
   module Plugins
-
+    # Plugin to get preferences from the user home directory
+    # .config/bicho/config.yml
+    #
     class User
-
       DEFAULT_CONFIG_PATH = File.join(ENV['HOME'], '.config', 'bicho', 'config.yml') unless defined? DEFAULT_CONFIG_PATH
 
       class << self
@@ -17,9 +18,7 @@ module Bicho
 
       def initialize
         @config = {}
-        if File.exist?(Bicho::Plugins::User.config_path)
-          @config = YAML.load_file(Bicho::Plugins::User.config_path)
-        end
+        @config = YAML.load_file(Bicho::Plugins::User.config_path) if File.exist?(Bicho::Plugins::User.config_path)
       end
 
       def default_site_url_hook(logger)
@@ -41,9 +40,6 @@ module Bicho
           url
         end
       end
-
-
     end
-
   end
 end

data/lib/bicho/query.rb

@@ -41,7 +41,7 @@ module Bicho
       ret = Bicho.client.search_bugs(self)
       return ret.each unless block_given?
       ret.each { |bug| yield bug }
-     end
+    end
 
     # obtains the parameter that can be passed to the XMLRPC API
     # @private
@@ -92,9 +92,7 @@ module Bicho
     #
     # @private
     def append_query(param, value)
-      unless @query_map.key?(param)
-        @query_map[param] = []
-      end
+      @query_map[param] = [] unless @query_map.key?(param)
       @query_map[param] = [@query_map[param], value].flatten
     end
   end

data/lib/bicho/version.rb

@@ -1,3 +1,3 @@
 module Bicho
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'.freeze
 end

data/test/helper.rb

@@ -1,5 +1,12 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'minitest/mock'
+Minitest::Reporters.use!(
+  Minitest::Reporters::ProgressReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)
 require 'bicho'
 
 if ENV['DEBUG']

data/test/test_attachments.rb

@@ -0,0 +1,30 @@
+require_relative 'helper'
+require 'digest'
+
+# Test for bug attachments
+class AttachmentsTest < Minitest::Test
+  def test_client_get_attachments
+    Bicho.client = Bicho::Client.new('https://bugzilla.gnome.org')
+
+    attachments = Bicho.client.get_attachments(679745)
+    assert_kind_of(Array, attachments)
+    assert !attachments.empty?
+
+    attachments.each do |attachment|
+      assert_kind_of(Bicho::Attachment, attachment)
+
+      next unless attachment.id == 329690
+      assert_equal('text/plain', attachment.content_type)
+      assert_equal(8559, attachment.size)
+      assert_equal('user-accounts: use Password Login instead of Automatic Login',
+                   attachment.summary)
+
+      assert_equal('80c4665205bcbd2b90ea920eff21f29988d8fc85f36c293a65fa3dad52d19354',
+                   Digest::SHA256.hexdigest(attachment.data.read))
+    end
+  end
+
+  def teardown
+    Bicho.client = nil
+  end
+end

data/test/test_history.rb

@@ -1,13 +1,19 @@
-require File.join(File.dirname(__FILE__), 'helper')
-
-class History_test < Test::Unit::TestCase
+require_relative 'helper'
 
+# Test for bug history
+class HistoryTest < Minitest::Test
   def test_basic_history
     Bicho.client = Bicho::Client.new('https://bugzilla.gnome.org')
 
     bug = Bicho.client.get_bug(645150)
 
-    assert bug.history.size > 0
+    history = bug.history
+
+    assert !history.empty?
+
+    history.each do |c|
+      assert c.timestamp.to_time.to_i > 0
+    end
   end
 
   def teardown

data/test/test_novell_plugin.rb

@@ -1,41 +1,43 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require_relative 'helper'
 require 'bicho/plugins/novell'
-require 'tmpdir'
+require 'logger'
 
-# Test for the plugin supporting the
-# Novell/SUSE bugzilla authentication
-class NovellPluginTest < Test::Unit::TestCase
-  def test_urls_are_correct
+# Test for the plugin supporting the Novell/SUSE bugzilla authentication
+class NovellPluginTest < Minitest::Test
+  def test_url_replacement
+    r, w = IO.pipe
+    log = Logger.new(w)
     %w(novell suse).each do |domain|
-      client = Bicho::Client.new("https://bugzilla.#{domain}.com")
-      assert_raises NoMethodError do
-        client.url
+      creds = { user: 'test', password: 'test' }
+      Bicho::Plugins::Novell.stub :oscrc_credentials, creds do
+        plugin = Bicho::Plugins::Novell.new
+        url = URI.parse("http://bugzilla.#{domain}.com")
+        site_url = plugin.transform_site_url_hook(url, log)
+        api_url = plugin.transform_api_url_hook(url, log)
+        assert_equal(site_url.to_s, "http://bugzilla.#{domain}.com")
+        assert_equal(api_url.to_s, 'https://test:test@apibugzilla.novell.com')
+        assert_match(/Rewrote url/, r.gets)
       end
     end
   end
 
-  def self.write_fake_oscrc(path)
-    File.open(path, 'w') do |f|
-      f.write(<<EOS)
+  def test_oscrc_parsing
+    oscrc = <<EOS
 [https://api.opensuse.org]
 user = foo
 pass = bar
 # fake osc file
 EOS
-    end
-  end
 
-  def test_oscrc_parsing
     Dir.mktmpdir do |tmp|
-      fake_oscrc = File.join(tmp, 'oscrc')
-      NovellPluginTest.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.key?(:user))
-      assert(credentials.key?(:password))
-      Bicho::Plugins::Novell.oscrc_path = nil
+      fake_oscrc = File.join(tmp, '.oscrc')
+      File.write(fake_oscrc, oscrc)
+      Bicho::Plugins::Novell.stub :oscrc_path, fake_oscrc do
+        credentials = Bicho::Plugins::Novell.oscrc_credentials
+        refute_nil(credentials)
+        assert(credentials.key?(:user))
+        assert(credentials.key?(:password))
+      end
     end
   end
 end

data/test/test_query.rb

@@ -1,9 +1,10 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require_relative 'helper'
 
-class Query_test < Test::Unit::TestCase
+# Test query DSL
+class QueryTest < Minitest::Test
   def test_active_record_style
     # No client set yet
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       Bicho::Bug.where.assigned_to('foo@bar.com').each do |bug|
         puts bug
       end
@@ -11,7 +12,7 @@ class Query_test < Test::Unit::TestCase
 
     Bicho.client = Bicho::Client.new('https://bugzilla.gnome.org')
 
-    ret  = Bicho::Bug.where.product('vala').status('resolved').component('Basic Types').each.to_a
+    ret = Bicho::Bug.where.product('vala').status('resolved').component('Basic Types').each.to_a
     assert ret.collect(&:id).include?(645_150)
   end
 
@@ -24,7 +25,7 @@ class Query_test < Test::Unit::TestCase
     ret = Bicho::Query.new.open
     assert_equal({ 'status' => [:new, :assigned, :needinfo, :reopened] }, ret.query_map)
   end
-  
+
   def teardown
     Bicho.client = nil
   end

data/test/test_user_plugin.rb

@@ -4,8 +4,7 @@ require 'tmpdir'
 
 # Test for the plugin implementing user
 # preferences
-class UserPluginTest < Test::Unit::TestCase
-
+class UserPluginTest < Minitest::Test
   def self.write_fake_config(path)
     File.open(path, 'w') do |f|
       f.write(<<EOS)

data/test/test_version.rb

@@ -1,21 +1,20 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require_relative 'helper'
 
-#
 # Test getting the version of the Bugzilla API
-#
-class Version_test < Test::Unit::TestCase
+class VersionTest < Minitest::Test
   def test_version_gnome
     Bicho.client = Bicho::Client.new('https://bugzilla.gnome.org')
 
-    ret  = Bicho::client.version
-    assert ret =~ /3.4/ # https://bugzilla.gnome.org/ is at 3.4.13 as of Jan/2015
+    ret = Bicho.client.version
+    # https://bugzilla.gnome.org/ is at 4.4.12 as of Jun/2016
+    assert_match(/4.4/, ret)
   end
 
   def test_version_suse
     Bicho.client = Bicho::Client.new('https://bugzilla.suse.com')
 
-    ret  = Bicho::client.version
-    assert ret =~ /4.4/ #https://bugzilla.suse.com is at 4.4.6 as of Jan/2015
+    ret = Bicho.client.version
+    # https://bugzilla.suse.com is at 4.4.6 as of Jan/2015
+    assert_match(/4.4/, ret)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bicho
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Duncan Mac-Vicar P.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -66,6 +66,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to access bugzilla
 email:
 - dmacvicar@suse.de
@@ -76,15 +132,18 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bicho.gemspec
 - bin/bicho
 - lib/bicho.rb
+- lib/bicho/attachment.rb
 - lib/bicho/bug.rb
 - lib/bicho/cli/command.rb
+- lib/bicho/cli/commands/attachments.rb
 - lib/bicho/cli/commands/history.rb
 - lib/bicho/cli/commands/search.rb
 - lib/bicho/cli/commands/show.rb
@@ -100,6 +159,7 @@ files:
 - lib/bicho/query.rb
 - lib/bicho/version.rb
 - test/helper.rb
+- test/test_attachments.rb
 - test/test_history.rb
 - test/test_novell_plugin.rb
 - test/test_query.rb
@@ -131,6 +191,7 @@ specification_version: 4
 summary: Library to access bugzilla
 test_files:
 - test/helper.rb
+- test/test_attachments.rb
 - test/test_history.rb
 - test/test_novell_plugin.rb
 - test/test_query.rb