gigamo-aurb 0.6.3 → 0.7.2

data/README.rdoc

@@ -0,0 +1,41 @@
+== Usage
+
+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>--search</b>:: Searches the AUR for a specified name or description
+
+== Installation
+
+Quick and dirty:
+
+  # ruby setup.rb all
+
+Or you can install it in ~/bin:
+
+  % ruby setup.rb config --bindir=$HOME/bin
+  % ruby setup.rb install
+
+For more information about setup.rb, see <tt>ruby setup.rb --help</tt>.
+
+If you prefer RubyGems:
+
+  % gem build aurb.gemspec
+  # gem install aurb-0.7.2.gem
+
+There is also a github gem available:
+
+  % gem sources -a http://gems.github.com/ (you only need to do this once)
+  # gem install gigamo-aurb
+
+=== Dependencies
+
+Aurb requires the 'facets', 'json' and 'highline' rubygems to be installed.
+
+== Todo
+
+* Automatically build (and install) the package after download?
+* Add dependency checking/downloading?

data/aurb.gemspec

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

data/bin/aurb

@@ -1,56 +1,80 @@
 #!/usr/bin/env ruby
-#  Author:: Gigamo <gigamo@gmail.com>
-# License:: Do whatever you want
 #
+# Author:: Gigamo <gigamo@gmail.com>
+#                        _
+#                       | |
+#        __ _ _   _ _ __| |__
+#       / _` | | | | '__| '_ \
+#      | (_| | |_| | |  | |_) |
+#       \__,_|\__,_|_|  |_.__/
+#
+#
+# A Ruby AUR (Arch User Repository) utility.
+#
+
 %w[optparse pathname fileutils zlib open-uri rubygems cgi json highline/import
-   facets/ansicode facets/minitar facets/version].each { |lib| require lib }
+   facets/ansicode facets/minitar facets/version].each {|lib| require lib}
 
 module Aurb
-
 # Path where PKGBUILDS will get saved to
-  DlPath = File.join File.expand_path('~'), 'abs'
+  DlPath = File.join ENV['HOME'], 'abs'
 
 # Program Info
-  PrInfo = {:name => 'Aurb', :version => [0, 6, 3].join('.'), :release => '2009-04-23'}
+  PrInfo = {:name => 'Aurb', :version => [0, 7, 2].join('.'), :release => '2009-04-24'}
 
   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
+      :info   => proc {|t| "http://aur.archlinux.org/rpc.php?type=info&arg=#{t}"},
+      :path   => Pathname.new(DlPath).realpath
   end
 
   module Util
+    def die message, code = 1
+      say message
+      exit code.to_i
+    end
+    module_function :die
+
     def ansi text, effect
       text = ANSICode.send(effect.to_sym) << text << ANSICode.clear if @opts.color
       text
     end
+
+    def yes_or_no? question
+      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.'
+      end
+    end
   end
 
   class Aur
     include Aurb::Util
 
-    def initialize config = {}
-      @config = config
-      @opts = Opts.new
+    def initialize config
+      @opts   = Opts.new
+      @config = config.merge @opts.config
     end
 
     def start
-      trap :INT do
-        puts "\nInterrupt signal received\n\n"
-        exit 0
-      end
-
+      trap(:INT) {die "\nInterrupt signal received\n\n", 0}
       instance_eval @opts.cmd
     end
 
     def download *packages
-      packages = packages.first if packages.first.is_a? Array
+      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'}
+    # Don't download a package if it's found in community
+      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?
 
-      if answer =~ /^y|yes$/i
+      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
@@ -58,10 +82,7 @@ module Aurb
                 fetch package
                 untar package
               end
-              puts <<DOWNLOAD
-(#{ansi "#{packages.index(package) + 1}", :green}/#{ansi "#{packages.length}", :green}) \
-#{in_sync?(package) ? "did NOT download #{package}" : "downloaded #{package}"}
-DOWNLOAD
+              say "(#{packages.index(package)+1}/#{packages.length}) downloaded #{package}"
             end
           end
         end
@@ -72,45 +93,38 @@ DOWNLOAD
       list(package).each do |names|
         result = json(@config[:info][names.last])
 
-        unless result['type'] == 'error'
+        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
-            puts <<SEARCH
-[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] \
-#{ansi result['Name'], :blue} (#{result['Version']}): #{result['Description']}
-SEARCH
+          if package.any? {|pac| (result['Name'] && result['Description']).include?(pac)}
+            say "[#{result['OutOfDate'] == '1' ? ansi('✘', :red) : ansi('✔', :green)}] " +
+              "#{ansi result['Name'], :blue} (#{result['Version']}): #{result['Description']}"
           end
         end
       end
     end
 
     def check_upgrade
-      raise 'Pacman binary not found' if `which pacman`.strip == ''
       upgradable = []
 
-      puts 'Searching for updates'
+      say 'Searching for updates'
       `pacman -Qm`.each_line do |line|
         name, version = line.chomp.split
         result = json(@config[:info][name])
 
-        unless result['type'] == 'error'
+        unless result['type'] =~ /error/
           result = result['results']
           next if in_sync? result['Name']
 
           if VersionNumber.new(result['Version']) > VersionNumber.new(version)
             upgradable << result['Name']
-            puts <<UPDATE
-  #{result['Name']}: #{ansi version, :red} => #{ansi result['Version'], :green}
-UPDATE
+            say " #{name}: #{ansi version, :red} => #{ansi result['Version'], :green}"
           end
         end
       end
 
-      upgradable.empty? ? puts('Nothing to update') : download(upgradable)
+      upgradable.any? ? download(upgradable) : say('Nothing to update')
     end
 
   private
@@ -121,7 +135,7 @@ UPDATE
     def list package
       info, list = json(@config[:search][CGI::escape(package)]), []
 
-      unless info['type'] == 'error'
+      unless info['type'] =~ /error/
         info['results'].each do |result|
           list << [result['Name'], result['ID']]
         end
@@ -141,6 +155,7 @@ UPDATE
     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
 
       Archive::Tar::Minitar.unpack \
@@ -149,21 +164,25 @@ UPDATE
     end
 
     def json item
-      JSON.parse(open(item).read)
+      JSON.parse open(item).read
     end
   end
 
   class Opts
-    attr_reader :cmd, :color
+    attr_reader :cmd, :config, :color
 
     def initialize
-      @@args = ARGV.empty? ? ['-h'] : ARGV
-      @color = true
+      @@args  = ARGV.any? ? ARGV : ['-h']
+      @config = {}
+      @color  = true
 
+    # Parse zeh ARGV!
       parse!
     end
 
   private
+    include Aurb::Util
+
     def parse!
       OptionParser.new do |o|
         o.program_name, o.version, o.release = \
@@ -171,7 +190,7 @@ UPDATE
 
         o.separator 'Actions (Required):'
         o.on '-D', '--download P1,P2,...', Array, 'download package(s)' do |d|
-          @cmd = "download('#{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}')"
@@ -180,10 +199,19 @@ UPDATE
           @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
+          else
+            die 'The path you specified doesn\'t exist'
+          end
+        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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gigamo-aurb
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.7.2
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ extra_rdoc_files: []
 files: 
 - bin/aurb
 - aurb.gemspec
-- README
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/gigamo/aurb
 post_install_message: 

data/README

@@ -1,11 +0,0 @@
-== 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