port_upgrade 0.0.5 → 0.1.0

data/History.txt

@@ -1,3 +1,21 @@
+== 0.1.0 2009-03-12
+* Removed use of optiflag gem. Using built-in optparse instead. The output flag has changed to -o from -ouput.
+* New script output allowing for individual phases to be run. Default is still to run everything.
+* Added experiment port_purge tool. USE WITH CAUTION. Does port removes directly so must be run as root.
+* New Port class added to better encapsulate functionality specfic to a port. Not used yet by main line of code.
+* More tests, more to come.
+* Bugs
+  * Removed post install message which had hard coded path (despite best efforts to make it dynamic)
+  * Fixes for sameple config file.
+  * Moved class Port into it's own file.
+  * Catch errors when reading malformed config files.
+  * When prompting about conflicting variants remove dups.
+  * Fixes Ruby 1.8.6 compatibility in <=> routine of Version class.
+  * port_tree.rb uses PortsDB class instead of the SQLite3 database directly
+  * Clear cached to_remove when outdated changes.
+  * Better regex for parsing exceptionally weird version strings in Portfiles.
+  * Return 0 for version strings that contain TCL code, for now.
+  
 == 0.0.5 2009-01-06
 * Bugs
   * port install needs -x to actually give useful return codes

data/Manifest.txt

@@ -2,8 +2,12 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+lib/port_purge/cli.rb
 lib/port_upgrade.rb
 lib/port_upgrade/cli.rb
+lib/port_upgrade/port.rb
+lib/port_upgrade/port_upgrade_sh.erb
 lib/port_upgrade/version.rb
 bin/port_upgrade
+bin/port_purge
 etc/port_upgrade.conf.sample

data/README.txt

@@ -16,7 +16,8 @@ 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
@@ -29,7 +30,6 @@ Updates your MacPorts while also removing old dependent versions of libraries an
 
 * ruby-sqlite3 gem
 * bz2 gem
-* optiflag gem
 
 == INSTALL:
 

data/Rakefile

@@ -7,21 +7,10 @@ $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:
-#{GEM_DIR}/port_upgrade-#{Ports::VERSION}/etc
-To install copy it to ~/.port_upgrade.conf
-
-
-}
-
   p.rubyforge_name       = "portupgrade"
-  p.summary = "Summary"
   p.extra_deps         = [
     ['sqlite3-ruby','>= 1.2.0'],
-    ['bz2','>= 0.2'],
-    ['optiflag','>= 0.6.0'],
+    ['bz2','>= 0.2']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/bin/port_purge

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+#
+#  Created on 2009-2-1.
+#  Copyright (c) 2009. All rights reserved.
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/port_upgrade")
+
+require "port_purge/cli"
+
+PortPurge::CLI.execute(STDOUT, ARGV)

data/etc/port_upgrade.conf.sample

@@ -5,7 +5,11 @@
   ncursesw:
     :after_uninstall: rm -rf /opt/local/share/terminfo
   ImageMagick:
-    :before_uninstall: gem uninstall rmagick
+    :before_uninstall: gem uninstall -I rmagick
     :after_install: gem install rmagick
+    :force_install: true
   python25:
-    :after_install: python_select python25
+    :final_install: python_select python25
+  sqlite3:
+    :before_uninstall: gem uninstall -I sqlite3-ruby
+    :after_install: gem install sqlite3-ruby

data/lib/port_purge/cli.rb

@@ -0,0 +1,73 @@
+require 'optparse'
+require 'ostruct'
+require 'yaml'
+
+include Ports
+
+module PortPurge
+  class CLI
+    DOTFILEPATH = File.join(ENV['HOME'],".port_upgrade_ports")
+    def self.execute(stdout, arguments=[])
+      options = OpenStruct.new
+      options.filter = nil
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: port_purge [-f filter]"
+        opts.on("-f", "--filter FILTER","FILTER ports to purge") do |filter|
+          options.filter  = filter
+        end
+      end      
+      opts.parse!
+      
+      @to_remove = []
+      @keep = []
+      begin
+        @keep = YAML::load(File.read(DOTFILEPATH)) if File.readable?(DOTFILEPATH)
+      rescue ArgumentError
+        $stderr.puts("Badly formed .port_upgrade_ports file. Skipping.")
+      end
+      @pdb = 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:"
+      diff = (ports-deps).sort
+      $stderr.puts "Applying filter /#{options.filter}/" unless options.filter.nil?
+      diff.each do |leaf|
+        next if @keep.include? leaf
+        unless options.filter.nil?
+          next unless Regexp.compile(options.filter).match(leaf)
+        end
+        
+        $stderr.print leaf
+        $stderr.print "   Remove? (Y/N/S/Q)"
+        reply = $stdin.gets
+        case reply.strip
+        when /^(yes|y)$/i
+          @to_remove << leaf
+        when /^(quit|q)$/i
+          exit -1
+        when /^(skip|s)$/i
+          break
+          $stderr.puts
+        else
+          @keep << leaf
+        end
+      end
+      File.open(DOTFILEPATH,'w') do |f|
+        f.write(@keep.to_yaml)
+      end
+      exit 0 unless @to_remove.size > 0
+      $stderr.print "Really remove #{@to_remove.join(" ")} ? (type yes) "
+      reply = $stdin.gets
+      if reply =~ /^yes$/i
+        @to_remove.each do |leaf|
+          s = "port uninstall #{leaf}"
+          $stderr.puts s
+          system(s)
+        end
+      else
+        $stderr.puts "Exiting"
+        exit -1
+      end
+    end
+  end
+end

data/lib/port_upgrade.rb

@@ -11,14 +11,16 @@
 # newer version instead, at your option.
 # ====================================================================
 #
-
+require 'rubygems'
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
+require 'port_upgrade/port'
+require 'port_upgrade/version'
 require 'yaml'
 require 'bz2'
 require 'find'
 require 'sqlite3'
+require 'erb'
 
 class String
   def dot_clean
@@ -27,10 +29,11 @@ class String
 end
 
 module Ports
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
   RECEIPT_PATH = '/opt/local/var/macports/receipts'
   MACPORTS_DB='/opt/local/var/macports/sources/rsync.macports.org/release/ports'
   CONFIG_FILE = 'port_upgrade.conf'
+  SH_ERB_PATH = File.join(File.dirname(__FILE__),"port_upgrade","port_upgrade_sh.erb")
   Struct.new('Edge',:port,:dep,:level)
   class Struct::Edge
     def <=>(other)
@@ -61,9 +64,6 @@ module Ports
     end
   end
 
-  class Port
-  end
-
   class PortTree
     def initialize(pdb,path=nil)
       @path=path
@@ -121,7 +121,7 @@ module Ports
         end
         @pdb.db.execute("insert or ignore into remports values(\"#{a}\",\"\")")
       end
-      @pdb.db.execute('delete from remports where port="gimp-app" and dep="gimp"')
+      #@pdb.db.execute('delete from remports where port="gimp-app" and dep="gimp"')
       #File.open("remtree.dot",'w') do |f|
       #  pt = table_to_tree('remports','remports','port','port','dep')
       #  f.write(pt.to_dot)
@@ -208,7 +208,7 @@ module Ports
       @db = SQLite3::Database.new(':memory:')#('port_tree.db')
       @pt = PortTree.new(self,path)
       @installed = @pt.installed
-      @outdated = outdated
+      set_outdated(outdated)
       @to_remove = nil
       config_file = locate_config_file
       unless config_file.nil?
@@ -217,6 +217,9 @@ module Ports
           @config = {} if @config == false
         rescue Errno::ENOENT
           $stderr.puts("No configuration loaded.")
+        rescue ArgumentError
+          $stderr.puts("Badly formed config file.")
+          exit(-1)
         end
       else
         $stderr.puts("No configuration loaded.")
@@ -280,7 +283,14 @@ module Ports
     end
     
     def set_outdated(out)
+      begin
+        out.each{|o| Port.new(o)} unless out.nil?
+      rescue RuntimeError => ex
+        $stderr.puts ex
+        exit(-1)
+      end
       @outdated = out
+      @to_remove = nil
     end
 
     def outdated(reload = false)
@@ -315,8 +325,8 @@ 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 $DEBUG
             cmp = Ports::Utilities.cmp_vers(version.split('+').first,curver)
+            $stderr.puts("#{port}: #{version.split('+').first} <=> #{curver}       #{cmp}") if $DEBUG
             if cmp.nil?
               $stderr.puts "Unable to compare versions: #{[port]}"
             else
@@ -334,6 +344,8 @@ module Ports
 
     def upgrade(path='port_upgrade.sh')
       final = []
+      uninstall_data = []
+      install_data = []
       @pt.setup_remports(outdated) if @to_remove.nil?
       remports = []
       remvariants = Hash.new {|h,k| h[k] = Array.new}
@@ -341,7 +353,6 @@ module Ports
       dotsh = File.new(path,'w')
       dotsh.chmod(0700)
       $stderr.puts "port_upgrade.sh open for write" if $DEBUG
-      dotsh.puts("#!/bin/sh")
       while stmt.execute.to_a.first[0].to_i > 0
           temp = get_leaves
           break if temp.size == 0
@@ -350,12 +361,12 @@ module Ports
               installed = rs.to_a
               installed.each do |port|
                 bu = get_before_uninstall(port[0])
-                dotsh.puts(bu) unless bu.nil?
-                dotsh.puts("port uninstall #{port[0]} @#{port[1]}#{port[2]} || exit -1")
+                uninstall_data << bu unless bu.nil?
+                uninstall_data << "port uninstall #{port[0]} @#{port[1]}#{port[2]} || exit -1"
                 au = get_after_uninstall(port[0])
-                dotsh.puts(au) unless au.nil?
+                uninstall_data << au unless au.nil?
                 remports.push(port[0])
-                remvariants[port[0]].push(port[2])
+                remvariants[port[0]].push(port[2]) if remvariants[port[0]] and remvariants[port[0]].index(port[2]).nil?
               end
             end
           end
@@ -370,15 +381,17 @@ module Ports
           variantindex = 0
         end
         bi = get_before_install(port)
-        dotsh.puts(bi) unless bi.nil?
-        dotsh.puts("port #{get_force(port)} -x install #{port} #{remvariants[port][variantindex]} || exit -1")
+        uninstall_data << bi unless bi.nil?
+        install_data << "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?
+        install_data << ai unless ai.nil?
       end
       stmt.close
-      final.each{|l| dotsh.puts(l)}
+      final_actions = final
+      template = ERB.new(File.read(SH_ERB_PATH))
+      dotsh.puts template.result(binding)
       dotsh.close
       true
     end
@@ -418,8 +431,8 @@ module Ports
       unless @config.nil?
         if @config.has_key?(:actions)
           if @config[:actions].has_key?(portname)
-            if @config[:actions][portname].has_key?(type)
-              @config[:actions][portname][type]
+            if @config[:actions][portname].is_a?(Hash) and @config[:actions][portname].has_key?(type)
+              @config[:actions][portname][type].to_s
             else
               nil
             end
@@ -432,7 +445,7 @@ module Ports
       answer=false
       while(!answer)
         $stderr.puts "Please choose from list:"
-        variants.each_with_index{|v,i| $stderr.puts "#{i}: #{v=="" ? "(none)" : v}"}
+        variants.sort.each_with_index{|v,i| $stderr.puts "#{i}: #{v=="" ? "(none)" : v}"}
         $stderr.print "> "
         reply = $stdin.gets
         clean = (reply.strip =~ /-?[0-9]+/)
@@ -449,6 +462,7 @@ module Ports
 
   class Portfile
     def initialize(path)
+      raise Errno::ENOENT if (File.file?(path) == false or File.readable?(path) == false)
       @path = path
     end
 
@@ -467,6 +481,8 @@ module Ports
         when /^set\s+(\S+)\s+(\S+)/
           vars[$1] = $2
           #$stderr.puts "Var: #{$1}  Val: #{$2}"
+        when /^version\s+\[(.*)\]/
+          v = nil
         when /^version\s+([^\s]+)/
           v = $1
           while(v =~ /(\$\{([^}]+)\})/) do
@@ -481,7 +497,7 @@ module Ports
         when /^revision\s+([^\s]+)/
           rev = $1
           #$stderr.puts "revision found #{rev}"
-        when /(\w+\.setup\s+\{[^\}]+\}\s+([^\s]+)|^\w+\.setup\s+[^ ]+ (.*))/
+        when /(\w+\.setup\s+\{[^\}]+\}\s+([^\s]+)|^\w+\.setup\s+[^ ]+ (\S+))/
           v = $2 || $3 if v.nil?
           break
         when /(\S+)\s+([^$]+)$/
@@ -489,7 +505,7 @@ module Ports
         end
       end
       rev = "0" if rev.nil?
-      v = v +"_"+rev
+      v = v +"_"+rev unless v.nil?
       return v
     end
   end

data/lib/port_upgrade/cli.rb

@@ -1,40 +1,62 @@
-require 'optiflag'
+require 'optparse'
+require 'ostruct'
 
-module PortUpgrade extend OptiFlagSet
-  
-    flag "output" do
-      description "Where to output the shell script that performs the upgrade."
-    end
-
-    optional_flag "outdated" do
-      description "Specify the list of outdated ports to upgrade."
-    end
-
-    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!
+module PortUpgrade
   
   class CLI
     def self.execute(stdout, arguments=[])
-      $verbose = true if PortUpgrade.flags.verbose
-      if PortUpgrade.flags.portoutdated
+      options = OpenStruct.new
+      options.output = nil
+      options.receipts = nil
+      options.outdated = nil
+      options.portoutdated = false
+      options.checkoutdated = false
+      options.verbose = false
+      
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: port_upgrade.rb -oFILENAME [options]"
+        opts.on("-o", "--output FILE","FILE to output shell commands") do |output|
+          options.output  = output
+        end
+        opts.on("--receipts PATH","PATH to receipts files") do |receipts|
+          options.receipts  = receipts
+        end
+        opts.on("--outdated OUTDATED","Space seperated list of ports to mark as outdated") do |outdated|
+          options.outdated  = outdated.split(" ")
+        end
+        opts.on("--portoutdated",'Use `port outdated`(slow) instead of internal version checking routine(fast)') do |po|
+          options.portoutdated = po
+          $stderr.puts "PORTOUTDATED: #{po}"
+        end
+        opts.on("--checkoutdated",'Check `port outdated` against internal routine for inconsistencies') do |co|
+          options.checkoutdated = co
+          $stderr.puts "CHECKOUTDATED: #{co}"
+        end
+        opts.on_tail("-V", "--version","Show version") do
+          $stderr.puts "port_upgrade #{Ports::VERSION}"
+          exit
+        end
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+          $stderr.puts "VERBOSE: #{v}"
+          options.verbose = v
+        end
+      end
+      opts.parse!(arguments)
+      if !options.output
+        puts opts
+        exit 1
+      end
+      $verbose = true# if options.verbose
+      if options.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)
+        if options.checkoutdated
+          mypdb = Ports::PortsDB.new(options.receipts)
           myoutdated = mypdb.outdated
           diff = outdated-myoutdated
           if diff.size > 0
@@ -43,15 +65,15 @@ module PortUpgrade extend OptiFlagSet
             $stderr.puts "No Difference"
           end
         end
-        pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts,outdated)
+        pdb = Ports::PortsDB.new(options.receipts,outdated)
       else
-        pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts)
-        pdb.set_outdated(PortUpgrade.flags.outdated.split(" ")) if PortUpgrade.flags.outdated
+        pdb = Ports::PortsDB.new(options.receipts)
+        pdb.set_outdated(options.outdated) if options.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(',')}"
-      pdb.upgrade(PortUpgrade.flags.output)
+      pdb.upgrade(options.output)
       pdb.close
     end
   end

data/lib/port_upgrade/port.rb

@@ -0,0 +1,64 @@
+module Ports
+  class Port
+    attr_reader :name,:versions,:portfile_path
+
+    def initialize(portname)
+      tmpp = File.join(RECEIPT_PATH,portname)
+      @name = portname
+      @versions = []
+      if File.exist?(tmpp) and File.readable?(tmpp)
+        @rp = tmpp
+        Find.find(@rp) do |d|
+          next unless File.directory?(d)
+          next if d == @rp
+          b = File.basename(d)
+          md = /([^+]+)((\+\w+)*)/.match(b)
+          @versions << md[1] unless md.nil?
+        end
+      end
+
+      Dir.entries(MACPORTS_DB).each do |d|
+        if File.directory?(File.join(MACPORTS_DB,d)) && d != '.' && d != '..'
+          testpath = File.join(MACPORTS_DB,d,@name,'Portfile')
+          if File.exist?(testpath)
+            @portfile_path = testpath
+            break
+          end
+        end
+      end
+      raise "NoSuchPort: #{@name}" if @portfile_path.nil?
+    end
+
+    def installed?
+      @rp.nil? ? false : true
+    end
+
+    def receipt_path=(path)
+      @rp = path
+    end
+
+    def receipt_path
+      @rp
+    end
+
+    def portfile
+      return nil if @portfile_path.nil?
+      @portfile ||= Ports::Portfile.new(@portfile_path)
+    end
+
+    def name=(n)
+      @name = n
+    end
+
+    def outdated?
+      result = false
+      @versions.each do |v|
+        if Ports::Utilities.cmp_vers(v,portfile.version) < 0
+          result = true
+          break
+        end
+      end
+      result
+    end
+  end
+end

data/lib/port_upgrade/port_upgrade_sh.erb

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+<%if uninstall_data.size == 0 and install_data.size == 0 and final_actions.size == 0 %>
+echo "Nothing to upgrade"
+<% else %>
+
+uninstall_ports() {
+<%= uninstall_data.join("\n") %>
+}
+
+install_ports() {
+<%= install_data.join("\n") %>
+}
+
+<% if final_actions.size > 0 %>
+final_actions()
+{
+<%= final_actions.join("\n") %>
+}
+<% end %>
+
+case $1 in
+  uninstall)
+    echo "uninstall"
+    uninstall_ports
+    ;;
+  install)
+    echo "install"
+    install_ports
+    ;;
+  final)
+	<%if final_actions.size > 0 %>
+    echo "final actions"
+  	final_actions
+  <% else %>
+    echo "No final actions"
+  <% end %>
+    ;;
+  '')
+    echo "full run"
+    uninstall_ports
+    install_ports
+		<%if final_actions.size > 0 %>
+		final_actions
+		<% end %>
+    ;;
+  *)
+    echo $1: unknown option >&2
+    exit 1
+    ;;
+esac
+<% end %>

data/lib/port_upgrade/version.rb

@@ -7,6 +7,7 @@ module Ports
     end
 
     def <=>(other)
+      return 0 if @parts.nil? or other.parts.nil?
       $stderr.puts("self: #{@parts.inspect}") if $DEBUG
       $stderr.puts("other: #{other.parts.inspect}") if $DEBUG
       cmp = 0
@@ -52,7 +53,7 @@ module Ports
       #puts "State: #{state}"
       parts = []
       part = ""
-      s.each_char do |c|
+      s.each_byte do |c|
         newstate = get_state(c)
         case newstate
         when state
@@ -69,6 +70,7 @@ module Ports
     end
 
     def breakup_version(v)
+      return nil if v.nil?
       raise "Bad input to version; not String" unless v.is_a?(String)
       if v =~ /\[[^\]]+\]/
         $stderr.puts "code version: #{v}"

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+require 'rubygems'
+require 'mocha'

data/test/test_port.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), '..', 'lib','port_upgrade')
+require 'shoulda'
+include Ports
+
+class TestPort < Test::Unit::TestCase
+  context "A Port instance" do
+    setup do
+      @port = Port.new('wget')
+    end
+
+    should "return not nil" do
+      assert_not_nil @port
+    end
+
+    should "be installed" do
+      assert(@port.installed?)
+    end
+  end
+
+  context "A NoSuchPort instance" do
+    setup do
+    end
+
+    should "raise NoSuchPort" do
+      assert_raise RuntimeError do
+        @port = Port.new('NOTwget')
+      end
+      assert_nil(@port)
+    end
+  end
+  
+end

data/test/test_port_purge_cli.rb

@@ -0,0 +1,16 @@
+#require File.join(File.dirname(__FILE__), "test_helper.rb")
+require 'test/unit'
+require 'stringio'
+require 'port_purge/cli'
+
+class TestPortPurgeCli < Test::Unit::TestCase
+  #def setup
+  #  PortPurge::CLI.execute(@stdout_io = StringIO.new, [])
+  #  @stdout_io.rewind
+  #  @stdout = @stdout_io.read
+  #end
+  
+  def test_not_print_default_output
+    assert_no_match(/To update this executable/, @stdout)
+  end
+end

data/test/test_port_upgrade_cli.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require 'test/unit'
+require 'port_upgrade/cli'
+require 'stringio'
+require 'optparse'
+
+class TestPortUpgradeCli < Test::Unit::TestCase
+  def setup
+    #PortUpgrade::CLI.execute(@stdout_io = StringIO.new, [])
+    #@stdout_io.rewind
+    #@stdout = @stdout_io.read
+  end
+  
+  def test_not_print_default_output
+    #assert_no_match(/To update this executable/, @stdout)
+  end
+  
+  def test_output_flag_requires_argument
+    assert_raise OptionParser::MissingArgument do
+      PortUpgrade::CLI.execute(stdout_io = StringIO.new, ["-o"])
+      stdout_io.rewind
+    end
+  end
+end

data/test/test_portfile.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), '..', 'lib','port_upgrade') #,'version')
+
+include Ports
+
+class TestPortfile < Test::Unit::TestCase
+  def test_portfile_bad_path
+    assert_raise Errno::ENOENT do
+      pf = Ports::Portfile.new('/tmp/not_a_path')
+    end      
+  end
+end

data/test/test_version.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
 require File.join(File.dirname(__FILE__), '..', 'lib','port_upgrade','version')
 require 'test/unit'
 include Ports

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -08:00
+date: 2009-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.2"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: optiflag
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -67,6 +57,7 @@ email:
 - tdoan@tdoan.com
 executables: 
 - port_upgrade
+- port_purge
 extensions: []
 
 extra_rdoc_files: 
@@ -78,21 +69,18 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- lib/port_purge/cli.rb
 - lib/port_upgrade.rb
 - lib/port_upgrade/cli.rb
+- lib/port_upgrade/port.rb
+- lib/port_upgrade/port_upgrade_sh.erb
 - lib/port_upgrade/version.rb
 - bin/port_upgrade
+- bin/port_purge
 - etc/port_upgrade.conf.sample
 has_rdoc: true
 homepage: http://portupgrade.rubyforge.org/
-post_install_message: |+
-  
-  
-  A sample config file can be found in:
-  /opt/local/lib/ruby/gems/1.8/gems/port_upgrade-0.0.5/etc
-  To install copy it to ~/.port_upgrade.conf
-  
-  
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
@@ -116,6 +104,11 @@ rubyforge_project: portupgrade
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Summary
+summary: Cleanly upgrade your MacPorts.
 test_files: 
+- test/test_helper.rb
+- test/test_port.rb
+- test/test_port_purge_cli.rb
+- test/test_port_upgrade_cli.rb
+- test/test_portfile.rb
 - test/test_version.rb