port_upgrade 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.3 2008-12-23
+
+* Bug Fix Release:
+  * Include sample port_upgrade.conf
+  * BUG #23330- Fix issue with ports categorized in one place but have their Portfile in another
+  * BUG #23362 - Fix receipt parsing issue with binary runtime dependencies 
+  * Outdated output now includes a count
 == 0.0.2 2008-12-23
 
 * Second rubyforge release:

data/Manifest.txt

@@ -1,8 +1,8 @@
 History.txt
 Manifest.txt
-PostInstall.txt
 README.txt
 Rakefile
 lib/port_upgrade.rb
 lib/port_upgrade/cli.rb
 bin/port_upgrade
+etc/port_upgrade.conf.sample

data/Rakefile

@@ -1,13 +1,21 @@
 %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")
+GEM_DIR = File.join(GEM_HOME,RbConfig::CONFIG["ruby_version"],"gems")
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
 $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.post_install_message = File.read('PostInstall.txt') # TODO remove if post-install message not required
-  p.rubyforge_name       = "portupgrade" # TODO this is default value
+  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'],
@@ -26,6 +34,3 @@ end
 
 require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/etc/port_upgrade.conf.sample

@@ -0,0 +1,11 @@
+--- 
+:actions:
+  ruby: 
+    :after_uninstall: rm -rf /opt/local/share/ri
+  ncursesw:
+    :after_uninstall: rm -rf /opt/local/share/terminfo
+  ImageMagick:
+    :before_uninstall: gem uninstall rmagick
+    :after_install: gem install rmagick
+  python25:
+    :after_install: python_select python25

data/lib/port_upgrade/cli.rb

@@ -19,7 +19,7 @@ module PortUpgrade extend OptiFlagSet
     def self.execute(stdout, arguments=[])
       pdb = Ports::PortsDB.new(PortUpgrade.flags.receipts)
       pdb.set_outdated(PortUpgrade.flags.outdated.split(" ")) if PortUpgrade.flags.outdated
-      $stderr.puts("Outdated: #{pdb.outdated.join(' ')}")
+      $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)

data/lib/port_upgrade.rb

@@ -26,10 +26,10 @@ class String
 end
 
 module Ports
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   RECEIPT_PATH = '/opt/local/var/macports/receipts'
   MACPORTS_DB='/opt/local/var/macports/sources/rsync.macports.org/release/ports'
-  CONFIG_FILE = 'port_upgrade_conf.yml'
+  CONFIG_FILE = 'port_upgrade.conf'
   Struct.new('Edge',:port,:dep,:level)
   class Struct::Edge
     def <=>(other)
@@ -180,7 +180,7 @@ module Ports
           if l =~ /depends_run (\{([^}]*)\}|([^ ]*))/
             deps = $2||$3
             deps.split(" ").each do |d|
-              original_depname = d.split(":")[1]
+              original_depname = d.split(":").last
               depname = d.split(":")[1].gsub(/(-|\.|\/)/,'_')
               begin
                 @pdb.db.execute("insert into deps values(?,?)",original_portname,original_depname)
@@ -241,7 +241,6 @@ module Ports
       to_search << File.join(local_dir,"etc",Ports::CONFIG_FILE)
       to_search << File.join(ENV['HOME'],"."+Ports::CONFIG_FILE)
       to_search.each do |path|
-        $stderr.puts "PATH: #{path}"
         return path if File.readable?(path)
       end
       return nil
@@ -312,10 +311,25 @@ module Ports
             end
           end
           portfile_path = File.join(MACPORTS_DB,cats.flatten,port,'Portfile')
-          e = 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
+          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')
+                if File.exist?(testpath)
+                   portfile_path = testpath
+                   break
+                 end
+              end
+            end
+          end
+          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
+          else
+            $stderr.puts "Unable to process Portfile (File Not Found) for #{port}"
+          end
         end
       end
       @outdated.uniq

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: port_upgrade
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -08:00
+date: 2008-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,25 +72,26 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 - Rakefile
 - lib/port_upgrade.rb
 - lib/port_upgrade/cli.rb
 - bin/port_upgrade
+- etc/port_upgrade.conf.sample
 has_rdoc: true
 homepage: http://portupgrade.rubyforge.org/
-post_install_message: |-
-  Port upgrade will recursively uninstall and reinstall your ports tree to get it fresh and clean and up to date. This gem installs a command "port_upgrade" which requires one option "-output". Portupgrade generates a shell script to do the actual work. To use port_upgrade do the following:
+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
+  To install copy it to ~/.port_upgrade.conf
+  
   
-  sudo port selfupdate (or sync)
-  port_upgrade -output upgrade.sh
-  sudo ./upgrade.sh # Watch it fly
 rdoc_options: 
 - --main
 - README.txt

data/PostInstall.txt

@@ -1,5 +0,0 @@
-Port upgrade will recursively uninstall and reinstall your ports tree to get it fresh and clean and up to date. This gem installs a command "port_upgrade" which requires one option "-output". Portupgrade generates a shell script to do the actual work. To use port_upgrade do the following:
-
-sudo port selfupdate (or sync)
-port_upgrade -output upgrade.sh
-sudo ./upgrade.sh # Watch it fly