tpkg 2.1.1 → 2.2.0

data/Rakefile

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('facter')
   s.add_dependency('net-ssh')
   s.add_dependency('ddao-kwalify')
-  s.version = '2.1.1'
+  s.version = '2.2.0'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/cpan2tpkg

@@ -20,7 +20,7 @@ use Storable qw(dclone);
 sub usage
 {
 	die <<EOF;
-Usage: cpan2tpkg
+Usage: cpan2tpkg [options] module
     [--version version]
        Version of module to install
     [--package-version version]

data/bin/tpkg

@@ -4,7 +4,6 @@
 ##############################################################################
 
 # Ensure we can find tpkg.rb
-#$:.unshift File.dirname(__FILE__)
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'optparse'
@@ -37,8 +36,11 @@ require 'tpkg'
 def rerun_with_sudo_if_necessary
   if Process.euid != 0 && @sudo
     warn "Executing with sudo"
+    # Depending on how sudo is configured it might remove TPKG_HOME from the
+    # environment.  As such we set the base as a command line option to ensure
+    # it survives the sudo process.
     if ENV['TPKG_HOME']
-      exec('sudo', 'env', "TPKG_HOME=#{ENV['TPKG_HOME']}", $0, *ARGV)
+      exec('sudo', $0, '--base', ENV['TPKG_HOME'], *ARGV)
     else
       exec('sudo', $0, *ARGV)
     end
@@ -230,8 +232,11 @@ end
 opts.on('--qconf', "Display tpkg's configuration settings") do |opt|
   @action = :query_conf
 end
+opts.on('--base', '=BASE', 'Base directory for tpkg operations') do |opt|
+  @tpkg_options[:base] = opt
+end
 opts.on('--source', '=NAME', 'Sources where packages are located', Array) do |opt|
-  @tpkg_options["sources"] = opt
+  @tpkg_options[:sources] = opt
 end
 opts.on('--download', '=PACKAGES', 'Download one or more packages', Array) do |opt|
   @action = :download
@@ -275,6 +280,9 @@ opts.on('--compress', '=[TYPE]', 'Compress files when making packages') do |opt|
     @compress = opt
   end
 end
+opts.on('--test-root TESTDIR', 'For use by the test suite only.') do |opt|
+  @tpkg_options[:file_system_root] = opt
+end
 opts.on('--debug', 'Print lots of messages about what tpkg is doing') do |opt|
   @debug = opt
   Tpkg::set_debug(@debug)
@@ -307,11 +315,32 @@ end
 #
 
 def instantiate_tpkg(options = {})
-  base = Tpkg::DEFAULT_BASE
-  sources = options["sources"] || []
+  base = options[:base]
+  sources = options[:sources] || []
   report_server = nil
   
-  [File.join(Tpkg::DEFAULT_CONFIGDIR, 'tpkg.conf'), File.join(ENV['HOME'], ".tpkg.conf")].each do |configfile|
+  # base can come from four possible places.  They take precedence in this
+  # order:
+  # - command line option
+  # - TPKG_HOME environment variable
+  # - config file
+  # - Tpkg::DEFAULT_BASE
+  
+  if ENV['TPKG_HOME']
+    if !base
+      base = ENV['TPKG_HOME']
+      # Warn the user, as this could potentially be confusing
+      # if they don't realize there's an environment variable set.
+      warn "Using base '#{base}' base from $TPKG_HOME"
+    else
+      warn "Ignoring TPKG_HOME" if @debug
+    end
+  end
+  
+  # FIXME: Move config file parsing to tpkg.rb
+  # http://sourceforge.net/apps/trac/tpkg/ticket/28
+  fsroot = options[:file_system_root] ? options[:file_system_root] : ''
+  [File.join(fsroot, Tpkg::DEFAULT_CONFIGDIR, 'tpkg.conf'), File.join(fsroot, ENV['HOME'], ".tpkg.conf")].each do |configfile|
     if File.exist?(configfile)
       IO.foreach(configfile) do |line|
         line.chomp!
@@ -320,11 +349,15 @@ def instantiate_tpkg(options = {})
         line.strip!  # Remove leading/trailing whitespace
         key, value = line.split(/\s*=\s*/, 2)
         if key == 'base'
-          # Warn the user, as this could potentially be confusing
-          # if they don't realize there's a config file lying
-          # around
-          base = value
-          warn "Using base #{base} from #{configfile}"
+          if !base
+            # Warn the user, as this could potentially be confusing
+            # if they don't realize there's a config file lying
+            # around
+            base = value
+            warn "Using base #{base} from #{configfile}"
+          else
+            warn "Ignoring 'base' option in #{@configfile}" if @debug
+          end
         elsif key == 'source'
           sources << value
           puts "Loaded source #{value} from #{configfile}" if (@debug)
@@ -336,11 +369,8 @@ def instantiate_tpkg(options = {})
     end
   end
   
-  if ENV['TPKG_HOME']
-    base = ENV['TPKG_HOME']
-    # Warn the user, as this could potentially be confusing
-    # if they don't realize there's an environment variable set.
-    warn "Using base '#{base}' base from $TPKG_HOME"
+  if !base
+    base = Tpkg::DEFAULT_BASE
   end
   
   if !@sudo
@@ -359,7 +389,15 @@ def instantiate_tpkg(options = {})
     end
   end
   
-  tpkg = Tpkg.new(:base => base, :sources => sources, :report_server => report_server, :lockforce => @lockforce, :force => @force, :sudo => @sudo)
+  # FIXME: This is ugly.  We would set the appropriate things in options and
+  # call Tpkg.new(options)
+  tpkg = Tpkg.new(:file_system_root => options[:file_system_root],
+                  :base => base,
+                  :sources => sources,
+                  :report_server => report_server,
+                  :lockforce => @lockforce,
+                  :force => @force,
+                  :sudo => @sudo)
 end
 
 passphrase_callback = lambda do | package |

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2

data/lib/tpkg/deployer.rb

@@ -165,7 +165,9 @@ class Deployer
     params = deploy_params.join(" ")
     cmd = nil
     if ENV['TPKG_HOME']
-      cmd = "env TPKG_HOME=#{ENV['TPKG_HOME']} tpkg #{params} -n"
+      # Preserve TPKG_HOME when deploying to remote systems so that users can
+      # perform operations against different tpkg base directories.
+      cmd = "tpkg #{params} --base #{ENV['TPKG_HOME']} -n"
     else
       cmd = "tpkg #{params} -n"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency