gigamo-aurb 0.5.2 → 0.5.4

data/README

@@ -1 +1,11 @@
-Coming soon.
+== Installation
+
+See <tt>ruby setup.rb --help</tt>.
+
+Quick and dirty (may require root):
+
+    ruby setup.rb all
+
+Or in ~/bin:
+
+    ruby setup.rb config --bindir=/home/username/bin && ruby setup.rb install

data/aurb.gemspec

@@ -1,14 +1,17 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.5.2'
-  s.date = '2009-04-07'
-  s.summary = 'A simple AUR utility'
-  s.email = 'gigamo@gmail.com'
-  s.homepage = 'http://github.com/gigamo/aurb'
+  s.version = '0.5.4'
+  s.date = %q{2009-04-10}
+  s.summary = %q{A simple AUR utility}
+  s.email = %q{gigamo@gmail.com}
+  s.homepage = %q{http://github.com/gigamo/aurb}
   s.description = s.summary
-  s.rubyforge_project = 'aurb'
-  s.has_rdoc = false
+  s.rubyforge_project = %q{aurb}
+  s.executables = ['aurb']
+  s.has_rdoc = true
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Aurb", "--main", "README"]
   s.authors = ['Gigamo']
   s.files = ['bin/aurb', 'aurb.gemspec', 'README']
-  s.bindir = 'bin'
+  s.add_dependency 'json'
+  s.add_dependency 'facets'
 end

data/bin/aurb

@@ -1,24 +1,21 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'zlib'
-require 'facets/minitar'
-require 'facets/version'
-require 'facets/ansicode'
-require 'json'
-require 'cgi'
-require 'open-uri'
-require 'optparse'
-require 'pathname'
+%w(optparse rubygems cgi json open-uri pathname zlib facets/ansicode facets/minitar facets/version).each do |lib|
+  require lib
+end
 
 module Aurb
-  Config = Struct.new(:search, :info, :sync, :dir)
-  Version = {:major => 0, :minor => 5, :tiny => 2}
+  Config  = Struct.new(:search, :info, :sync, :dir)
+  Version = [0, 5, 4]
+  # Change Me!
+  DlPath  = File.join(File.expand_path('~'), 'abs') # => '/home/gig/abs' in my case
 
   def self.aur
     @aur ||= Aur.new
   end
 
   module Util
+    # Colorize a string
+    # Example: color('Text', :green)
     def color(text, effect)
       ANSICode.send(effect.to_sym) << text << ANSICode.clear
     end
@@ -33,46 +30,41 @@ module Aurb
       @config = Config.new(
         'http://aur.archlinux.org/rpc.php?type=search&arg=%s',
         'http://aur.archlinux.org/rpc.php?type=info&arg=%s',
-        '/var/lib/pacman/sync/%s',
-        # Change this to reflect your personal download path
-        Pathname.new(File.join(ENV['HOME'], 'abs')).realpath
+        '/var/lib/pacman/sync/community',
+        Pathname.new(DlPath).realpath
       )
       @opts = Opts.new(ARGV)
     end
 
     def start
-      trap(:INT) { raise AurbError, 'Catched SIGINT' }
-
-      if @opts[:cmd]
-        instance_eval(@opts[:cmd])
-      else
-        raise AurbError, "#{color('Fatal', :on_red)}: no option given, see --help"
-      end
+      # Exit peacefully on *INT
+      trap(:INT) { exit 0 }
+      # Evaluate a command in string form
+      # Example: instance_eval('search("package")')
+      # Which will invoke the search method
+      instance_eval(@opts[:cmd])
     rescue AurbError => e
-      puts e.message
+      $stderr.puts e.message
       exit 1
     end
 
     def download(*packages)
       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
+            # 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. Pacman will do."
+              exec "sudo pacman -S #{package}"
+            else
+            # Else download and untar it from the AUR
+              Dir.chdir(@config.dir) do |dir|
+                fetch(package, dir)
+                puts "#{color('==>', :yellow)} Downloaded #{package}"
+                untar(package)
+                puts "#{color('==>', :yellow)} Unpacked #{package}"
               end
-
-              puts "#{color('==>', :yellow)} Unpacking #{package}"
-              Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')), Dir.pwd)
             end
           end
         end
@@ -80,41 +72,50 @@ module Aurb
     end
 
     def search(package)
-      threads, count = [], 0
+      count, threads = 0, []
       list(package).each do |names|
+        # Launch a separate thread for each packagename to be checked
+        # This is slooow otherwise, because it will have to wait for each result
+        # to be displayed before going on to the next one
         threads << Thread.new do
-          result = JSON.parse(open(@config.info % names[1]).read)
+          result = json(@config.info % names[1])
           unless result['type'] == 'error'
             result = result['results']
-            next if in_sync? result['Name'], 'community'
-            if package.any? do |pac|
-                (result['Name'].include?(pac)) || (result['Description'].include?(pac))
-              end
+            # Skip this iteration if the package is found in the community repo
+            next if in_sync? result['Name']
+            # Check both name and description for matches
+            if package.any? { |pac| (result['Name'].include?(pac)) || (result['Description'].include?(pac)) }
               count += 1
               puts "[#{result['OutOfDate'] == '1' ? color('✘', :red) : color('✔', :green)}] #{color(result['Name'], :blue)} (#{result['Version']}): #{result['Description']}"
             end
           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)} #{count == 1 ? 'result' : 'results'}" if count > 0
+      puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} #{count == 1 ? 'result' : 'results'}"
     end
 
     def check_upgrade
-      uppkgs, found, upcount = [], false, 0
-      puts "#{color('==>', :yellow)} Checking for upgrades"
+      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.parse(open(@config.info % name).read)
+        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
             if VersionNumber.new(result['Version']) > VersionNumber.new(version)
-              found = true
+              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)}"
-              upcount += 1
-              uppkgs << name
             end
           else
             puts "#{color(name, :bold)} (#{color(version, :green)}) is up to date"
@@ -122,50 +123,64 @@ module Aurb
         end
       end
 
-      if found
-        puts "\n#{color('==>', :yellow)} Found #{color(upcount.to_s, :magenta)} #{upcount == 1 ? 'upgrade' : 'upgrades'}"
-        uppkgs.each do |pkg|
+      puts "\n#{color('==>', :yellow)} Found #{color(count.to_s, :magenta)} #{count == 1 ? 'upgrade' : 'upgrades'}"
+      unless upgradable.empty?
+        # Prompt asking to download the upgrades
+        upgradable.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
     end
 
   private
-    def in_sync?(package, repo)
-      repo = @config.sync % repo
-      true if Dir["#{repo}/#{package}-*"].first
+    def in_sync?(package)
+      Dir["#{@config.sync}/#{package}-*"].first ? true : false
     end
 
     def list(package)
-      info, list = JSON.parse(open(@config.search % CGI::escape(package)).read), []
+      info, list = json(@config.search % CGI::escape(package)), []
       if info['type'] == 'error'
         raise AurbError, "#{color('Fatal', :on_red)}: no results"
       end
       for result in info['results'] do
         list << [result['Name'], result['ID']]
       end
-
       list.sort unless list.empty?
     end
+
+    def fetch(package, dir)
+      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
+    end
+
+    def untar(package)
+      Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')), Dir.pwd)
+    end
+
+    def json(item)
+      JSON.parse(open(item).read)
+    end
   end
 
   class Opts < Hash
-    def initialize(args)
-      parse(args)
+    def initialize(args = ARGV)
+      @@args = args.empty? ? ['-h'] : args
+      parse
     end
 
   private
-    def parse(args)
+    def parse
       OptionParser.new do |o|
-        o.version      = '%s.%s.%s' % [:major, :minor, :tiny].map {|v| Version[v]}
+        o.version      = Version.join('.')
         o.program_name = 'Aurb'
-        o.release      = '2009-04-07'
+        o.release      = '2009-04-10'
 
         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*"', '"}')"
         end
         o.on('-S', '--search PKG', 'Search for a package.') do |s|
           self[:cmd] = "search('#{s}')"
@@ -173,7 +188,7 @@ module Aurb
         o.on('-U', '--upgrade', 'Check for upgrades.') do
           self[:cmd] = 'check_upgrade'
         end
-      end.parse!(args)
+      end.parse!(@@args)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors: 
 - Gigamo
@@ -9,14 +9,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-04-10 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: facets
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A simple AUR utility
 email: gigamo@gmail.com
-executables: []
-
+executables: 
+- aurb
 extensions: []
 
 extra_rdoc_files: []
@@ -25,11 +44,16 @@ files:
 - bin/aurb
 - aurb.gemspec
 - README
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/gigamo/aurb
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Aurb
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement