tpkg 1.21.1 → 1.22.1

data/lib/tpkg/deployer.rb

@@ -156,7 +156,7 @@ class Deployer
   # deploy_params is an array that holds the list of paramters that is used when invoking tpkg on to the remote
   # servers where we want to deploy to. 
   # 
-  # servers is an array or a callback that list the remote servers where we want to deploy to
+  # servers is an array, a filename or a callback that list the remote servers where we want to deploy to
   def deploy(deploy_params, servers)
     params = deploy_params.join(" ")  
     cmd = "tpkg #{params} -n"
@@ -175,6 +175,13 @@ class Deployer
     deploy_to = []
     if servers.kind_of?(Proc)
       deploy_to = servers.call
+    elsif servers.size == 1 && File.exists?(servers[0])
+      File.open(servers[0], 'r') do |f|
+        while line = f.gets
+          deploy_to << line.chomp.split(",")
+        end
+      end
+      deploy_to.flatten!
     else
       deploy_to = servers
     end

data/lib/tpkg/metadata.rb

@@ -230,12 +230,12 @@ class Metadata
   end
 
   def self.get_pkgs_metadata_from_yml_doc(yml_doc, metadata=nil, source=nil)
-    metadata = {} if metadata.nil?
+    metadata ||= {} 
     metadata_lists = yml_doc.split("---")
     metadata_lists.each do | metadata_text |
       if metadata_text =~ /^:?name:(.+)/
         name = $1.strip
-        metadata[name] = [] if !metadata[name]
+        metadata[name] ||= []
         metadata[name] << Metadata.new(metadata_text,'yml', source)
       end
     end
@@ -363,6 +363,14 @@ class Metadata
       # TODO: use DTD to validate XML
       errors = verify_required_fields
     end
+
+    # Verify version and package version begin with a digit
+    if to_hash[:version].to_s !~ /^\d/
+      errors << "Version must begins with a digit"
+    end
+    if to_hash[:package_version] && to_hash[:package_version].to_s !~ /^\d/
+      errors << "Package version must begins with a digit"
+    end
     errors
   end
 

data/schema/schema-1.0.5.yml

@@ -0,0 +1,86 @@
+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 }
+          "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:
+              "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 } }
+

data/schema/schema.yml

@@ -41,6 +41,7 @@ mapping:
           "name": { type: text, required: yes }
           "data": { type: text }
           "datascript": { type: text }
+          "datafile": { type: text }
   "files":
     type: map
     mapping:
@@ -82,3 +83,4 @@ mapping:
                 mapping: { "owner": { type: text },
                            "group": { type: text },
                            "perms": { type: text } }
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.21.1
+  version: 1.22.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-04-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,24 +55,25 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/cpan2tpkg
-- bin/tpkg_xml_to_yml
-- bin/tpkg
-- bin/gem2tpkg
-- schema/tpkg.dtd
-- schema/schema-1.0.yml
-- schema/tpkg-1.0.0.dtd
-- schema/tpkg-1.0.4.dtd
-- schema/tpkg-1.0.3.dtd
-- schema/schema.yml
-- schema/tpkg-1.0.5.dtd
-- schema/tpkg-1.0.2.dtd
-- schema/tpkg-1.0.1.dtd
 - lib/tpkg/versiontype.rb
 - lib/tpkg/deployer.rb
 - lib/tpkg/thread_pool.rb
 - lib/tpkg/metadata.rb
 - lib/tpkg.rb
+- schema/tpkg-1.0.4.dtd
+- schema/tpkg-1.0.0.dtd
+- schema/tpkg-1.0.5.dtd
+- schema/tpkg.dtd
+- schema/tpkg-1.0.1.dtd
+- schema/tpkg-1.0.3.dtd
+- schema/schema.yml
+- schema/tpkg-1.0.2.dtd
+- schema/schema-1.0.yml
+- schema/schema-1.0.5.yml
+- bin/tpkg
+- bin/cpan2tpkg
+- bin/gem2tpkg
+- bin/tpkg_xml_to_yml
 - Rakefile
 has_rdoc: true
 homepage: http://tpkg.sourceforge.net