port_upgrade 0.1.0 → 0.1.1

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 lib/port_purge/cli.rb
 lib/port_upgrade.rb

data/{README.txt → README.rdoc}

@@ -16,15 +16,15 @@ A clean way to keep your MacPorts up to date.
 Updates your MacPorts while also removing old dependent versions of libraries and applications.
 
 == SYNOPSIS:
-  0) Install a port_upgrade config file into ~/.port_upgrade.conf, 
-     a sample is included with the gem (optional)
-  1) Update your ports database from macports.org
-  sudo port selfupdate (or sync)
-  2) Run port_upgrade to generate a shell script
-  port_upgrade -output upgrade.sh
-  3) Run the shell script to update your ports tree
-  sudo ./upgrade.sh
-  4) There is no step 4
+
+* Install a port_upgrade config file into ~/.port_upgrade.conf, a sample is included with the gem (optional)
+* Update your ports database from macports.org
+  * sudo port selfupdate (or sync)
+* Run port_upgrade to generate a shell script
+  * port_upgrade -output upgrade.sh
+* Run the shell script to update your ports tree
+  * sudo ./upgrade.sh
+* There is no step 4
 
 == REQUIREMENTS:
 

data/lib/port_purge/cli.rb

@@ -2,8 +2,6 @@ require 'optparse'
 require 'ostruct'
 require 'yaml'
 
-include Ports
-
 module PortPurge
   class CLI
     DOTFILEPATH = File.join(ENV['HOME'],".port_upgrade_ports")
@@ -25,7 +23,7 @@ module PortPurge
       rescue ArgumentError
         $stderr.puts("Badly formed .port_upgrade_ports file. Skipping.")
       end
-      @pdb = PortsDB.new
+      @pdb = Ports::PortsDB.new
       ports = @pdb.db.query('select port from ports').collect{|p| p[0]}
       deps = @pdb.db.query('select dep from deps').collect{|p| p[0]}
       $stderr.puts "Leaves:"

data/lib/port_upgrade.rb

@@ -29,7 +29,7 @@ class String
 end
 
 module Ports
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   RECEIPT_PATH = '/opt/local/var/macports/receipts'
   MACPORTS_DB='/opt/local/var/macports/sources/rsync.macports.org/release/ports'
   CONFIG_FILE = 'port_upgrade.conf'
@@ -205,6 +205,7 @@ module Ports
 
   class PortsDB
     def initialize(path=nil,outdated=nil)
+      @path=path
       @db = SQLite3::Database.new(':memory:')#('port_tree.db')
       @pt = PortTree.new(self,path)
       @installed = @pt.installed
@@ -425,6 +426,10 @@ module Ports
       get_port_action(portname,:final_install)
     end
 
+    def [](portname)
+      Port.new(portname,@path)
+    end
+    
     private
 
     def get_port_action(portname,type)

data/lib/port_upgrade/cli.rb

@@ -70,7 +70,8 @@ module PortUpgrade
         pdb = Ports::PortsDB.new(options.receipts)
         pdb.set_outdated(options.outdated) if options.outdated
       end
-      $stderr.puts("Outdated(#{pdb.outdated.size}): #{pdb.outdated.join(' ')}")
+      $stderr.puts("Outdated(#{pdb.outdated.size}):")
+      $stderr.puts "#{pdb.outdated.uniq.collect {|portname| p=pdb[portname] ;"#{portname}(#{p.versions.join(", ")}) < #{p.portfile.version}"}.join("\n")}"
       to_remove = pdb.to_remove
       $stderr.puts "#{to_remove.size} ports to remove: #{to_remove.join(',')}"
       pdb.upgrade(options.output)

data/lib/port_upgrade/port.rb

@@ -2,8 +2,9 @@ module Ports
   class Port
     attr_reader :name,:versions,:portfile_path
 
-    def initialize(portname)
-      tmpp = File.join(RECEIPT_PATH,portname)
+    def initialize(portname,receipt_path=nil)
+      receipt_path ||= RECEIPT_PATH
+      tmpp = File.join(receipt_path,portname)
       @name = portname
       @versions = []
       if File.exist?(tmpp) and File.readable?(tmpp)

data/lib/port_upgrade/version.rb

@@ -1,9 +1,9 @@
 module Ports
   class Version
     include Comparable
-    attr_reader :parts
+    attr_reader :parts,:portrev
     def initialize(s)
-      @parts = breakup_version(s)
+      @parts,@portrev = breakup_version(s)
     end
 
     def <=>(other)
@@ -13,62 +13,25 @@ module Ports
       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
+        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
+        a = p =~ /^-?[0-9]+$/ ? p.to_i : p
+        b = q =~ /^-?[0-9]+$/ ? q.to_i : q
+        $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
+      cmp = @portrev <=> other.portrev
       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_byte 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)
       return nil if v.nil?
       raise "Bad input to version; not String" unless v.is_a?(String)
@@ -76,12 +39,16 @@ module Ports
         $stderr.puts "code version: #{v}"
         result = ["0"]
       else
-        result = []
-        v.split(/[-_.]/).each do |part|
-          result << subparts(part)
+        md = v.match(/(.*)_(\d+)$/)
+        if md.nil?
+          portrev = 0
+        else
+          v = md[1]
+          portrev = md[2]
         end
+        result = v.scan(/[0-9]+|[a-zA-Z]+/)
       end
-      result
+      return result,portrev
     end
   end
 end

data/test/test_port_purge_cli.rb

@@ -1,4 +1,4 @@
-#require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), "test_helper.rb")
 require 'test/unit'
 require 'stringio'
 require 'port_purge/cli'

data/test/test_version.rb

@@ -75,6 +75,12 @@ class TestVersion < Test::Unit::TestCase
     end
   end
   
+  def test_6
+    v1 = Version.new("1.8.7-p72_3")
+    v2 = Version.new("1.8.7-p160_1")
+    assert_equal(v1 <=> v2, -1)
+  end
+  
   def test_other_class
     assert_raise RuntimeError do
       v = Version.new(["2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -63,11 +63,11 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - lib/port_purge/cli.rb
 - lib/port_upgrade.rb
@@ -80,10 +80,12 @@ files:
 - etc/port_upgrade.conf.sample
 has_rdoc: true
 homepage: http://portupgrade.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -101,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: portupgrade
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Cleanly upgrade your MacPorts.
 test_files: 
 - test/test_helper.rb