[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Package.pm,1.45,1.46

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26573

Modified Files:
	Package.pm 
Log Message:
OIN-121: update package creation to use OI2::Brick instead of sample/ files

Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Package.pm	2 Feb 2005 13:14:35 -0000	1.45
--- Package.pm	2 Feb 2005 15:47:21 -0000	1.46
***************
*** 20,24 ****
  use OpenInteract2::Config::PackageChanges;
  use OpenInteract2::Config::Readonly;
- use OpenInteract2::Config::TransferSample;
  use OpenInteract2::Exception qw( oi_error );
  use OpenInteract2::I18N::Initializer;
--- 20,23 ----
***************
*** 383,389 ****
      }
  
!     # Both of these will throw an error on failure
! 
!     my $sample_dir = $class->_skel_get_sample_dir( $params );
      $name = $class->_skel_clean_package_name( $name );
  
--- 382,386 ----
      }
  
!     # dies on failure
      $name = $class->_skel_clean_package_name( $name );
  
***************
*** 403,414 ****
  
      eval {
!         $class->_skel_create_subdirectories(
!             $full_skeleton_dir );
!         $class->_skel_copy_sample_files(
!             $name, $sample_dir, $full_skeleton_dir );
          $class->_skel_create_changelog(
              $name, $full_skeleton_dir, 'Changes' );
!         $class->_skel_create_manifest(
!             $full_skeleton_dir );
      };
      if ( $@ ) {
--- 400,408 ----
  
      eval {
!         $class->_skel_create_subdirectories( $full_skeleton_dir );
!         $class->_skel_copy_resources( $name, $full_skeleton_dir );
          $class->_skel_create_changelog(
              $name, $full_skeleton_dir, 'Changes' );
!         $class->_skel_create_manifest( $full_skeleton_dir );
      };
      if ( $@ ) {
***************
*** 842,859 ****
  
  
! # Copies over the sample skeleton files from the sample directory in
! # the OI2 source to a new package directory, making some simple
! # variable substitutions along the way.
  
! sub _skel_copy_sample_files {
!     my ( $class, $name, $sample_dir, $dest_dir ) = @_;
      my $class_name = ucfirst $name;
      $class_name =~ s/_(\w)/\U$1\U/g;
!     my %vars = ( package_name => $name,
!                  class_name   => $class_name );
! 
!     return OpenInteract2::Config::TransferSample
!                          ->new( $sample_dir )
!                          ->run( $dest_dir, \%vars );
  }
  
--- 836,851 ----
  
  
! # Copies over all resources from the 'package' brick
  
! sub _skel_copy_resources {
!     my ( $class, $name, $dest_dir ) = @_;
!     require OpenInteract2::Brick;
!     my $brick = OpenInteract2::Brick->new( 'package' );
      my $class_name = ucfirst $name;
      $class_name =~ s/_(\w)/\U$1\U/g;
!     return $brick->copy_all_resources_to( $dest_dir, {
!         package_name => $name,
!         class_name   => $class_name 
!     });
  }