aurb 1.1.0 → 1.1.1

data/README.rdoc

@@ -12,15 +12,15 @@ Aurb can download from, search and look for updates on the AUR.
 
 Download one or more packages:
 
-  $ aurb --download "firefox-nightly opera chromium-browser-svn"
+  $ aurb download "firefox-nightly opera chromium-browser-svn"
 
 Search for one or more packages:
 
-  $ aurb --search "firefox opera"
+  $ aurb search "firefox opera"
 
 Look for upgrades to packages you have installed from the AUR:
 
-  $ aurb --upgrade
+  $ aurb upgrade
 
 == Tests
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/aurb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
-  s.date = %q{2010-02-07}
+  s.date = %q{2010-02-08}
   s.default_executable = %q{aurb}
   s.email = %q{gigamo@gmail.com}
   s.executables = ["aurb"]

data/lib/aurb.rb

@@ -17,7 +17,7 @@ require 'archive/tar/minitar'
 require 'facets/version'
 
 module Aurb #:nodoc:
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   class AurbError < StandardError
     def self.status_code(code = nil)
@@ -44,6 +44,10 @@ module Aurb #:nodoc:
       "http://aur.archlinux.org/rpc.php?type=#{type}&arg=#{arg}"
     end
 
+    def aur_download_path(pkg)
+      "http://aur.archlinux.org/packages/#{pkg}/#{pkg}.tar.gz"
+    end
+
     def aur
       @aur ||= Aur.new
     end

data/lib/aurb/aur.rb

@@ -23,10 +23,8 @@ module Aurb
     #
     #   download(['aurb']) # => ['http://.../aurb.tar.gz']
     def download(packages)
-      url = lambda {|p| "http://aur.archlinux.org/packages/#{p}/#{p}.tar.gz"}
-
       packages.map do |package|
-        url.call(URI.escape(package.to_s))
+        Aurb.aur_download_path URI.escape(package.to_s)
       end.select do |package|
         downloadable?(package)
       end.delete_if(&:blank?)
@@ -39,15 +37,12 @@ module Aurb
     #   # With Aurb on the AUR as version [0, 8, 2, 1]
     #   upgrade(['aurb 0.0.0.0', 'aurb 0.9.9.9']) # => [:aurb]
     def upgrade(list)
-      upgradables = []
-
-      list.each do |line|
+      list.inject([]) do |ary, line|
         name, version = line.split
         next if in_community?(name)
-        upgradables << name.to_sym if upgradable?(name, version)
+        ary << name.to_sym if upgradable?(name, version)
+        ary
       end
-
-      upgradables
     end
 
     protected
@@ -64,39 +59,46 @@ module Aurb
 
     # Compare version of local +package+ with the one on the AUR.
     def upgradable?(package, version)
-      json = parse_json(Aurb.aur_path(:info, package.to_s))
-      return if json.type =~ /error/
-      remote_package = json.results
+      parse_json(Aurb.aur_path(:info, package.to_s)) do |json|
+        return false if json.type =~ /error/
 
-      local_version  = VersionNumber.new(version)
-      remote_version = VersionNumber.new(remote_package.Version)
+        remote_package = json.results
 
-      local_version < remote_version
+        local_version  = VersionNumber.new(version)
+        remote_version = VersionNumber.new(remote_package.Version)
+
+        local_version < remote_version
+      end
     end
 
     # Returns an array containing a hash of search results
     # for a given +package+.
     def list_search_results(package)
       json = parse_json(Aurb.aur_path(:search, URI.escape(package.to_s)))
-      return if json.type =~ /error/
-      ids  = json.results.map(&:ID)
-      results = []
-
-      ids.each do |id|
-        json     = parse_json(Aurb.aur_path(:info, id))
-        next if json.type =~ /error/
-        result   = json.results.symbolize_keys
-        results << result unless in_community?(result[:Name])
+      return [] if json.type =~ /error/
+
+      ids = json.results.map(&:ID)
+      ids.inject([]) do |ary, id|
+        parse_json(Aurb.aur_path(:info, id)) do |json|
+          next if json.type =~ /error/
+          result = json.results.symbolize_keys
+          ary << result unless in_community?(result.Name)
+        end
+        ary
       end
-
-      results
     end
 
     private
 
     # Shortcut to the +Yajl+ JSON parser.
     def parse_json(json)
-      Yajl::Parser.new.parse(open(json).read)
+      json = Yajl::Parser.new.parse(open(json).read)
+
+      if block_given?
+        yield json
+      else
+        json
+      end
     end
   end
 end

data/lib/aurb/support.rb

@@ -30,20 +30,6 @@ class Hash
   end
 end
 
-class Array
-  # Extracts options from a set of arguments.
-  #
-  #   def options(*args)
-  #     args.extract_options!
-  #   end
-  #
-  #   options(1, 2)           # => {}
-  #   options(1, 2, :a => :b) # => {:a=>:b}
-  def extract_options!
-    last.is_a?(Hash) ? pop : {}
-  end
-end
-
 class String
   # Colors a string with +color+.
   # Uses the ANSICode library provided by +facets+.

data/test/unit/test_aur.rb

@@ -24,7 +24,6 @@ class AurTest < Test::Unit::TestCase
 
     context 'download' do
       setup do
-        @url = lambda {|p| "http://aur.archlinux.org/packages/#{p}/#{p}.tar.gz"}
         @package_working = ['awesome-git']
         @package_faulty  = ['awesome']
       end
@@ -35,7 +34,7 @@ class AurTest < Test::Unit::TestCase
       end
 
       should 'return download links' do
-        assert_equal [@url.call(@package_working.join)], @aur.download(@package_working)
+        assert_equal [Aurb.aur_download_path(@package_working.join)], @aur.download(@package_working)
       end
 
       should 'filter out non-existant packages' do
@@ -45,16 +44,21 @@ class AurTest < Test::Unit::TestCase
 
     context 'search' do
       setup do
-        @package = ['aurb']
+        @package_working = ['aurb']
+        @package_faulty  = ['foobarbaz']
       end
 
       should 'return an array of results' do
-        assert @aur.search(@package).is_a?(Array)
+        assert @aur.search(@package_working).is_a?(Array)
+      end
+
+      should 'filter out non-existant packages' do
+        assert_equal [], @aur.search(@package_faulty)
       end
 
       context 'result' do
         setup do
-          @result = @aur.search(@package).first
+          @result = @aur.search(@package_working).first
         end
 
         should 'return an array containing hashes' do

data/test/unit/test_support.rb

@@ -1,40 +1,39 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class SupportTest < Test::Unit::TestCase
-  context 'The core extensions' do
+  context 'Object' do
     should 'be able to check for blank' do
       assert ''.blank?
       assert nil.blank?
+      assert [].blank?
     end
+  end
 
-    context 'for hash' do
-      setup do
-        @hash_s = {'hello' => 'world'}
-        @hash_sym = {:hello => 'world'}
-      end
+  context 'Hash' do
+    setup do
+      @hash_str = {'hello' => 'world'}
+      @hash_sym = {:hello => 'world'}
+    end
 
-      should 'be able to symbolize keys' do
-        assert_equal @hash_sym, @hash_s.symbolize_keys
-        symbolized = @hash_s.symbolize_keys!
-        assert_equal @hash_sym, symbolized
-      end
+    should 'be able to symbolize keys' do
+      assert_equal @hash_sym, @hash_str.symbolize_keys
+      symbolized = @hash_str.symbolize_keys!
+      assert_equal @hash_sym, symbolized
+    end
 
-      should 'provide methods for its keys and automatically symbolize them' do
-        assert_equal 'world', @hash_s.hello
-        assert_equal 'world', @hash_sym.hello
-      end
+    should 'provide methods for its keys through method_missing' do
+      assert_equal 'world', @hash_str.hello
+      assert_equal 'world', @hash_sym.hello
     end
+  end
 
-    context 'for array' do
-      setup do
-        @array_no_opts   = [1, 2]
-        @array_with_opts = [1, 2, :a => :b]
-      end
+  context 'String' do
+    setup do
+      @str = 'foo'
+    end
 
-      should 'be able to extract options' do
-        assert_equal({}, @array_no_opts.extract_options!)
-        assert_equal({:a => :b}, @array_with_opts.extract_options!)
-      end
+    should 'be able to colorize itself through the ansi library' do
+      assert_equal "\e[34mfoo\e[0m", @str.colorize(:blue)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: aurb
 dependencies: 
 - !ruby/object:Gem::Dependency