tpkg 1.21.0 → 1.21.1

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

data/bin/cpan2tpkg

@@ -131,8 +131,13 @@ CPAN::Shell->o('conf', 'makepl_arg', "DESTDIR=$workdir");
 # http://perldoc.perl.org/Module/Build.html#INSTALL-PATHS
 CPAN::Shell->o('conf', 'mbuildpl_arg', "--destdir=$workdir");
 
-# FIXME: desired?
-#CPAN::Shell->o('conf', 'prerequisites_policy', "ask");
+# Automatically install dependencies so that we can package them too
+CPAN::Shell->o('conf', 'prerequisites_policy', "follow");
+
+# In order for cpan2tpkg to be able to install and package dependencies of the
+# user's module we need perl to be able to find modules installed in our
+# working directory.
+$ENV{PERL5LIB} = File::Spec->catdir($workdir, $Config{sitelib});
 
 # Install the module
 if ($force)
@@ -141,7 +146,7 @@ if ($force)
 }
 else
 {
-	$modobj->install;
+	CPAN::Shell->install($module);
 }
 
 # It is not nearly as straightforward as one might wish to get
@@ -150,7 +155,7 @@ else
 # system directories from $Config, any directories in the PERL5LIB environment
 # variable, and any extra directories you pass it. You can work around the
 # system directories from $Config by passing EU::I your own modified $Config
-# via the config_override parameter. You can also empty out $ENV[PERL5LIB].
+# via the config_override parameter. We override $ENV{PERL5LIB} above.
 # And that just leaves it searching the extra directories you pass it via the
 # extra_libs parameter. To further complicate matters EU::I searches the
 # directories in @INC when asked for the version of an installed module, but
@@ -167,8 +172,6 @@ foreach my $incdir (@INC)
 my %myconfig = %{dclone(\%Config)};
 $myconfig{archlibexp} = File::Spec->catdir($workdir, $Config{archlibexp});
 $myconfig{sitearchexp} = File::Spec->catdir($workdir, $Config{sitearchexp});
-# EU::I searches PERL5LIB as well, so clear that out
-$ENV{PERL5LIB} = '';
 my $extinst = ExtUtils::Installed->new(
 	config_override=>\%myconfig,
 	inc_override=>\@incwork,
@@ -187,8 +190,8 @@ MODULE: foreach my $name ($extinst->modules)
 	# Sometimes calling expand on a result from EU::I->modules doesn't
 	# work.  For example, if the user requests Date::Parse that module
 	# is part of the TimeDate distribution.  EU::I->modules will return
-	# ['Perl', 'TimeDate'], but calling expand on TimeDate fails.  It
-	# seems like we should find an alternative to EU::I->modules,
+	# ['Perl', 'TimeDate'], but calling expand on TimeDate fails.
+	# FIXME:  We should find an alternative to EU::I->modules,
 	# something that returns the distributions installed rather than the
 	# modules.
 	if (!$mod)
@@ -258,11 +261,14 @@ MODULE: foreach my $name ($extinst->modules)
 			# This is a bit of an indirect way to identify core modules
 			# but the only way I can figure out.  Core stuff gets
 			# installed with perl into /home/t/perl-version, CPAN
-			# modules into /home/t/lib/perl5/site_perl.  The "d" in
-			# dslip_status has "s" as one of it's possible values,
-			# meaning "Standard, supplied with Perl 5" according to the
-			# docs.  However, that doesn't seem to be set reliably.
-			if ($depmod->inst_file =~ m,/home/t/perl,)
+			# modules into /home/t/lib/perl5/site_perl.
+			#
+			# What seems like it should be the "right" way is that the "D"
+			# (aka "Development Stage") field in dslip_status has "S" (aka
+			# "Standard, supplied with Perl 5") as one of its possible values,
+			# according to the docs (http://perldoc.perl.org/CPAN.html).
+			# However, that doesn't seem to be set reliably.
+			if ($depmod->inst_file && $depmod->inst_file =~ /$Config{prefix}/)
 			{
 				print "Prereq $dep is a core module, skipping\n";
 				next PREREQ;

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '1.21.0'
+  VERSION = '1.21.1'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -3809,7 +3809,7 @@ class Tpkg
     # log changes 
     currently_installed = metadata_for_installed_packages.collect{|metadata| metadata.to_hash}
     newly_installed = currently_installed - already_installed_pkgs
-    removed = already_installed_pkgs - currently_installed,
+    removed = already_installed_pkgs - currently_installed
     log_changes({:newly_installed => newly_installed, :removed => removed})
 
     # send update back to reporting server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.21.0
+  version: 1.21.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +00:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,24 +55,24 @@ 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
-- bin/tpkg
-- bin/cpan2tpkg
-- bin/gem2tpkg
-- bin/tpkg_xml_to_yml
 - Rakefile
 has_rdoc: true
 homepage: http://tpkg.sourceforge.net