tpkg 2.2.1 → 2.2.2

data/Rakefile

@@ -4,8 +4,8 @@ spec = Gem::Specification.new do |s|
   s.summary	= 'tpkg Application Packaging & Deployment'
   s.add_dependency('facter')
   s.add_dependency('net-ssh')
-  s.add_dependency('ddao-kwalify')
-  s.version = '2.2.1'
+  s.add_dependency('kwalify')
+  s.version = '2.2.2'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/cpan2tpkg

@@ -1,4 +1,9 @@
 #!/opt/tpkg/bin/perl
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
 
 use warnings;
 use strict;

data/bin/gem2tpkg

@@ -1,4 +1,9 @@
 #!/usr/bin/ruby -w
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
 
 # Ensure we can find tpkg.rb
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")

data/bin/tpkg

@@ -1,6 +1,8 @@
 #!/usr/bin/ruby -w
 ##############################################################################
-# tpkg package management and deployment tool
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
 ##############################################################################
 
 # Ensure we can find tpkg.rb
@@ -455,9 +457,9 @@ case @action
 when :make
   @other_options[:force] = @force
   @other_options[:compress] = @compress
-  pkgfile = Tpkg::make_package(@action_value, passphrase_callback, @other_options)
-  if pkgfile
-    puts "Package is #{pkgfile}"
+  madepkg = Tpkg::make_package(@action_value, passphrase_callback, @other_options)
+  if madepkg
+    puts "Package is #{madepkg}"
   else
     puts "Package build aborted or failed"
   end
@@ -506,12 +508,12 @@ when :execute_init
   ret_val = tpkg.execute_init(@init_options)
 when :query_installed
   tpkg = instantiate_tpkg(@tpkg_options)
-  req = nil
+  queryreq = nil
   matches = []
   if @action_value
     @action_value.each do | value |
-      req = Tpkg::parse_request(value, tpkg.installed_directory)
-      match = tpkg.installed_packages_that_meet_requirement(req)
+      queryreq = Tpkg::parse_request(value, tpkg.installed_directory)
+      match = tpkg.installed_packages_that_meet_requirement(queryreq)
 
       # If the user requested specific packages and we found no matches
       # then exit with a non-zero value to indicate failure.  This allows
@@ -521,7 +523,7 @@ when :query_installed
       matches |= match
     end
   else
-    matches = tpkg.installed_packages_that_meet_requirement(req)
+    matches = tpkg.installed_packages_that_meet_requirement(queryreq)
   end
 
   if !@quiet
@@ -571,23 +573,23 @@ when :query_list_files
   tpkg = instantiate_tpkg(@tpkg_options)
   pkgfiles = nil
   if File.exist?(@action_value)
-    fip = Tpkg::files_in_package(@action_value)
-    tpkg.normalize_paths(fip)
+    fipfile = Tpkg::files_in_package(@action_value)
+    tpkg.normalize_paths(fipfile)
     puts "#{@action_value}:"
-    fip[:normalized].each { |file| puts file }
+    fipfile[:normalized].each { |file| puts file }
   else
     pkgfiles = []
     metadatas = []
     requirements = []
     packages = {}
 
-    req = Tpkg::parse_request(@action_value)
-    pkgs = tpkg.installed_packages_that_meet_requirement(req)
-    if pkgs.nil? or pkgs.empty?
+    queryreq = Tpkg::parse_request(@action_value)
+    instpkgs = tpkg.installed_packages_that_meet_requirement(queryreq)
+    if instpkgs.nil? or instpkgs.empty?
       ret_val = 1
       puts "Could not find any installed packages that meet the request \"#{@action_value}\""
     end
-    pkgs.each do | pkg |
+    instpkgs.each do | pkg |
       pkgfiles << pkg[:metadata][:filename] 
     end
 
@@ -608,11 +610,11 @@ when :query_who_owns_file
   end
 when :query_available
   tpkg = instantiate_tpkg(@tpkg_options)
-  req = nil
+  queryreq = nil
   if @action_value
-    req = Tpkg::parse_request(@action_value)
+    queryreq = Tpkg::parse_request(@action_value)
   end
-  tpkg.available_packages_that_meet_requirement(req).each do |pkg|
+  tpkg.available_packages_that_meet_requirement(queryreq).each do |pkg|
     next if pkg[:source] == :native_installed
     next if pkg[:source] == :native_available
     puts "#{pkg[:metadata][:filename]} (#{pkg[:source]})"
@@ -649,9 +651,9 @@ when :query_requires
   end
 when :query_local_depends
   tpkg = instantiate_tpkg(@tpkg_options)
-  req = Tpkg::parse_request(@action_value)
-  pkgs = tpkg.installed_packages_that_meet_requirement(req)
-  pkgs.each do | pkg |
+  queryreq = Tpkg::parse_request(@action_value)
+  instpkgs = tpkg.installed_packages_that_meet_requirement(queryreq)
+  instpkgs.each do | pkg |
     puts pkg[:metadata][:filename] + ':'
     if pkg[:metadata][:dependencies]
       pkg[:metadata][:dependencies].each do |req|

data/bin/tpkg_xml_to_yml

@@ -1,4 +1,9 @@
 #!/usr/bin/ruby -w
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
 
 # Ensure we can find tpkg.rb
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")

data/lib/tpkg.rb

@@ -1,62 +1,46 @@
 ##############################################################################
-# tpkg package management system library
-# Copyright 2009, 2010 AT&T Interactive
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
 # License: MIT (http://www.opensource.org/licenses/mit-license.php)
 ##############################################################################
 
 STDOUT.sync = STDERR.sync = true # All outputs/prompts to the kernel ASAP
 
-# When we build the tpkg packages we put this file in
-# /usr/lib/ruby/site_ruby/1.8/ or similar and then the rest of the ruby
-# files (versiontype.rb, deployer.rb, etc) into
-# /usr/lib/ruby/site_ruby/1.8/tpkg/
-# We need to tell Ruby to search that tpkg subdirectory.
-# The alternative is to specify the subdirectory in the require
-# (require 'tpkg/versiontype' for example), but tpkg is also the name
-# of the executable script so we can't create a subdirectory here named
-# tpkg.  If we put the subdir in the require lines then users couldn't
-# run tpkg directly from an svn working copy.
-tpkglibdir = File.join(File.dirname(__FILE__), 'tpkg')
-if File.directory?(tpkglibdir)
-  $:.unshift(tpkglibdir)
-end
-
-# We store this gem in our thirdparty directory. So we need to add it
-# it to the search path
-#  This one is for when everything is installed
-$:.unshift(File.join(File.dirname(__FILE__), 'thirdparty/kwalify-0.7.1/lib'))
-#  And this one for when we're in the svn directory structure
-$:.unshift(File.join(File.dirname(File.dirname(__FILE__)), 'thirdparty/kwalify-0.7.1/lib'))
-
-begin
-  # Try loading facter w/o gems first so that we don't introduce a
-  # dependency on gems if it is not needed.
-  require 'facter'         # Facter
-rescue LoadError
-  require 'rubygems'
-  require 'facter'
+# Exclude standard libraries and gems from the warnings induced by
+# running ruby with the -w flag.  Several of these have warnings under
+# ruby 1.9 and there's nothing we can do to fix that.
+require 'tpkg/silently'
+Silently.silently do
+  begin
+    # Try loading facter w/o gems first so that we don't introduce a
+    # dependency on gems if it is not needed.
+    require 'facter'       # Facter
+  rescue LoadError
+    require 'rubygems'
+    require 'facter'
+  end
+  require 'digest/sha2'    # Digest::SHA256#hexdigest, etc.
+  require 'uri'            # URI
+  require 'net/http'       # Net::HTTP
+  require 'net/https'      # Net::HTTP#use_ssl, etc.
+  require 'time'           # Time#httpdate
+  require 'rexml/document' # REXML::Document
+  require 'fileutils'      # FileUtils.cp, rm, etc.
+  require 'tempfile'       # Tempfile
+  require 'find'           # Find
+  require 'etc'            # Etc.getpwnam, getgrnam
+  require 'openssl'        # OpenSSL
+  require 'open3'          # Open3
+  require 'set'            # Enumerable#to_set
+  require 'yaml'           # YAML
 end
-require 'digest/sha2'    # Digest::SHA256#hexdigest, etc.
-require 'uri'            # URI
-require 'net/http'       # Net::HTTP
-require 'net/https'      # Net::HTTP#use_ssl, etc.
-require 'time'           # Time#httpdate
-require 'rexml/document' # REXML::Document
-require 'fileutils'      # FileUtils.cp, rm, etc.
-require 'tempfile'       # Tempfile
-require 'find'           # Find
-require 'etc'            # Etc.getpwnam, getgrnam
-require 'openssl'        # OpenSSL
-require 'open3'          # Open3
-require 'versiontype'    # Version
-require 'deployer'
-require 'set'
-require 'metadata'
-require 'kwalify'        # for validating yaml
+require 'tpkg/versiontype' # Version
+require 'tpkg/deployer'
+require 'tpkg/metadata'
 
 class Tpkg
   
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2
@@ -66,6 +50,9 @@ class Tpkg
   CONNECTION_TIMEOUT = 10
 
   DEFAULT_OWNERSHIP_UID = 0
+  DEFAULT_OWNERSHIP_GID = 0
+  DEFAULT_FILE_PERMS = nil
+  DEFAULT_DIR_PERMS = 0755
 
   attr_reader :installed_directory
  
@@ -629,9 +616,9 @@ class Tpkg
     metadata = metadata_from_directory(directory)
     # And write that out to metadata.yml
     metadata_tmpfile = Tempfile.new('metadata.yml', dest)
-    metadata.each do | metadata |
-      YAML::dump(metadata.to_hash.recursively{|h| h.stringify_keys }, metadata_tmpfile)  
-      #YAML::dump(metadata.to_hash, metadata_tmpfile)  
+    metadata.each do | m |
+      YAML::dump(m.to_hash.recursively{|h| h.stringify_keys }, metadata_tmpfile)
+      #YAML::dump(m.to_hash, metadata_tmpfile)  
     end
     metadata_tmpfile.close
     File.chmod(0644, metadata_tmpfile.path)
@@ -1106,7 +1093,7 @@ class Tpkg
       perms = stat.mode
       # This is what we set the ownership to by default
       uid = DEFAULT_OWNERSHIP_UID
-      gid = DEFAULT_OWNERSHIP_UID
+      gid = DEFAULT_OWNERSHIP_GID
     end
 
     # get default permission and ownership
@@ -2545,8 +2532,8 @@ class Tpkg
     
     # Handle any default permissions and ownership
     default_uid = DEFAULT_OWNERSHIP_UID
-    default_gid = DEFAULT_OWNERSHIP_UID
-    default_perms = nil
+    default_gid = DEFAULT_OWNERSHIP_GID
+    default_perms = DEFAULT_FILE_PERMS
 
     if (metadata[:files][:file_defaults][:posix][:owner] rescue nil)
       default_uid = Tpkg::lookup_uid(metadata[:files][:file_defaults][:posix][:owner])
@@ -2561,7 +2548,7 @@ class Tpkg
     # Set default dir uid/gid to be same as for file.
     default_dir_uid = default_uid
     default_dir_gid = default_gid
-    default_dir_perms = 0755
+    default_dir_perms = DEFAULT_DIR_PERMS
 
     if (metadata[:files][:dir_defaults][:posix][:owner] rescue nil)
       default_dir_uid = Tpkg::lookup_uid(metadata[:files][:dir_defaults][:posix][:owner])
@@ -2572,15 +2559,16 @@ class Tpkg
     if (metadata[:files][:dir_defaults][:posix][:perms] rescue nil)
       default_dir_perms = metadata[:files][:dir_defaults][:posix][:perms]
     end
-
+    
+    # FIXME: attempt lchown/lchmod on symlinks
     root_dir = File.join(workdir, 'tpkg', 'root')
     reloc_dir = File.join(workdir, 'tpkg', 'reloc')
     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)
-        else
+        if File.file?(f) && !File.symlink?(f)
           File.chown(default_uid, default_gid, f)
+        elsif File.directory?(f) && !File.symlink?(f)
+          File.chown(default_dir_uid, default_dir_gid, f)
         end
       rescue Errno::EPERM
         raise if Process.euid == 0
@@ -2628,14 +2616,22 @@ class Tpkg
             gid = Tpkg::lookup_gid(tpkgfile[:posix][:group])
           end
           begin
-            File.chown(uid, gid, working_path)
+            if !File.symlink?(working_path)
+              File.chown(uid, gid, working_path)
+            else
+              # FIXME: attempt lchown
+            end
           rescue Errno::EPERM
             raise if Process.euid == 0
           end
         end
         if tpkgfile[:posix][:perms]
           perms = tpkgfile[:posix][:perms]
-          File.chmod(perms, working_path)
+          if !File.symlink?(working_path)
+            File.chmod(perms, working_path)
+          else
+            # FIXME: attempt lchmod
+          end
         end
       end
       

data/lib/tpkg/deployer.rb

@@ -1,21 +1,30 @@
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
+
 # We store these gems in our thirdparty directory. So we need to add it
 # it to the search path
-#  This one is for when everything is installed
-$:.unshift(File.join(File.dirname(__FILE__), 'thirdparty/net-ssh-2.0.11/lib'))
-#  And this one for when we're in the svn directory structure
-$:.unshift(File.join(File.dirname(File.dirname(__FILE__)), 'thirdparty/net-ssh-2.0.11/lib'))
+$:.unshift(File.join(File.dirname(__FILE__), 'thirdparty/net-ssh-2.1.0/lib'))
 
 $debug = true
 
-require 'thread_pool'
-begin
-  # Try loading net-ssh w/o gems first so that we don't introduce a
-  # dependency on gems if it is not needed.
-  require 'net/ssh'
-rescue LoadError
-  require 'rubygems'
-  require 'net/ssh'
+# Exclude standard libraries and gems from the warnings induced by
+# running ruby with the -w flag.  If any of these had warnings there's
+# nothing we could do to fix that.
+require 'tpkg/silently'
+Silently.silently do
+  begin
+    # Try loading net-ssh w/o gems first so that we don't introduce a
+    # dependency on gems if it is not needed.
+    require 'net/ssh'
+  rescue LoadError
+    require 'rubygems'
+    require 'net/ssh'
+  end
 end
+require 'tpkg/thread_pool'
 
 class Deployer
   
@@ -97,11 +106,11 @@ class Deployer
             # back and forth if needed. it WILL NOT WORK without this, and it has to
             # be done before any call to exec.
             
-            channel.request_pty do |ch, success|
+            channel.request_pty do |ch_pty, success|
               raise "Could not obtain pty (i.e. an interactive ssh session)" if !success
             end
             
-            channel.exec(cmd) do |ch, success|
+            channel.exec(cmd) do |ch_exec, success|
               puts "Executing #{cmd} on #{server}"
               # 'success' isn't related to bash exit codes or anything, but more
               # about ssh internals (i think... not bash related anyways).
@@ -113,7 +122,7 @@ class Deployer
               # in (see below) returns data. This is what we've been doing all this
               # for; now we can check to see if it's a password prompt, and
               # interactively return data if so (see request_pty above).
-              channel.on_data do |ch, data|
+              channel.on_data do |ch_data, data|
                 if data =~ /Password:/
                   password = get_sudo_pw unless !password.nil? && password != ""
                   channel.send_data "#{password}\n"
@@ -126,11 +135,11 @@ class Deployer
                 end
               end
               
-              channel.on_extended_data do |ch, type, data|
+              channel.on_extended_data do |ch_onextdata, type, data|
                 print "SSH command returned on stderr: #{data}"
               end
               
-              channel.on_request "exit-status" do |ch, data|
+              channel.on_request "exit-status" do |ch_onreq, data|
                 exit_status = data.read_long
               end
             end

data/lib/tpkg/metadata.rb

@@ -1,13 +1,22 @@
-require 'yaml'
-require 'rexml/document'
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
 
 # We store this gem in our thirdparty directory. So we need to add it
 # it to the search path
-#  This one is for when everything is installed
-$:.unshift(File.join(File.dirname(__FILE__), 'thirdparty/kwalify-0.7.1/lib'))
-#  And this one for when we're in the svn directory structure
-$:.unshift(File.join(File.dirname(File.dirname(__FILE__)), 'thirdparty/kwalify-0.7.1/lib'))
-require 'kwalify' # for validating yaml
+$:.unshift(File.join(File.dirname(__FILE__), 'thirdparty/kwalify-0.7.2/lib'))
+
+# Exclude standard libraries and gems from the warnings induced by
+# running ruby with the -w flag.  Several of these have warnings and
+# there's nothing we can do to fix that.
+require 'tpkg/silently'
+Silently.silently do
+  require 'yaml'           # YAML
+  require 'rexml/document' # REXML::Document
+  require 'kwalify'        # Kwalify, for validating yaml
+end
 
 # This class is taken from the ActiveSupport gem. 
 # With yaml, keys are stored as string. But when we convert xml to hash, we store the key as
@@ -229,6 +238,8 @@ class Metadata
     dirtystring.downcase.gsub(/[^\w]/, '')
   end
 
+  # Parse a file containing multiple package metadata documents (such as is
+  # generated by Tpkg.extract_metadata) into a hash of Metadata objects
   def self.get_pkgs_metadata_from_yml_doc(yml_doc, metadata=nil, source=nil)
     metadata ||= {} 
     metadata_lists = yml_doc.split("---")
@@ -242,7 +253,7 @@ class Metadata
     return metadata
   end
 
-  # Given the directory from which the metadata is saved, returns a Metadata
+  # Given the directory of an unpacked package, returns a Metadata
   # object. The metadata file can be in yml or xml format
   def self.instantiate_from_dir(dir)
     metadata = nil
@@ -258,6 +269,10 @@ class Metadata
 
   # metadata_text = text representation of the metadata
   # format = yml, xml, json, etc.
+  # source = Source, in the tpkg sense, of the package described by this
+  # metadata.  I.e. the filename of an individual package or a directory or
+  # URL containing multiple packages and a metadata.yml file.  Used by tpkg to
+  # report on how many packages are available from various sources.
   def initialize(metadata_text, format, source=nil)
     @hash = nil
     @metadata_text = metadata_text

data/lib/tpkg/silently.rb

@@ -0,0 +1,11 @@
+# http://www.caliban.org/ruby/rubyguide.shtml#warnings
+class Silently
+  def self.silently(&block)
+    warn_level = $VERBOSE
+    $VERBOSE = nil
+    result = block.call
+    $VERBOSE = warn_level
+    result
+  end
+end
+

data/lib/tpkg/thread_pool.rb

@@ -1,8 +1,20 @@
-require 'thread'
-begin
-  require 'fastthread'
-rescue LoadError
-#  $stderr.puts "Using the ruby-core thread implementation"
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
+
+# Exclude standard libraries and gems from the warnings induced by
+# running ruby with the -w flag.  If any of these had warnings there's
+# nothing we could do to fix that.
+require 'tpkg/silently'
+Silently.silently do
+  require 'thread'
+  begin
+    require 'fastthread'
+  rescue LoadError
+  #  $stderr.puts "Using the ruby-core thread implementation"
+  end
 end
 
 class ThreadPool

data/lib/tpkg/versiontype.rb

@@ -1,3 +1,9 @@
+##############################################################################
+# tpkg package management system
+# Copyright 2009, 2010, 2011 AT&T Interactive
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+##############################################################################
+
 # This class stores numbers with multiple decimal points, a format
 # commonly used for version numbers.  For example '2.5.1'.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Darren Dao
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ddao-kwalify
+  name: kwalify
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -79,6 +79,7 @@ files:
 - bin/tpkg_xml_to_yml
 - lib/tpkg/deployer.rb
 - lib/tpkg/metadata.rb
+- lib/tpkg/silently.rb
 - lib/tpkg/thread_pool.rb
 - lib/tpkg/versiontype.rb
 - lib/tpkg.rb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tpkg
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: tpkg Application Packaging & Deployment