aurb 1.2.0 → 1.2.1

data/.gitignore

@@ -5,3 +5,4 @@ InstalledFiles
 doc
 pkg
 .yardoc
+*.gem

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/aurb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-03-05}
   s.default_executable = %q{aurb}
   s.email = %q{gigamo@gmail.com}
   s.executables = ["aurb"]
@@ -28,7 +28,11 @@ Gem::Specification.new do |s|
      "lib/aurb.rb",
      "lib/aurb/aur.rb",
      "lib/aurb/cli.rb",
-     "lib/aurb/support.rb",
+     "lib/aurb/core_ext.rb",
+     "lib/aurb/core_ext/hash.rb",
+     "lib/aurb/core_ext/object.rb",
+     "lib/aurb/core_ext/string.rb",
+     "lib/aurb/version.rb",
      "test/test_helper.rb",
      "test/unit/test_aur.rb",
      "test/unit/test_support.rb"

data/lib/aurb.rb

@@ -12,8 +12,6 @@ require 'ansi'
 require 'archive/tar/minitar'
 
 module Aurb #:nodoc:
-  VERSION = '1.2.0'
-
   autoload :Aur, 'aurb/aur'
 
   class AurbError < StandardError
@@ -35,7 +33,7 @@ module Aurb #:nodoc:
       @logger ||= Logger.new(STDOUT)
     end
 
-    def aur_path(type, arg)
+    def aur_rpc_path(type, arg)
       "http://aur.archlinux.org/rpc.php?type=#{type}&arg=#{arg}"
     end
 
@@ -49,4 +47,4 @@ module Aurb #:nodoc:
   end
 end
 
-require 'aurb/support'
+require 'aurb/core_ext'

data/lib/aurb/aur.rb

@@ -42,7 +42,7 @@ module Aurb
       packages.map do |package|
         Aurb.aur_download_path URI.escape(package.to_s)
       end.select do |package|
-        downloadable?(package)
+        !!(open package rescue false)
       end.delete_if(&:blank?)
     end
 
@@ -51,53 +51,42 @@ module Aurb
     # the +download+ method.
     #
     #   # With Aurb on the AUR as version 1.1.2-1
-    #   upgrade(['aurb 0.0.0-0', 'aurb 0.9.9-9']) # => [:aurb]
-    def upgrade(list)
+    #   upgrade('aurb 0.0.0-0', 'aurb 0.9.9-9') # => [:aurb]
+    def upgrade(*list)
+      upgradables = []
       list.inject([]) do |ary, line|
-        name, version = line.split
-        next if in_community?(name)
-        ary << name.to_sym if upgradable?(name, version)
-        ary
-      end
+        ary << Thread.new do
+          name, version = line.split
+          next if Dir["/var/lib/pacman/sync/community/#{name}-#{version}"].any?
+          upgradables << name.to_sym if upgradable?(name, version)
+        end
+      end.each(&:join)
+      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)
       local_version  = Version.new(version)
       remote_version = nil
-
-      parse_json Aurb.aur_path(:info, package.to_s) do |json|
+      parse_json Aurb.aur_rpc_path(:info, package.to_s) do |json|
         return if json.type =~ /error/
         remote_version = Version.new(json.results.Version)
       end
-
       remote_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)))
+      json = parse_json(Aurb.aur_rpc_path(:search, URI.escape(package.to_s)))
       return [] if json.type =~ /error/
-
       ids = json.results.map(&:ID)
       ids.inject([]) do |ary, id|
-        parse_json Aurb.aur_path(:info, id) do |json|
+        parse_json Aurb.aur_rpc_path(:info, id) do |json|
           next if json.type =~ /error/
-          result = json.results.symbolize_keys
-          ary << result unless in_community?(result.Name)
+          ary << json.results.symbolize_keys
         end
         ary
       end

data/lib/aurb/cli.rb

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/..'
 require 'thor'
-require File.expand_path(File.dirname(__FILE__) + '/../aurb')
+require 'aurb'
 
 module Aurb
   class CLI < Thor
     ARGV = ::ARGV.dup
 
-    map '-d' => :download
-    map '-s' => :search
-    map '-u' => :upgrade
+    map %w[-d --download] => :download,
+        %w[-s --search]   => :search,
+        %w[-u --upgrade]  => :upgrade,
+        %w[-v --version]  => :version
 
     desc 'download PACKAGES', 'Download packages'
     method_option :path,
@@ -61,11 +63,19 @@ module Aurb
     desc 'upgrade', 'Search for upgrades to installed packages'
     def upgrade
       list = `pacman -Qm`.split(/\n/)
-      pkgs = Aurb.aur.upgrade(list)
+      pkgs = Aurb.aur.upgrade(*list)
       puts 'Nothing to upgrade'.colorize(:red) and return if pkgs.blank?
       pkgs.each do |package|
         puts "#{package.to_s.colorize(:yellow)} has an upgrade available"
       end
     end
+
+    desc 'version', 'Show version and exit'
+    def version
+      require 'aurb/version'
+      require 'thor/version'
+      puts "Aurb v#{Aurb::VERSION} - Thor v#{Thor::VERSION}"
+      puts 'Copyright (c) 2009-2010 Gigamo <gigamo@gmail.com>'
+    end
   end
 end

data/lib/aurb/core_ext.rb

@@ -0,0 +1,5 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
+require 'core_ext/object'
+require 'core_ext/hash'
+require 'core_ext/string'

data/lib/aurb/core_ext/hash.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Aurb
+  module CoreExt
+    module Hash
+      # Returns a new hash with all keys converted to symbols.
+      def symbolize_keys
+        inject({}) do |options, (key, value)|
+          options[(key.to_sym rescue key) || key] = value
+          options
+        end
+      end
+
+      # Destructively converts all keys to symbols.
+      def symbolize_keys!
+        self.replace(self.symbolize_keys)
+      end
+
+      # Delegation
+      def method_missing(key)
+        self.symbolize_keys[key.to_sym]
+      end
+    end
+  end
+end
+
+Hash.send :include, Aurb::CoreExt::Hash

data/lib/aurb/core_ext/object.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Aurb
+  module CoreExt
+    module Object
+      # An object is blank if it's false, empty or a whitespace string.
+      def blank?
+        respond_to?(:empty?) ? empty? : !self
+      end
+    end
+  end
+end
+
+Object.send :include, Aurb::CoreExt::Object

data/lib/aurb/core_ext/string.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Aurb
+  module CoreExt
+    module String
+      # Colors a string with +color+.
+      # Uses the ANSICode library provided by +facets+.
+      #
+      #   "Hello".colorize(:blue) # => "\e[34mHello\e[0m"
+      #
+      # For more information on available effects, see
+      # http://facets.rubyforge.org/apidoc/api/more/classes/ANSICode.html
+      def colorize(effect)
+        ANSI::Code.send(effect.to_sym) << self << ANSI::Code.clear
+      rescue
+        self
+      end
+    end
+  end
+end
+
+String.send :include, Aurb::CoreExt::String

data/lib/aurb/version.rb

@@ -0,0 +1,3 @@
+module Aurb
+  VERSION = '1.2.1'.freeze
+end

data/test/unit/test_aur.rb

@@ -26,12 +26,12 @@ class AurTest < Test::Unit::TestCase
       end
 
       should 'return an array' do
-        assert_operator Array, :===, Aurb.aur.upgrade(@list)
+        assert_operator Array, :===, Aurb.aur.upgrade(*@list)
       end
 
       should 'contain only upgradable packages' do
-        assert_not_equal [:aurb, :aurb], Aurb.aur.upgrade(@list)
-        assert_equal [:aurb], Aurb.aur.upgrade(@list)
+        assert_not_equal [:aurb, :aurb], Aurb.aur.upgrade(*@list)
+        assert_equal [:aurb], Aurb.aur.upgrade(*@list)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-03-05 00:00:00 +01:00
 default_executable: aurb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,11 @@ files:
 - lib/aurb.rb
 - lib/aurb/aur.rb
 - lib/aurb/cli.rb
-- lib/aurb/support.rb
+- lib/aurb/core_ext.rb
+- lib/aurb/core_ext/hash.rb
+- lib/aurb/core_ext/object.rb
+- lib/aurb/core_ext/string.rb
+- lib/aurb/version.rb
 - test/test_helper.rb
 - test/unit/test_aur.rb
 - test/unit/test_support.rb

data/lib/aurb/support.rb

@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-#
-# Most of these extracted from Rails source (http://github.com/rails/rails)
-
-class Object
-  # An object is blank if it's false, empty or a whitespace string.
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end
-
-class Hash
-  # Returns a new hash with all keys converted to symbols.
-  def symbolize_keys
-    inject({}) do |options, (key, value)|
-      options[(key.to_sym rescue key) || key] = value
-      options
-    end
-  end
-
-  # Destructively converts all keys to symbols.
-  def symbolize_keys!
-    self.replace(self.symbolize_keys)
-  end
-
-  # Delegation
-  def method_missing(key)
-    self.symbolize_keys[key.to_sym]
-  end
-end
-
-class String
-  # Colors a string with +color+.
-  # Uses the ANSICode library provided by +facets+.
-  #
-  #   "Hello".colorize(:blue) # => "\e[34mHello\e[0m"
-  #
-  # For more information on available effects, see
-  # http://facets.rubyforge.org/apidoc/api/more/classes/ANSICode.html
-  def colorize(effect)
-    ANSI::Code.send(effect.to_sym) << self << ANSI::Code.clear
-  rescue
-    self
-  end
-end