port_upgrade 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.0 2009-01-02
+* Add flag to call port outdated instead of using internal routine
+* Complete rewrite of version comparison routine
+* Bugs
+  * Fix computing depth of receipts when using a custom path
 == 0.0.3 2008-12-23
 
 * Bug Fix Release:

data/Manifest.txt

@@ -4,5 +4,6 @@ README.txt
 Rakefile
 lib/port_upgrade.rb
 lib/port_upgrade/cli.rb
+lib/port_upgrade/version.rb
 bin/port_upgrade
 etc/port_upgrade.conf.sample

data/bin/port_upgrade

@@ -6,5 +6,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/port_upgrade")
 
 require "port_upgrade/cli"
+require "port_upgrade/version"
 
 PortUpgrade::CLI.execute(STDOUT, ARGV)

data/lib/port_upgrade/cli.rb

@@ -13,12 +13,41 @@ module PortUpgrade extend OptiFlagSet
     optional_flag "receipts" do
     end
     
+    optional_switch_flag "portoutdated" do
+      description "Call \"port outdated\" instead of using internal routine for determining out of date ports. Overides outdated flag."
+    end
+    
+    optional_switch_flag "checkoutdated" do
+      description "Compare internal outdated routing with \"port outdated \""
+    end
+    
+    optional_switch_flag "verbose" do
+    end
+
     and_process!
   
   class CLI
     def self.execute(stdout, arguments=[])
-      pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts)
-      pdb.set_outdated(PortUpgrade.flags.outdated.split(" ")) if PortUpgrade.flags.outdated
+      $verbose = true if PortUpgrade.flags.verbose
+      if PortUpgrade.flags.portoutdated
+        $stderr.print "Running port outdated..."
+        outdated = `port outdated`.find_all{|l| (l =~ /(The following|No installed ports are outdated)/).nil? }.collect{|l| l.split[0]}
+        $stderr.puts "done"
+        if PortUpgrade.flags.checkoutdated
+          mypdb = Ports::PortsDB.new(PortUpgrade.flags.receipts)
+          myoutdated = mypdb.outdated
+          diff = outdated-myoutdated
+          if diff.size > 0
+            $stderr.puts "Difference with internal: #{(outdated-myoutdated).join(",")}\n\n"
+          else
+            $stderr.puts "No Difference"
+          end
+        end
+        pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts,outdated)
+      else
+        pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts)
+        pdb.set_outdated(PortUpgrade.flags.outdated.split(" ")) if PortUpgrade.flags.outdated
+      end
       $stderr.puts("Outdated(#{pdb.outdated.size}): #{pdb.outdated.join(' ')}")
       to_remove = pdb.to_remove
       $stderr.puts "#{to_remove.size} ports to remove: #{to_remove.join(',')}"

data/lib/port_upgrade/version.rb

@@ -0,0 +1,72 @@
+module Ports
+  class Version
+    include Comparable
+    attr_reader :parts
+    def initialize(s)
+      @parts = breakup_version(s)
+    end
+
+    def <=>(other)
+      cmp = 0
+      @parts.each_with_index do |p,i|
+        #$stderr.puts "Sizes: #{p.size} #{other.parts[i].size}"
+        p.each_with_index do |q,j|
+          a = q
+          b = other.parts[i][j]
+          a = a.to_i if a =~ /^[0-9]+$/
+          b = b.to_i if b =~ /^[0-9]+$/
+          #$stderr.puts "#{a} <=> #{b}"
+          cmp = a <=> b
+          break if cmp != 0
+        end
+        break if cmp != 0
+      end
+      cmp
+    end
+
+    private
+    def get_state(c)
+      case c
+      when /[0-9]/
+        state = 'd'
+      else
+        state = 'o'
+      end
+    end
+
+    def subparts(s)
+      state = get_state(s[0,1])
+      #puts "State: #{state}"
+      parts = []
+      part = ""
+      s.each_char do |c|
+        newstate = get_state(c)
+        case newstate
+        when state
+          part << c
+        else
+          parts << part #[part,state]
+          part = ""
+          part << c
+          state = newstate
+        end
+      end
+      parts << part #[part,state]
+      parts
+    end
+
+    def breakup_version(v)
+      raise "Bad input to version; not String" unless v.is_a?(String)
+      if v =~ /\[[^\]]+\]/
+        $stderr.puts "code version: #{v}"
+        result = ["0"]
+      else
+        result = []
+        v.split(/[-_.]/).each do |part|
+          result << subparts(part)
+        end
+      end
+      result
+    end
+  end
+end

data/lib/port_upgrade.rb

@@ -26,7 +26,7 @@ class String
 end
 
 module Ports
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   RECEIPT_PATH = '/opt/local/var/macports/receipts'
   MACPORTS_DB='/opt/local/var/macports/sources/rsync.macports.org/release/ports'
   CONFIG_FILE = 'port_upgrade.conf'
@@ -54,21 +54,9 @@ module Ports
     end
 
     def self.cmp_vers(versa,versb)
-      sa = versa.tr("._-","")
-      sb = versb.tr("._-","")
-      a=sa.to_i
-      b=sb.to_i
-      #a==0 ? asize=0 : asize = Math.log10(a).to_i
-      asize=sa.length
-      #b==0 ? bsize=0 : bsize = Math.log10(b).to_i
-      bsize=sb.length
-      diff = asize-bsize
-      if diff < 0
-        a = a * (10 ** diff.abs)
-      elsif diff > 0
-        b = b * (10 ** diff.abs)
-      end
-      a <=> b
+      va = Version.new(versa)
+      vb = Version.new(versb)
+      return va <=> vb
     end
   end
 
@@ -149,12 +137,12 @@ module Ports
       @pdb.db.execute("create table ports(port text,version text, variant text)")
       @pdb.db.execute("create table deps(port text, dep text)")
       @pdb.db.execute("create unique index uniqdep on deps(port,dep)")
-
+      receipt_size = receipt_path.split("/").size
       Find.find(receipt_path) do |filename|
         next unless filename =~ /.bz2$/
         next unless File.stat(filename).file?
         pieces = filename.split("/")
-        next unless pieces.size == 9
+        next unless (pieces.size - receipt_size) == 3
         original_portname = pieces[-3]
         md = /([^+]+)((\+\w+)*)/.match(pieces[-2]) #seperate version from variants
         version = md[1]
@@ -326,7 +314,15 @@ module Ports
           if File.exist?(portfile_path)
             curver = Portfile.new(portfile_path).version
             #puts "%-32s%s < %s" %[port,version.split('+').first,curver] if Ports::Utilities.cmp_vers(version.split('+').first,curver) < 0
-            @outdated << port if Ports::Utilities.cmp_vers(version.split('+').first,curver) < 0
+            $stderr.puts("#{port}: #{version.split('+').first}, #{curver}") if $verbose
+            cmp = Ports::Utilities.cmp_vers(version.split('+').first,curver)
+            if cmp.nil?
+              $stderr.puts "Unable to compare versions: #{[port]}"
+            else
+               if cmp < 0
+                 @outdated << port
+               end
+             end
           else
             $stderr.puts "Unable to process Portfile (File Not Found) for #{port}"
           end
@@ -373,7 +369,7 @@ module Ports
         end
         bi = get_before_install(port)
         dotsh.puts(bi) unless bi.nil?
-        dotsh.puts("port install #{port} #{remvariants[port][variantindex]} || exit -1")
+        dotsh.puts("port #{get_force(port)} install #{port} #{remvariants[port][variantindex]} || exit -1")
         ai = get_after_install(port)
         dotsh.puts(ai) unless ai.nil?
       end
@@ -381,6 +377,15 @@ module Ports
       true
     end
 
+    def get_force(portname)
+      force = get_port_action(portname,:force_install)
+      if force
+        return "-f"
+      else
+        return ""
+      end
+    end
+    
     def get_before_uninstall(portname)
       get_port_action(portname,:before_uninstall)
     end
@@ -466,8 +471,8 @@ module Ports
         when /^revision\s+([^\s]+)/
           rev = $1
           #$stderr.puts "revision found #{rev}"
-        when /\w+\.setup\s+(\S+)? ([\S]+)/
-          v = $2 if v.nil?
+        when /(\w+\.setup\s+\{[^\}]+\}\s+([^\s]+)|^\w+\.setup\s+[^ ]+ (.*))/
+          v = $2 || $3 if v.nil?
           break
         when /(\S+)\s+([^$]+)$/
           vars[$1] = $2

data/test/test_version.rb

@@ -0,0 +1,69 @@
+require File.join(File.dirname(__FILE__), '..', 'lib','port_upgrade','version')
+require 'test/unit'
+include Ports
+
+class TestVersion < Test::Unit::TestCase
+  def setup
+    raw_tests = %q{ImageMagick                    6.4.6-7_0 < 6.4.8-1_0     
+    binutils                       2.17_0 < 2.19_0           
+    boost                          1.35.0_2 < 1.37.0_0       
+    cairo                          1.8.4_0 < 1.8.6_1         
+    dbus                           1.2.4_2 < 1.2.10_0        
+    dbus-glib                      0.76_1 < 0.78_0           
+    fftw-3                         3.2_0 < 3.2_1             
+    fontconfig                     2.6.0_0 < 2.6.0_1         
+    git-core                       1.6.0.4_0 < 1.6.1_0       
+    gtk2                           2.14.4_1 < 2.14.5_0       
+    iso-codes                      3.2_0 < 3.5_0             
+    libgpg-error                   1.6_0 < 1.7_0             
+    libidl                         0.8.11_0 < 0.8.12_0       
+    libpng                         1.2.33_0 < 1.2.34_0       
+    libtool                        1.5.26_0 < 2.2.6a_0       
+    mhash                          0.9.9_0 < 0.9.9.9_0       
+    pango                          1.22.3_0 < 1.22.4_0       
+    proj                           4.6.0_0 < 4.6.1_0         
+    py25-hashlib                   2.5.2_0 < 2.5.4_0         
+    py25-sqlite3                   2.5.2_0 < 2.5.4_0         
+    py25-zlib                      2.5.2_0 < 2.5.4_0         
+    python25                       2.5.2_7 < 2.5.4_0         
+    subversion                     1.5.4_0 < 1.5.5_0         
+    subversion-perlbindings        1.5.4_0 < 1.5.5_0         
+    wireshark                      1.0.4_0 < 1.0.5_0         
+    xorg-util-macros               1.2.0_0 < 1.2.1_0         
+    xrender                        0.9.4_1 < 0.9.4_4
+}
+  @tests = raw_tests.collect{|l| parts = l.split(" "); [parts[1],parts[3]] }
+  end
+
+  def test_1
+    v1 = Version.new("1.2.6_0")
+    v2 = Version.new("1.2.10_0")
+    assert_equal(v1 <=> v2, -1)
+  end
+
+  def test_2
+    v1 = Version.new("1.5.26_0")
+    v2 = Version.new("2.2.6a_0")
+    assert_equal(v1 <=> v2, -1)
+  end
+
+  def test_3
+    v1 = Version.new("2.2.6b_0")
+    v2 = Version.new("2.2.6a_0")
+    assert_equal(v1 <=> v2, 1)
+  end
+  
+  def test_current
+    @tests.each do |test|
+      v1 = Version.new(test[0])
+      v2 = Version.new(test[1])
+      assert_equal(v1 <=> v2, -1)
+    end
+  end
+  
+  def test_other_class
+    assert_raise RuntimeError do
+      v = Version.new(["2"])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-31 00:00:00 -08:00
+date: 2009-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - Rakefile
 - lib/port_upgrade.rb
 - lib/port_upgrade/cli.rb
+- lib/port_upgrade/version.rb
 - bin/port_upgrade
 - etc/port_upgrade.conf.sample
 has_rdoc: true
@@ -88,7 +89,7 @@ post_install_message: |+
   
   
   A sample config file can be found in:
-  /opt/local/lib/ruby/gems/1.8/gems/port_upgrade-0.0.3/etc
+  /opt/local/lib/ruby/gems/1.8/gems/port_upgrade-0.0.4/etc
   To install copy it to ~/.port_upgrade.conf
   
   
@@ -117,4 +118,4 @@ signing_key:
 specification_version: 2
 summary: Summary
 test_files: 
-- test/test_port_upgrade_cli.rb
+- test/test_version.rb

data/test/test_port_upgrade_cli.rb

@@ -1,15 +0,0 @@
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require 'port_upgrade/cli'
-
-class TestPortUpgradeCli < Test::Unit::TestCase
-  def setup
-    @stdout_io = StringIO.new
-    PortUpgrade::CLI.execute(@stdout_io, [])
-    @stdout_io.rewind
-    @stdout = @stdout_io.read
-  end
-  
-  def test_not_print_default_output
-    assert_no_match(/To update this executable/, @stdout)
-  end
-end