gigamo-aurb 0.5.8 → 0.6.1

data/aurb.gemspec

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

data/bin/aurb

@@ -1,11 +1,15 @@
 #!/usr/bin/env ruby
-require 'open-uri'
+#  Author:: Gigamo <gigamo@gmail.com>
+# License:: GPL
+#
+
 require 'rubygems'
+require 'open-uri'
 
 module Aurb
 
-DlPath = File.join(File.expand_path('~'), 'abs') # Change me!
-Config = Struct.new :search, :info, :sync, :dir  # Don't change me!
+DlPath = File.join File.expand_path('~'), 'abs' # Change me!
+Config = Struct.new :search, :info, :dir # Don't change me!
 
 def self.aur
   @aur ||= Aur.new
@@ -18,15 +22,15 @@ module Util
   #
   # For a full list of available effects, see
   # http://facets.rubyforge.org/doc/api/more/classes/ANSICode.html
+  #
   def ansi text, effect
     require 'facets/ansicode' unless defined? ANSICode
 
     ANSICode.send(effect.to_sym) << text << ANSICode.clear
   end
+  module_function :ansi
 end
 
-class AurbError < Exception; end
-
 class Aur
   include Aurb::Util
 
@@ -36,22 +40,22 @@ class Aur
     @config = Config.new(
       'http://aur.archlinux.org/rpc.php?type=search&arg=%s',
       'http://aur.archlinux.org/rpc.php?type=info&arg=%s',
-      '/var/lib/pacman/sync/community',
       Pathname.new(DlPath).realpath
     )
-    @opts = Opts.new(ARGV)
+    @opts = Opts.new
   end
 
   def start
-    trap(:INT) { exit 0 } # Exit peacefully on *INT
+    trap :INT do
+      puts "\nInterrupt signal received\n\n"
+      exit 0 # Exit peacefully on *INT
+    end
 
     # Evaluate a command in string form
-    # Example: instance_eval('search("package")')
-    # Which will invoke the search method
+    # 
+    #   instance_eval('search("package")')
+    #
     instance_eval @opts[:cmd]
-  rescue AurbError => e
-    $stderr.puts e.message
-    exit 1
   end
 
   # Downloads +packages+
@@ -59,15 +63,17 @@ class Aur
   #   download('awesome-git', 'aurb')
   #
   def download *packages
+    packages = packages[0] if packages[0].is_a? Array
     packages.each do |package|
       list(package).each do |names|
-        if names.first == package
+        if names[0] == package
           if in_sync? package
-            puts "#{ansi('==>', :yellow)} Found #{package} in community. Use pacman!"
+            puts ":: Found #{package} in community. Use pacman!"
           else
             Dir.chdir(@config.dir) do
               fetch package
               untar package
+              puts " (#{packages.index(package)+1}/#{packages.length}) Downloaded #{package}"
             end
           end
         end
@@ -91,12 +97,12 @@ class Aur
         next if in_sync? result['Name']
 
         if package.any? do |pac| # Check both name and description for matches
-          (result['Name'].include?(pac)) || (result['Description'].include?(pac))
+          (result['Name'].include? pac) || (result['Description'].include? pac)
         end
           count += 1
 
           puts "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] \
-#{ansi(result['Name'], :blue)} (#{result['Version']}): #{result['Description']}"
+#{ansi result['Name'], :blue} (#{result['Version']}): #{result['Description']}"
         end
       end
     end
@@ -106,9 +112,10 @@ class Aur
   # official repository.
   #
   def check_upgrade
-    count, upgradable = 0, []
+    upgradable = []
+
+    puts ":: Searching for upgrades. This may take a while..."
 
-    puts "#{ansi('==>', :yellow)} Searching for upgrades. This may take a while..."
     `pacman -Qm`.each_line do |line|
       name, version = line.chomp.split
       result = json(@config.info % name)
@@ -118,30 +125,27 @@ class Aur
 
         next if in_sync? result['Name']
 
-        if (result.is_a?(Hash)) && (result['Version'] != version)
+        if (result.is_a? Hash) && (result['Version'] != version)
           require 'facets/version'
 
           if VersionNumber.new(result['Version']) > VersionNumber.new(version)
-            count += 1
             upgradable << name
 
-            puts "#{ansi(name, :bold)} #{ansi(version, :red)} -> \
-#{ansi(result['Version'], :green)}"
+            puts " #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
           end
         end
       end
     end
 
-    if upgradable.empty? && count == 0
-      puts "#{ansi('==>', :yellow)} Everything is up to date"
+    if upgradable.empty?
+      puts ":: Everything is up to date"
     else
       require 'readline'
 
-      puts "#{ansi('==>', :yellow)} Targets (#{count}): #{upgradable.join(', ')}"
-
-      upgradable.each do |pkg|
-        answer = Readline::readline("#{ansi('==>', :yellow)} Download #{pkg}? ")
-        answer =~ /^y|yes$/i ? download(pkg) : next
+      puts ":: Targets (#{upgradable.length}): #{upgradable.join(', ')}"
+      answer = Readline::readline "Proceed by downloading these packages? [y/n] "
+      if answer =~ /^y|yes$/i
+        download upgradable
       end
     end
   end
@@ -152,7 +156,7 @@ private
   #   in_sync?('awesome-git')
   #
   def in_sync? package
-    !!Dir["#{@config.sync}/#{package}-*"].first
+    !!Dir["/var/lib/pacman/sync/community/#{package}-*"][0]
   end
 
   # Returns a list of packages found by a search
@@ -178,15 +182,13 @@ private
   #   fetch('awesome-git', $0.dirname)
   #
   def fetch package
-    File.delete("#{package}.tar.gz") if File.exists?("#{package}.tar.gz")
+    File.delete "#{package}.tar.gz" if File.exists? "#{package}.tar.gz"
 
     open("http://aur.archlinux.org/packages/#{package}/#{package}.tar.gz") do |remote|
       File.open("#{package}.tar.gz", 'wb') do |local|
         local.write(remote.read)
       end
     end
-
-    puts "#{ansi('==>', :yellow)} Fetched #{package}.tar.gz"
   end
 
   # Untars +package+
@@ -198,13 +200,11 @@ private
     require 'zlib'
     require 'fileutils'
 
-    FileUtils.rm_r(package) if File.directory?(package)
+    FileUtils.rm_r package if File.directory? package
 
     Archive::Tar::Minitar.unpack(
       Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')), Dir.pwd
     )
-
-    puts "#{ansi('==>', :yellow)} Untarred #{package}.tar.gz"
   end
 
   # Shortcut to parsing json
@@ -212,15 +212,15 @@ private
   #   json('http://foo.bar')
   #
   def json item
-    require 'json'
+    require 'json' unless defined? JSON
 
     JSON.parse(open(item).read)
   end
 end
 
 class Opts < Hash
-  def initialize(args = ARGV)
-    @@args = args.empty? ? ['-h'] : args
+  def initialize
+    @@args = ARGV.empty? ? ['-h'] : ARGV
     parse
   end
 
@@ -229,19 +229,19 @@ private
     require 'optparse'
 
     OptionParser.new do |o|
-      o.version      = [0, 5, 8].join('.')
+      o.version      = [0, 6, 1].join('.')
       o.program_name = 'Aurb'
-      o.release      = '2009-04-15'
+      o.release      = '2009-04-19'
 
-      o.on('-D', '--download P1,P2,...', Array, "Download package(s).") do |d|
+      o.on '-D', '--download P1,P2,...', Array, "Download package(s)." do |d|
         self[:cmd] = "download('#{d*"', '"}')"
       end
 
-      o.on('-S', '--search PKG', 'Search for a package.') do |s|
+      o.on '-S', '--search PKG', 'Search for a package.' do |s|
         self[:cmd] = "search('#{s}')"
       end
 
-      o.on('-U', '--upgrade', 'Check the AUR for upgrades.') do
+      o.on '-U', '--upgrade', 'Check the AUR for upgrades.' do
         self[:cmd] = 'check_upgrade'
       end
     end.parse! @@args
@@ -254,8 +254,5 @@ at_exit do
   if __FILE__ == $0
     raise $! if $!
     Aurb.aur.start
-  else
-    $stderr.puts 'Please only run me by myself. Thanks.'
-    exit 1
   end
 end

metadata

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