aurb 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/aurb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/aurb/core_ext/object.rb",
      "lib/aurb/core_ext/string.rb",
      "lib/aurb/version.rb",
+     "performance/aur.rb",
      "test/test_helper.rb",
      "test/unit/test_aur.rb",
      "test/unit/test_support.rb"

data/lib/aurb/aur.rb

@@ -61,7 +61,7 @@ module Aurb
           upgradables << name.to_sym if upgradable?(name, version)
         end
       end.each(&:join)
-      upgradables
+      upgradables.delete_if(&:blank?)
     end
 
   protected
@@ -83,13 +83,16 @@ module Aurb
       json = parse_json(Aurb.aur_rpc_path(:search, URI.escape(package.to_s)))
       return [] if json.type =~ /error/
       ids = json.results.map(&:ID)
+      results = []
       ids.inject([]) do |ary, id|
-        parse_json Aurb.aur_rpc_path(:info, id) do |json|
-          next if json.type =~ /error/
-          ary << json.results.symbolize_keys
+        ary << Thread.new do
+          parse_json Aurb.aur_rpc_path(:info, id) do |json|
+            next if json.type =~ /error/
+            results << json.results.symbolize_keys
+          end
         end
-        ary
-      end
+      end.each(&:join)
+      results
     end
 
   private

data/lib/aurb/cli.rb

@@ -25,8 +25,7 @@ module Aurb
     def download(*pkgs)
       pkgs = Aurb.aur.download(*pkgs)
       puts 'No downloadable packages found'.colorize(:red) and return if pkgs.blank?
-      opts = options.dup
-      path = opts[:path][0] == '/' ? opts[:path] : File.join(Dir.pwd, opts[:path])
+      path = options.path[0] == '/' ? options.path : File.join(Dir.pwd, options.path)
       if File.exist?(path)
         path = File.expand_path(path)
       else
@@ -41,7 +40,7 @@ module Aurb
             end
           end
           Archive::Tar::Minitar.unpack Zlib::GzipReader.new(File.open(local, 'rb')), Dir.pwd
-          File.delete local unless opts.keep?
+          File.delete local unless options.keep?
         end
         puts "(#{index+1}/#{pkgs.size}) downloaded #{local}"
       end

data/lib/aurb/version.rb

@@ -1,3 +1,3 @@
 module Aurb
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/performance/aur.rb

@@ -0,0 +1,16 @@
+require 'pp'
+require 'benchmark'
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'aurb'
+
+Benchmark.bm 5 do |x|
+  x.report 'search' do
+    Aurb.aur.search *:quake
+  end
+
+  x.report 'upgrade' do
+    Aurb.aur.upgrade *`pacman -Qm`.split(/\n/)
+  end
+end

data/test/unit/test_aur.rb

@@ -12,7 +12,7 @@ class AurTest < Test::Unit::TestCase
         ]
 
         versions.each do |version|
-          assert Aurb::Aur::Version.new(version[:old]) < Aurb::Aur::Version.new(version[:new])
+          assert_operator Aurb::Aur::Version.new(version[:old]), :<, Aurb::Aur::Version.new(version[:new])
         end
       end
     end
@@ -21,8 +21,7 @@ class AurTest < Test::Unit::TestCase
   context 'Aurb::Aur #' do
     context 'upgrade' do
       setup do
-        @list = ['aurb 0.0.0-0',
-                 'aurb 9.9.9-9']
+        @list = "aurb 0.0.0-0\naurb 9.9.9-9".split(/\n/)
       end
 
       should 'return an array' do
@@ -39,7 +38,6 @@ class AurTest < Test::Unit::TestCase
       setup do
         @package_working = 'aurb'
         @package_faulty  = 'foobarbaz'
-        @package_multi   = 'aurb', 'yaourt'
       end
 
       should 'return an array' do
@@ -61,7 +59,6 @@ class AurTest < Test::Unit::TestCase
       setup do
         @package_working = 'aurb'
         @package_faulty  = 'foobarbaz'
-        @package_multi   = 'aurb', 'yaourt'
       end
 
       should 'return an array of results' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Gigamo
@@ -87,6 +87,7 @@ files:
 - lib/aurb/core_ext/object.rb
 - lib/aurb/core_ext/string.rb
 - lib/aurb/version.rb
+- performance/aur.rb
 - test/test_helper.rb
 - test/unit/test_aur.rb
 - test/unit/test_support.rb