gigamo-aurb 0.8.3 → 0.8.4

data/README.rdoc

@@ -6,14 +6,14 @@ See <tt>aurb --help</tt> for a full list of commands.
 
 Required options:
 
-<b>--download</b>:: Downloads a specified package and untars it
-<b>--search</b>:: Searches the AUR for a specified name or description
-<b>--upgrade</b>:: Searches the AUR for updates to foreign local packages
+<tt>--download</tt>:: Downloads a specified package and untars it
+<tt>--search</tt>:: Searches the AUR for a specified name or description
+<tt>--upgrade</tt>:: Searches the AUR for updates to foreign local packages
 
 Optional options:
 
-<b>--no-color</b>:: Suppress colored output
-<b>--path</b>:: Override the default save path (defined as DlPath)
+<tt>--no-color</tt>:: Suppress colored output
+<tt>--path</tt>:: Override the default save path (defined as DlPath)
 
 Other:
 
@@ -48,6 +48,20 @@ There is also a github gem available:
 
 Aurb requires the 'facets', 'json' and 'highline' rubygems to be installed.
 
+Facets for:
+
+* Checking version numbers
+* Coloring text
+* Untarring
+
+JSON for:
+
+* Parsing the AUR
+
+Highline for:
+
+* Interactivity
+
 == Todo
 
 * Automatically build (and install) the package after download?

data/aurb.gemspec

@@ -1,7 +1,9 @@
+# aurb.gemspec
+
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.8.3'
-  s.date = %q{2009-05-07}
+  s.version = '0.8.4'
+  s.date = %q{2009-06-15}
   s.summary = %q{An AUR utility written in Ruby}
   s.email = %q{gigamo@gmail.com}
   s.homepage = %q{http://github.com/gigamo/aurb}

data/bin/aurb

@@ -1,22 +1,5 @@
 #!/usr/bin/env ruby
-#++
-# 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.
-#--
-# Inspired by arson (http://evaryont.github.com/arson)
+# encoding: utf-8
 require 'rubygems'
 
 {
@@ -25,10 +8,10 @@ require 'rubygems'
   :zlib      => ['zlib',            true ],
   :openuri   => ['open-uri',        true ],
   :json      => ['json',            true ],
-  :highline  => ['highline/import', false],
+  :gettext   => ['gettext',         false],
   :ansicode  => ['facets/ansicode', false],
-  :minitar   => ['facets/minitar',  true ],
-  :version   => ['facets/version',  true ],
+  :minitar   => ['facets/minitar',  false],
+  :version   => ['facets/version',  false],
 }.each do |key, info|
   path, required = info[0, 2]
   $have_lib ||= {}
@@ -39,7 +22,7 @@ require 'rubygems'
   rescue LoadError
     if required
       abort <<-ERR
-You're missing '#{lib}'.
+You're missing '#{path}'.
 Please make sure you have the necessary rubygems installed.
       ERR
     else
@@ -48,12 +31,13 @@ Please make sure you have the necessary rubygems installed.
   end
 end
 
+def _ str
+  $have_lib[:gettext] ? GetText::_(str) : str
+end
+
 module Aurb
-# Default download path
   DlPath = File.join ENV['HOME'], 'abs'
-
-# Program info
-  PrInfo = {:name => 'Aurb', :version => [0, 8, 3].join('.'), :release => '2009-05-07'}
+  PrInfo = {:name => 'Aurb', :version => [0, 8, 4].join('.'), :release => '2009-06-15'}
 
   class << self
     def aur
@@ -67,21 +51,8 @@ module Aurb
       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
-      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
+      text
     end
   end
 
@@ -90,7 +61,7 @@ module Aurb
 
     def start
       trap :INT do
-        $stderr.puts "\nInterrupt signal received\n\n"
+        $stderr.puts _("\nInterrupt signal received\n\n")
         exit 0
       end
 
@@ -107,23 +78,24 @@ module Aurb
 
     def download packages
       packages.delete_if {|pkg| in_sync?(pkg)}
-      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? [yn] '
-        packages.each do |package|
-          begin
-            Dir.chdir @config[:path] do
-              fetch package
-              untar package
-            end
-          rescue OpenURI::HTTPError
-            $stderr.puts "Something went wrong downloading '#{package}'. Are you sure it exists?"
-            package == packages.last ? exit : next
+      abort _('ERROR: No package(s) to download. Possibly the package(s) you ' +
+        'specified was/were found in the community repository?') if packages.empty?
+
+      $stdout.puts _("Targets (#{ansi packages.length, :magenta}): #{packages.join(', ')}")
+
+      packages.each do |package|
+        begin
+          Dir.chdir @config[:path] do
+            fetch package
+            untar package
           end
-          $stdout.puts "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
+        rescue OpenURI::HTTPError
+          warn _("WARN: Something went wrong downloading '#{package}'. Are you sure it exists?")
+
+          package == packages.last ? exit : next
         end
+
+        $stdout.puts _("(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}")
       end
     end
 
@@ -131,12 +103,15 @@ module Aurb
       packages.each do |package|
         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)}
-              $stdout.puts "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
-                "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}"
+              $stdout.puts _("[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
+                "#{ansi result['Name'], :blue} (#{result['Version']})\n    #{result['Description']}")
             end
           end
         end
@@ -144,20 +119,30 @@ module Aurb
     end
 
     def check_upgrade
-      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]
-        unless result['type'] =~ /error/
-          result = result['results']
-          next if in_sync? result['Name']
-          if VersionNumber.new(result['Version']) > VersionNumber.new(version)
-            upgradable << result['Name']
-            $stdout.puts "> #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
+      if $have_lib[:version]
+        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]
+
+          unless result['type'] =~ /error/
+            result = result['results']
+
+            next if in_sync? result['Name']
+
+            if VersionNumber.new(result['Version']) > VersionNumber.new(version)
+              upgradable << result['Name']
+
+              $stdout.puts _("> #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}")
+            end
           end
         end
+
+        upgradable.any? ? ($stdout.puts; download upgradable) : ($stdout.puts _('Nothing to update'))
+      else
+        warn _('WARN: You need the facets rubygem installed to check for updates')
       end
-      upgradable.any? ? ($stdout.puts; download upgradable) : ($stdout.puts 'Nothing to update')
     end
 
   private
@@ -167,11 +152,13 @@ module Aurb
 
     def list package
       list, info = [], json(@config[:rpc]['search', URI.escape(package)])
+
       unless info['type'] =~ /error/
         info['results'].each do |result|
           list << result['ID']
         end
       end
+
       list.sort
     end
 
@@ -184,11 +171,15 @@ module Aurb
     end
 
     def untar package
-      Archive::Tar::Minitar.unpack \
-        Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
-        Dir.pwd
+      if $have_lib[:minitar]
+        Archive::Tar::Minitar.unpack \
+          Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
+          Dir.pwd
 
-      File.delete "#{package}.tar.gz"
+        File.delete "#{package}.tar.gz"
+      else
+        warn _('WARN: You need the facets rubygem installed to untar the package')
+      end
     end
 
     def json item
@@ -210,30 +201,30 @@ module Aurb
     def parse!
       ARGV.unshift '-h' if ARGV.empty?
       gopts = GetoptLong.new \
-        ['--download', '-d',        GetoptLong::REQUIRED_ARGUMENT],
-        ['--search', '-s',          GetoptLong::REQUIRED_ARGUMENT],
-        ['--upgrade', '-u',         GetoptLong::NO_ARGUMENT],
-        ['--no-color',              GetoptLong::NO_ARGUMENT],
-        ['--path',                  GetoptLong::OPTIONAL_ARGUMENT],
-        ['--version', '-v',         GetoptLong::NO_ARGUMENT],
-        ['--help', '-h',            GetoptLong::NO_ARGUMENT]
+        ['--download', '-d', GetoptLong::REQUIRED_ARGUMENT],
+        ['--search',   '-s', GetoptLong::REQUIRED_ARGUMENT],
+        ['--upgrade',  '-u', GetoptLong::NO_ARGUMENT      ],
+        ['--no-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.split]
-        when '--search'   then @cmd << ['search', arg.split]
-        when '--upgrade'  then @cmd << ['check_upgrade']
+        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 || File.expand_path(arg)
           else
-            warn "WARN: '#{arg}' does not exist. Fell back to [#{@config[:path]}]\n"
+            warn _("WARN: '#{arg}' does not exist. Fell back to [#{@config[:path]}]\n")
           end
-        when '--version' then $stderr.puts '%s %s (%s)' %
+        when '--version' then $stdout.puts _('%s %s (%s)' %
           [
             :name, :version, :release
-          ].map {|key| PrInfo[key]}
+          ].map {|key| PrInfo[key]})
           exit -1
         when '--help'    then print_help
         end
@@ -241,8 +232,8 @@ module Aurb
     rescue GetoptLong::Error; exit 2
     end
 
-    def print_help out = $stderr
-      out.puts <<-HELP
+    def print_help out = $stdout
+      out.puts _(<<-HELP)
 Aurb - An AUR utility written in Ruby.
 
 Usage:
@@ -271,7 +262,6 @@ 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

metadata

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