aurb 1.1.1 → 1.1.2

data/Rakefile

@@ -14,7 +14,6 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency('thor')
   gem.add_dependency('ansi')
   gem.add_dependency('archive-tar-minitar')
-  gem.add_dependency('facets')
   
   gem.add_development_dependency('shoulda')
 end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/aurb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aurb}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gigamo"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-09}
   s.default_executable = %q{aurb}
   s.email = %q{gigamo@gmail.com}
   s.executables = ["aurb"]
@@ -53,14 +53,12 @@ Gem::Specification.new do |s|
       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"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
@@ -68,7 +66,6 @@ Gem::Specification.new do |s|
     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"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end

data/bin/aurb

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-#
-#--
-# Copyright protects this work.
-# See LICENSE file for details.
-#++
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/aurb/cli')
 

data/lib/aurb.rb

@@ -1,23 +1,20 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-#
-#--
-# Copyright protects this work.
-# See LICENSE file for details.
-#++
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'logger'
-require 'getoptlong'
 require 'open-uri'
 
 require 'zlib'
 require 'yajl'
 require 'ansi'
 require 'archive/tar/minitar'
-require 'facets/version'
 
 module Aurb #:nodoc:
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
+
+  autoload :Aur, 'aurb/aur'
 
   class AurbError < StandardError
     def self.status_code(code = nil)
@@ -34,8 +31,6 @@ module Aurb #:nodoc:
   class AurbArgumentError < AurbError; status_code(12); end
 
   class << self
-    attr_reader :aur
-
     def logger
       @logger ||= Logger.new(STDOUT)
     end
@@ -54,6 +49,4 @@ module Aurb #:nodoc:
   end
 end
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
-require 'aurb/aur'
 require 'aurb/support'

data/lib/aurb/aur.rb

@@ -1,13 +1,29 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-#
-#--
-# Copyright protects this work.
-# See LICENSE file for details.
-#++
 
 module Aurb
   class Aur
+    # Compare package versions.
+    #
+    #   Version.new('1.0.0') < Version.new('2.0.0') # => true
+    #   Version.new('1.1-1') < Version.new('1.0-6') # => false
+    class Version
+      include Comparable
+
+      attr_reader :version
+
+      def initialize(*args)
+        @version = args.join('.').split(/\W+/).map(&:to_i)
+      end
+
+      def <=>(other)
+        [self.version.size, other.version.size].max.times do |i|
+          c = self.version[i] <=> other.version[i]
+          return c if c != 0
+        end
+      end
+    end
+
     # Search the AUR for given +packages+.
     # Returns an array of results.
     #
@@ -34,8 +50,8 @@ module Aurb
     # 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]
+    #   # 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)
       list.inject([]) do |ary, line|
         name, version = line.split
@@ -59,16 +75,15 @@ module Aurb
 
     # Compare version of local +package+ with the one on the AUR.
     def upgradable?(package, version)
-      parse_json(Aurb.aur_path(:info, package.to_s)) do |json|
-        return false if json.type =~ /error/
+      local_version  = Version.new(version)
+      remote_version = nil
 
-        remote_package = json.results
-
-        local_version  = VersionNumber.new(version)
-        remote_version = VersionNumber.new(remote_package.Version)
-
-        local_version < remote_version
+      parse_json Aurb.aur_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
@@ -79,7 +94,7 @@ module Aurb
 
       ids = json.results.map(&:ID)
       ids.inject([]) do |ary, id|
-        parse_json(Aurb.aur_path(:info, id)) do |json|
+        parse_json Aurb.aur_path(:info, id) do |json|
           next if json.type =~ /error/
           result = json.results.symbolize_keys
           ary << result unless in_community?(result.Name)

data/lib/aurb/cli.rb

@@ -1,10 +1,5 @@
 #!/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')
@@ -30,7 +25,7 @@ module Aurb
       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)
+        path = File.expand_path(path)
       else
         raise AurbDownloadError, "'#{path}' is not a valid path"
       end
@@ -40,9 +35,9 @@ module Aurb
         total   = pkgs.size
         local   = package.split('/')[-1]
 
-        Dir.chdir(opts[:path]) do
-          open(package) do |remote|
-            File.open(local, 'wb') do |local|
+        Dir.chdir path do
+          open package do |remote|
+            File.open local, 'wb' do |local|
               local.write remote.read
             end
           end

data/test/unit/test_aur.rb

@@ -1,44 +1,58 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class AurTest < Test::Unit::TestCase
-  context 'Aurb::Aur #' do
-    setup do
-      @aur = Aurb.aur
+  context 'Aurb::Aur ::' do
+    context 'Version' do
+      should 'be able to compare versions and return the newest' do
+        versions = [
+          {:old => '1',       :new => '2'      },
+          {:old => '1-3',     :new => '2-1'    },
+          {:old => '1.0.0-2', :new => '2.0.0-3'},
+          {:old => '1.0.pre', :new => '1.0.1'  }
+        ]
+
+        versions.each do |version|
+          assert Aurb::Aur::Version.new(version[:old]) < Aurb::Aur::Version.new(version[:new])
+        end
+      end
     end
+  end
 
+  context 'Aurb::Aur #' do
     context 'upgrade' do
       setup do
-        @list = ['aurb 0.0.0.0',
-                 'aurb 9.9.9.9']
+        @list = ['aurb 0.0.0-0',
+                 'aurb 9.9.9-9']
       end
 
       should 'return an array' do
-        assert @aur.upgrade(@list).is_a?(Array)
+        assert Aurb.aur.upgrade(@list).is_a?(Array)
       end
 
       should 'contain only upgradable packages' do
-        assert_not_equal [:aurb, :aurb], @aur.upgrade(@list)
-        assert_equal [:aurb], @aur.upgrade(@list)
+        assert_not_equal [:aurb, :aurb], Aurb.aur.upgrade(@list)
+        assert_equal [:aurb], Aurb.aur.upgrade(@list)
       end
     end
 
     context 'download' do
       setup do
-        @package_working = ['awesome-git']
-        @package_faulty  = ['awesome']
+        @package_working = ['aurb']
+        @package_faulty  = ['foobarbaz']
       end
 
       should 'return an array' do
-        assert @aur.download(@package_working).is_a?(Array)
-        assert @aur.download(@package_faulty).is_a?(Array)
+        assert Aurb.aur.download(@package_working).is_a?(Array)
+        assert Aurb.aur.download(@package_faulty).is_a?(Array)
       end
 
       should 'return download links' do
-        assert_equal [Aurb.aur_download_path(@package_working.join)], @aur.download(@package_working)
+        assert_equal [Aurb.aur_download_path(@package_working.join)], Aurb.aur.download(@package_working)
       end
 
       should 'filter out non-existant packages' do
-        assert_equal [], @aur.download(@package_faulty)
+        assert Aurb.aur.download(@package_faulty).blank?
+        assert_equal [], Aurb.aur.download(@package_faulty)
       end
     end
 
@@ -49,16 +63,17 @@ class AurTest < Test::Unit::TestCase
       end
 
       should 'return an array of results' do
-        assert @aur.search(@package_working).is_a?(Array)
+        assert Aurb.aur.search(@package_working).is_a?(Array)
       end
 
       should 'filter out non-existant packages' do
-        assert_equal [], @aur.search(@package_faulty)
+        assert Aurb.aur.search(@package_faulty).blank?
+        assert_equal [], Aurb.aur.search(@package_faulty)
       end
 
       context 'result' do
         setup do
-          @result = @aur.search(@package_working).first
+          @result = Aurb.aur.search(@package_working).first
         end
 
         should 'return an array containing hashes' do

data/test/unit/test_support.rb

@@ -12,13 +12,13 @@ class SupportTest < Test::Unit::TestCase
   context 'Hash' do
     setup do
       @hash_str = {'hello' => 'world'}
-      @hash_sym = {:hello => 'world'}
+      @hash_sym = {:hello  => 'world'}
     end
 
     should 'be able to symbolize keys' do
       assert_equal @hash_sym, @hash_str.symbolize_keys
-      symbolized = @hash_str.symbolize_keys!
-      assert_equal @hash_sym, symbolized
+      @hash_str.symbolize_keys!
+      assert_equal @hash_sym, @hash_str
     end
 
     should 'provide methods for its keys through method_missing' do
@@ -33,6 +33,7 @@ class SupportTest < Test::Unit::TestCase
     end
 
     should 'be able to colorize itself through the ansi library' do
+      assert @str.colorize(:blue)
       assert_equal "\e[34mfoo\e[0m", @str.colorize(:blue)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurb
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Gigamo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-09 00:00:00 +01:00
 default_executable: aurb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,16 +52,6 @@ dependencies:
       - !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: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   type: :development