gigamo-aurb 0.8.1 → 0.8.2

data/README.rdoc

@@ -2,11 +2,19 @@
 
 See <tt>aurb --help</tt> for a full list of commands.
 
-=== Overview
+=== Quick Overview
 
-<b>--upgrade</b>:: Searches the AUR for upgrades to local packages that don't exist in any official repository
-<b>--download</b>:: Downloads your specified package(s) from the AUR and untars it
+Required options:
+
+<b>--download</b>:: Downloads a specified package and untars it
 <b>--search</b>:: Searches the AUR for a specified name or description
+<b>--upgrade</b>:: Searches the AUR for updates to foreign local packages
+
+Optional options:
+
+<b>--no-color</b>:: Suppress colored output
+<b>--path</b>:: Override the default save path (defined as DlPath)
+<b>--version</b>:: Print version and exit
 
 == Installation
 
@@ -24,7 +32,9 @@ For more information about setup.rb, see <tt>ruby setup.rb --help</tt>.
 If you prefer RubyGems:
 
   % gem build aurb.gemspec
-  # gem install aurb-0.7.2.gem
+  # gem install aurb-$VERSION.gem
+
+(substitute $VERSION with aurb's current version)
 
 There is also a github gem available:
 

data/aurb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.8.1'
-  s.date = %q{2009-05-03}
+  s.version = '0.8.2'
+  s.date = %q{2009-05-04}
   s.summary = %q{A simple AUR utility}
   s.email = %q{gigamo@gmail.com}
   s.homepage = %q{http://github.com/gigamo/aurb}

data/bin/aurb

@@ -26,7 +26,7 @@ module Aurb
   DlPath = File.join ENV['HOME'], 'abs'
 
 # Program info
-  PrInfo = {:name => 'Aurb', :version => [0, 8, 1].join('.'), :release => '2009-05-03'}
+  PrInfo = {:name => 'Aurb', :version => [0, 8, 2].join('.'), :release => '2009-05-04'}
 
   class << self
     def aur
@@ -65,7 +65,10 @@ module Aurb
 
     def start
       set_trap
-      instance_eval @opts.cmd
+      @opts.cmd.each do |cmd|
+        instance_eval cmd
+        say "\n---\n\n" unless cmd == @opts.cmd.last
+      end
     end
 
     def download packages
@@ -74,7 +77,6 @@ module Aurb
       abort 'FATAL: No package(s) to download. Possibly the package(s) you ' +
         'specified was/were found in the community repository?' if packages.empty?
       say "Targets (#{ansi packages.length, :magenta}): #{packages.join(', ')}"
-
       if yes_or_no? 'Proceed? '
         packages.each do |package|
           begin
@@ -82,27 +84,28 @@ module Aurb
               fetch package
               untar package
             end
-          rescue OpenURI::HTTPError
-            say "Something went wrong downloading '#{package}'. Are you sure it exists?"
+          rescue OpenURI::HTTPError => e
+            say "Something went wrong downloading '#{package}'. Are you sure it exists?\n" +
+              "---\n#{e.message}"
             package == packages.last ? exit : next
           end
-
           say "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
         end
       end
     end
 
-    def search package
-      list(package).each do |names|
-        result = json @config[:rpc]['info', names.last]
-
-        unless result['type'] =~ /error/
-          result = result['results']
-          next if in_sync? result['Name']
-
-          if package.any? {|pac| result['Name'].include?(pac) || result['Description'].include?(pac)}
-            say "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
-              "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}"
+    def search packages
+      packages = packages.split
+      packages.each do |package|
+        list(package).each do |names|
+          result = json @config[:rpc]['info', names.last]
+          unless result['type'] =~ /error/
+            result = result['results']
+            next if in_sync? result['Name']
+            if package.any? {|pac| result['Name'].include?(pac) || result['Description'].include?(pac)}
+              say "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
+                "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}"
+            end
           end
         end
       end
@@ -111,22 +114,18 @@ module Aurb
     def check_upgrade
       upgradable = []
       say 'Searching for updates'
-
       IO.popen('pacman -Qm', IO::RDONLY) {|pm| pm.read.lines}.each do |line|
         name, version = line.chomp.split
         result = json @config[:rpc]['info', name]
-
         unless result['type'] =~ /error/
           result = result['results']
           next if in_sync? result['Name']
-
           if VersionNumber.new(result['Version']) > VersionNumber.new(version)
             upgradable << result['Name']
             say " #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
           end
         end
       end
-
       upgradable.any? ? (say "\n"; download upgradable) : say('Nothing to update')
     end
 
@@ -137,13 +136,11 @@ module Aurb
 
     def list package
       info, list = json(@config[:rpc]['search', URI.escape(package)]), []
-
       unless info['type'] =~ /error/
         info['results'].each do |result|
           list << [result['Name'], result['ID']]
         end
       end
-
       list.sort
     end
 
@@ -156,14 +153,11 @@ module Aurb
     end
 
     def untar package
-      abort "FATAL: #{package}.tar.gz not found for untar" \
-        unless File.exists? "#{package}.tar.gz" # This should never, ever happen.
-
       Archive::Tar::Minitar.unpack \
         Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
         Dir.pwd
 
-      FileUtils.rm "#{package}.tar.gz" if File.exists? "#{package}.tar.gz"
+      FileUtils.rm "#{package}.tar.gz"
     end
 
     def json item
@@ -172,37 +166,34 @@ module Aurb
   end
 
   class Opts
-    attr_reader :cmd, :config
+    attr_reader :config
+    attr_reader :cmd
 
     def initialize
       @config = {:path => DlPath, :color => true}
-    # Parse zeh ARGV!
+      @cmd    = []
+
       parse!
     end
 
   private
-    include Aurb::Util
-
     def parse!
-      if ARGV.empty?
-        abort 'No argument given. Try --help.'
-      end
-
+      ARGV.unshift '-h' if ARGV.empty?
       gopts = GetoptLong.new \
         ['--download', '-d',        GetoptLong::REQUIRED_ARGUMENT],
         ['--search', '-s',          GetoptLong::REQUIRED_ARGUMENT],
         ['--upgrade', '-u',         GetoptLong::NO_ARGUMENT],
-        ['--color',                 GetoptLong::NO_ARGUMENT],
+        ['--no-color',              GetoptLong::NO_ARGUMENT],
         ['--path',                  GetoptLong::OPTIONAL_ARGUMENT],
         ['--version', '-v',         GetoptLong::NO_ARGUMENT],
         ['--help', '-h',            GetoptLong::NO_ARGUMENT]
 
       gopts.each do |opt, arg|
         case opt
-        when '--download' then @cmd            = "download '#{arg}'"
-        when '--search'   then @cmd            = "search '#{arg}'"
-        when '--upgrade'  then @cmd            = 'check_upgrade'
-        when '--color'    then @config[:color] = !@config[:color]
+        when '--download' then @cmd << "download '#{arg}'"
+        when '--search'   then @cmd << "search '#{arg}'"
+        when '--upgrade'  then @cmd << 'check_upgrade'
+        when '--no-color' then @config[:color] = false
         when '--path'     then
           if File.exists? arg = (arg[0...1] == '/' ? arg : File.join(Dir.pwd, arg))
             @config[:path] = Pathname.new(arg).realpath
@@ -216,7 +207,7 @@ module Aurb
 Aurb - An AUR utility written in Ruby.
 
 Usage:
-  #$0 [options]
+  #{File.basename $0} [options]
 
 Options (Required):
   -d, --download PACKAGE      Download a package.
@@ -224,14 +215,13 @@ Options (Required):
   -u, --upgrade               Search for package updates.
 
 Optional:
-  --color                     Use colors? [#{@config[:color]}]
+  --no-color                  Disable colored output.
   --path [PATH]               Override the default save path. [#{@config[:path]}]
   --version                   Show version and exit.
 HELP
         end
       end
-    rescue GetoptLong::Error
-      abort $!.message
+    rescue GetoptLong::Error; exit 2
     end
   end
 end
@@ -247,7 +237,7 @@ __END__
 
 =head1 NAME
 
-Aurb - A Ruby AUR Utility
+Aurb - An AUR utility written in Ruby
 
 =head1 SYNOPSIS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency