tpkg 2.3.0 → 2.3.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name = 'tpkg'
   s.summary = 'tpkg Application Packaging & Deployment'
-  s.version = '2.3.0'
+  s.version = '2.3.1'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/gem2tpkg

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby
 ##############################################################################
 # tpkg package management system
 # License: MIT (http://www.opensource.org/licenses/mit-license.php)

data/bin/tpkg

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby
 ##############################################################################
 # tpkg package management system
 # License: MIT (http://www.opensource.org/licenses/mit-license.php)
@@ -23,13 +23,6 @@ require 'tpkg'
 @prompt = true
 @quiet = false
 @sudo = nil
-# Neither of the common Windows environments for running Ruby have
-# sudo, so turn it off by default on those platforms
-if RUBY_PLATFORM == 'i386-mingw32' || RUBY_PLATFORM == 'i386-cygwin'
-  @sudo = false
-else
-  @sudo = true
-end
 @force = false
 @deploy = false
 @deploy_params = ARGV   # hold parameters for how to invoke tpkg on the machines we're deploying to
@@ -52,9 +45,9 @@ def rerun_with_sudo_if_necessary
     # 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', $0, '--base', ENV['TPKG_HOME'], *ARGV)
+      exec('sudo', '-H', $0, '--base', ENV['TPKG_HOME'], *ARGV)
     else
-      exec('sudo', $0, *ARGV)
+      exec('sudo', '-H', $0, *ARGV)
     end
   end
 end
@@ -92,6 +85,20 @@ def parse_config_files
         elsif key == 'host_group_script'
           settings[:host_group_script] = value
           puts "Loaded host group script #{value} from #{configfile}" if @debug
+        elsif key == 'sudo'
+          sudoval = nil
+          # My kingdom for a String#to_boolean
+          if value == 'true'
+            sudoval = true
+          elsif value == 'false'
+            sudoval = false
+          else
+            puts "Unrecognized value #{value} for sudo setting in #{configfile}, ignoring"
+          end
+          if !sudoval.nil?
+            settings[:sudo] = sudoval
+            puts "Loaded sudo #{value} from #{configfile}" if @debug
+          end
         end
       end
     end
@@ -484,11 +491,23 @@ def instantiate_tpkg
   
   # Sources can come from the command line and config files.  We use the
   # combined set of sources.
-  @sources.concat(settings[:sources])
+  @sources.concat(settings[:sources]).uniq!
   @tpkg_options[:sources] = @sources
   
   @tpkg_options[:report_server] = settings[:report_server]
-  @tpkg_options[:sudo] = @sudo
+  # sudo can come from three possible places.  They take precedence in this
+  # order:
+  # - command line option
+  # - config file
+  # - Tpkg.sudo_default? method defined in tpkg.rb
+  case
+  when !@sudo.nil?
+    @tpkg_options[:sudo] = @sudo
+  when @tpkg_options.has_key?(:sudo)
+    @sudo = @tpkg_options[:sudo]
+  else
+    @sudo = @tpkg_options[:sudo] = Tpkg.sudo_default?
+  end
   @tpkg_options[:force] = @force
   
   if !@sudo
@@ -636,7 +655,7 @@ when :query_installed
       # command-line syntax like "tpkg -q foo || tpkg -i foo" to ensure
       # that a package is installed.
       ret_val = 1
-      $stderr.puts "No packages matching '#{@action_value}' installed" if !@quiet
+      $stderr.puts "No packages matching '#{@action_value.join(',')}' installed" if !@quiet
     else
       packages.each do | name, pkgs |
         matches.concat(pkgs)
@@ -884,7 +903,7 @@ when :query_available
     ret_val = 1
     if !@quiet
       if @action_value
-        $stderr.puts "No packages matching '#{@action_value}' available"
+        $stderr.puts "No packages matching '#{@action_value.join(',')}' available"
       else
         $stderr.puts "No packages available"
       end

data/bin/tpkg_xml_to_yml

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby
 ##############################################################################
 # tpkg package management system
 # License: MIT (http://www.opensource.org/licenses/mit-license.php)

data/lib/tpkg.rb

@@ -42,7 +42,7 @@ OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cip
 
 class Tpkg
   
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2
@@ -749,7 +749,18 @@ class Tpkg
     end
     @@os.dup
   end
-
+  
+  # Should sudo be on by default?
+  def self.sudo_default?
+    # Neither of the common Windows environments for running Ruby have
+    # sudo, so turn it off by default on those platforms
+    if RUBY_PLATFORM == 'i386-mingw32' || RUBY_PLATFORM == 'i386-cygwin'
+      false
+    else
+      true
+    end
+  end
+  
   # Given an array of pkgs. Determine if any of those package
   # satisfy the requirement specified by req
   def self.packages_meet_requirement?(pkgs, req)
@@ -1356,7 +1367,7 @@ class Tpkg
     if options.has_key?(:force)
       @force = options[:force]
     end
-    @sudo = true
+    @sudo = Tpkg.sudo_default?
     if options.has_key?(:sudo)
       @sudo = options[:sudo]
     end

metadata

@@ -1,71 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tpkg
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 3
-  - 0
-  version: 2.3.0
+version: !ruby/object:Gem::Version
+  version: 2.3.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Darren Dao
 - Jason Heiss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: facter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70195691861980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70195691861980
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &70195691861560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: kwalify
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70195691861560
+- !ruby/object:Gem::Dependency
+  name: kwalify
+  requirement: &70195691861000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70195691861000
 description: 
 email: tpkg-users@lists.sourceforge.net
-executables: 
+executables:
 - tpkg
 - cpan2tpkg
 - gem2tpkg
 - tpkg_xml_to_yml
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/cpan2tpkg
 - bin/gem2tpkg
 - bin/tpkg
@@ -95,36 +84,28 @@ files:
 - schema/tpkg-1.0.8.dtd
 - schema/tpkg-1.0.9.dtd
 - schema/tpkg.dtd
-has_rdoc: true
 homepage: http://tpkg.sourceforge.net
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      version: "1.8"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.8'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: tpkg
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: tpkg Application Packaging & Deployment
 test_files: []
-