gigamo-aurb 0.6.2 → 0.6.3

data/aurb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'aurb'
-  s.version = '0.6.2'
-  s.date = %q{2009-04-19}
+  s.version = '0.6.3'
+  s.date = %q{2009-04-23}
   s.summary = %q{A simple AUR utility}
   s.email = %q{gigamo@gmail.com}
   s.homepage = %q{http://github.com/gigamo/aurb}
@@ -9,9 +9,10 @@ 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']
   s.authors = ['Gigamo']
   s.files = ['bin/aurb', 'aurb.gemspec', 'README']
   s.add_dependency 'json'
   s.add_dependency 'facets'
+  s.add_dependency 'highline'
 end

data/bin/aurb

@@ -1,268 +1,193 @@
 #!/usr/bin/env ruby
 #  Author:: Gigamo <gigamo@gmail.com>
-# License:: GPL
+# License:: Do whatever you want
 #
-
-require 'rubygems'
-require 'open-uri'
+%w[optparse pathname fileutils zlib open-uri rubygems cgi json highline/import
+   facets/ansicode facets/minitar facets/version].each { |lib| require lib }
 
 module Aurb
 
-DlPath = File.join File.expand_path('~'), 'abs' # Change me!
-Config = Struct.new :search, :info, :dir # Don't change me!
+# Path where PKGBUILDS will get saved to
+  DlPath = File.join File.expand_path('~'), 'abs'
 
-def self.aur
-  @aur ||= Aur.new
-end
+# Program Info
+  PrInfo = {:name => 'Aurb', :version => [0, 6, 3].join('.'), :release => '2009-04-23'}
+
+  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
+  end
 
-module Util
-  # Colorize a string
-  #
-  #   ansi('Text', :green)
-  #
-  # For a full list of available effects, see
-  # http://facets.rubyforge.org/doc/api/more/classes/ANSICode.html
-  #
-  def ansi text, effect
-    require 'facets/ansicode' unless defined? ANSICode
-
-    if @opts[:color]
-      ANSICode.send(effect.to_sym) << text << ANSICode.clear
-    else
+  module Util
+    def ansi text, effect
+      text = ANSICode.send(effect.to_sym) << text << ANSICode.clear if @opts.color
       text
     end
   end
-  module_function :ansi
-end
 
-class Aur
-  include Aurb::Util
+  class Aur
+    include Aurb::Util
 
-  def initialize
-    require 'pathname'
+    def initialize config = {}
+      @config = config
+      @opts = Opts.new
+    end
 
-    @config = Config.new(
-      'http://aur.archlinux.org/rpc.php?type=search&arg=%s',
-      'http://aur.archlinux.org/rpc.php?type=info&arg=%s',
-      Pathname.new(DlPath).realpath
-    )
-    @opts = Opts.new
-  end
+    def start
+      trap :INT do
+        puts "\nInterrupt signal received\n\n"
+        exit 0
+      end
 
-  def start
-    trap :INT do
-      puts "\nInterrupt signal received\n\n"
-      exit 0 # Exit peacefully on *INT
+      instance_eval @opts.cmd
     end
 
-    # Evaluate a command in string form
-    # 
-    #   instance_eval('search("package")')
-    #
-    instance_eval @opts[:cmd]
-  end
+    def download *packages
+      packages = packages.first if packages.first.is_a? Array
+
+      puts "Targets (#{ansi "#{packages.length}", :magenta}): #{packages.join(', ')}"
+      answer = ask("Proceed? [Y/n] ") {|q| q.readline = true; q.default = 'y'}
 
-  # Downloads +packages+
-  #
-  #   download('awesome-git', 'aurb')
-  #
-  def download *packages
-    require 'readline'
-
-    packages = packages[0] if packages[0].is_a? Array
-
-    puts "Targets (#{packages.length}): #{packages.join(', ')}"
-    answer = Readline::readline "Proceed? [y/n] "
-
-    if answer =~ /^y|yes$/i
-      packages.each do |package|
-        list(package).each do |names|
-          if names[0] == package
-            if in_sync? package
-              puts ":: Found #{package} in community. Use pacman!"
-            else
-              Dir.chdir(@config.dir) do
+      if answer =~ /^y|yes$/i
+        packages.each do |package|
+          list(package).each do |names|
+            if names.first == package
+              FileUtils.cd @config[:path] do
                 fetch package
                 untar package
-
-                puts "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
               end
+              puts <<DOWNLOAD
+(#{ansi "#{packages.index(package) + 1}", :green}/#{ansi "#{packages.length}", :green}) \
+#{in_sync?(package) ? "did NOT download #{package}" : "downloaded #{package}"}
+DOWNLOAD
             end
           end
         end
       end
     end
-  end
-
-  # Searches for +package+
-  #
-  #   search('awesome')
-  #
-  def search package
-    count, threads = 0, []
-
-    list(package).each do |names|
-      result = json(@config.info % names[1])
-
-      unless result['type'] == 'error'
-        result = result['results']
 
-        next if in_sync? result['Name']
+    def search package
+      list(package).each do |names|
+        result = json(@config[:info][names.last])
 
-        if package.any? do |pac| # Check both name and description for matches
-          (result['Name'].include? pac) || (result['Description'].include? pac)
-        end
-          count += 1
+        unless result['type'] == 'error'
+          result = result['results']
+          next if in_sync? result['Name']
 
-          puts "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] \
-#{ansi result['Name'], :blue} (#{result['Version']}): #{result['Description']}"
+          if package.any? do |pac| # Check both name and description for matches
+            result['Name'].include?(pac) || result['Description'].include?(pac)
+          end
+            puts <<SEARCH
+[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] \
+#{ansi result['Name'], :blue} (#{result['Version']}): #{result['Description']}
+SEARCH
+          end
         end
       end
     end
-  end
 
-  # Checks the aur for upgrades to local packages that were not found in any
-  # official repository.
-  #
-  def check_upgrade
-    upgradable = []
+    def check_upgrade
+      raise 'Pacman binary not found' if `which pacman`.strip == ''
+      upgradable = []
 
-    puts ":: Searching for upgrades. This may take a while..."
+      puts 'Searching for updates'
+      `pacman -Qm`.each_line do |line|
+        name, version = line.chomp.split
+        result = json(@config[:info][name])
 
-    `pacman -Qm`.each_line do |line|
-      name, version = line.chomp.split
-      result = json(@config.info % name)
-
-      unless result['type'] == 'error'
-        result = result['results']
-
-        next if in_sync? result['Name']
-
-        if (result.is_a? Hash) && (result['Version'] != version)
-          require 'facets/version'
+        unless result['type'] == 'error'
+          result = result['results']
+          next if in_sync? result['Name']
 
           if VersionNumber.new(result['Version']) > VersionNumber.new(version)
-            upgradable << name
-
-            puts " #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
+            upgradable << result['Name']
+            puts <<UPDATE
+  #{result['Name']}: #{ansi version, :red} => #{ansi result['Version'], :green}
+UPDATE
           end
         end
       end
-    end
-
-    upgradable.empty? ? puts(':: Everything up to date') : download(upgradable)
-  end
 
-private
-  # Checks if a package exists in the community repository
-  #
-  #   in_sync?('awesome-git')
-  #
-  def in_sync? package
-    !!Dir["/var/lib/pacman/sync/community/#{package}-*"][0]
-  end
+      upgradable.empty? ? puts('Nothing to update') : download(upgradable)
+    end
 
-  # Returns a list of packages found by a search
-  #
-  #   list('awesome-git')
-  #
-  def list package
-    require 'cgi'
+  private
+    def in_sync? package
+      !!Dir["/var/lib/pacman/sync/community/#{package}-*"].first
+    end
 
-    info, list = json(@config.search % CGI::escape(package)), []
+    def list package
+      info, list = json(@config[:search][CGI::escape(package)]), []
 
-    unless info['type'] == 'error'
-      info['results'].each do |result|
-        list << [result['Name'], result['ID']]
+      unless info['type'] == 'error'
+        info['results'].each do |result|
+          list << [result['Name'], result['ID']]
+        end
       end
-    end
 
-    list.sort
-  end
+      list.sort
+    end
 
-  # Downloads given +package+ into +dir+
-  #
-  #   fetch('awesome-git', $0.dirname)
-  #
-  def fetch package
-    File.delete "#{package}.tar.gz" if File.exists? "#{package}.tar.gz"
+    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|
-        local.write(remote.read)
+      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
-  end
-
-  # Untars +package+
-  #
-  #   untar('awesome-git') #=> .tar.gz is automagically appended
-  #
-  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
-    )
-  end
+    def untar package
+      FileUtils.rm_r package if File.directory? package
 
-  # Shortcut to parsing json
-  #
-  #   json('http://foo.bar')
-  #
-  def json item
-    require 'json' unless defined? JSON
-
-    JSON.parse(open(item).read)
-  end
-end
+      Archive::Tar::Minitar.unpack \
+        Zlib::GzipReader.new(File.open("#{package}.tar.gz", 'rb')),
+        Dir.pwd
+    end
 
-class Opts < Hash
-  def initialize
-    @@args = ARGV.empty? ? ['-h'] : ARGV
-    parse
+    def json item
+      JSON.parse(open(item).read)
+    end
   end
 
-private
-  def parse
-    require 'optparse'
-
-    self[:color] = true
-
-    OptionParser.new do |o|
-      o.version      = [0, 6, 2].join('.')
-      o.program_name = 'Aurb'
-      o.release      = '2009-04-19'
+  class Opts
+    attr_reader :cmd, :color
 
-      o.separator 'Actions:'
+    def initialize
+      @@args = ARGV.empty? ? ['-h'] : ARGV
+      @color = true
 
-      o.on '-D', '--download P1,P2,...', Array, "Download package(s)." do |d|
-        self[:cmd] = "download('#{d*"', '"}')"
-      end
-
-      o.on '-S', '--search PKG', 'Search for a package.' do |s|
-        self[:cmd] = "search('#{s}')"
-      end
-
-      o.on '-U', '--upgrade', 'Check the AUR for upgrades.' do
-        self[:cmd] = 'check_upgrade'
-      end
+      parse!
+    end
 
-      o.separator 'Optional:'
+  private
+    def parse!
+      OptionParser.new do |o|
+        o.program_name, o.version, o.release = \
+          [:name, :version, :release].map {|key| PrInfo[key]}
 
-      o.on '-C', '--[no-]color', 'Toggle colored output' do |c|
-        self[:color] = c
-      end
-    end.parse! @@args
+        o.separator 'Actions (Required):'
+        o.on '-D', '--download P1,P2,...', Array, 'download package(s)' do |d|
+          @cmd = "download('#{d*"', '"}')"
+        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 '--[no-]color', "use colors? [#{@color ? 'yes' : 'no'}]" do |c|
+          @color = c
+        end
+      end.parse! @@args
+    end
   end
 end
 
-end
-
 at_exit do
   if __FILE__ == $0
     raise $! if $!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  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: