gigamo-aurb 0.7.2 → 0.8.1

data/README.rdoc

@@ -5,7 +5,7 @@ See <tt>aurb --help</tt> for a full list of commands.
 === 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 from the AUR and untars it
+<b>--download</b>:: Downloads your specified package(s) from the AUR and untars it
 <b>--search</b>:: Searches the AUR for a specified name or description
 
 == Installation

data/aurb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.7.2'
-  s.date = %q{2009-04-24}
+  s.version = '0.8.1'
+  s.date = %q{2009-05-03}
   s.summary = %q{A simple AUR utility}
   s.email = %q{gigamo@gmail.com}
   s.homepage = %q{http://github.com/gigamo/aurb}
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{aurb}
   s.executables = ['aurb']
   s.has_rdoc = true
-  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'Aurb', '--main', 'README']
+  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'Aurb', '--main', 'README.rdoc']
   s.authors = ['Gigamo']
   s.files = ['bin/aurb', 'aurb.gemspec', 'README.rdoc']
   s.add_dependency 'json'

data/bin/aurb

@@ -1,52 +1,56 @@
 #!/usr/bin/env ruby
+#++
+# Copyright (C) 2009 Gigamo
 #
-# Author:: Gigamo <gigamo@gmail.com>
-#                        _
-#                       | |
-#        __ _ _   _ _ __| |__
-#       / _` | | | | '__| '_ \
-#      | (_| | |_| | |  | |_) |
-#       \__,_|\__,_|_|  |_.__/
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# A Ruby AUR (Arch User Repository) utility.
-#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#--
+# Inspired by arson (http://evaryont.github.com/arson)
 
-%w[optparse pathname fileutils zlib open-uri rubygems cgi json highline/import
+%w[getoptlong pathname fileutils zlib open-uri rubygems json highline/import
    facets/ansicode facets/minitar facets/version].each {|lib| require lib}
 
 module Aurb
-# Path where PKGBUILDS will get saved to
+# Default download path
   DlPath = File.join ENV['HOME'], 'abs'
 
-# Program Info
-  PrInfo = {:name => 'Aurb', :version => [0, 7, 2].join('.'), :release => '2009-04-24'}
+# Program info
+  PrInfo = {:name => 'Aurb', :version => [0, 8, 1].join('.'), :release => '2009-05-03'}
 
-  def self.aur
-    @aur ||= Aur.new \
-      :search => proc {|t| "http://aur.archlinux.org/rpc.php?type=search&arg=#{t}"},
-      :info   => proc {|t| "http://aur.archlinux.org/rpc.php?type=info&arg=#{t}"},
-      :path   => Pathname.new(DlPath).realpath
+  class << self
+    def aur
+      @aur ||= Aur.new \
+        :rpc => proc {|t, a| "http://aur.archlinux.org/rpc.php?type=#{t}&arg=#{a}"}
+    end
   end
 
   module Util
-    def die message, code = 1
-      say message
-      exit code.to_i
+    def set_trap
+      trap(:INT) {abort "\nInterrupt signal received\n\n"}
     end
-    module_function :die
 
     def ansi text, effect
-      text = ANSICode.send(effect.to_sym) << text << ANSICode.clear if @opts.color
+      text = ANSICode.send(effect.to_sym) << text.to_s << ANSICode.clear if @config[:color]
       text
     end
 
     def yes_or_no? question
-      ask(question, lambda {|yn| yn.downcase[0] == ?y}) do |q|
+      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.'
+        q.responses[:not_valid] = 'Yes or no, please'
       end
     end
   end
@@ -56,50 +60,49 @@ module Aurb
 
     def initialize config
       @opts   = Opts.new
-      @config = config.merge @opts.config
+      @config = config.merge(@opts.config)
     end
 
     def start
-      trap(:INT) {die "\nInterrupt signal received\n\n", 0}
+      set_trap
       instance_eval @opts.cmd
     end
 
-    def download *packages
-      packages = packages.first if packages.first.is_a?(Array)
-
-    # Don't download a package if it's found in community
+    def download packages
+      packages = packages.split
       packages.delete_if {|pkg| in_sync?(pkg)}
-      die '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(', ')}"
+      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|
-          list(package).each do |names|
-            if names.first == package
-              FileUtils.cd @config[:path] do
-                fetch package
-                untar package
-              end
-              say "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
+          begin
+            FileUtils.cd @config[:path] do
+              fetch package
+              untar package
             end
+          rescue OpenURI::HTTPError
+            say "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}"
         end
       end
     end
 
     def search package
       list(package).each do |names|
-        result = json(@config[:info][names.last])
+        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'] && result['Description']).include?(pac)}
+          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']}): #{result['Description']}"
+              "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}"
           end
         end
       end
@@ -107,11 +110,11 @@ module Aurb
 
     def check_upgrade
       upgradable = []
-
       say 'Searching for updates'
-      `pacman -Qm`.each_line do |line|
+
+      IO.popen('pacman -Qm', IO::RDONLY) {|pm| pm.read.lines}.each do |line|
         name, version = line.chomp.split
-        result = json(@config[:info][name])
+        result = json @config[:rpc]['info', name]
 
         unless result['type'] =~ /error/
           result = result['results']
@@ -124,7 +127,7 @@ module Aurb
         end
       end
 
-      upgradable.any? ? download(upgradable) : say('Nothing to update')
+      upgradable.any? ? (say "\n"; download upgradable) : say('Nothing to update')
     end
 
   private
@@ -133,7 +136,7 @@ module Aurb
     end
 
     def list package
-      info, list = json(@config[:search][CGI::escape(package)]), []
+      info, list = json(@config[:rpc]['search', URI.escape(package)]), []
 
       unless info['type'] =~ /error/
         info['results'].each do |result|
@@ -145,22 +148,22 @@ module Aurb
     end
 
     def fetch package
-      FileUtils.rm "#{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|
+      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
     end
 
     def untar package
-      die "#{package}.tar.gz was not found." unless File.exists? "#{package}.tar.gz"
-      FileUtils.rm_r package if File.directory? 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"
     end
 
     def json item
@@ -169,13 +172,10 @@ module Aurb
   end
 
   class Opts
-    attr_reader :cmd, :config, :color
+    attr_reader :cmd, :config
 
     def initialize
-      @@args  = ARGV.any? ? ARGV : ['-h']
-      @config = {}
-      @color  = true
-
+      @config = {:path => DlPath, :color => true}
     # Parse zeh ARGV!
       parse!
     end
@@ -184,34 +184,54 @@ module Aurb
     include Aurb::Util
 
     def parse!
-      OptionParser.new do |o|
-        o.program_name, o.version, o.release = \
-          [:name, :version, :release].map {|key| PrInfo[key]}
+      if ARGV.empty?
+        abort 'No argument given. Try --help.'
+      end
 
-        o.separator 'Actions (Required):'
-        o.on '-D', '--download P1,P2,...', Array, 'download package(s)' do |d|
-          @cmd = "download('#{d*"', '"}')" # XXX: Very ugly. Makes instance_eval work though.
-        end
-        o.on '-S', '--search PKG', 'search for a package' do |s|
-          @cmd = "search('#{s}')"
-        end
-        o.on '-U', '--upgrade', 'check the AUR for upgrades' do
-          @cmd = 'check_upgrade'
-        end
-        o.separator 'Optional:'
-        o.on '--save-to [PATH]', "download path [#{DlPath}]" do |d|
-          if File.exists? d = (d[0...1] == '/' ? d : File.join(Dir.pwd, d))
-            @config[:path] = Pathname.new(d).realpath
+      gopts = GetoptLong.new \
+        ['--download', '-d',        GetoptLong::REQUIRED_ARGUMENT],
+        ['--search', '-s',          GetoptLong::REQUIRED_ARGUMENT],
+        ['--upgrade', '-u',         GetoptLong::NO_ARGUMENT],
+        ['--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 '--path'     then
+          if File.exists? arg = (arg[0...1] == '/' ? arg : File.join(Dir.pwd, arg))
+            @config[:path] = Pathname.new(arg).realpath
           else
-            die 'The path you specified doesn\'t exist'
+            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
+Aurb - An AUR utility written in Ruby.
+
+Usage:
+  #$0 [options]
+
+Options (Required):
+  -d, --download PACKAGE      Download a package.
+  -s, --search PACKAGE        Search for package(s).
+  -u, --upgrade               Search for package updates.
+
+Optional:
+  --color                     Use colors? [#{@config[:color]}]
+  --path [PATH]               Override the default save path. [#{@config[:path]}]
+  --version                   Show version and exit.
+HELP
         end
-        o.on '--[no-]color', "use colors? [#{@color ? 'yes' : 'no'}]" do |c|
-          @color = c
-        end
-      end.parse! @@args
-    rescue OptionParser::ParseError
-      die 'I.. I think you broke it...'
+      end
+    rescue GetoptLong::Error
+      abort $!.message
     end
   end
 end
@@ -222,3 +242,42 @@ at_exit do
     Aurb.aur.start
   end
 end
+
+__END__
+
+=head1 NAME
+
+Aurb - A Ruby AUR Utility
+
+=head1 SYNOPSIS
+
+  aurb --help
+
+=head1 DESCRIPTION
+
+Aurb is a small AUR utility written in Ruby. It can download and search for packages,
+and search the AUR for updates to local packages. Run aurb -h for more information.
+
+=head1 AUTHOR
+
+Gigamo <lt>gigamo at gmail dot com<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2009 Gigamo
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ rdoc_options:
 - --title
 - Aurb
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement