gigamo-aurb 0.5.6 → 0.5.7

data/aurb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.5.6'
-  s.date = %q{2009-04-13}
+  s.version = '0.5.7'
+  s.date = %q{2009-04-14}
   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,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'open-uri'
 require 'rubygems'
 
 module Aurb
@@ -13,11 +14,11 @@ end
 module Util
   # Colorize a string
   #
-  #   color('Text', :green)
+  #   ansi('Text', :green)
   #
   # For a full list of available effects, see
   # http://facets.rubyforge.org/doc/api/more/classes/ANSICode.html
-  def color text, effect
+  def ansi text, effect
     require 'facets/ansicode' unless defined? ANSICode
 
     ANSICode.send(effect.to_sym) << text << ANSICode.clear
@@ -41,15 +42,13 @@ class Aur
     @opts = Opts.new(ARGV)
   end
 
-  # Starts Aurb
   def start
-    # Exit peacefully on *INT
-    trap(:INT) { exit 0 }
+    trap(:INT) { exit 0 } # Exit peacefully on *INT
 
     # Evaluate a command in string form
     # Example: instance_eval('search("package")')
     # Which will invoke the search method
-    instance_eval(@opts[:cmd])
+    instance_eval @opts[:cmd]
   rescue AurbError => e
     $stderr.puts e.message
     exit 1
@@ -63,23 +62,13 @@ class Aur
     packages.each do |package|
       list(package).each do |names|
         if names.first == package
-          # Check if the package exists in the community repo
-          # Invoke pacman if so
           if in_sync? package
-            puts "#{color('==>', :yellow)} Found #{package} in community repo."
+            puts "#{ansi('==>', :yellow)} Found #{package} in community repo. Pacman!"
             exec "sudo pacman -S #{package}"
           else
-            Dir.chdir(@config.dir) do |dir|
-              # Remove old files if they already exist instead of overwriting
-              require 'fileutils'
-
-              FileUtils.rm("#{package}.tar.gz") if File.exists?("#{package}.tar.gz")
-              fetch(package, dir)
-              puts "#{color('==>', :yellow)} Downloaded #{package}"
-
-              FileUtils.rm_r(package) if File.directory?(package)
-              untar(package)
-              puts "#{color('==>', :yellow)} Unpacked #{package}"
+            Dir.chdir(@config.dir) do
+              fetch package
+              untar package
             end
           end
         end
@@ -95,75 +84,64 @@ class Aur
     count, threads = 0, []
 
     list(package).each do |names|
-      # Launch a separate thread for each packagename to be checked
-      threads << Thread.new do
-        result = json(@config.info % names[1])
-
-        unless result['type'] == 'error'
-          result = result['results']
-          # Skip this iteration if the package is found in the community repo
-          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))
-          end
-            count += 1
-            puts "[#{result['OutOfDate'] == '1' ? color('✘', :red) : color('✔', :green)}] \
-#{color(result['Name'], :blue)} (#{result['Version']}): #{result['Description']}"
-          end
+      result = json(@config.info % names[1])
+
+      unless result['type'] == 'error'
+        result = result['results']
+        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))
+        end
+          count += 1
+          puts "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] \
+#{ansi(result['Name'], :blue)} (#{result['Version']}): #{result['Description']}"
         end
       end
     end
-    # Join the threads after searching is finished
-    threads.each { |t| t.join }
 
-    puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} \
+    puts "\n#{ansi('==>', :yellow)} Found #{ansi(count.to_s, :magenta)} \
 #{count == 1 ? 'result' : 'results'}"
   end
 
   # Checks the aur for upgrades to local packages that were not found in any
   # official repository.
+  #
   def check_upgrade
     count, upgradable = 0, []
 
     `pacman -Qm`.each_line do |line|
-      # Pacman -Qm output: name 1.1-1
-      # Split them up in variables
       name, version = line.chomp.split
       result = json(@config.info % name)
 
-      # Ensure that packages are on the aur before checking
       unless result['type'] == 'error'
         result = result['results']
 
-        # Check if local version != remote version
         if (result.is_a?(Hash)) && (result['Version'] != version)
-          # Make sure the remote version is newer
           require 'facets/version'
 
           if VersionNumber.new(result['Version']) > VersionNumber.new(version)
             count += 1
-            # Insert the upgradable package's name into an array which we will
-            # use later to prompt the download
             upgradable << name
-            puts "#{color(name, :bold)} (#{color(version, :red)}) \
-can be upgraded to #{color(result['Version'], :green)}"
+
+            puts "#{ansi(name, :blink)} (#{ansi(version, :red)}) \
+can be upgraded to #{ansi(result['Version'], :green)}"
           end
         else
-          puts "#{color(name, :bold)} (#{color(version, :green)}) is up to date"
+          puts "#{ansi(name, :bold)} (#{ansi(version, :green)}) is up to date"
         end
       end
     end
 
-    puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} \
+    puts "\n#{ansi('==>', :yellow)} Found #{ansi(count.to_s, :magenta)} \
 #{count == 1 ? 'upgrade' : 'upgrades'}"
 
     unless upgradable.empty?
-      # Prompt asking to download the upgrades
+      require 'readline'
+
       upgradable.each do |pkg|
-        print "#{color('==>', :yellow)} Download '#{pkg}'? [y] "
-        $stdin.gets.chomp =~ /^y/ ? download(pkg) : next
+        answer = Readline::readline("#{ansi('==>', :yellow)} Download #{pkg}? ")
+        answer =~ /^y|yes$/i ? download(pkg) : next
       end
     end
   end
@@ -187,26 +165,31 @@ private
     info, list = json(@config.search % CGI::escape(package)), []
 
     if info['type'] == 'error'
-      raise AurbError, "#{color('Fatal', :on_red)}: no results"
+      raise AurbError, "#{ansi('Fatal', :on_red)}: no results"
     end
 
     info['results'].each do |result|
+      next if in_sync? result['Name']
       list << [result['Name'], result['ID']]
     end
 
-    list.empty ? nil : list.sort
+    list.sort
   end
 
   # Downloads given +package+ into +dir+
   #
   #   fetch('awesome-git', $0.dirname)
   #
-  def fetch package, dir
+  def fetch package
+    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("#{dir}/#{package}.tar.gz", 'wb') do |local|
+      File.open("#{package}.tar.gz", 'wb') do |local|
         local.write(remote.read)
       end
     end
+
+    puts "#{ansi('==>', :yellow)} Fetched #{package}.tar.gz"
   end
 
   # Untars +package+
@@ -216,11 +199,15 @@ private
   def untar package
     require 'facets/minitar'
     require 'zlib'
+    require 'fileutils'
+
+    FileUtils.rm_r(package) if File.directory?(package)
 
     Archive::Tar::Minitar.unpack(
-      Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
-      Dir.pwd
+      Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')), Dir.pwd
     )
+
+    puts "#{ansi('==>', :yellow)} Untarred #{package}.tar.gz"
   end
 
   # Shortcut to parsing json
@@ -229,7 +216,6 @@ private
   #
   def json item
     require 'json'
-    require 'open-uri'
 
     JSON.parse(open(item).read)
   end
@@ -246,9 +232,9 @@ private
     require 'optparse'
 
     OptionParser.new do |o|
-      o.version      = [0, 5, 6].join('.')
+      o.version      = [0, 5, 7].join('.')
       o.program_name = 'Aurb'
-      o.release      = '2009-04-13'
+      o.release      = '2009-04-14'
 
       o.on('-D', '--download P1,P2,...', Array, "Download package(s).") do |d|
         self[:cmd] = "download('#{d*"', '"}')"
@@ -259,15 +245,18 @@ private
       o.on('-U', '--upgrade', 'Check the AUR for upgrades.') do
         self[:cmd] = 'check_upgrade'
       end
-    end.parse!(@@args)
+    end.parse! @@args
   end
 end
-end
 
-at_exit do
-if __FILE__ == $0
-  raise $! if $!
-  Aurb.aur.start
 end
 
+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.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency