tpkg 1.27.3 → 1.27.4

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

data/bin/gem2tpkg

@@ -12,7 +12,7 @@ require 'facter'
 
 # We don't want to just use the first gem command in the user's PATH by
 # 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-ypc/bin/gem"
+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.

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '1.27.3'
+  VERSION = '1.27.4'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -469,7 +469,7 @@ class Tpkg
       end
 
       # check if it's from root dir or reloc dir
-      if f =~ /^#{root_dir}/
+      if f =~ /^#{Regexp.escape(root_dir)}/
         short_fn = f[root_dir.length ..-1]
       else
         short_fn = f[reloc_dir.length + 1..-1]
@@ -2661,7 +2661,7 @@ class Tpkg
       next if File.symlink?(f)
 
       # check if it's from root dir or reloc dir
-      if f =~ /^#{root_dir}/
+      if f =~ /^#{Regexp.escape(root_dir)}/
         short_fn = f[root_dir.length ..-1]
       else
         short_fn = f[reloc_dir.length + 1..-1]
@@ -3120,19 +3120,8 @@ class Tpkg
     requests.each do |request|
       puts "parse_requests processing #{request.inspect}" if @@debug
 
-      if request =~ /^[-\w=<>\d\.]+$/ && !File.file?(request)  # basic package specs ('foo' or 'foo=1.0')
-        puts "parse_requests request looks like package spec" if @@debug
-
-        # Tpkg::parse_request is a class method and doesn't know where packages are installed. 
-        # So we have to tell it ourselves.
-        req = Tpkg::parse_request(request, @installed_directory)
-        newreqs << req
-
-        puts "Initializing the list of possible packages for this req" if @@debug
-        if !packages[req[:name]]
-          packages[req[:name]] = available_packages_that_meet_requirement(req)
-        end
-      else  # User specified a file or URI
+      # User specified a file or URI
+      if request =~ /^http[s]?:\/\// or File.file?(request)
         req = {}
         metadata = nil
         source = nil
@@ -3168,6 +3157,18 @@ class Tpkg
         # The user specified a particular package, so it is the only package
         # that can be used to meet the requirement
         packages[req[:name]] = [pkg]
+      else # basic package specs ('foo' or 'foo=1.0')
+        puts "parse_requests request looks like package spec" if @@debug
+
+        # Tpkg::parse_request is a class method and doesn't know where packages are installed. 
+        # So we have to tell it ourselves.
+        req = Tpkg::parse_request(request, @installed_directory)
+        newreqs << req
+
+        puts "Initializing the list of possible packages for this req" if @@debug
+        if !packages[req[:name]]
+          packages[req[:name]] = available_packages_that_meet_requirement(req)
+        end
       end
     end
 
@@ -3781,9 +3782,9 @@ class Tpkg
             is_doing_upgrade = true if removed_pkgs.include?(pkg[:metadata][:name])
             ret_val |= unpack(pkgfile, :passphrase => passphrase, :externals_to_skip => externals_to_skip,
                                        :is_doing_upgrade => is_doing_upgrade)
+            # create and install stubbed native package if needed
+            stub_native_pkg(pkg)
           end
-          # create and install stubbed native package if needed
-          stub_native_pkg(pkg)
           has_updates = true
         end
       end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.27.3
+  hash: 115
+  prerelease: false
+  segments: 
+  - 1
+  - 27
+  - 4
+  version: 1.27.4
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,39 +16,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +00:00
+date: 2010-08-19 00:00:00 -07: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: 
@@ -55,34 +73,34 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/tpkg/versiontype.rb
+- bin/cpan2tpkg
+- bin/gem2tpkg
+- bin/tpkg
+- bin/tpkg_xml_to_yml
 - lib/tpkg/deployer.rb
-- lib/tpkg/thread_pool.rb
 - lib/tpkg/metadata.rb
+- lib/tpkg/thread_pool.rb
+- lib/tpkg/versiontype.rb
 - lib/tpkg.rb
-- schema/tpkg-1.0.4.dtd
+- Rakefile
+- schema/schema-1.0.5.yml
+- schema/schema-1.0.6.yml
+- schema/schema-1.0.7.yml
+- schema/schema-1.0.8.yml
 - schema/schema-1.0.9.yml
+- schema/schema-1.0.yml
+- schema/schema.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
-- schema/tpkg-1.0.3.dtd
-- schema/schema.yml
 - 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.3.dtd
+- schema/tpkg-1.0.4.dtd
+- schema/tpkg-1.0.5.dtd
 - schema/tpkg-1.0.6.dtd
-- schema/schema-1.0.5.yml
-- bin/tpkg
-- bin/cpan2tpkg
-- bin/gem2tpkg
-- bin/tpkg_xml_to_yml
-- Rakefile
+- schema/tpkg-1.0.7.dtd
+- schema/tpkg-1.0.8.dtd
+- schema/tpkg-1.0.9.dtd
+- schema/tpkg.dtd
 has_rdoc: true
 homepage: http://tpkg.sourceforge.net
 licenses: []
@@ -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