gigamo-aurb 0.3.1 → 0.4.1

data/aurb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.3.1'
-  s.date = '2009-04-05'
+  s.version = '0.4.1'
+  s.date = '2009-04-06'
   s.summary = 'A simple AUR utility'
   s.email = 'gigamo@gmail.com'
   s.homepage = 'http://github.com/gigamo/aurb'

data/bin/aurb

@@ -6,16 +6,22 @@ end
 
 module Aurb
   Config = Struct.new(:search, :info, :sync, :dir)
-  Version = [0, 3, 1]
+  Version = [0, 4, 1]
 
   def self.aur
     @aur ||= Aur.new
   end
 
+  module Util
+    def color(text, effect)
+      return ANSICode.send(effect) << text << ANSICode.clear
+    end
+  end
+
   class AurbError < Exception; end
 
   class Aur
-    attr_accessor :config
+    include Aurb::Util
 
     def initialize
       @config = Config.new(
@@ -29,45 +35,46 @@ module Aurb
     end
 
     def start
-      begin
-        if @opts[:cmd]
-          instance_eval(@opts[:cmd])
-        else
-          raise AurbError, "#{color('Fatal', :on_red)}: no option given, see --help"
-        end
-      rescue AurbError => e
-        puts e.message
+      if @opts[:cmd]
+        instance_eval(@opts[:cmd])
+      else
+        raise AurbError, "#{color('Fatal', :on_red)}: no option given, see --help"
       end
+    rescue AurbError => e
+      puts e.message
+      exit
     end
 
-    def download(package)
-      unless File.exists? File.join(@config.dir, package)
-        for names in list(package) do
-          if names.first == package
-            Dir.chdir(@config.dir) do |dir|
-              if in_sync? package, 'community'
-                puts "#{color('==>', :yellow)} Found #{package} in community repo. Pacman will do."
-                # exec will automatically terminate the script
-                exec "sudo pacman -S #{package}"
-              else
-                puts "#{color('==>', :yellow)} Downloading #{package}."
-                open("http://aur.archlinux.org/packages/#{package}/#{package}.tar.gz") do |remote|
-                  File.open("#{dir}/#{package}.tar.gz", 'wb') do |file|
-                    file.write(remote.read)
+    def download(*packages)
+      for package in packages do
+        unless File.exists? File.join(@config.dir, package)
+          for names in list(package) do
+            if names.first == package
+              Dir.chdir(@config.dir) do |dir|
+                if in_sync? package, 'community'
+                  puts "#{color('==>', :yellow)} Found #{package} in community repo. Pacman will do."
+                  # exec will automatically terminate the script
+                  exec "sudo pacman -S #{package}"
+                else
+                  puts "#{color('==>', :yellow)} Downloading #{package}."
+                  open("http://aur.archlinux.org/packages/#{package}/#{package}.tar.gz") do |remote|
+                    File.open("#{dir}/#{package}.tar.gz", 'wb') do |file|
+                      file.write(remote.read)
+                    end
                   end
                 end
-              end
 
-              puts "#{color('==>', :yellow)} Unpacking #{package}."
-              Archive::Tar::Minitar.unpack(
-                Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
-                Dir.pwd
-              )
+                puts "#{color('==>', :yellow)} Unpacking #{package}."
+                Archive::Tar::Minitar.unpack(
+                  Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
+                  Dir.pwd
+                )
+              end
             end
           end
+        else
+          raise AurbError, "#{color('Fatal', :on_red)}: directory already exists"
         end
-      else
-        raise AurbError, "#{color('Fatal', :on_red)}: directory already exists"
       end
     end
 
@@ -93,38 +100,41 @@ module Aurb
       end
       threads.each { |t| t.join }
 
-      puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} #{count == 1 ? 'result' : 'results'}."
+      if count == 0
+        raise AurbError, "#{color('Fatal', :on_red)}: no results"
+      else
+        puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} #{count == 1 ? 'result' : 'results'}."
+      end
     end
 
     def check_upgrade
-      threads, found = [], false
+      threads, found, upcount = [], false, 0
       puts "#{color('==>', :yellow)} Checking for upgrades."
-
       `pacman -Qm`.each_line do |line|
         threads << Thread.new do
           name, version = line.chomp.split
           result = JSON.parse(open(@config.info % name).read)
           if result === Hash && result['Version'] != version
             found = true
-            iver = VersionNumber.new(version)
-            aver = VersionNumber.new(result['Version'])
-
-            if aver > iver
-              puts "#{color(name, :bold)}: #{color(version, :red)} -> #{color(result['Version'])}"
+            if VersionNumber.new(result['Version']) > VersionNumber.new(version)
+              puts "#{color(name, :bold)}: #{color(version, :red)} -> #{color(result['Version'], :green)}"
+              upcount += 1
             end
+          else
+            puts "#{color(name, :bold)} is up to date"
           end
         end
       end
       threads.each { |t| t.join }
 
-      puts "#{color('==>', :yellow)} All packages are up-to-date." unless found
+      if found
+        puts "\n#{color('==>', :yellow)} Found #{color(upcount.to_s, :magenta)} #{upcount == 1 ? 'upgrade' : 'upgrades'}."
+      else
+        puts "\n#{color('==>', :yellow)} All packages are up to date."
+      end
     end
 
   private
-    def color(text, effect)
-      return ANSICode.send(effect) << text << ANSICode.clear
-    end
-
     def in_sync?(package, repo)
       repo = @config.sync % repo
       return true if Dir["#{repo}/#{package}-*"].first
@@ -133,7 +143,7 @@ module Aurb
     def list(package)
       info, list = JSON.parse(open(@config.search % CGI::escape(package)).read), []
       if info['type'] == 'error'
-        raise AurbError, "#{color('Fatal', :on_red)}: #{info['results']}"
+        raise AurbError, "#{color('Fatal', :on_red)}: no results"
       end
       for result in info['results'] do
         list << [result['Name'], result['ID']]
@@ -153,15 +163,15 @@ module Aurb
       OptionParser.new do |o|
         o.version      = Version*'.'
         o.program_name = 'Aurb'
-        o.release      = '2009-04-05'
+        o.release      = '2009-04-06'
 
-        o.on('-D', '--download=PKG', 'Download +PKG+') do |p| 
-          self[:cmd] = "download('#{p}')"
+        o.on('-D', '--download P1,P2,...', Array, 'Download package(s). Separate by commas if multiple (no spaces).') do |d|
+          self[:cmd] = "download('#{d*'\', \''}')" # wow. ugly
         end
-        o.on('-S', '--search=PKG', 'Search for +PKG+') do |p|
-          self[:cmd] = "search('#{p}')"
+        o.on('-S', '--search PKG', 'Search for a package.') do |s|
+          self[:cmd] = "search('#{s}')" % s
         end
-        o.on('-U', '--upgrade', 'Check for upgrades') do
+        o.on('-U', '--upgrade', 'Check for upgrades.') do
           self[:cmd] = 'check_upgrade'
         end
       end.parse!(args)

metadata

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