port_upgrade 0.0.4 → 0.0.5

data/History.txt

@@ -1,8 +1,18 @@
-== 0.4.0 2009-01-02
+== 0.0.5 2009-01-06
+* Bugs
+  * port install needs -x to actually give useful return codes
+  * Fixed issue with database inserts when there are more than one version of something to uninstall
+  * Added summary to Rakefile so it will show up on gem search
+* Yet another rewrite of version compare routine. Handles version string that differ in length now
+* Better debugging output
+* Added new config file action final_install. For items that need to happen after a port is installed, but is best at the very end of all the installs.
+
+== 0.0.4 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/Rakefile

@@ -6,6 +6,7 @@ GEM_DIR = File.join(GEM_HOME,RbConfig::CONFIG["ruby_version"],"gems")
 $hoe = Hoe.new('port_upgrade',Ports::VERSION) do |p|
   p.developer('Tony Doan', 'tdoan@tdoan.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.summary = "Cleanly upgrade your MacPorts."
   p.post_install_message = %Q{
 
 A sample config file can be found in:

data/bin/port_upgrade

@@ -3,6 +3,7 @@
 #  Created on 2008-12-15.
 #  Copyright (c) 2008. All rights reserved.
 
+require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/port_upgrade")
 
 require "port_upgrade/cli"

data/lib/port_upgrade/version.rb

@@ -7,19 +7,32 @@ module Ports
     end
 
     def <=>(other)
+      $stderr.puts("self: #{@parts.inspect}") if $DEBUG
+      $stderr.puts("other: #{other.parts.inspect}") if $DEBUG
       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
+      numparts = @parts.size>other.parts.size ? @parts.size : other.parts.size
+      0.upto(numparts-1) do |i|
+        p = i>=@parts.size ? ["-1"] : @parts[i]
+        q = i>=other.parts.size ? ["-1"] : other.parts[i]
+        numsubparts = p.size>q.size ? p.size : q.size
+        0.upto(numsubparts-1) do |j|
+          r = j>=p.size ? "-1" : p[j]
+          s = j>=q.size ? "-1" : q[j]
+
+          $stderr.puts("p of #{j}: #{r}") if $DEBUG
+          $stderr.puts("q of #{j}: #{s}") if $DEBUG
+          a = r =~ /^-?[0-9]+$/ ? r.to_i : r
+          b = s =~ /^-?[0-9]+$/ ? s.to_i : s
+          $stderr.puts "#{a.inspect} <=> #{b.inspect}" if $DEBUG
+          if a.instance_of?(b.class)
+            cmp = a <=> b
+          else
+            $stderr.puts "Can't compare different classes #{a.class.to_s} <=> #{b.class.to_s}" if $DEBUG
+            cmp = 0
+          end
+          return cmp if cmp != 0
         end
-        break if cmp != 0
+        return cmp if cmp != 0
       end
       cmp
     end

data/lib/port_upgrade.rb

@@ -15,6 +15,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'yaml'
 require 'bz2'
 require 'find'
 require 'sqlite3'
@@ -26,7 +27,7 @@ class String
 end
 
 module Ports
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   RECEIPT_PATH = '/opt/local/var/macports/receipts'
   MACPORTS_DB='/opt/local/var/macports/sources/rsync.macports.org/release/ports'
   CONFIG_FILE = 'port_upgrade.conf'
@@ -118,7 +119,7 @@ module Ports
         rescue SQLite3::SQLException => exp
           $stderr.puts "Dup insert into remports:  #{exp}}" if $DEBUG
         end
-        @pdb.db.execute("insert into remports values(\"#{a}\",\"\")")
+        @pdb.db.execute("insert or ignore into remports values(\"#{a}\",\"\")")
       end
       @pdb.db.execute('delete from remports where port="gimp-app" and dep="gimp"')
       #File.open("remtree.dot",'w') do |f|
@@ -314,7 +315,7 @@ 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
-            $stderr.puts("#{port}: #{version.split('+').first}, #{curver}") if $verbose
+            $stderr.puts("#{port}: #{version.split('+').first}, #{curver}") if $DEBUG
             cmp = Ports::Utilities.cmp_vers(version.split('+').first,curver)
             if cmp.nil?
               $stderr.puts "Unable to compare versions: #{[port]}"
@@ -332,6 +333,7 @@ module Ports
     end
 
     def upgrade(path='port_upgrade.sh')
+      final = []
       @pt.setup_remports(outdated) if @to_remove.nil?
       remports = []
       remvariants = Hash.new {|h,k| h[k] = Array.new}
@@ -369,11 +371,15 @@ module Ports
         end
         bi = get_before_install(port)
         dotsh.puts(bi) unless bi.nil?
-        dotsh.puts("port #{get_force(port)} install #{port} #{remvariants[port][variantindex]} || exit -1")
+        dotsh.puts("port #{get_force(port)} -x install #{port} #{remvariants[port][variantindex]} || exit -1")
         ai = get_after_install(port)
+        fi = get_final_install(port)
+        final << fi unless fi.nil?
         dotsh.puts(ai) unless ai.nil?
       end
       stmt.close
+      final.each{|l| dotsh.puts(l)}
+      dotsh.close
       true
     end
 
@@ -402,6 +408,10 @@ module Ports
       get_port_action(portname,:after_install)
     end
 
+    def get_final_install(portname)
+      get_port_action(portname,:final_install)
+    end
+
     private
 
     def get_port_action(portname,type)
@@ -475,7 +485,7 @@ module Ports
           v = $2 || $3 if v.nil?
           break
         when /(\S+)\s+([^$]+)$/
-          vars[$1] = $2
+          vars[$1] = $2.strip
         end
       end
       rev = "0" if rev.nil?

data/test/test_version.rb

@@ -6,6 +6,7 @@ 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           
+    bison                          2.4_1 < 2.4.1_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        
@@ -53,6 +54,18 @@ class TestVersion < Test::Unit::TestCase
     assert_equal(v1 <=> v2, 1)
   end
   
+  def test_4
+    v1 = Version.new("2.24a.1")
+    v2 = Version.new("2.24b.1")
+    assert_equal(v1 <=> v2, -1)
+  end
+  
+  def test_5
+    v1 = Version.new("5.820_0")
+    v2 = Version.new("5.820 LWP_0")
+    assert_equal(v1 <=> v2, 0)
+  end
+  
   def test_current
     @tests.each do |test|
       v1 = Version.new(test[0])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-02 00:00:00 -08:00
+date: 2009-01-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -89,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.4/etc
+  /opt/local/lib/ruby/gems/1.8/gems/port_upgrade-0.0.5/etc
   To install copy it to ~/.port_upgrade.conf