tpkg 1.22.1 → 1.23.2

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

data/bin/gem2tpkg

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 
 # Ensure we can find tpkg.rb
-$:.unshift File.dirname(__FILE__)
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'fileutils' # FileUtils.cp, rm, etc.
 require 'tempfile'  # Tempfile
@@ -321,10 +321,16 @@ def package(gem)
         end
       when '~>'
         # ~> 2.2 is equivalent to >= 2.2 and < 3
+        # ~> 2.2.0 is equivalent to >= 2.2.0 and < 2.3.0
         deps[depgem][:minimum_version] = depver
-        majorver = depver.split('.').first.to_i
-        maxver = "#{majorver}.9999.9999"
-        deps[depgem][:maximum_version] = maxver
+        # '2.2.0' -> ['2', '2', '0']
+        depverparts = depver.split('.')
+        # ['2', '2', '0'] -> ['2', '2']
+        depverparts.pop
+        # ['2', '2'] -> ['2', '2', '9999']
+        depverparts << '9999'
+        # ['2', '2', '9999'] -> '2.2.9999'
+        deps[depgem][:maximum_version] = depverparts.join('.')
       end
     end
   end

data/bin/tpkg

@@ -239,9 +239,13 @@ end
 opts.on('--force', 'Force the execution of a given task') do |opt|
   @force = opt
 end
-opts.on('--use-ssh-key', 'Use ssh key for deploying instead of password') do |opt|
-  @deploy_options["use-ssh-key"] = opt
-  @deploy_params = @deploy_params - ['--use-ssh-key']
+opts.on('-o', '--out', '=DIR', 'Output directory for the -m option') do |opt|
+  @other_options[:out] = opt
+end
+opts.on('--use-ssh-key [FILE]', 'Use ssh key for deploying instead of password') do |opt|
+  @deploy_options["use-ssh-key"] = true
+  @deploy_options["ssh-key"] = opt
+  @deploy_params = @deploy_params - ['--use-ssh-key', opt, "--use-ssh-key=#{opt}"]
 end
 opts.on('--deploy-as', '=USERNAME', 'What username to use for deploying to remote server') do |opt|
   @deploy_options["deploy-as"] = opt
@@ -341,6 +345,18 @@ if @deploy
 #  puts "Creating deployer with #{@worker_count} number of worker"
   @deploy_options["max-worker"] = @worker_count
   @deploy_options["abort-on-fail"] = false
+
+  # check to see if ssh-key is accessible
+  ssh_key =  @deploy_options["use-ssh-key"]
+  if ssh_key && ssh_key.is_a?(String) 
+    if !File.readable?(ssh_key) && Process.euid == 0
+      raise "Unable to read ssh key from #{ssh_key}"
+    elsif !File.readable?(ssh_key)
+      warn "Warning: Unable to read ssh key from #{ssh_key}. Attempting to rerun tpkg with sudo."
+      rerun_with_sudo_if_necessary
+    end
+  end
+
   Tpkg::deploy(@deploy_params, @deploy_options,  @servers) 
   exit
 end
@@ -349,10 +365,17 @@ if @action_value.is_a?(Array)
   @action_value.uniq!
 end
 
+# tell tpkg not to prompt if stdin is not tty
+if !$stdin.tty?
+  Tpkg::set_prompt(false)
+end
+
 ret_val = 0
 case @action
 when :make
-  pkgfile = Tpkg::make_package(@action_value, passphrase_callback, {:force => @force, :compress => @compress})
+  @other_options[:force] = @force
+  @other_options[:compress] = @compress
+  pkgfile = Tpkg::make_package(@action_value, passphrase_callback, @other_options)
   if pkgfile
     puts "Package is #{pkgfile}"
   else
@@ -493,7 +516,7 @@ when :query_who_owns_file
   tpkg = instantiate_tpkg(@tpkg_options)
   tpkg.files_for_installed_packages.each do |pkgfile, fip|
     fip[:normalized].each do |file|
-      if file == @action_value
+      if file == File.expand_path(@action_value)
         puts "#{file}: #{pkgfile}"
       end
     end

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '1.22.1'
+  VERSION = '1.23.2'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -225,6 +225,17 @@ class Tpkg
   # Makes a package from a directory containing the files to put into the package
   def self.make_package(pkgsrcdir, passphrase=nil, options = {})
     pkgfile = nil
+
+    # validate the output directory if the user has specified one
+    outdir = options[:out]
+    if outdir
+      outdir = File.expand_path(outdir)
+      if !File.directory?(outdir)
+        raise "#{outdir} is not a valid directory"
+      elsif !File.writable?(outdir)
+        raise "#{outdir} is not writable"
+      end
+    end
     
     # Make a working directory
     workdir = nil
@@ -341,7 +352,13 @@ class Tpkg
       package_filename = metadata.generate_package_filename
       package_directory = File.join(workdir, package_filename)
       Dir.mkdir(package_directory)
-      pkgfile = File.join(File.dirname(pkgsrcdir), package_filename + '.tpkg')
+      
+      if outdir 
+        pkgfile = File.join(outdir, package_filename + '.tpkg')
+      else
+        pkgfile = File.join(File.dirname(pkgsrcdir), package_filename + '.tpkg')
+      end
+
       if File.exist?(pkgfile) || File.symlink?(pkgfile)
         if @@prompt
           print "Package file #{pkgfile} already exists, overwrite? [y/N]"
@@ -383,7 +400,7 @@ class Tpkg
       # Remove our working directory
       FileUtils.rm_rf(workdir)
     end
-    
+   
     # Return the filename of the package
     pkgfile
   end
@@ -1382,9 +1399,10 @@ class Tpkg
       if Tpkg::get_os =~ /RedHat|CentOS|Fedora/
         [ {:arg => 'installed', :header => 'Installed', :source => :native_installed},
           {:arg => 'available', :header => 'Available', :source => :native_available} ].each do |yum|
-          puts "available_native_packages running 'yum list #{yum[:arg]} #{pkgname}'" if @@debug
+          cmd = "yum info #{yum[:arg]} #{pkgname}"
+          puts "available_native_packages running '#{cmd}'" if @@debug
           stderr_first_line = nil
-          Open3.popen3("yum info #{yum[:arg]} #{pkgname}") do |stdin, stdout, stderr|
+          Open3.popen3(cmd) do |stdin, stdout, stderr|
             stdin.close
             read_packages = false
             name = version = package_version = nil
@@ -3784,7 +3802,7 @@ class Tpkg
     if options[:remove_all_dep]
       packages_to_remove |= get_dependents(packages_to_remove)
     elsif options[:remove_all_prereq]
-      puts "Attemping to remove #{packages_to_remove.map do |pkg| pkg[:metadata][:filename] end} and all prerequisites."
+      puts "Attempting to remove #{packages_to_remove.map do |pkg| pkg[:metadata][:filename] end} and all prerequisites."
       # Get list of dependency prerequisites
       ptr = packages_to_remove | get_prerequisites(packages_to_remove)
       pkg_files_to_remove = ptr.map { |pkg| pkg[:metadata][:filename] }
@@ -4113,10 +4131,14 @@ class Tpkg
         packages_to_execute_on.concat(installed_packages_that_meet_requirement(req))
       end
     end
-    
-    packages_to_execute_on.each do |pkg|
-      ret_val |= execute_init_for_package(pkg, action, requested_init_scripts)
-    end 
+
+    if packages_to_execute_on.empty?
+      warn "Warning: Unable to find package(s) \"#{requested_packages.join(",")}\"."
+    else 
+      packages_to_execute_on.each do |pkg|
+        ret_val |= execute_init_for_package(pkg, action, requested_init_scripts)
+      end 
+    end
     return ret_val
   end
  

data/lib/tpkg/deployer.rb

@@ -34,6 +34,7 @@ class Deployer
       @max_worker = options["max-worker"]
       @abort_on_failure = options["abort-on-failure"]
       @use_ssh_key = options["use-ssh-key"]
+      @ssh_key = options["ssh-key"]
     end
   end
 
@@ -79,13 +80,17 @@ class Deployer
   end
 
   # Return a block that can be used for executing a cmd on the remote server
-  def ssh_execute(server, username, password, cmd)
+  def ssh_execute(server, username, password, key, cmd)
     return lambda { 
       exit_status = 0
       result = []
 
+      params = {}
+      params[:password] = password if password
+      params[:keys] = [key] if key
+      
       begin
-        Net::SSH.start(server, username, :password => password) do |ssh|
+        Net::SSH.start(server, username, params) do |ssh|
           puts "Connecting to #{server}"
           ch = ssh.open_channel do |channel|
             # now we request a "pty" (i.e. interactive) session so we can send data
@@ -176,6 +181,7 @@ class Deployer
     if servers.kind_of?(Proc)
       deploy_to = servers.call
     elsif servers.size == 1 && File.exists?(servers[0])
+      puts "Reading server list from file #{servers[0]}"
       File.open(servers[0], 'r') do |f|
         while line = f.gets
           deploy_to << line.chomp.split(",")
@@ -188,7 +194,7 @@ class Deployer
 
     deploy_to.each do | server |
       tp.process do
-        status = ssh_execute(server, @user, @password, cmd).call
+        status = ssh_execute(server, @user, @password, @ssh_key, cmd).call
         statuses[server] = status
       end
     end

data/schema/schema-1.0.6.yml

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

@@ -19,6 +19,7 @@ mapping:
           "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":

data/schema/tpkg-1.0.6.dtd

@@ -0,0 +1,42 @@
+<!ELEMENT tpkg (name, version, package_version?, maintainer+, operatingsystem*, architecture*, description?, bugreporting?, dependencies?, externals?, files?)>
+
+<!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, encrypt?, init?, crontab?, posix?)>
+<!ELEMENT path (#PCDATA)>
+<!ELEMENT encrypt EMPTY>
+<!ATTLIST encrypt precrypt (true|false) #IMPLIED>
+<!ELEMENT init (start?, levels?)>
+<!ELEMENT start (#PCDATA)>
+<!ELEMENT levels (#PCDATA)>
+<!ELEMENT crontab (user?)>
+<!ELEMENT user (#PCDATA)>
+

data/schema/tpkg.dtd

@@ -10,11 +10,12 @@
 <!ELEMENT bugreporting (#PCDATA)>
 
 <!ELEMENT dependencies (dependency*)>
-<!ELEMENT dependency (name, minimum_version?, maximum_version?, minimum_package_version?, maximum_package_version?, native?)>
+<!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*)>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.22.1
+  version: 1.23.2
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +00:00
+date: 2010-05-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,9 @@ files:
 - 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.6.dtd
 - schema/schema-1.0.5.yml
 - bin/tpkg
 - bin/cpan2tpkg