tpkg 2.3.2 → 2.3.3

data/Rakefile

@@ -2,10 +2,10 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name = 'tpkg'
   s.summary = 'tpkg Application Packaging & Deployment'
-  s.version = '2.3.2'
+  s.version = '2.3.3'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
-  s.homepage = 'http://tpkg.sourceforge.net'
+  s.homepage = 'http://tpkg.github.com/'
   s.rubyforge_project = 'tpkg'
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.8'

data/bin/tpkg

@@ -64,7 +64,7 @@ def parse_config_files
   end
   
   # FIXME: Move config file parsing to tpkg.rb
-  # http://sourceforge.net/apps/trac/tpkg/ticket/28
+  # https://github.com/tpkg/client/issues/22
   fsroot = @tpkg_options[:file_system_root] ? @tpkg_options[:file_system_root] : ''
   settings = {:sources => []}
   [File.join(fsroot, Tpkg::DEFAULT_CONFIGDIR, 'tpkg.conf'),
@@ -514,8 +514,8 @@ end
 case
 when !@sudo.nil?
   @tpkg_options[:sudo] = @sudo
-when @tpkg_options.has_key?(:sudo)
-  @sudo = @tpkg_options[:sudo]
+when settings.has_key?(:sudo)
+  @sudo = @tpkg_options[:sudo] = settings[:sudo]
 else
   @sudo = @tpkg_options[:sudo] = Tpkg.sudo_default?
 end

data/lib/tpkg.rb

@@ -42,7 +42,7 @@ OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cip
 
 class Tpkg
   
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2
@@ -3692,9 +3692,14 @@ class Tpkg
             name = pkg[:metadata][:name]
             version = pkg[:metadata][:version]
             package_version = pkg[:metadata][:package_version]
-            pkgname = "#{name}-#{version}"
+            pkgname = "#{name}"
+           if Tpkg::get_os =~ /Debian|Ubuntu/
+               pkgname << "=#{version}"
+           else
+               pkgname <<"-#{version}"
+           end
             if package_version
-              pkgname << "-#{package_version}"
+                pkgname << "-#{package_version}"
             end
             puts "Native #{pkgname}"
           else    
@@ -3776,7 +3781,7 @@ class Tpkg
         elsif Tpkg::get_os =~ /Debian|Ubuntu/
           name = pkg[:metadata][:name]
           version = pkg[:metadata][:version]
-          pkgname = "#{name}-#{version}"
+          pkgname = "#{name}=#{version}"
           if pkg[:metadata][:package_version]
             pkgname << "-#{pkg[:metadata][:package_version]}"
           end
@@ -3987,7 +3992,7 @@ class Tpkg
         elsif Tpkg::get_os =~ /Debian|Ubuntu/
           name = pkg[:metadata][:name]
           version = pkg[:metadata][:version]
-          pkgname = "#{name}-#{version}"
+          pkgname = "#{name}=#{version}"
           if pkg[:metadata][:package_version]
             pkgname << "-#{pkg[:metadata][:package_version]}"
           end
@@ -4768,7 +4773,13 @@ class Tpkg
   end
   
   def send_update_to_server(options={})
-    request = {"client"=>Facter['fqdn'].value}
+    
+    fqdn = Facter['fqdn'].value
+    if fqdn == nil
+      fqdn = Facter['hostname'].value<<"."<<Facter['domain'].value
+    end
+    
+    request = {"client"=>fqdn}
     request[:user] = Etc.getlogin || Etc.getpwuid(Process.uid).name
     request[:tpkg_home] = ENV['TPKG_HOME']
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tpkg
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70208837451800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208837451800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70208837451260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208837451260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kwalify
-  requirement: &70208837450840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208837450840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: tpkg-users@lists.sourceforge.net
 executables:
@@ -71,7 +86,6 @@ files:
 - 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.1.dtd
@@ -84,7 +98,7 @@ files:
 - schema/tpkg-1.0.8.dtd
 - schema/tpkg-1.0.9.dtd
 - schema/tpkg.dtd
-homepage: http://tpkg.sourceforge.net
+homepage: http://tpkg.github.com/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tpkg
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: tpkg Application Packaging & Deployment

data/schema/schema-1.0.yml

@@ -1,84 +0,0 @@
-type: map
-mapping: 
-  "schema_file": { 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 }
-          "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 }
-  "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:
-              "path": { type: text, required: yes }
-              "encrypt": { type: any, pattern: /^true$|^precrypt$/ }
-              "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 } }