port_upgrade 0.1.1 → 0.1.2

data/Manifest.txt

@@ -8,6 +8,7 @@ lib/port_upgrade/cli.rb
 lib/port_upgrade/port.rb
 lib/port_upgrade/port_upgrade_sh.erb
 lib/port_upgrade/version.rb
+lib/port_upgrade/port_upgrade_config.rb
 bin/port_upgrade
 bin/port_purge
 etc/port_upgrade.conf.sample

data/README.rdoc

@@ -1,11 +1,12 @@
 port_upgrade
 2008-07-14
 
-Copyright (C) 2008 Tony Doan (tdoan@tdoan.com)
+Copyright (C) 2009 Tony Doan (tdoan@tdoan.com)
 
 = port_upgrade
 
-* http://portupgrade.rubyforge.org/
+* {RubyForge homepage}[http://portupgrade.rubyforge.org]
+* FAQ[http://wiki.github.com/tdoan/port_upgrade/faq]
 
 == DESCRIPTION:
 
@@ -21,7 +22,7 @@ Updates your MacPorts while also removing old dependent versions of libraries an
 * 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
+  * port_upgrade -o upgrade.sh
 * Run the shell script to update your ports tree
   * sudo ./upgrade.sh
 * There is no step 4
@@ -35,6 +36,20 @@ Updates your MacPorts while also removing old dependent versions of libraries an
 
 * sudo gem install port_upgrade
 
+== Additional Usage Scenerios
+
+1) Uninstall a port on which other ports depend. Example with libiconv
+  
+<tt>port_upgrade --outdated=libiconv -o iconv_uninstall.sh</tt>
+
+<tt>./iconv_uninstall.sh uninstall</tt>
+  
+2) 
+
+== Known Bugs
+
+* Does not check epoch dates in Portfiles
+
 == LICENSE:
 
 Copyright (c) 2008 Tony Doan <tdoan@tdoan.com>

data/Rakefile

@@ -1,3 +1,4 @@
+require 'hoe'
 %w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/port_upgrade.rb'
 GEM_HOME = File.join(RbConfig::CONFIG["libdir"],RbConfig::CONFIG["RUBY_INSTALL_NAME"],"gems")

data/bin/port_upgrade

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

data/lib/port_purge/cli.rb

@@ -42,10 +42,9 @@ module PortPurge
         when /^(yes|y)$/i
           @to_remove << leaf
         when /^(quit|q)$/i
-          exit -1
+          exit(-1)
         when /^(skip|s)$/i
           break
-          $stderr.puts
         else
           @keep << leaf
         end
@@ -64,7 +63,7 @@ module PortPurge
         end
       else
         $stderr.puts "Exiting"
-        exit -1
+        exit(-1)
       end
     end
   end

data/lib/port_upgrade.rb

@@ -16,6 +16,7 @@ $:.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 'port_upgrade/port_upgrade_config'
 require 'yaml'
 require 'bz2'
 require 'find'
@@ -29,10 +30,9 @@ class String
 end
 
 module Ports
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   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
@@ -205,40 +205,20 @@ module Ports
 
   class PortsDB
     def initialize(path=nil,outdated=nil)
+      mp_version_path = "/opt/local/var/macports/sources/rsync.macports.org/release/base//config/mp_version"
+      @mp_version = File.read("/opt/local/var/macports/sources/rsync.macports.org/release/base//config/mp_version").to_f
+      @needs_dash_x = @mp_version < 1.8
+      @dash_x = @needs_dash_x ? "-x" : ""
       @path=path
       @db = SQLite3::Database.new(':memory:')#('port_tree.db')
       @pt = PortTree.new(self,path)
       @installed = @pt.installed
       set_outdated(outdated)
       @to_remove = nil
-      config_file = locate_config_file
-      unless config_file.nil?
-        begin
-          @config = YAML::load(File.open(config_file))
-          @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.")
-      end
+      @config = PortUpgradeConfig.instance.config
+      
     end
     
-    def locate_config_file
-      to_search = []
-      local_dir = File.dirname($0).sub(/bin$/,"")
-      local_dir = local_dir == "" ? "." : local_dir
-      to_search << File.join(local_dir,"etc",Ports::CONFIG_FILE)
-      to_search << File.join(ENV['HOME'],"."+Ports::CONFIG_FILE)
-      to_search.each do |path|
-        return path if File.readable?(path)
-      end
-      return nil
-    end
-
     def installed
       @installed
     end
@@ -310,16 +290,16 @@ module Ports
               cats << (md[2].nil? ? md[1] : md[2].split.first)
             end
           end
-          portfile_path = File.join(MACPORTS_DB,cats.flatten,port,'Portfile')
+          portfile_path = File.join(get_macports_db_path,cats.flatten,port,'Portfile')
           unless File.exist?(portfile_path)
             $stderr.puts "Searching for #{port}'s Portfile"
-            Dir.entries(MACPORTS_DB).each do |d|
-              if File.directory?(File.join(MACPORTS_DB,d)) && d != '.' && d != '..'
-                testpath = File.join(MACPORTS_DB,d,port,'Portfile')
+            Dir.entries(get_macports_db_path).each do |d|
+              if File.directory?(File.join(get_macports_db_path,d)) && d != '.' && d != '..'
+                testpath = File.join(get_macports_db_path,d,port,'Portfile')
                 if File.exist?(testpath)
-                   portfile_path = testpath
-                   break
-                 end
+                  portfile_path = testpath
+                  break
+                end
               end
             end
           end
@@ -331,10 +311,10 @@ module Ports
             if cmp.nil?
               $stderr.puts "Unable to compare versions: #{[port]}"
             else
-               if cmp < 0
-                 @outdated << port
-               end
-             end
+              if cmp < 0
+                @outdated << port
+              end
+            end
           else
             $stderr.puts "Unable to process Portfile (File Not Found) for #{port}"
           end
@@ -383,7 +363,7 @@ module Ports
         end
         bi = get_before_install(port)
         uninstall_data << bi unless bi.nil?
-        install_data << "port #{get_force(port)} -x install #{port} #{remvariants[port][variantindex]} || exit -1"
+        install_data << "port #{get_force(port)} #{@dash_x} install #{port} #{remvariants[port][variantindex]} || exit -1"
         ai = get_after_install(port)
         fi = get_final_install(port)
         final << fi unless fi.nil?
@@ -426,6 +406,10 @@ module Ports
       get_port_action(portname,:final_install)
     end
 
+    def get_macports_db_path
+      PortUpgradeConfig.instance.get_macports_db_path
+    end
+    
     def [](portname)
       Port.new(portname,@path)
     end

data/lib/port_upgrade/cli.rb

@@ -32,6 +32,9 @@ module PortUpgrade
           options.checkoutdated = co
           $stderr.puts "CHECKOUTDATED: #{co}"
         end
+        opts.on("-p",'Add pid to the end of the outputfile') do 
+          options.pid = "." + Process.pid.to_s
+        end
         opts.on_tail("-V", "--version","Show version") do
           $stderr.puts "port_upgrade #{Ports::VERSION}"
           exit
@@ -42,6 +45,7 @@ module PortUpgrade
         end
         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
           $stderr.puts "VERBOSE: #{v}"
+          $stderr.puts Ports::PortUpgradeConfig.instance.get_macports_db_path
           options.verbose = v
         end
       end
@@ -50,7 +54,8 @@ module PortUpgrade
         puts opts
         exit 1
       end
-      $verbose = true# if options.verbose
+      $verbose = true if options.verbose
+      options.output += options.pid if options.pid
       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]}

data/lib/port_upgrade/port.rb

@@ -1,12 +1,15 @@
+require 'port_upgrade/port_upgrade_config'
 module Ports
   class Port
     attr_reader :name,:versions,:portfile_path
-
+    @config = PortUpgradeConfig.instance.config
+    
     def initialize(portname,receipt_path=nil)
       receipt_path ||= RECEIPT_PATH
       tmpp = File.join(receipt_path,portname)
       @name = portname
       @versions = []
+      @portfile_path = nil
       if File.exist?(tmpp) and File.readable?(tmpp)
         @rp = tmpp
         Find.find(@rp) do |d|
@@ -18,9 +21,9 @@ module Ports
         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')
+      Dir.entries(get_macports_db_path).each do |d|
+        if File.directory?(File.join(get_macports_db_path,d)) && d != '.' && d != '..'
+          testpath = File.join(get_macports_db_path,d,@name,'Portfile')
           if File.exist?(testpath)
             @portfile_path = testpath
             break
@@ -61,5 +64,10 @@ module Ports
       end
       result
     end
+
+    def get_macports_db_path
+      PortUpgradeConfig.instance.get_macports_db_path
+    end
+    
   end
 end

data/lib/port_upgrade/port_upgrade_config.rb

@@ -0,0 +1,51 @@
+require 'singleton'
+require 'yaml'
+
+module Ports
+  CONFIG_FILE = 'port_upgrade.conf'
+  class PortUpgradeConfig
+    include Singleton
+    @@config=nil
+    def locate_config_file
+      to_search = []
+      local_dir = File.dirname($0).sub(/bin$/,"")
+      local_dir = local_dir == "" ? "." : local_dir
+      to_search << File.join(local_dir,"etc",Ports::CONFIG_FILE)
+      to_search << File.join(ENV['HOME'],"."+Ports::CONFIG_FILE)
+      to_search.each do |path|
+        return path if File.readable?(path)
+      end
+      return nil
+    end
+    
+    def get_macports_db_path
+      unless config.nil?
+        if config.has_key?(:macports_db_path)
+          config[:macports_db_path]
+        else
+          MACPORTS_DB
+        end
+      end
+    end
+    
+    def config
+      return @@config unless @@config.nil?
+
+      config_file = locate_config_file
+      unless config_file.nil?
+        begin
+          @@config = YAML::load(File.open(config_file))
+          @@config = {} if @@config == false
+          return @@config
+        rescue Errno::ENOENT
+          throw "No configuration loaded."
+        rescue ArgumentError
+          throw "Badly formed config file."
+        end
+      else
+        #throw "No configuration loaded."
+        return nil
+      end
+    end
+  end
+end

data/test/test_helper.rb

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

data/test/test_port.rb

@@ -20,6 +20,7 @@ class TestPort < Test::Unit::TestCase
 
   context "A NoSuchPort instance" do
     setup do
+      @port = nil
     end
 
     should "raise NoSuchPort" do

data/test/test_port_purge_cli.rb

@@ -3,14 +3,14 @@ require 'test/unit'
 require 'stringio'
 require 'port_purge/cli'
 
-class TestPortPurgeCli < Test::Unit::TestCase
+#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
+  #def test_not_print_default_output
+  #  assert_no_match(/To update this executable/, @stdout)
+  #end
+#end

data/test/test_version.rb

@@ -34,7 +34,7 @@ class TestVersion < Test::Unit::TestCase
     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]] }
+  @tests = raw_tests.split("\n").collect{|l| parts = l.split(" "); [parts[1],parts[3]] }
   end
 
   def test_1

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,50 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 -07:00
+date: 2010-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bz2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
         version: "0.2"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: A clean way to keep your MacPorts up to date.
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id004
+description: ""
 email: 
 - tdoan@tdoan.com
 executables: 
@@ -63,7 +83,6 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
@@ -75,35 +94,38 @@ files:
 - lib/port_upgrade/port.rb
 - lib/port_upgrade/port_upgrade_sh.erb
 - lib/port_upgrade/version.rb
+- lib/port_upgrade/port_upgrade_config.rb
 - bin/port_upgrade
 - bin/port_purge
 - etc/port_upgrade.conf.sample
 has_rdoc: true
-homepage: http://portupgrade.rubyforge.org/
+homepage: 
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: portupgrade
-rubygems_version: 1.3.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cleanly upgrade your MacPorts.