tpkg 2.0.0 → 2.0.1

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.0.0'
+  s.version = '2.0.1'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/tpkg

@@ -9,6 +9,7 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'optparse'
 require 'tpkg'
+require 'etc' 
 
 #
 # Parse the command line options
@@ -60,7 +61,8 @@ opts.on('--extract', '-x', '=DIRECTORY', 'Extract the metadata for a directory o
   @action = :extract
   @action_value = opt
 end
-opts.on('--install', '-i', '=PACKAGES', 'Install one or more packages', Array) do |opt|
+installexample = "      --install pkgname=version=package_version\n          (Example: tpkg --install hive=2.1)  Will install hive version 2.1"
+opts.on('--install', '-i', '=PACKAGES', "Install one or more packages\n#{installexample}", Array) do |opt|
   @rerun_with_sudo = true
   @action = :install
   @action_value = opt
@@ -220,6 +222,9 @@ end
 opts.on('--qenv', "Display machine's information") do |opt|
   @action = :query_env
 end
+opts.on('--qconf', "Display tpkg's configuration settings") do |opt|
+  @action = :query_conf
+end
 opts.on('--source', '=NAME', 'Sources where packages are located', Array) do |opt|
   @tpkg_options["sources"] = opt
 end
@@ -332,8 +337,24 @@ def instantiate_tpkg(options = {})
     # if they don't realize there's an environment variable set.
     warn "Using base '#{base}' base from $TPKG_HOME"
   end
-  
-  tpkg = Tpkg.new(:base => base, :sources => sources, :report_server => report_server, :lockforce => @lockforce, :force => @force)
+  if !@sudo 
+    curruid = Etc.getpwuid.uid
+    if curruid == 0
+      puts "** ERROR **\n--no-sudo cannot be used as 'root' user or with sudo command."
+      exit 1
+     end
+    if !File::exists?(File.join(ENV['HOME'], ".tpkg.conf"))
+      puts "** ERROR **\nWhen specifying --no-sudo, #{File.join(ENV['HOME'], ".tpkg.conf")} and custom 'base' dir with write privileges is required\n" and exit 1
+    elsif base == '/home/t'
+      puts "** ERROR **\nWhen specifying --no-sudo, custom base dir with write privileges is required\n" and exit 1
+    end
+    baseuid = File.stat(base).uid 
+    if baseuid != curruid 
+      puts "** ERROR **\nbase dir (#{base}) not owned by you.\n" 
+      exit 1
+    end
+  end
+  tpkg = Tpkg.new(:base => base, :sources => sources, :report_server => report_server, :lockforce => @lockforce, :force => @force, :sudo => @sudo)
 end
 
 passphrase_callback = lambda do | package |
@@ -503,7 +524,7 @@ when :query_list_files
   if File.exist?(@action_value)
     fip = Tpkg::files_in_package(@action_value)
     tpkg.normalize_paths(fip)
-    puts "#{pkgfile}:"
+    puts "#{@action_value}:"
     fip[:normalized].each { |file| puts file }
   else
     pkgfiles = []
@@ -629,6 +650,17 @@ when :query_tpkg_metadata
 when :query_env
   puts "Operating System: #{Tpkg::get_os}"
   puts "Architecture: #{Tpkg::get_arch}"
+when :query_conf
+  # This is somewhat arbitrarily limited to the options read from the
+  # tpkg.conf config files.  The reason it exists at all is that it is
+  # difficult for users to programatically find out what these will be set to
+  # without recreating all of our logic about deciding which config files to
+  # read, which order to read them in, what environment variables override the
+  # config files, etc.
+  tpkg = instantiate_tpkg(@tpkg_options)
+  puts "Base: #{tpkg.base}"
+  puts "Sources: #{tpkg.sources.inspect}"
+  puts "Report server: #{tpkg.report_server}"
 when :query_history
   tpkg = instantiate_tpkg(@tpkg_options)
   tpkg.installation_history

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -1126,7 +1126,7 @@ class Tpkg
     metadata = data[:metadata]
     if (metadata && metadata[:files] && metadata[:files][:file_defaults] && metadata[:files][:file_defaults][:posix])
       uid = Tpkg::lookup_uid(metadata[:files][:file_defaults][:posix][:owner]) if metadata[:files][:file_defaults][:posix][:owner]
-      gid = Tpkg::lookup_uid(metadata[:files][:file_defaults][:posix][:group]) if metadata[:files][:file_defaults][:posix][:group]
+      gid = Tpkg::lookup_gid(metadata[:files][:file_defaults][:posix][:group]) if metadata[:files][:file_defaults][:posix][:group]
       perms = metadata[:files][:file_defaults][:posix][:perms] if metadata[:files][:file_defaults][:posix][:perms]
     end
 
@@ -1134,7 +1134,7 @@ class Tpkg
     file_metadata = data[:file_metadata]
     if file_metadata && file_metadata[:posix]
       uid = Tpkg::lookup_uid(file_metadata[:posix][:owner]) if file_metadata[:posix][:owner]
-      gid = Tpkg::lookup_uid(file_metadata[:posix][:group]) if file_metadata[:posix][:group]
+      gid = Tpkg::lookup_gid(file_metadata[:posix][:group]) if file_metadata[:posix][:group]
       perms = file_metadata[:posix][:perms] if file_metadata[:posix][:perms]
     end
     return perms, uid, gid
@@ -1233,6 +1233,10 @@ class Tpkg
     if options.has_key?(:force)
       @force = options[:force]
     end
+    @sudo = true
+    if options.has_key?(:sudo)
+      @sudo = options[:sudo]
+    end
     
     @file_system_root = '/'  # Not sure if this needs to be more portable
     # This option is only intended for use by the test suite
@@ -1293,6 +1297,14 @@ class Tpkg
     @available_packages_cache = {}
   end
   
+  attr_reader :base
+  attr_reader :sources
+  attr_reader :report_server
+  attr_reader :lockforce
+  attr_reader :force
+  attr_reader :sudo
+  attr_reader :file_system_root
+  
   def source_to_local_directory(source)
     source_as_directory = source.gsub(/[^a-zA-Z0-9]/, '')
     File.join(@sources_directory, source_as_directory)
@@ -2774,6 +2786,11 @@ class Tpkg
   
   def install_crontabs(metadata)
     crontab_destinations(metadata).each do |crontab, destination|
+      if !@sudo && (destination[destination.keys.first] =~ /\/var\/spool\/cron/)
+        install_crontab_bycmd(metadata, crontab, destination) 
+        next
+      end
+
       begin
         if destination[:link]
           install_crontab_link(metadata, crontab, destination)
@@ -2868,8 +2885,25 @@ class Tpkg
     # FIXME: On Solaris we should bounce cron or use the crontab
     # command, otherwise cron won't pick up the changes
   end
+  def install_crontab_bycmd(metadata, crontab, destination)
+    oldcron = `crontab -l`
+    tmpf = '/tmp/tpkg_cron.' + rand.to_s
+    tmpfh = File.open(tmpf,'w')
+    tmpfh.write(oldcron) unless oldcron.empty?
+    tmpfh.puts "### TPKG START - #{@base} - #{File.basename(metadata[:filename].to_s)}"
+    tmpfh.write File.readlines(crontab)
+    tmpfh.puts "### TPKG END - #{@base} - #{File.basename(metadata[:filename].to_s)}" 
+    tmpfh.close
+    `crontab #{tmpf}`
+    FileUtils.rm(tmpf)
+  end
   def remove_crontabs(metadata)
     crontab_destinations(metadata).each do |crontab, destination|
+      if !@sudo && (destination[destination.keys.first] =~ /\/var\/spool\/cron/)
+        remove_crontab_bycmd(metadata, crontab, destination) 
+        next
+      end
+
       begin
         if destination[:link]
           remove_crontab_link(metadata, crontab, destination)
@@ -2937,6 +2971,24 @@ class Tpkg
       # command, otherwise cron won't pick up the changes
     end
   end
+  def remove_crontab_bycmd(metadata, crontab, destination)
+    oldcron = `crontab -l`
+    tmpf = '/tmp/tpkg_cron.' + rand.to_s
+    tmpfh = File.open(tmpf,'w')
+    skip = false
+    oldcron.each do |line|
+      if line == "### TPKG START - #{@base} - #{File.basename(metadata[:filename].to_s)}\n"
+        skip = true
+      elsif line == "### TPKG END - #{@base} - #{File.basename(metadata[:filename].to_s)}\n"
+        skip = false
+      elsif !skip
+        tmpfh.write(line)
+      end
+    end
+    tmpfh.close
+    `crontab #{tmpf}`
+    FileUtils.rm(tmpf)
+  end
   
   def run_preinstall(package_file, workdir)
     if File.exist?(File.join(workdir, 'tpkg', 'preinstall'))
@@ -3222,7 +3274,7 @@ class Tpkg
 
     if !all_requests_satisfied
       puts errors.join("\n")
-      raise "Unable to satisfy the request(s)"
+      raise "Unable to satisfy the request(s).  Try running with --debug for more info"
     end
   end
   
@@ -3412,7 +3464,7 @@ class Tpkg
     #solution_packages = best_solution(requirements.dup, packages.dup)
     solution_packages = best_solution(requirements, packages, core_packages)
     if !solution_packages
-      raise "Unable to resolve dependencies"
+      raise "Unable to resolve dependencies.  Try running with --debug for more info"
     end
     
     success = handle_conflicting_pkgs(installed_packages, solution_packages, options)
@@ -3634,7 +3686,7 @@ class Tpkg
     solution_packages = best_solution(requirements, packages, core_packages)
   
     if solution_packages.nil?
-      raise "Unable to find solution for upgrading. Please verify that you specified the correct package(s) for upgrade."
+      raise "Unable to find solution for upgrading. Please verify that you specified the correct package(s) for upgrade.  Try running with --debug for more info"
     end
 
     success = handle_conflicting_pkgs(installed_packages, solution_packages, options)
@@ -4387,7 +4439,7 @@ class Tpkg
     parse_requests(requests, requirements, packages)
     packages = packages.values.flatten
     if packages.size < 1
-      puts "Unable to find any packages that satisfy your request."
+      puts "Unable to find any packages that satisfy your request.  Try running with --debug for more info"
       Dir.chdir(original_dir) 
       return GENERIC_ERR
     end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -16,51 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ddao-kwalify
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 description: 
 email: tpkg-users@lists.sourceforge.net
 executables: 
@@ -111,28 +93,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
       version: "1.8"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: tpkg
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: tpkg Application Packaging & Deployment