aurb 1.0.3 → 1.1.0

data/Rakefile

@@ -11,6 +11,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ['Gigamo']
   
   gem.add_dependency('yajl-ruby')
+  gem.add_dependency('thor')
   gem.add_dependency('ansi')
   gem.add_dependency('archive-tar-minitar')
   gem.add_dependency('facets')

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/aurb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-07}
   s.default_executable = %q{aurb}
   s.email = %q{gigamo@gmail.com}
   s.executables = ["aurb"]
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
      "bin/aurb",
      "lib/aurb.rb",
      "lib/aurb/aur.rb",
+     "lib/aurb/cli.rb",
      "lib/aurb/support.rb",
-     "lib/aurb/version.rb",
      "test/test_helper.rb",
      "test/unit/test_aur.rb",
      "test/unit/test_support.rb"
@@ -50,12 +50,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<ansi>, [">= 0"])
       s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0"])
       s.add_runtime_dependency(%q<facets>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<ansi>, [">= 0"])
       s.add_dependency(%q<archive-tar-minitar>, [">= 0"])
       s.add_dependency(%q<facets>, [">= 0"])
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<ansi>, [">= 0"])
     s.add_dependency(%q<archive-tar-minitar>, [">= 0"])
     s.add_dependency(%q<facets>, [">= 0"])

data/bin/aurb

@@ -6,88 +6,11 @@
 # See LICENSE file for details.
 #++
 
-require File.expand_path(File.dirname(__FILE__) + '/../lib/aurb')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/aurb/cli')
 
-class Session
-  include Aurb::Aur
-
-  @@path ||= ENV[:HOME] + '/abs'
-
-  def self.parse_options
-    ARGV.unshift '-h' if ARGV.empty?
-
-    gopts = GetoptLong.new(
-      ['--download', '-d', GetoptLong::REQUIRED_ARGUMENT],
-      ['--search',   '-s', GetoptLong::REQUIRED_ARGUMENT],
-      ['--upgrade',  '-u', GetoptLong::NO_ARGUMENT      ],
-      ['--version',  '-v', GetoptLong::NO_ARGUMENT      ],
-      ['--help',     '-h', GetoptLong::NO_ARGUMENT      ]
-    )
-
-    gopts.each do |opt, args|
-      case opt
-      when '--download'
-        packages = download(args.split)
-        puts 'No downloadable packages found' and return if packages.blank?
-        packages.each_with_index do |package, index|
-          current = index + 1
-          total   = packages.size
-          local   = package.split('/')[-1]
-
-          Dir.chdir(@@path) do
-            open(package) do |remote|
-              File.open(local, 'wb') do |local|
-                local.write remote.read
-              end
-            end
-
-            Archive::Tar::Minitar.unpack(
-              Zlib::GzipReader.new(File.open(local, 'rb')), Dir.pwd
-            )
-            File.delete local
-          end
-
-          puts "(#{current}/#{total}) downloaded #{local}"
-        end
-      when '--search'
-        packages = search(args.split)
-        puts 'No results found' and return if packages.blank?
-        packages.each do |package|
-          status  = package.OutOfDate == '1' ? '✘'.colorize(:red) : '✔'.colorize(:green)
-          name    = package.Name.colorize(:yellow)
-          version = package.Version
-          description = package.Description
-
-          puts "[#{status}] #{name} (#{version})\n    #{description}"
-        end
-      when '--upgrade'
-        local_list = `pacman -Qm`.split(/\n/)
-        packages = upgrade(local_list)
-        puts 'Nothing to upgrade' and return if packages.blank?
-        packages.each do |package|
-          puts "#{package} has an upgrade available"
-        end
-      when '--version'
-        puts Aurb::Version
-      when '--help'
-        puts %{
-  Aurb - An AUR (Arch User Repository) script
-
-  Usage:
-    #{name = File.basename $0} [options]
-
-  Options (Required):
-    -d, --download "packages"   Download package(s).
-    -s, --search "packages"     Search package(s).
-    -u, --upgrade               Search for package upgrades.
-
-  Other:
-        --version               Show version and exit.
-        --help                  You're looking at it.
-        }
-      end
-    end
-  end
+begin
+  Aurb::CLI.start
+rescue Aurb::AurbError => e
+  puts e.message.colorize(:red)
+  exit e.status_code
 end
-
-Session.parse_options

data/lib/aurb.rb

@@ -8,36 +8,48 @@
 
 require 'logger'
 require 'getoptlong'
-require 'zlib'
 require 'open-uri'
+
+require 'zlib'
 require 'yajl'
 require 'ansi'
 require 'archive/tar/minitar'
 require 'facets/version'
 
-module Aurb
-  # Generic Aurb error.
-  class AurbError < StandardError; end
+module Aurb #:nodoc:
+  VERSION = '1.1.0'
 
-  # Raised for faulty arguments.
-  class AurbArgumentError < AurbError
-    def initialize
-      super('Invalid arguments')
+  class AurbError < StandardError
+    def self.status_code(code = nil)
+      return @code unless code
+      @code = code
     end
-  end
 
-  # Make a +Logger+ object available.
-  def self.logger
-    @logger ||= Logger.new(STDOUT)
+    def status_code
+      self.class.status_code
+    end
   end
 
-  # Returns an URL which will be used for JSON parsing.
-  def self.aur_path(type, arg)
-    "http://aur.archlinux.org/rpc.php?type=#{type}&arg=#{arg}"
+  class AurbDownloadError < AurbError; status_code(10); end
+  class AurbArgumentError < AurbError; status_code(12); end
+
+  class << self
+    attr_reader :aur
+
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def aur_path(type, arg)
+      "http://aur.archlinux.org/rpc.php?type=#{type}&arg=#{arg}"
+    end
+
+    def aur
+      @aur ||= Aur.new
+    end
   end
 end
 
-$LOAD_PATH.unshift File.dirname(__FILE__)
-require 'aurb/support'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 require 'aurb/aur'
-require 'aurb/version'
+require 'aurb/support'

data/lib/aurb/aur.rb

@@ -7,115 +7,96 @@
 #++
 
 module Aurb
-  module Aur
-    def self.included(klass)
-      klass.class_eval { extend ClassMethods }
+  class Aur
+    # Search the AUR for given +packages+.
+    # Returns an array of results.
+    #
+    #   search(['aurb']) # => [{:ID => ..., :Name => 'aurb', ...}, {...}]
+    def search(packages)
+      packages.map do |package|
+        list_search_results(package)
+      end.flatten.delete_if(&:blank?)
     end
 
-    module ClassMethods
-      # Search the AUR for given +packages+.
-      # Returns an array of results.
-      #
-      #   search(['aurb']) # => [{:ID => ..., :Name => 'aurb', ...}, {...}]
-      def search(packages)
-        if packages.is_a?(Array)
-          results = packages.map do |package|
-            list_search_results(package)
-          end.flatten
-        elsif packages.is_a?(String) || packages.is_a?(Symbol)
-          results = list_search_results(packages)
-        else
-          raise AurbArgumentError and return
-        end
-
-        results.delete_if(&:blank?)
-      end
+    # Download +packages+ from the AUR.
+    # Returns an array of downloadable package urls.
+    #
+    #   download(['aurb']) # => ['http://.../aurb.tar.gz']
+    def download(packages)
+      url = lambda {|p| "http://aur.archlinux.org/packages/#{p}/#{p}.tar.gz"}
+
+      packages.map do |package|
+        url.call(URI.escape(package.to_s))
+      end.select do |package|
+        downloadable?(package)
+      end.delete_if(&:blank?)
+    end
 
-      # Download +packages+ from the AUR.
-      # Returns an array of downloadable package urls.
-      #
-      #   download(['aurb']) # => ['http://.../aurb.tar.gz']
-      def download(packages)
-        if packages.is_a?(String) || packages.is_a?(Symbol)
-          packages = packages.to_s.split(/\s+/)
-        end
-        raise AurbArgumentError and return unless packages.is_a?(Array)
-
-        url = lambda {|p| "http://aur.archlinux.org/packages/#{p}/#{p}.tar.gz"}
-
-        downloadables = packages.map do |package|
-          url.call(URI.escape(package.to_s))
-        end.select do |package|
-          downloadable?(package)
-        end
-
-        downloadables.delete_if(&:blank?)
+    # Returns a +list+ of names of packages that have an upgrade
+    # available to them, which could then in turn be passed on to
+    # the +download+ method.
+    #
+    #   # With Aurb on the AUR as version [0, 8, 2, 1]
+    #   upgrade(['aurb 0.0.0.0', 'aurb 0.9.9.9']) # => [:aurb]
+    def upgrade(list)
+      upgradables = []
+
+      list.each do |line|
+        name, version = line.split
+        next if in_community?(name)
+        upgradables << name.to_sym if upgradable?(name, version)
       end
 
-      # Returns a +list+ of names of packages that have an upgrade
-      # available to them, which could then in turn be passed on to
-      # the +download+ method.
-      #
-      #   # With Aurb on the AUR as version [0, 8, 2, 1]
-      #   upgrade(['aurb 0.0.0.0', 'aurb 0.9.9.9']) # => [:aurb]
-      def upgrade(list)
-        upgradables = []
-
-        list.each do |line|
-          name, version = line.split
-          next if in_community?(name)
-          upgradables << name if upgradable?(name, version)
-        end
-
-        upgradables.map(&:to_sym)
+      upgradables
+    end
+
+    protected
+
+    # See if +package+ is available in the community repository.
+    def in_community?(package)
+      Dir["/var/lib/pacman/sync/community/#{package}-*"].any?
+    end
+
+    # Check if +package+ is available for download.
+    def downloadable?(package)
+      open package rescue false
+    end
+
+    # Compare version of local +package+ with the one on the AUR.
+    def upgradable?(package, version)
+      json = parse_json(Aurb.aur_path(:info, package.to_s))
+      return if json.type =~ /error/
+      remote_package = json.results
+
+      local_version  = VersionNumber.new(version)
+      remote_version = VersionNumber.new(remote_package.Version)
+
+      local_version < remote_version
+    end
+
+    # Returns an array containing a hash of search results
+    # for a given +package+.
+    def list_search_results(package)
+      json = parse_json(Aurb.aur_path(:search, URI.escape(package.to_s)))
+      return if json.type =~ /error/
+      ids  = json.results.map(&:ID)
+      results = []
+
+      ids.each do |id|
+        json     = parse_json(Aurb.aur_path(:info, id))
+        next if json.type =~ /error/
+        result   = json.results.symbolize_keys
+        results << result unless in_community?(result[:Name])
       end
 
-      private
-        # See if +package+ is available in the community repository.
-        def in_community?(package)
-          Dir["/var/lib/pacman/sync/community/#{package}-*"].any?
-        end
-
-        # Shortcut to the +Yajl+ JSON parser.
-        def parse_json(json)
-          Yajl::Parser.new.parse(open(json).read)
-        end
-
-        # Check if +package+ is available for download.
-        def downloadable?(package)
-          open package rescue false
-        end
-
-        # Compare version of local +package+ with the one on the AUR.
-        def upgradable?(package, version)
-          json = parse_json(Aurb.aur_path(:info, package.to_s))
-          return if json.type =~ /error/
-          remote_package = json.results
-
-          local_version  = VersionNumber.new(version)
-          remote_version = VersionNumber.new(remote_package.Version)
-
-          local_version < remote_version
-        end
-
-        # Returns an array containing a hash of search results
-        # for a given +package+.
-        def list_search_results(package)
-          json = parse_json(Aurb.aur_path(:search, URI.escape(package.to_s)))
-          return if json.type =~ /error/
-          ids  = json.results.map(&:ID)
-          results = []
-
-          ids.each do |id|
-            json     = parse_json(Aurb.aur_path(:info, id))
-            next if json.type =~ /error/
-            result   = json.results.symbolize_keys
-            results << result unless in_community?(result[:Name])
-          end
-
-          results
-        end
-      # private
+      results
+    end
+
+    private
+
+    # Shortcut to the +Yajl+ JSON parser.
+    def parse_json(json)
+      Yajl::Parser.new.parse(open(json).read)
     end
   end
 end

data/lib/aurb/cli.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+#
+#--
+# Copyright protects this work.
+# See LICENSE file for details.
+#++
+
+require 'thor'
+require File.expand_path(File.dirname(__FILE__) + '/../aurb')
+
+module Aurb
+  class CLI < Thor
+    ARGV   = ::ARGV.dup
+
+    map '-d' => :download
+    map '-s' => :search
+    map '-u' => :upgrade
+
+    desc 'download "PACKAGES"', 'Download packages'
+    method_option :path,
+                  :type    => :string,
+                  :default => File.join(ENV[:HOME], 'abs'),
+                  :banner  => 'Specify the path to download to'
+    def download(pkgs)
+      pkgs = Aurb.aur.download(pkgs.split)
+
+      puts 'No downloadable packages found' and return if pkgs.blank?
+
+      opts = options.dup
+      path = opts[:path][0] == '/' ? opts[:path] : File.join(Dir.pwd, opts[:path])
+      if File.exist?(path)
+        opts[:path] = File.expand_path(path)
+      else
+        raise AurbDownloadError, "'#{path}' is not a valid path"
+      end
+
+      pkgs.each_with_index do |package, index|
+        current = index + 1
+        total   = pkgs.size
+        local   = package.split('/')[-1]
+
+        Dir.chdir(opts[:path]) do
+          open(package) do |remote|
+            File.open(local, 'wb') do |local|
+              local.write remote.read
+            end
+          end
+
+          Archive::Tar::Minitar.unpack(
+            Zlib::GzipReader.new(File.open(local, 'rb')), Dir.pwd
+          )
+          File.delete local
+        end
+
+        puts "(#{current}/#{total}) downloaded #{local}"
+      end
+    end
+
+    desc 'search "PACKAGES"', 'Search for packages'
+    def search(pkgs)
+      pkgs = Aurb.aur.search(pkgs.split)
+
+      puts 'No results found' and return if pkgs.blank?
+
+      pkgs.each do |package|
+        status = package.OutOfDate == '1' ? '✘'.colorize(:red) : '✔'.colorize(:green)
+        name, version, description = package.Name.colorize(:yellow),
+                                     package.Version,
+                                     package.Description
+
+        puts "[#{status}] #{name} (#{version})\n    #{description}"
+      end
+    end
+
+    desc 'upgrade', 'Search for upgrades to installed packages'
+    def upgrade
+      list = `pacman -Qm`.split(/\n/)
+      pkgs = Aurb.aur.upgrade(list)
+
+      puts 'Nothing to upgrade' and return if pkgs.blank?
+
+      pkgs.each do |package|
+        puts "#{package} has an upgrade available"
+      end
+    end
+  end
+end

data/lib/aurb/support.rb

@@ -10,17 +10,6 @@ class Object
   end
 end
 
-class Symbol
-  # Turns the symbol into a proc, useful for enumerations.
-  #
-  #   items.select(&:cool?).map(&:name)
-  #   # Does the same as
-  #   items.select {|i| i.cool?}.map {|i| i.name}
-  def to_proc
-    Proc.new {|obj| obj.__send__(self)}
-  end
-end
-
 class Hash
   # Returns a new hash with all keys converted to symbols.
   def symbolize_keys

data/test/test_helper.rb

@@ -3,13 +3,4 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/aurb')
 require 'shoulda'
 
 class Test::Unit::TestCase
-  include Aurb
-
-  def Session
-    klass = Class.new do
-      include Aurb::Aur
-    end
-
-    klass
-  end
 end

data/test/unit/test_aur.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class AurTest < Test::Unit::TestCase
-  context 'Aur ClassMethod' do
+  context 'Aurb::Aur #' do
     setup do
-      @session = Session()
+      @aur = Aurb.aur
     end
 
     context 'upgrade' do
@@ -13,61 +13,48 @@ class AurTest < Test::Unit::TestCase
       end
 
       should 'return an array' do
-        assert @session.upgrade(@list).is_a?(Array)
+        assert @aur.upgrade(@list).is_a?(Array)
       end
 
       should 'contain only upgradable packages' do
-        assert_not_equal [:aurb, :aurb], @session.upgrade(@list)
-        assert_equal [:aurb], @session.upgrade(@list)
+        assert_not_equal [:aurb, :aurb], @aur.upgrade(@list)
+        assert_equal [:aurb], @aur.upgrade(@list)
       end
     end
 
     context 'download' do
       setup do
         @url = lambda {|p| "http://aur.archlinux.org/packages/#{p}/#{p}.tar.gz"}
-        @package_working = 'awesome-git'
-        @package_faulty  = 'awesome'
-      end
-
-      should 'accept arrays, symbols and strings' do
-        assert_nothing_raised { @session.download(@package_working.to_s) }
-        assert_nothing_raised { @session.download(@package_working.split) }
-        assert_nothing_raised { @session.download(@package_working.to_sym) }
+        @package_working = ['awesome-git']
+        @package_faulty  = ['awesome']
       end
 
       should 'return an array' do
-        assert @session.download(@package_working).is_a?(Array)
-        assert @session.download(@package_faulty).is_a?(Array)
+        assert @aur.download(@package_working).is_a?(Array)
+        assert @aur.download(@package_faulty).is_a?(Array)
       end
 
       should 'return download links' do
-        assert_equal [@url.call(@package_working)], @session.download(@package_working)
+        assert_equal [@url.call(@package_working.join)], @aur.download(@package_working)
       end
 
       should 'filter out non-existant packages' do
-        assert_equal [], @session.download(@package_faulty)
+        assert_equal [], @aur.download(@package_faulty)
       end
     end
 
     context 'search' do
       setup do
-        @package = 'aurb'
-      end
-
-      should 'accept arrays, symbols and strings' do
-        assert_nothing_raised { @session.search(@package.to_s)   }
-        assert_nothing_raised { @session.search(@package.split)   }
-        assert_nothing_raised { @session.search(@package.to_sym) }
+        @package = ['aurb']
       end
 
       should 'return an array of results' do
-        assert @session.search(@package.to_s).is_a?(Array)
-        assert @session.search(@package.split).is_a?(Array)
+        assert @aur.search(@package).is_a?(Array)
       end
 
       context 'result' do
         setup do
-          @result = @session.search(@package).first
+          @result = @aur.search(@package).first
         end
 
         should 'return an array containing hashes' do

data/test/unit/test_support.rb

@@ -7,17 +7,6 @@ class SupportTest < Test::Unit::TestCase
       assert nil.blank?
     end
 
-    context 'for symbol' do
-      setup do
-        @stub = ['HELLO']
-      end
-
-      should 'allow for to_proc on enumerations' do
-        assert_equal @stub.map {|s| s.downcase}, @stub.map(&:downcase)
-        assert_equal ['hello'], @stub.map(&:downcase)
-      end
-    end
-
     context 'for hash' do
       setup do
         @hash_s = {'hello' => 'world'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 +01:00
+date: 2010-02-07 00:00:00 +01:00
 default_executable: aurb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ansi
   type: :runtime
@@ -81,8 +91,8 @@ files:
 - bin/aurb
 - lib/aurb.rb
 - lib/aurb/aur.rb
+- lib/aurb/cli.rb
 - lib/aurb/support.rb
-- lib/aurb/version.rb
 - test/test_helper.rb
 - test/unit/test_aur.rb
 - test/unit/test_support.rb

data/lib/aurb/version.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-#
-#--
-# Copyright protects this work.
-# See LICENSE file for details.
-#++
-
-module Aurb
-  module Version
-    MAJOR = '1'
-    MINOR = '0'
-    TINY  = '3'
-
-    def self.to_s
-      [MAJOR, MINOR, TINY].join('.').freeze
-    end
-  end
-end