aurb 1.1.2 → 1.2.0

data/README.md

@@ -0,0 +1,41 @@
+# Aurb
+
+An AUR (Arch User Repository) utility.
+
+Aurb can download from, search and look for updates on the AUR.
+
+## Install
+
+For Arch users, aurb is [available on the aur](http://aur.archlinux.org/packages.php?ID=24395).
+
+If you rather install it as a gem, you could:
+
+    # gem install aurb
+
+## Usage
+
+Download one or more packages:
+
+    $ aurb download hon ioquake3
+
+Search for one or more packages:
+
+    $ aurb search firefox opera
+
+Look for upgrades to packages you have installed from the AUR:
+
+    $ aurb upgrade
+
+## Tests
+
+Clone the project, and run:
+
+    $ rake test
+
+## Documentation
+
+See [rdoc.info](http://rdoc.info/projects/gigamo/aurb).
+
+## Copyright
+
+Copyright (c) 2009-2010 Gigamo. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/aurb.gemspec

@@ -5,22 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-03-04}
   s.default_executable = %q{aurb}
   s.email = %q{gigamo@gmail.com}
   s.executables = ["aurb"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.md"
   ]
   s.files = [
     ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.md",
      "Rakefile",
      "VERSION",
      "aurb.gemspec",

data/lib/aurb.rb

@@ -12,7 +12,7 @@ require 'ansi'
 require 'archive/tar/minitar'
 
 module Aurb #:nodoc:
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 
   autoload :Aur, 'aurb/aur'
 

data/lib/aurb/aur.rb

@@ -27,8 +27,8 @@ module Aurb
     # Search the AUR for given +packages+.
     # Returns an array of results.
     #
-    #   search(['aurb']) # => [{:ID => ..., :Name => 'aurb', ...}, {...}]
-    def search(packages)
+    #   search('aurb') # => [{:ID => ..., :Name => 'aurb', ...}, {...}]
+    def search(*packages)
       packages.map do |package|
         list_search_results(package)
       end.flatten.delete_if(&:blank?)
@@ -37,8 +37,8 @@ module Aurb
     # Download +packages+ from the AUR.
     # Returns an array of downloadable package urls.
     #
-    #   download(['aurb']) # => ['http://.../aurb.tar.gz']
-    def download(packages)
+    #   download('aurb') # => ['http://.../aurb.tar.gz']
+    def download(*packages)
       packages.map do |package|
         Aurb.aur_download_path URI.escape(package.to_s)
       end.select do |package|
@@ -61,7 +61,7 @@ module Aurb
       end
     end
 
-    protected
+  protected
 
     # See if +package+ is available in the community repository.
     def in_community?(package)
@@ -103,17 +103,12 @@ module Aurb
       end
     end
 
-    private
+  private
 
     # Shortcut to the +Yajl+ JSON parser.
     def parse_json(json)
       json = Yajl::Parser.new.parse(open(json).read)
-
-      if block_given?
-        yield json
-      else
-        json
-      end
+      yield json rescue json
     end
   end
 end

data/lib/aurb/cli.rb

@@ -6,22 +6,23 @@ require File.expand_path(File.dirname(__FILE__) + '/../aurb')
 
 module Aurb
   class CLI < Thor
-    ARGV   = ::ARGV.dup
+    ARGV = ::ARGV.dup
 
     map '-d' => :download
     map '-s' => :search
     map '-u' => :upgrade
 
-    desc 'download "PACKAGES"', 'Download packages'
+    desc 'download PACKAGES', 'Download packages'
     method_option :path,
                   :type    => :string,
                   :default => File.join(ENV[:HOME], 'abs'),
                   :banner  => 'Specify the path to download to'
-    def download(pkgs)
-      pkgs = Aurb.aur.download(pkgs.split)
-
-      puts 'No downloadable packages found' and return if pkgs.blank?
-
+    method_option :keep,
+                  :type    => :boolean,
+                  :banner  => 'Keep the tarball after downloading'
+    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])
       if File.exist?(path)
@@ -29,41 +30,30 @@ module Aurb
       else
         raise AurbDownloadError, "'#{path}' is not a valid path"
       end
-
       pkgs.each_with_index do |package, index|
-        current = index + 1
-        total   = pkgs.size
-        local   = package.split('/')[-1]
-
+        local = package.split('/')[-1]
         Dir.chdir path do
           open package do |remote|
             File.open local, 'wb' do |local|
               local.write remote.read
             end
           end
-
-          Archive::Tar::Minitar.unpack(
-            Zlib::GzipReader.new(File.open(local, 'rb')), Dir.pwd
-          )
-          File.delete local
+          Archive::Tar::Minitar.unpack Zlib::GzipReader.new(File.open(local, 'rb')), Dir.pwd
+          File.delete local unless opts.keep?
         end
-
-        puts "(#{current}/#{total}) downloaded #{local}"
+        puts "(#{index+1}/#{pkgs.size}) downloaded #{local}"
       end
     end
 
-    desc 'search "PACKAGES"', 'Search for packages'
-    def search(pkgs)
-      pkgs = Aurb.aur.search(pkgs.split)
-
-      puts 'No results found' and return if pkgs.blank?
-
+    desc 'search PACKAGES', 'Search for packages'
+    def search(*pkgs)
+      pkgs = Aurb.aur.search(*pkgs)
+      puts 'No results found'.colorize(:red) and return if pkgs.blank?
       pkgs.each do |package|
         status = package.OutOfDate == '1' ? '✘'.colorize(:red) : '✔'.colorize(:green)
         name, version, description = package.Name.colorize(:yellow),
                                      package.Version,
                                      package.Description
-
         puts "[#{status}] #{name} (#{version})\n    #{description}"
       end
     end
@@ -72,11 +62,9 @@ module Aurb
     def upgrade
       list = `pacman -Qm`.split(/\n/)
       pkgs = Aurb.aur.upgrade(list)
-
-      puts 'Nothing to upgrade' and return if pkgs.blank?
-
+      puts 'Nothing to upgrade'.colorize(:red) and return if pkgs.blank?
       pkgs.each do |package|
-        puts "#{package} has an upgrade available"
+        puts "#{package.to_s.colorize(:yellow)} has an upgrade available"
       end
     end
   end

data/test/unit/test_aur.rb

@@ -26,7 +26,7 @@ class AurTest < Test::Unit::TestCase
       end
 
       should 'return an array' do
-        assert Aurb.aur.upgrade(@list).is_a?(Array)
+        assert_operator Array, :===, Aurb.aur.upgrade(@list)
       end
 
       should 'contain only upgradable packages' do
@@ -37,56 +37,55 @@ class AurTest < Test::Unit::TestCase
 
     context 'download' do
       setup do
-        @package_working = ['aurb']
-        @package_faulty  = ['foobarbaz']
+        @package_working = 'aurb'
+        @package_faulty  = 'foobarbaz'
+        @package_multi   = 'aurb', 'yaourt'
       end
 
       should 'return an array' do
-        assert Aurb.aur.download(@package_working).is_a?(Array)
-        assert Aurb.aur.download(@package_faulty).is_a?(Array)
+        assert_operator Array, :===, Aurb.aur.download(*@package_working)
+        assert_operator Array, :===, Aurb.aur.download(*@package_faulty)
       end
 
       should 'return download links' do
-        assert_equal [Aurb.aur_download_path(@package_working.join)], Aurb.aur.download(@package_working)
+        assert_equal [Aurb.aur_download_path(*@package_working)], Aurb.aur.download(*@package_working)
       end
 
       should 'filter out non-existant packages' do
-        assert Aurb.aur.download(@package_faulty).blank?
-        assert_equal [], Aurb.aur.download(@package_faulty)
+        assert Aurb.aur.download(*@package_faulty).blank?
+        assert_equal [], Aurb.aur.download(*@package_faulty)
       end
     end
 
     context 'search' do
       setup do
-        @package_working = ['aurb']
-        @package_faulty  = ['foobarbaz']
+        @package_working = 'aurb'
+        @package_faulty  = 'foobarbaz'
+        @package_multi   = 'aurb', 'yaourt'
       end
 
       should 'return an array of results' do
-        assert Aurb.aur.search(@package_working).is_a?(Array)
+        assert_operator Array, :===, Aurb.aur.search(*@package_working)
+        assert_operator Array, :===, Aurb.aur.search(*@package_faulty)
       end
 
       should 'filter out non-existant packages' do
-        assert Aurb.aur.search(@package_faulty).blank?
-        assert_equal [], Aurb.aur.search(@package_faulty)
+        assert Aurb.aur.search(*@package_faulty).blank?
+        assert_equal [], Aurb.aur.search(*@package_faulty)
       end
 
       context 'result' do
         setup do
-          @result = Aurb.aur.search(@package_working).first
+          @result = Aurb.aur.search(*@package_working).first
         end
 
         should 'return an array containing hashes' do
-          assert @result.is_a?(Hash)
+          assert_operator Hash, :===, @result
         end
 
         context 'keys' do
-          setup do
-            @key = @result.keys.first
-          end
-
           should 'be symbolized' do
-            assert @key.is_a?(Symbol)
+            assert_operator Symbol, :===, @result.keys.first
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2010-03-04 00:00:00 +01:00
 default_executable: aurb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,11 +70,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - aurb.gemspec

data/README.rdoc

@@ -1,37 +0,0 @@
-= Aurb
-
-An AUR (Arch User Repository) utility.
-
-Aurb can download from, search and look for updates on the AUR.
-
-== Install
-
-  $ gem install aurb
-
-== Usage
-
-Download one or more packages:
-
-  $ aurb download "firefox-nightly opera chromium-browser-svn"
-
-Search for one or more packages:
-
-  $ aurb search "firefox opera"
-
-Look for upgrades to packages you have installed from the AUR:
-
-  $ aurb upgrade
-
-== Tests
-
-Just clone the project, and run
-
-  $ rake test:units
-
-== Documentation
-
-See http://rdoc.info/projects/gigamo/aurb
-
-== Copyright
-
-Copyright (c) 2009-2010 Gigamo. See LICENSE for details.