[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website Create.pm,1.27,1.28 Upgrade.pm,1.15,1.16

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

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

Modified Files:
	Create.pm Upgrade.pm 
Log Message:
modify website upgrade to use OI2::Brick framework and move common code to parent class

Index: Create.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Create.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Create.pm	2 Feb 2005 13:58:37 -0000	1.27
--- Create.pm	2 Feb 2005 16:16:52 -0000	1.28
***************
*** 195,213 ****
  }
  
- sub _install_packages_from_bricks {
-     my ( $self, $website_dir, $package_names ) = @_;
-     foreach my $name ( @{ $package_names } ) {
-         my $brick_name = 'pkg_' . $name;
-         my $brick = OpenInteract2::Brick->new( $brick_name );
-         foreach my $pkg_name ( $brick->list_resources ) {
-             my $pkg_info = $brick->load_resource( $pkg_name );
-             my $pkg_file = OpenInteract2::Util->decode_base64_and_store(
-                 \$pkg_info->{content}
-             );
-             $self->_install_package_file( undef, $pkg_file, $website_dir );
-         }
-     }
- }
- 
  # Create nowrite flags for HTML and widget dirs
  
--- 195,198 ----

Index: Upgrade.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Upgrade.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Upgrade.pm	5 Dec 2004 20:01:35 -0000	1.15
--- Upgrade.pm	2 Feb 2005 16:16:52 -0000	1.16
***************
*** 7,11 ****
  use File::Spec::Functions  qw( catdir );
  use OpenInteract2::Manage  qw( SYSTEM_PACKAGES );
- use OpenInteract2::Config::TransferSample;
  
  $OpenInteract2::Manage::Website::Upgrade::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
--- 7,10 ----
***************
*** 28,32 ****
      return {
          website_dir => $self->_get_website_dir_param,
-         source_dir  => $self->_get_source_dir_param,
          skip_packages => {
              description => 'Indicates that we should not update the packages',
--- 27,30 ----
***************
*** 38,42 ****
  sub run_task {
      my ( $self ) = @_;
!     my $source_dir = $self->param( 'source_dir' );
      if ( $self->param( 'skip_packages' ) ) {
          $self->_ok( 'install package',
--- 36,40 ----
  sub run_task {
      my ( $self ) = @_;
!     my $website_dir = $self->param( 'website_dir' );
      if ( $self->param( 'skip_packages' ) ) {
          $self->_ok( 'install package',
***************
*** 46,58 ****
          $self->notify_observers( progress => 'Upgrading packages',
                                   { long => 'yes' } );
!         $self->_install_packages( $source_dir, SYSTEM_PACKAGES );
          $self->notify_observers( progress => 'Package upgrade complete' );
      }
  
!     my $widget_dir = catdir( $source_dir, 'sample', 'website', 'template' );
!     my $website_dir = $self->param( 'website_dir' );
!     my $transfer = OpenInteract2::Config::TransferSample->new( $widget_dir );
!     $transfer->run( $website_dir );
!     foreach my $file ( @{ $transfer->files_copied } ) {
          $self->_ok(
              'copy updated template files',
--- 44,54 ----
          $self->notify_observers( progress => 'Upgrading packages',
                                   { long => 'yes' } );
!         $self->_install_packages_from_bricks( $website_dir, SYSTEM_PACKAGES );
          $self->notify_observers( progress => 'Package upgrade complete' );
      }
  
!     my $brick = OpenInteract2::Brick->new( 'widgets' );
!     my $status = $brick->copy_all_resources_to( $website_dir );
!     foreach my $file ( @{ $status->{copied} } ) {
          $self->_ok(
              'copy updated template files',
***************
*** 61,65 ****
          );
      }
!     foreach my $file ( @{ $transfer->files_skipped } ) {
          $self->_ok(
              'copy updated template files',
--- 57,61 ----
          );
      }
!     foreach my $file ( @{ $status->{skipped} } ) {
          $self->_ok(
              'copy updated template files',
***************
*** 68,72 ****
          );
      }
!     foreach my $file ( @{ $transfer->files_same } ) {
          $self->_ok(
              'copy updated template files',
--- 64,68 ----
          );
      }
!     foreach my $file ( @{ $status->{same} } ) {
          $self->_ok(
              'copy updated template files',