gigamo-aurb 0.8.2 → 0.8.3

data/README.rdoc

@@ -14,6 +14,9 @@ Optional options:
 
 <b>--no-color</b>:: Suppress colored output
 <b>--path</b>:: Override the default save path (defined as DlPath)
+
+Other:
+
 <b>--version</b>:: Print version and exit
 
 == Installation

data/aurb.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.8.2'
-  s.date = %q{2009-05-04}
-  s.summary = %q{A simple AUR utility}
+  s.version = '0.8.3'
+  s.date = %q{2009-05-07}
+  s.summary = %q{An AUR utility written in Ruby}
   s.email = %q{gigamo@gmail.com}
   s.homepage = %q{http://github.com/gigamo/aurb}
   s.description = s.summary

data/bin/aurb

@@ -17,40 +17,70 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #--
 # Inspired by arson (http://evaryont.github.com/arson)
-
-%w[getoptlong pathname fileutils zlib open-uri rubygems json highline/import
-   facets/ansicode facets/minitar facets/version].each {|lib| require lib}
+require 'rubygems'
+
+{
+  :getopt    => ['getoptlong',      true ],
+  :pathname  => ['pathname',        false],
+  :zlib      => ['zlib',            true ],
+  :openuri   => ['open-uri',        true ],
+  :json      => ['json',            true ],
+  :highline  => ['highline/import', false],
+  :ansicode  => ['facets/ansicode', false],
+  :minitar   => ['facets/minitar',  true ],
+  :version   => ['facets/version',  true ],
+}.each do |key, info|
+  path, required = info[0, 2]
+  $have_lib ||= {}
+
+  begin
+    require path
+    $have_lib[key] = true
+  rescue LoadError
+    if required
+      abort <<-ERR
+You're missing '#{lib}'.
+Please make sure you have the necessary rubygems installed.
+      ERR
+    else
+      $have_lib[key] = false
+    end
+  end
+end
 
 module Aurb
 # Default download path
   DlPath = File.join ENV['HOME'], 'abs'
 
 # Program info
-  PrInfo = {:name => 'Aurb', :version => [0, 8, 2].join('.'), :release => '2009-05-04'}
+  PrInfo = {:name => 'Aurb', :version => [0, 8, 3].join('.'), :release => '2009-05-07'}
 
   class << self
     def aur
       @aur ||= Aur.new \
-        :rpc => proc {|t, a| "http://aur.archlinux.org/rpc.php?type=#{t}&arg=#{a}"}
+        :rpc => proc {|type, arg| "http://aur.archlinux.org/rpc.php?type=#{type}&arg=#{arg}"}
     end
   end
 
   module Util
-    def set_trap
-      trap(:INT) {abort "\nInterrupt signal received\n\n"}
-    end
-
     def ansi text, effect
-      text = ANSICode.send(effect.to_sym) << text.to_s << ANSICode.clear if @config[:color]
+      if @config[:color] && $have_lib[:ansicode]
+        text = ANSICode.send(effect.to_sym) << text.to_s << ANSICode.clear
+      end
       text
     end
 
     def yes_or_no? question
-      ask question, lambda {|yn| yn.downcase[0] == ?y} do |q|
-        q.readline              = true
-        q.default               = 'y'
-        q.validate              = /\Ay(?:es)?|no?\Z/i
-        q.responses[:not_valid] = 'Yes or no, please'
+      if $have_lib[:highline]
+        ask question, lambda {|yn| yn.downcase[0] == ?y} do |q|
+          q.readline              = true
+          q.validate              = /\Ay(?:es)?|no?\Z/i
+          q.responses[:not_valid] = 'Yes or no, please'
+        end
+      else
+        $stdout.print question
+        answer = $stdin.gets.chomp
+        answer =~ /\Ay(?:es)?|no?\Z/i
       end
     end
   end
@@ -58,52 +88,54 @@ module Aurb
   class Aur
     include Aurb::Util
 
-    def initialize config
-      @opts   = Opts.new
-      @config = config.merge(@opts.config)
-    end
-
     def start
-      set_trap
+      trap :INT do
+        $stderr.puts "\nInterrupt signal received\n\n"
+        exit 0
+      end
+
       @opts.cmd.each do |cmd|
-        instance_eval cmd
-        say "\n---\n\n" unless cmd == @opts.cmd.last
+        cmd.length == 1 ? __send__(cmd.first) : __send__(cmd.first, cmd.last)
+        $stdout.puts "\n\n-----" unless cmd == @opts.cmd.last
       end
     end
 
+    def initialize config
+      @opts   = Opts.new
+      @config = config.merge(@opts.config)
+    end
+
     def download packages
-      packages = packages.split
       packages.delete_if {|pkg| in_sync?(pkg)}
-      abort 'FATAL: No package(s) to download. Possibly the package(s) you ' +
+      abort 'ERROR: 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? '
+      if yes_or_no? 'Proceed? [yn] '
         packages.each do |package|
           begin
-            FileUtils.cd @config[:path] do
+            Dir.chdir @config[:path] do
               fetch package
               untar package
             end
-          rescue OpenURI::HTTPError => e
-            say "Something went wrong downloading '#{package}'. Are you sure it exists?\n" +
-              "---\n#{e.message}"
+          rescue OpenURI::HTTPError
+            $stderr.puts "Something went wrong downloading '#{package}'. Are you sure it exists?"
             package == packages.last ? exit : next
           end
-          say "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
+          $stdout.puts "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
         end
       end
     end
 
     def search packages
-      packages = packages.split
       packages.each do |package|
-        list(package).each do |names|
-          result = json @config[:rpc]['info', names.last]
+        list(package).each do |id|
+          result = json @config[:rpc]['info', id]
           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)}] " +
+              $stdout.puts "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
                 "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}"
             end
           end
@@ -112,8 +144,7 @@ module Aurb
     end
 
     def check_upgrade
-      upgradable = []
-      say 'Searching for updates'
+      upgradable ||= []
       IO.popen('pacman -Qm', IO::RDONLY) {|pm| pm.read.lines}.each do |line|
         name, version = line.chomp.split
         result = json @config[:rpc]['info', name]
@@ -122,11 +153,11 @@ module Aurb
           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}"
+            $stdout.puts "> #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
           end
         end
       end
-      upgradable.any? ? (say "\n"; download upgradable) : say('Nothing to update')
+      upgradable.any? ? ($stdout.puts; download upgradable) : ($stdout.puts 'Nothing to update')
     end
 
   private
@@ -135,10 +166,10 @@ module Aurb
     end
 
     def list package
-      info, list = json(@config[:rpc]['search', URI.escape(package)]), []
+      list, info = [], json(@config[:rpc]['search', URI.escape(package)])
       unless info['type'] =~ /error/
         info['results'].each do |result|
-          list << [result['Name'], result['ID']]
+          list << result['ID']
         end
       end
       list.sort
@@ -157,7 +188,7 @@ module Aurb
         Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
         Dir.pwd
 
-      FileUtils.rm "#{package}.tar.gz"
+      File.delete "#{package}.tar.gz"
     end
 
     def json item
@@ -166,14 +197,13 @@ module Aurb
   end
 
   class Opts
-    attr_reader :config
-    attr_reader :cmd
+    attr_reader :config, :cmd
 
     def initialize
-      @config = {:path => DlPath, :color => true}
-      @cmd    = []
+      @config, @cmd = {:path => DlPath, :color => true}, []
 
       parse!
+      self
     end
 
   private
@@ -190,24 +220,33 @@ module Aurb
 
       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 '--download' then @cmd << ['download', arg.split]
+        when '--search'   then @cmd << ['search', arg.split]
+        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
+            @config[:path] = Pathname.new(arg).realpath || File.expand_path(arg)
           else
             warn "WARN: '#{arg}' does not exist. Fell back to [#{@config[:path]}]\n"
           end
-        when '--version' then abort '%s %s (%s)' % [
-          :name, :version, :release
-        ].map {|key| PrInfo[key]}
-        when '--help'    then abort <<HELP
+        when '--version' then $stderr.puts '%s %s (%s)' %
+          [
+            :name, :version, :release
+          ].map {|key| PrInfo[key]}
+          exit -1
+        when '--help'    then print_help
+        end
+      end
+    rescue GetoptLong::Error; exit 2
+    end
+
+    def print_help out = $stderr
+      out.puts <<-HELP
 Aurb - An AUR utility written in Ruby.
 
 Usage:
-  #{File.basename $0} [options]
+  #{name = File.basename $0} [options]
 
 Options (Required):
   -d, --download PACKAGE      Download a package.
@@ -215,13 +254,26 @@ Options (Required):
   -u, --upgrade               Search for package updates.
 
 Optional:
-  --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; exit 2
+      --no-color              Disable colored output.
+      --path [PATH]           Override the default save path. [#{@config[:path]}]
+
+Other:
+      --version               Show version and exit.
+      --help                  This message.
+
+Examples:
+  #{name} -d 'package1 package2' --path ~/downloads
+  #{name} -s 'package1 package2' --no-color
+  #{name} --upgrade
+
+You can also chain commands, like so:
+
+  #{name} -d 'thispackage' -s 'thatpackage' -u
+
+Aurb was inspired by arson. Do have a look at http://evaryont.github.com/arson
+For further information you can contact the author at <gigamo@gmail.com>.
+      HELP
+      exit -1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: A simple AUR utility
+description: An AUR utility written in Ruby
 email: gigamo@gmail.com
 executables: 
 - aurb
@@ -84,6 +84,6 @@ rubyforge_project: aurb
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A simple AUR utility
+summary: An AUR utility written in Ruby
 test_files: []