gigamo-aurb 0.4.1 → 0.5.1

data/aurb.gemspec

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

data/bin/aurb

@@ -1,12 +1,18 @@
 #!/usr/bin/env ruby
-libraries = %w[rubygems zlib facets/version facets/minitar facets/ansicode json cgi open-uri optparse]
-for library in libraries do
-  require library
-end
+require 'rubygems'
+require 'zlib'
+require 'facets/minitar'
+require 'facets/version'
+require 'facets/ansicode'
+require 'json'
+require 'cgi'
+require 'open-uri'
+require 'optparse'
+require 'pathname'
 
 module Aurb
   Config = Struct.new(:search, :info, :sync, :dir)
-  Version = [0, 4, 1]
+  Version = {:major => 0, :minor => 5, :tiny => 1}
 
   def self.aur
     @aur ||= Aur.new
@@ -14,7 +20,7 @@ module Aurb
 
   module Util
     def color(text, effect)
-      return ANSICode.send(effect) << text << ANSICode.clear
+      ANSICode.send(effect.to_sym) << text << ANSICode.clear
     end
   end
 
@@ -29,12 +35,14 @@ module Aurb
         'http://aur.archlinux.org/rpc.php?type=info&arg=%s',
         '/var/lib/pacman/sync/%s',
         # Change this to reflect your personal download path
-        File.join(ENV['HOME'], 'abs')
+        Pathname.new(File.join(ENV['HOME'], 'abs')).realpath
       )
       @opts = Opts.new(ARGV)
     end
 
     def start
+      trap(:INT) { raise AurbError, 'Catched SIGINT' }
+
       if @opts[:cmd]
         instance_eval(@opts[:cmd])
       else
@@ -42,57 +50,49 @@ module Aurb
       end
     rescue AurbError => e
       puts e.message
-      exit
+      exit 1
     end
 
     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
+      packages.each do |package|
+        puts "#{color('Warning', :on_yellow)}: directory for '#{package}' already exists" if File.exists? File.join(@config.dir, package)
+        list(package).each do |names|
+          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 "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 |local|
+                    local.write(remote.read)
                   end
                 end
-
-                puts "#{color('==>', :yellow)} Unpacking #{package}."
-                Archive::Tar::Minitar.unpack(
-                  Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
-                  Dir.pwd
-                )
               end
+
+              puts "#{color('==>', :yellow)} Unpacking #{package}."
+              Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')), Dir.pwd)
             end
           end
-        else
-          raise AurbError, "#{color('Fatal', :on_red)}: directory already exists"
         end
       end
     end
 
     def search(package)
       threads, count = [], 0
-      for name in list(package) do
+      list(package).each do |names|
         threads << Thread.new do
-          result = JSON.parse(open(@config.info % name[1]).read)
+          result = JSON.parse(open(@config.info % names[1]).read)
           if result['type'] == 'error'
             raise AurbError, "#{color('Fatal', :on_red)}: no results"
           else
             result = result['results']
             next if in_sync? result['Name'], 'community'
             if package.any? do |pac|
-                result['Name'].include? pac or result['Description'].include? pac
+                (result['Name'].include?(pac)) || (result['Description'].include?(pac))
               end
               count += 1
-
               puts "[#{result['OutOfDate'] == '1' ? color('✘', :red) : color('✔', :green)}] #{color(result['Name'], :blue)} (#{result['Version']}): #{result['Description']}"
             end
           end
@@ -100,35 +100,33 @@ module Aurb
       end
       threads.each { |t| t.join }
 
-      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
+      puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} #{count == 1 ? 'result' : 'results'}." if count > 0
     end
 
     def check_upgrade
-      threads, found, upcount = [], false, 0
+      uppkgs, 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
+        name, version = line.chomp.split
+        result = JSON.parse(open(@config.info % name).read)['results']
+        if (result.is_a?(Hash)) && (result['Version'] != version)
+          if VersionNumber.new(result['Version']) > VersionNumber.new(version)
             found = true
-            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"
+            puts "#{color(name, :bold)}: #{color(version, :red)} -> #{color(result['Version'], :green)}"
+            upcount += 1
+            uppkgs << name
           end
+        else
+          puts "#{color(name, :bold)} is up to date"
         end
       end
-      threads.each { |t| t.join }
 
       if found
         puts "\n#{color('==>', :yellow)} Found #{color(upcount.to_s, :magenta)} #{upcount == 1 ? 'upgrade' : 'upgrades'}."
+        uppkgs.each do |pkg|
+          print "#{color('==>', :yellow)} Download '#{pkg}'? [y] "
+          $stdin.gets.chomp =~ /^y/ ? download(pkg) : next
+        end
       else
         puts "\n#{color('==>', :yellow)} All packages are up to date."
       end
@@ -137,7 +135,7 @@ module Aurb
   private
     def in_sync?(package, repo)
       repo = @config.sync % repo
-      return true if Dir["#{repo}/#{package}-*"].first
+      true if Dir["#{repo}/#{package}-*"].first
     end
 
     def list(package)
@@ -149,7 +147,7 @@ module Aurb
         list << [result['Name'], result['ID']]
       end
 
-      return list.sort
+      list.sort unless list.empty?
     end
   end
 
@@ -161,15 +159,15 @@ module Aurb
   private
     def parse(args)
       OptionParser.new do |o|
-        o.version      = Version*'.'
+        o.version      = '%s.%s.%s' % [:major, :minor, :tiny].map {|v| Version[v]}
         o.program_name = 'Aurb'
         o.release      = '2009-04-06'
 
         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
+          self[:cmd] = "download('#{d*"', '"}')" # wow. ugly
         end
         o.on('-S', '--search PKG', 'Search for a package.') do |s|
-          self[:cmd] = "search('#{s}')" % s
+          self[:cmd] = "search('#{s}')"
         end
         o.on('-U', '--upgrade', 'Check for upgrades.') do
           self[:cmd] = 'check_upgrade'

metadata

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