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

data/bin/tpkg

@@ -270,8 +270,7 @@ opts.on('--debug', 'Print lots of messages about what tpkg is doing') do |opt|
   Tpkg::set_debug(@debug)
 end
 opts.on('--version', 'Show tpkg version') do |opt|
-  puts Tpkg::VERSION
-  exit
+  @action = :query_version
 end
 opts.on_tail("-h", "--help", "Show this message") do
   puts opts
@@ -491,6 +490,8 @@ when :query_info
         end
       end
     end
+    tpkg_version = metadata[:tpkg_version] || "< 1.26.1"
+    puts "This package was built with tpkg version #{tpkg_version}."
     if metadata[:dependencies] 
       puts "This package depends on other packages, use --qd/--qld to view the dependencies."
     end
@@ -631,5 +632,7 @@ when :query_env
 when :query_history
   tpkg = instantiate_tpkg(@tpkg_options)
   tpkg.installation_history
+when :query_version
+  puts Tpkg::VERSION
 end
 exit ret_val

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '1.25.1'
+  VERSION = '1.27.1'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -93,6 +93,9 @@ class Tpkg
   def self.find_tar
     if !@@tar
       catch :tar_found do
+        if !ENV['PATH']
+          raise "tpkg cannot run because the PATH env variable is not set."
+        end
         ENV['PATH'].split(':').each do |path|
           TARNAMES.each do |tarname|
             if File.executable?(File.join(path, tarname))
@@ -308,10 +311,15 @@ class Tpkg
         raise "Failed to create package."  unless options[:force]
       end
 
-      # file_metadata.yml hold information for files that are installed
+      # file_metadata hold information for files that are installed
       # by the package. For example, checksum, path, relocatable or not, etc.
       File.open(File.join(tpkgdir, "file_metadata.bin"), "w") do |file|
         filemetadata = get_filemetadata_from_directory(tpkgdir)
+        filemetadata[:files].each do |file1|
+          if metadata[:files][:files] && metadata[:files][:files].any?{|file2|file2[:path] == file1[:path] && file2[:config]}
+            file1[:config] = true
+          end 
+        end
         data = filemetadata.to_hash.recursively{|h| h.stringify_keys }
         Marshal::dump(data, file)
       end
@@ -378,7 +386,7 @@ class Tpkg
       end
     
       # update metadata file with the tpkg version 
-      # TODO
+      metadata.add_tpkg_version(VERSION)
  
       # Tar up the tpkg directory
       tpkgfile = File.join(package_directory, 'tpkg.tar')
@@ -484,12 +492,12 @@ class Tpkg
     #return FileMetadata.new(YAML::dump(filemetadata),'yml')
     return FileMetadata.new(Marshal::dump(filemetadata),'bin')
   end
-  
-  def self.verify_package_checksum(package_file)
-    topleveldir = package_toplevel_directory(package_file)
+ 
+  def self.verify_package_checksum(package_file, options = {}) 
+    topleveldir = options[:topleveldir] || package_toplevel_directory(package_file)
     # Extract checksum.xml from the package
     checksum_xml = nil
-    IO.popen("#{find_tar} -xf #{package_file} -O #{File.join(topleveldir, 'checksum.xml')} #{@@taroptions}") do |pipe|
+    IO.popen("#{find_tar} #{@@taroptions} -xf #{package_file} -O #{File.join(topleveldir, 'checksum.xml')}") do |pipe|
       checksum_xml = REXML::Document.new(pipe.read)
     end
     if !$?.success?
@@ -536,8 +544,8 @@ class Tpkg
   end
 
   # Extracts and returns the metadata from a package file
-  def self.metadata_from_package(package_file)
-    topleveldir = package_toplevel_directory(package_file)
+  def self.metadata_from_package(package_file, options = {})
+    topleveldir = options[:topleveldir] || package_toplevel_directory(package_file)
     # Verify checksum
     verify_package_checksum(package_file)
     # Extract and parse tpkg.xml
@@ -880,10 +888,7 @@ class Tpkg
   end
   
   def self.files_in_package(package_file, options = {})
-    file_lists = []
-    files = {}
-    files[:root] = []
-    files[:reloc] = []
+    files = {:root => [], :reloc => []}
 
     # If the metadata_directory option is available, it means this package
     # has been installed and the file_metadata might be available in that directory.
@@ -903,6 +908,7 @@ class Tpkg
         end
       end
     else
+      file_lists = []
       topleveldir = package_toplevel_directory(package_file)
       extract_tpkg_tar_cmd = cmd_to_extract_tpkg_tar(package_file, topleveldir)
       IO.popen("#{extract_tpkg_tar_cmd} | #{find_tar} #{@@taroptions} -tf -") do |pipe|
@@ -1137,7 +1143,7 @@ class Tpkg
   # Return what type of compression. If tpkg.tar wasn't compressed, then return nil.
   def self.get_compression(package_file)
     compression = nil
-    IO.popen("#{find_tar} -tf #{package_file} #{@@taroptions}") do |pipe|
+    IO.popen("#{find_tar} #{@@taroptions} -tf #{package_file}") do |pipe|
       pipe.each do |file|
         if file =~ /tpkg.tar.gz$/
           compression = "gzip" 
@@ -1154,11 +1160,11 @@ class Tpkg
   def self.cmd_to_extract_tpkg_tar(package_file, topleveldir)
     compression = get_compression(package_file)
     if compression == "gzip"
-      cmd = "#{find_tar} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar.gz')} #{@@taroptions} | gunzip -c"
+      cmd = "#{find_tar} #{@@taroptions} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar.gz')} | gunzip -c"
     elsif compression == "bz2"
-      cmd = "#{find_tar} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar.bz2')} #{@@taroptions} | bunzip2 -c"
+      cmd = "#{find_tar} #{@@taroptions} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar.bz2')} | bunzip2 -c"
     else
-      cmd = "#{find_tar} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar')} #{@@taroptions}"
+      cmd = "#{find_tar} #{@@taroptions} -xf #{package_file} -O #{File.join(topleveldir, 'tpkg.tar')}"
     end
   end
  
@@ -1759,7 +1765,7 @@ class Tpkg
     ret = {}
 
     if package_files
-      packages_files.collect!{|package_file| File.basename(package_file, File.extname(package_file))}
+      package_files.collect!{|package_file| File.basename(package_file, File.extname(package_file))}
     end
 
     if File.directory?(@metadata_directory)
@@ -2459,7 +2465,6 @@ class Tpkg
   # calling this method.
   def unpack(package_file, options={})
     ret_val = 0
-    metadata = Tpkg::metadata_from_package(package_file)
 
     # set env variable to let pre/post install know  whether this unpack 
     # is part of an install or upgrade
@@ -2483,24 +2488,20 @@ class Tpkg
     files_info = {} # store perms, uid, gid, etc. for files
     checksums_of_decrypted_files = {}
 
-    # Get list of conflicting files/directories & store their perm/ownership. That way, we can
-    # set them to the correct values later on in order to preserve them.
-    rel_root_dir = File.join('tpkg', 'root')
-    rel_reloc_dir = File.join('tpkg', 'reloc')
-    files = `#{extract_tpkg_tar_cmd} | #{@tar} #{@@taroptions} -tf -`
-    files = files.split("\n")
+    metadata = Tpkg::metadata_from_package(package_file, {:topleveldir => topleveldir})
+
+    # Get list of files/directories that already exist in the system. Store their perm/ownership. 
+    # That way, when we copy over the new files, we can set the new files to have the same perm/owernship.
     conflicting_files = {}
-    files.each do | file |
-      if file =~ /^#{rel_root_dir}/
-        possible_conflicting_file = File.join(@file_system_root, file[rel_root_dir.length ..-1])
-      elsif file =~ /^#{rel_reloc_dir}/
-        possible_conflicting_file = File.join(@base, file[rel_reloc_dir.length + 1..-1])
-      end
-      if possible_conflicting_file && (File.exists?(possible_conflicting_file) && !File.symlink?(possible_conflicting_file))
-         conflicting_files[File.join(workdir, file)] = File.stat(possible_conflicting_file)
+    fip = Tpkg::files_in_package(package_file)
+    (fip[:root] | fip[:reloc]).each do |file|
+      file_in_staging = normalize_path(file, File.join(workdir, 'tpkg', 'root'), File.join(workdir, 'tpkg', 'reloc'))
+      file_in_system = normalize_path(file)
+      if File.exists?(file_in_system) && !File.symlink?(file_in_system)
+        conflicting_files[file] = {:normalized => file_in_staging, :stat => File.stat(file_in_system)}
       end
     end
-    
+
     run_preinstall(package_file, workdir)
     
     run_externals_for_install(metadata, workdir, options[:externals_to_skip])
@@ -2568,12 +2569,14 @@ class Tpkg
     # Reset the permission/ownership of the conflicting files as how they were before.
     # This needs to be done after the default permission/ownership is applied, but before
     # the handling of ownership/permissions on specific files
-    conflicting_files.each do | file, stat |
-      File.chmod(stat.mode, file)
-      File.chown(stat.uid, stat.gid, file)
+    conflicting_files.each do | file, info |
+      stat = info[:stat]
+      file_path = info[:normalized]
+      File.chmod(stat.mode, file_path)
+      File.chown(stat.uid, stat.gid, file_path)
     end
     
-    # Handle any decryption and ownership/permissions on specific files
+    # Handle any decryption, ownership/permissions, and other issues for specific files
     metadata[:files][:files].each do |tpkgfile|
       tpkg_path = tpkgfile[:path]
       working_path = normalize_path(tpkg_path, File.join(workdir, 'tpkg', 'root'), File.join(workdir, 'tpkg', 'reloc'))
@@ -2639,6 +2642,12 @@ class Tpkg
           end
         end
       end
+
+      # If a conf file already exists on the file system, don't overwrite it. Rename
+      # the new one with .tpkgnew file extension.
+      if tpkgfile[:config] && conflicting_files[tpkgfile[:path]]
+        FileUtils.mv(conflicting_files[tpkgfile[:path]][:normalized], "#{conflicting_files[tpkgfile[:path]][:normalized]}.tpkgnew")
+      end
     end if metadata[:files] && metadata[:files][:files]
 
     # We should get the perms, gid, uid stuff here since all the files
@@ -3515,6 +3524,8 @@ class Tpkg
         else
           if prompt_for_conflicting_files(pkgfile)
             ret_val |= unpack(pkgfile, :passphrase => passphrase)
+            # create and install stubbed native package if needed
+            stub_native_pkg(pkg)
           end
         end
       end
@@ -3588,8 +3599,10 @@ class Tpkg
             if dep[:name] == req[:name]
               # Package metadata is almost usable as-is as a req, just need to
               # set :type
-              addreq = metadata.to_hash
+              # and remove filename (since we're not explicitly requesting the exact file)
+              addreq = metadata.to_hash.clone
               addreq[:type] = :tpkg
+              addreq[:filename] = nil
               additional_requirements << addreq
             end
           end if metadata[:dependencies]
@@ -3768,7 +3781,8 @@ class Tpkg
             ret_val |= unpack(pkgfile, :passphrase => passphrase, :externals_to_skip => externals_to_skip,
                                        :is_doing_upgrade => is_doing_upgrade)
           end
-
+          # create and install stubbed native package if needed
+          stub_native_pkg(pkg)
           has_updates = true
         end
       end
@@ -3946,13 +3960,36 @@ class Tpkg
           run_external(pkg[:metadata][:filename], :remove, external[:name], external[:data])
         end
       end if pkg[:metadata][:externals]
-      
+
+      # determine which configuration files have been modified
+      modified_conf_files = []
+      file_metadata = file_metadata_for_installed_packages([pkg[:metadata][:filename]]).values[0]
+      file_metadata[:files].each do |file|
+        if file[:config]
+          # get expected checksum. For files that were encrypted, we're interested in the
+          # checksum of the decrypted version 
+          chksum_expected = file[:checksum][:digests].first[:value]
+          file[:checksum][:digests].each do | digest |
+            if digest[:decrypted] == true
+              chksum_expected = digest[:value].to_s
+            end
+          end
+          fp = normalize_path(file[:path])
+          chksum_actual = Digest::SHA256.hexdigest(File.read(fp))
+          if chksum_actual != chksum_expected
+            modified_conf_files << fp
+          end
+        end
+      end if file_metadata
+
       # Remove files
       files_to_remove = conflicting_files(package_file, CHECK_REMOVE)
       # Reverse the order of the files, as directories will appear first
       # in the listing but we want to remove any files in them before
       # trying to remove the directory.
       files_to_remove.reverse.each do |file|
+        # don't remove conf files that have been modified
+        next if modified_conf_files.include?(file)
         begin
           if !File.directory?(file)
             File.delete(file)
@@ -4006,6 +4043,9 @@ class Tpkg
       package_metadata_dir = File.join(@metadata_directory, File.basename(package_file, File.extname(package_file)))
       FileUtils.rm_rf(package_metadata_dir)
 
+      # remove native dependency stub packages if needed
+      remove_native_stub_pkg(pkg)
+
       # Cleanup
       FileUtils.rm_rf(workdir)
     end
@@ -4079,12 +4119,7 @@ class Tpkg
           perms_expected = file[:perms].to_s
         end 
 
-        # normalize file path
-        if file[:relocatable] == true
-          fp = File.join(@base, fp)
-        else
-          fp = File.join(@file_system_root, fp)
-        end
+        fp  = normalize_path(fp)
   
         # can't handle symlink
         if File.symlink?(fp)
@@ -4463,6 +4498,102 @@ class Tpkg
       puts "Failed to send update to reporter server"
     end
   end
+ 
+  # create and install native stub package if needed 
+  # this stub package helps prevent user from removing native packages that 
+  # our tpkg packages depend on 
+  def stub_native_pkg(pkg)
+    # gather all of the native dependencies
+    native_deps = pkg[:metadata].get_native_deps
+
+    return if native_deps.nil? or native_deps.empty?
+    
+    if Tpkg::get_os =~ /RedHat|CentOS|Fedora/
+      rpm = create_rpm("stub_for_#{pkg[:metadata][:name]}", native_deps)
+      return if rpm.nil?
+  
+      # install the rpm
+      cmd = "rpm -i #{rpm}"
+      puts cmd if @@debug
+      system(cmd)
+      if !$?.success?
+        warn "Warning: Failed to install native stub package for #{pkg[:metadata][:name]}"
+      end
+    else
+      # TODO: support other OSes
+    end
+  end
+
+  # remove the native dependency stub packages if there's any
+  def remove_native_stub_pkg(pkg)
+    # Don't have to do anything if this package has no native dependencies
+    native_deps = pkg[:metadata].get_native_deps
+    return if native_deps.nil? or native_deps.empty?
+
+    # the convention is that stub package is named as "stub_for_pkgname"
+    stub_pkg_name = "stub_for_#{pkg[:metadata][:name]}"
+
+    if Tpkg::get_os =~ /RedHat|CentOS|Fedora/
+      cmd = "yum -y remove #{stub_pkg_name}"
+      puts cmd if @@debug
+      system(cmd)
+      if !$?.success?
+        warn "Warning: Failed to remove native stub package for #{pkg[:metadata][:name]}"
+      end
+    else
+      # TODO: support other OSes
+    end
+  end
 
+  def create_rpm(name, deps=[])
+    # setup directories for rpmbuild
+    topdir = Tpkg::tempdir('rpmbuild')
+    %w[BUILD RPMS SOURCES SPECS SRPMS].each do |dir|
+      FileUtils.mkdir_p(File.join(topdir, dir))
+    end
+
+    dep_list = deps.collect{|dep|dep[:name]}.join(",")
+
+    # create rpm spec file
+    spec = <<-EOS.gsub(/^\s+/, "")
+    Name: #{name}
+    Summary: stub pkg created by tpkg
+    Version: 1
+    Release: 1
+    buildarch: noarch
+    Requires: #{dep_list}
+    Group: Applications/System
+    License: MIT
+    BuildRoot: %{_builddir}/%{name}-buildroot
+    %description
+    stub pkg created by tpkg for the following dependencies: #{dep_list}
+    %files
+    EOS
+    spec_file = File.join(topdir, 'SPECS', 'pkg.spec')
+    File.open(spec_file, 'w') do |file|
+      file.puts(spec)
+    end
+
+    # run rpmbuild
+    system("rpmbuild -bb --define '_topdir #{topdir}' #{spec_file}")
+    if !$?.success?
+      warn "Warning: Failed to create native stub package for #{name}"
+      return nil
+    end
+
+    # copy result over to tmpfile
+    result = File.join(topdir, 'RPMS', 'noarch', "#{name}-1-1.noarch.rpm")
+    rpm = nil
+    if File.exists?(result)
+      tmpfile = Tempfile.new(File.basename(result))
+      FileUtils.cp(result, tmpfile.path)
+      rpm = tmpfile.path
+    end
+
+    # cleanup
+    FileUtils.rm_rf(topdir)
+
+    return rpm
+  end
 end
 

data/lib/tpkg/metadata.rb

@@ -221,8 +221,8 @@ end
 # is that you can give it a metadata file of any format, such as yaml or xml,
 # and it will provide you a uniform interface for accessing/dealing with the metadata.
 class Metadata
-  attr_accessor :source
-  REQUIRED_FIELDS = [:name, :version, :maintainer]
+  attr_accessor :source, :file_path
+  REQUIRED_FIELDS = [:name, :version, :maintainer, :description]
 
   # Cleans up a string to make it suitable for use in a filename
   def self.clean_for_filename(dirtystring)
@@ -248,8 +248,10 @@ class Metadata
     metadata = nil
     if File.exist?(File.join(dir, 'tpkg.yml'))
       metadata = Metadata.new(File.read(File.join(dir, 'tpkg.yml')), 'yml')
+      metadata.file_path = File.join(dir, 'tpkg.yml')
     elsif File.exists?(File.join(dir, 'tpkg.xml'))
       metadata = Metadata.new(File.read(File.join(dir, 'tpkg.xml')), 'xml')
+      metadata.file_path = File.join(dir, 'tpkg.xml')
     end
     return metadata
   end
@@ -330,6 +332,33 @@ class Metadata
     file.close
   end
 
+  # Add tpkg_version to the existing tpkg.xml or tpkg.yml file
+  def add_tpkg_version(version)
+    if @format == 'xml'
+      metadata_xml = REXML::Document.new(@metadata_text)
+      if metadata_xml.root.elements["tpkg_version"] && (tpkg_version = metadata_xml.root.elements["tpkg_version"].text) != Tpkg::VERSION
+        warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
+      elsif !metadata_xml.root.elements["tpkg_version"]
+        tpkg_version_ele = REXML::Element.new("tpkg_version")
+        tpkg_version_ele.text = Tpkg::VERSION
+        metadata_xml.root.add_element(tpkg_version_ele)  
+        File.open(@file_path, 'w') do |file|
+          metadata_xml.write(file)
+        end
+      end
+    elsif @format == 'yml'
+      if (tpkg_version = to_hash[:tpkg_version]) && tpkg_version != Tpkg::VERSION
+        warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
+      elsif !tpkg_version
+        File.open(@file_path, 'a') do |file|
+          file.puts "tpkg_version: #{Tpkg::VERSION}"
+        end 
+      end
+    else
+      raise "Unknown metadata format"
+    end
+  end
+
   def generate_package_filename
     name = to_hash[:name]
     version = to_hash[:version]
@@ -454,7 +483,7 @@ class Metadata
       end
     end
 
-    [:package_version, :description, :bugreporting].each do |optfield|
+    [:tpkg_version, :package_version, :description, :bugreporting].each do |optfield|
       if metadata_xml.elements["/tpkg/#{optfield.to_s}"]
         metadata_hash[optfield] =
           metadata_xml.elements["/tpkg/#{optfield.to_s}"].text
@@ -596,6 +625,7 @@ class Metadata
     metadata_xml.elements.each('/tpkg/files/file') do |filexml|
       file = {}
       file[:path] = filexml.elements['path'].text
+      file[:config] = true if filexml.elements['config']
       if filexml.elements['encrypt']
         encrypt = {}
         if filexml.elements['encrypt'].attribute('precrypt') &&
@@ -656,6 +686,13 @@ class Metadata
 
     return metadata_hash
   end
+
+  def get_native_deps
+    dependencies = to_hash[:dependencies]
+    return nil if dependencies.nil? or dependencies.empty?
+
+    return dependencies.select{|dep| dep[:type] == :native}
+  end
 end
 
 class FileMetadata < Metadata

data/schema/schema-1.0.8.yml

@@ -0,0 +1,93 @@
+type: map
+mapping: 
+  "schema_file": { type: text }
+  "tpkg_version": { type: text }
+  "name": { type: str, required: yes }
+  "version": { type: text, required: yes }
+  "package_version": { type: text }
+  "maintainer": { type: str, required: yes }
+  "operatingsystem": { type: seq, sequence: [ {type: str} ] }
+  "architecture": { type: seq, sequence: [ {type: str} ] }
+  "description": { type: str }
+  "bugreporting": { type: str }
+  "dependencies": 
+    type: seq
+    sequence: 
+      - type: map
+        mapping:
+          "name": { type: str, required: yes }
+          "minimum_version": { type: text }
+          "maximum_version": { type: text }
+          "minimum_package_version": { type: text }
+          "maximum_package_version": { type: text }
+          "allowed_versions": { type: text }
+          "native": { type: bool }
+          "type": { type: any, pattern: /(native|tpkg)$/ }
+  "conflicts":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "name": { type: str, required: yes }
+          "minimum_version": { type: text }
+          "maximum_version": { type: text }
+          "minimum_package_version": { type: text } 
+          "maximum_package_version": { type: text } 
+          "native": { type: bool }
+          "type": { type: any, pattern: /(native|tpkg)$/ }
+  "externals":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "name": { type: text, required: yes }
+          "data": { type: text }
+          "datascript": { type: text }
+          "datafile": { type: text }
+  "files":
+    type: map
+    mapping:
+      "file_defaults":
+        type: map
+        mapping:
+          "posix":
+            type: map
+            mapping:
+              "owner": { type: text }
+              "group": { type: text }
+              "perms": { type: text }
+      "dirs_defaults":
+        type: map
+        mapping:
+          "posix":
+            type: map
+            mapping:
+              "owner": { type: text }
+              "group": { type: text }
+              "perms": { type: text }
+      "files":
+        type: seq
+        sequence:
+          - type: map
+            mapping:
+              "config": { type: bool, default: false }
+              "path": { type: text, required: yes }
+              "encrypt": 
+                type: map
+                mapping:
+                  "algorithm": { type: text }
+                  "precrypt": { type: any, pattern: /^true$|^false$/ }
+              "init":
+                type: map
+                mapping:
+                  "start": { type: int }
+                  "levels": { type: seq, sequence: [ { type: int } ] }
+              "crontab":
+                type: map
+                mapping: { "user": { type: str } }
+              "posix":  
+                type: map
+                mapping: { "owner": { type: text },
+                           "group": { type: text },
+                           "perms": { type: text } }
+

data/schema/schema-1.0.9.yml

@@ -0,0 +1,93 @@
+type: map
+mapping: 
+  "schema_file": { type: text }
+  "tpkg_version": { type: text }
+  "name": { type: str, required: yes }
+  "version": { type: text, required: yes }
+  "package_version": { type: text }
+  "maintainer": { type: str, required: yes }
+  "operatingsystem": { type: seq, sequence: [ {type: str} ] }
+  "architecture": { type: seq, sequence: [ {type: str} ] }
+  "description": { type: str, required: yes }
+  "bugreporting": { type: str }
+  "dependencies": 
+    type: seq
+    sequence: 
+      - type: map
+        mapping:
+          "name": { type: str, required: yes }
+          "minimum_version": { type: text }
+          "maximum_version": { type: text }
+          "minimum_package_version": { type: text }
+          "maximum_package_version": { type: text }
+          "allowed_versions": { type: text }
+          "native": { type: bool }
+          "type": { type: any, pattern: /(native|tpkg)$/ }
+  "conflicts":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "name": { type: str, required: yes }
+          "minimum_version": { type: text }
+          "maximum_version": { type: text }
+          "minimum_package_version": { type: text } 
+          "maximum_package_version": { type: text } 
+          "native": { type: bool }
+          "type": { type: any, pattern: /(native|tpkg)$/ }
+  "externals":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "name": { type: text, required: yes }
+          "data": { type: text }
+          "datascript": { type: text }
+          "datafile": { type: text }
+  "files":
+    type: map
+    mapping:
+      "file_defaults":
+        type: map
+        mapping:
+          "posix":
+            type: map
+            mapping:
+              "owner": { type: text }
+              "group": { type: text }
+              "perms": { type: text }
+      "dirs_defaults":
+        type: map
+        mapping:
+          "posix":
+            type: map
+            mapping:
+              "owner": { type: text }
+              "group": { type: text }
+              "perms": { type: text }
+      "files":
+        type: seq
+        sequence:
+          - type: map
+            mapping:
+              "config": { type: bool, default: false }
+              "path": { type: text, required: yes }
+              "encrypt": 
+                type: map
+                mapping:
+                  "algorithm": { type: text }
+                  "precrypt": { type: any, pattern: /^true$|^false$/ }
+              "init":
+                type: map
+                mapping:
+                  "start": { type: int }
+                  "levels": { type: seq, sequence: [ { type: int } ] }
+              "crontab":
+                type: map
+                mapping: { "user": { type: str } }
+              "posix":  
+                type: map
+                mapping: { "owner": { type: text },
+                           "group": { type: text },
+                           "perms": { type: text } }
+

data/schema/schema.yml

@@ -1,13 +1,14 @@
 type: map
 mapping: 
   "schema_file": { type: text }
+  "tpkg_version": { type: text }
   "name": { type: str, required: yes }
   "version": { type: text, required: yes }
   "package_version": { type: text }
   "maintainer": { type: str, required: yes }
   "operatingsystem": { type: seq, sequence: [ {type: str} ] }
   "architecture": { type: seq, sequence: [ {type: str} ] }
-  "description": { type: str }
+  "description": { type: str, required: yes }
   "bugreporting": { type: str }
   "dependencies": 
     type: seq
@@ -69,6 +70,7 @@ mapping:
         sequence:
           - type: map
             mapping:
+              "config": { type: bool, default: false }
               "path": { type: text, required: yes }
               "encrypt": 
                 type: map

data/schema/tpkg-1.0.8.dtd

@@ -0,0 +1,45 @@
+<!ELEMENT tpkg (name, version, package_version?, maintainer+, operatingsystem*, architecture*, description?, bugreporting?, dependencies?, externals?, files?, tpkg_version?)>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT package_version (#PCDATA)>
+<!ELEMENT maintainer (#PCDATA)>
+<!ELEMENT operatingsystem (#PCDATA)>
+<!ELEMENT architecture (#PCDATA)>
+<!ELEMENT description (#PCDATA)>
+<!ELEMENT bugreporting (#PCDATA)>
+
+<!ELEMENT dependencies (dependency*)>
+<!ELEMENT dependency (name, minimum_version?, maximum_version?, minimum_package_version?, maximum_package_version?, allowed_versions?, native?)>
+<!ELEMENT minimum_version (#PCDATA)>
+<!ELEMENT maximum_version (#PCDATA)>
+<!ELEMENT minimum_package_version (#PCDATA)>
+<!ELEMENT maximum_package_version (#PCDATA)>
+<!ELEMENT allowed_versions (#PCDATA)>
+<!ELEMENT native EMPTY>
+
+<!ELEMENT externals (external*)>
+<!ELEMENT external (name, (data|datafile|datascript))>
+<!ELEMENT data (#PCDATA)>
+<!ELEMENT datafile (#PCDATA)>
+<!ELEMENT datascript (#PCDATA)>
+
+<!ELEMENT files (file_defaults?, file*)>
+<!ELEMENT file_defaults (posix?)>
+<!ELEMENT posix (owner?, group?, perms?)>
+<!ELEMENT owner (#PCDATA)>
+<!ELEMENT group (#PCDATA)>
+<!ELEMENT perms (#PCDATA)>
+<!ELEMENT file (path, config?, encrypt?, init?, crontab?, posix?)>
+<!ELEMENT path (#PCDATA)>
+<!ELEMENT config EMPTY>
+<!ELEMENT encrypt EMPTY>
+<!ATTLIST encrypt precrypt (true|false) #IMPLIED>
+<!ATTLIST encrypt algorithm CDATA #IMPLIED>
+<!ELEMENT init (start?, levels?)>
+<!ELEMENT start (#PCDATA)>
+<!ELEMENT levels (#PCDATA)>
+<!ELEMENT crontab (user?)>
+<!ELEMENT user (#PCDATA)>
+
+<!ELEMENT tpkg_version (#PCDATA)>

data/schema/tpkg-1.0.9.dtd

@@ -0,0 +1,45 @@
+<!ELEMENT tpkg (name, version, package_version?, maintainer+, operatingsystem*, architecture*, description, bugreporting?, dependencies?, externals?, files?, tpkg_version?)>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT package_version (#PCDATA)>
+<!ELEMENT maintainer (#PCDATA)>
+<!ELEMENT operatingsystem (#PCDATA)>
+<!ELEMENT architecture (#PCDATA)>
+<!ELEMENT description (#PCDATA)>
+<!ELEMENT bugreporting (#PCDATA)>
+
+<!ELEMENT dependencies (dependency*)>
+<!ELEMENT dependency (name, minimum_version?, maximum_version?, minimum_package_version?, maximum_package_version?, allowed_versions?, native?)>
+<!ELEMENT minimum_version (#PCDATA)>
+<!ELEMENT maximum_version (#PCDATA)>
+<!ELEMENT minimum_package_version (#PCDATA)>
+<!ELEMENT maximum_package_version (#PCDATA)>
+<!ELEMENT allowed_versions (#PCDATA)>
+<!ELEMENT native EMPTY>
+
+<!ELEMENT externals (external*)>
+<!ELEMENT external (name, (data|datafile|datascript))>
+<!ELEMENT data (#PCDATA)>
+<!ELEMENT datafile (#PCDATA)>
+<!ELEMENT datascript (#PCDATA)>
+
+<!ELEMENT files (file_defaults?, file*)>
+<!ELEMENT file_defaults (posix?)>
+<!ELEMENT posix (owner?, group?, perms?)>
+<!ELEMENT owner (#PCDATA)>
+<!ELEMENT group (#PCDATA)>
+<!ELEMENT perms (#PCDATA)>
+<!ELEMENT file (path, config?, encrypt?, init?, crontab?, posix?)>
+<!ELEMENT path (#PCDATA)>
+<!ELEMENT config EMPTY>
+<!ELEMENT encrypt EMPTY>
+<!ATTLIST encrypt precrypt (true|false) #IMPLIED>
+<!ATTLIST encrypt algorithm CDATA #IMPLIED>
+<!ELEMENT init (start?, levels?)>
+<!ELEMENT start (#PCDATA)>
+<!ELEMENT levels (#PCDATA)>
+<!ELEMENT crontab (user?)>
+<!ELEMENT user (#PCDATA)>
+
+<!ELEMENT tpkg_version (#PCDATA)>

data/schema/tpkg.dtd

@@ -1,4 +1,4 @@
-<!ELEMENT tpkg (name, version, package_version?, maintainer+, operatingsystem*, architecture*, description?, bugreporting?, dependencies?, externals?, files?)>
+<!ELEMENT tpkg (name, version, package_version?, maintainer+, operatingsystem*, architecture*, description, bugreporting?, dependencies?, externals?, files?, tpkg_version?)>
 
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT version (#PCDATA)>
@@ -30,8 +30,9 @@
 <!ELEMENT owner (#PCDATA)>
 <!ELEMENT group (#PCDATA)>
 <!ELEMENT perms (#PCDATA)>
-<!ELEMENT file (path, encrypt?, init?, crontab?, posix?)>
+<!ELEMENT file (path, config?, encrypt?, init?, crontab?, posix?)>
 <!ELEMENT path (#PCDATA)>
+<!ELEMENT config EMPTY>
 <!ELEMENT encrypt EMPTY>
 <!ATTLIST encrypt precrypt (true|false) #IMPLIED>
 <!ATTLIST encrypt algorithm CDATA #IMPLIED>
@@ -41,3 +42,4 @@
 <!ELEMENT crontab (user?)>
 <!ELEMENT user (#PCDATA)>
 
+<!ELEMENT tpkg_version (#PCDATA)>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.25.1
+  version: 1.27.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +00:00
+date: 2010-07-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,9 +61,11 @@ files:
 - lib/tpkg/metadata.rb
 - lib/tpkg.rb
 - schema/tpkg-1.0.4.dtd
+- schema/schema-1.0.9.yml
 - schema/tpkg-1.0.0.dtd
 - schema/tpkg-1.0.5.dtd
 - schema/schema-1.0.7.yml
+- schema/tpkg-1.0.9.dtd
 - schema/tpkg.dtd
 - schema/tpkg-1.0.1.dtd
 - schema/tpkg-1.0.7.dtd
@@ -72,6 +74,8 @@ files:
 - schema/tpkg-1.0.2.dtd
 - schema/schema-1.0.6.yml
 - schema/schema-1.0.yml
+- schema/tpkg-1.0.8.dtd
+- schema/schema-1.0.8.yml
 - schema/tpkg-1.0.6.dtd
 - schema/schema-1.0.5.yml
 - bin/tpkg