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

data/bin/gem2tpkg

@@ -14,8 +14,9 @@ require 'facter'
 # default, as that may not be a tpkg gem.  I.e. /usr/bin/gem on Mac OS X.
 DEFAULT_GEM_COMMAND = "#{Tpkg::DEFAULT_BASE}/ruby-1.8/bin/gem"
 
-# Haven't found a Ruby method for creating temporary directories,
-# so create a temporary file and replace it with a directory.
+# Ruby 1.8.7 and later have Dir.mktmpdir, but we support ruby 1.8.5 for
+# RHEL/CentOS 5.  So this is a basic substitute.
+# FIXME: consider "backport" for Dir.mktmpdir like we use in the test suite
 def tempdir(basename, tmpdir=Dir::tmpdir)
   tmpfile = Tempfile.new(basename, tmpdir)
   tmpdir = tmpfile.path

data/bin/tpkg

@@ -483,7 +483,7 @@ when :verify
   # Verify an installed pkg
   else
     tpkg = instantiate_tpkg(@tpkg_options)
-    results = tpkg.verify_file_metadata(@action_value)
+    results = tpkg.verify_file_metadata([@action_value])
     if results.length == 0
       puts "No package found"
     end

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2
@@ -452,15 +452,28 @@ class Tpkg
     end
     toplevel
   end
-
+  
+  # Takes the path to the 'tpkg' directory of an unpacked package and returns
+  # an array of the top level directories that exist for package files within
+  # that directory.  Currently that is one or both of 'reloc' for relocatable
+  # files and 'root' for non-relocatable files.
+  def self.get_package_toplevels(tpkgdir)
+    toplevels = []
+    ['reloc', 'root'].each do |toplevel|
+      if File.directory?(File.join(tpkgdir, toplevel))
+        toplevels << File.join(tpkgdir, toplevel)
+      end
+    end
+    toplevels
+  end
+  
   def self.get_filemetadata_from_directory(tpkgdir)
     filemetadata = {}
     root_dir = File.join(tpkgdir, "root")
     reloc_dir = File.join(tpkgdir, "reloc")
     files = []
 
-    Find.find(root_dir, reloc_dir) do |f|
-      next if !File.exist?(f)
+    Find.find(*get_package_toplevels(tpkgdir)) do |f|
       relocatable = false
 
       # Append file separator at the end for directory
@@ -625,8 +638,9 @@ class Tpkg
     File.rename(metadata_tmpfile.path, File.join(dest, 'metadata.yml'))
   end
   
-  # Haven't found a Ruby method for creating temporary directories,
-  # so create a temporary file and replace it with a directory.
+  # Ruby 1.8.7 and later have Dir.mktmpdir, but we support ruby 1.8.5 for
+  # RHEL/CentOS 5.  So this is a basic substitute.
+  # FIXME: consider "backport" for Dir.mktmpdir like we use in the test suite
   def self.tempdir(basename, tmpdir=Dir::tmpdir)
     tmpfile = Tempfile.new(basename, tmpdir)
     tmpdir = tmpfile.path
@@ -1303,6 +1317,8 @@ class Tpkg
       elsif File.directory?(File.join(@configdir, 'tpkg', 'ca'))
         http.ca_path = File.join(@configdir, 'tpkg', 'ca')
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      else
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
     end
     http.start
@@ -2559,12 +2575,7 @@ class Tpkg
 
     root_dir = File.join(workdir, 'tpkg', 'root')
     reloc_dir = File.join(workdir, 'tpkg', 'reloc')
-    Find.find(root_dir, reloc_dir) do |f|
-      # If the package doesn't contain either of the top level
-      # directories we need to skip them, find will pass them to us
-      # even if they don't exist.
-      next if !File.exist?(f)
-
+    Find.find(*Tpkg::get_package_toplevels(File.join(workdir, 'tpkg'))) do |f|
       begin
         if File.directory?(f)
           File.chown(default_dir_uid, default_dir_gid, f)
@@ -2669,11 +2680,7 @@ class Tpkg
 
     # We should get the perms, gid, uid stuff here since all the files
     # have been set up correctly
-    Find.find(root_dir, reloc_dir) do |f|
-      # If the package doesn't contain either of the top level
-      # directory we need to skip them, find will pass them to us
-      # even if they don't exist.
-      next if !File.exist?(f)
+    Find.find(*Tpkg::get_package_toplevels(File.join(workdir, 'tpkg'))) do |f|
       next if File.symlink?(f)
 
       # check if it's from root dir or reloc dir
@@ -3078,6 +3085,15 @@ class Tpkg
               # datafile again in the future.
               external.delete(:datafile)
             elsif external[:datascript]
+              # Warn the user about non-executable files, popen will visibly
+              # complain but in the midst of a complex install of multiple
+              # packages it won't be clear to the user in what context the
+              # program was executed nor which package has the problem.  Our
+              # warning specifies that it was a datascript and includes the
+              # package name.
+              if !File.executable?(external[:datascript])
+                warn "Warning: datascript for package #{File.basename(metadata[:filename])} is not executable, execution will likely fail"
+              end
               # Run the script
               IO.popen(external[:datascript]) do |pipe|
                 external[:data] = pipe.read

data/lib/tpkg/metadata.rb

@@ -560,7 +560,20 @@ class Metadata
       external = {}
       external[:name] = extxml.elements['name'].text
       if extxml.elements['data']
-        external[:data] = extxml.elements['data'].children.to_s
+        # The data element requires special handling.  We want to capture its
+        # raw contents, which may be XML.  The "text" method we use for other
+        # fields only returns text outside of child XML elements.  That fine
+        # for other fields which we don't expect to contain any child
+        # elements.  But here there may well be child elements and we need to
+        # capture the raw data.
+        # I.e. if we have:
+        # <data>
+        #   <one>Some text</one>
+        #   <two>Other text</two>
+        # </data>
+        # We want to capture:
+        # "\n  <one>Some text</one>\n  <two>Other text</two>\n"
+        external[:data] = extxml.elements['data'].children.join('')
       elsif extxml.elements['datafile']
         # We don't have access to the package contents here, so we just save
         # the name of the file and leave it up to others to read the file

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  hash: 5
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,39 +16,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -08:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ddao-kwalify
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: tpkg-users@lists.sourceforge.net
 executables: 
@@ -93,21 +111,28 @@ 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.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: tpkg Application Packaging & Deployment