[Bps-public-commit] Shipwright branch, master, updated. 4f9e4ee0a4fa253e06a4f6b399cc0fa4f8d40f9a

sunnavy at bestpractical.com sunnavy at bestpractical.com
Wed Dec 9 23:04:35 EST 2009


The branch, master has been updated
       via  4f9e4ee0a4fa253e06a4f6b399cc0fa4f8d40f9a (commit)
       via  6f435807d728f806c5fb3a4dfcc13290c4381001 (commit)
       via  0953638f16b9469f0732805fd21c23ca2543ad9b (commit)
      from  62d45445f9b355798fc0beef8973dc0cb6f873a1 (commit)

Summary of changes:
 Changes                       |   10 +++++++++-
 META.yml                      |    2 +-
 lib/Shipwright/Backend/Git.pm |   16 +++++++++++++++-
 lib/Shipwright/Script.pm      |    6 ++++--
 4 files changed, 29 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 0953638f16b9469f0732805fd21c23ca2543ad9b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Dec 10 11:56:21 2009 +0800

    _sync_local_dir for git backend

diff --git a/lib/Shipwright/Backend/Git.pm b/lib/Shipwright/Backend/Git.pm
index 34547b6..a8f5136 100644
--- a/lib/Shipwright/Backend/Git.pm
+++ b/lib/Shipwright/Backend/Git.pm
@@ -46,9 +46,12 @@ for Shipwright L<repository|Shipwright::Manual::Glossary/repository>.
 
 sub build {
     my $self = shift;
+    my %args = @_;
+    $self->SUPER::build(%args);
     $self->strip_repository
       if $self->repository =~ m{^git:[a-z]+(?:\+[a-z]+)?://};
-    $self->SUPER::build(@_);
+    $self->_sync_local_dir if -e $self->local_dir && !$args{no_sync_local_dir};
+    return $self;
 }
 
 =item initialize
@@ -143,6 +146,17 @@ sub _initialize_local_dir {
     return $target;
 }
 
+sub _sync_local_dir {
+    my $self = shift;
+    my $target = $self->local_dir;
+    my $cwd = getcwd;
+    chdir $target or return;
+
+    Shipwright::Util->run( [ $ENV{'SHIPWRIGHT_GIT'}, 'pull' ] );
+    chdir $cwd;
+}
+
+
 =item check_repository
 
 check if the given repository is valid.
diff --git a/lib/Shipwright/Script.pm b/lib/Shipwright/Script.pm
index 734ce62..933f4e6 100644
--- a/lib/Shipwright/Script.pm
+++ b/lib/Shipwright/Script.pm
@@ -56,8 +56,10 @@ sub prepare {
           if !$cmd->repository && $ENV{SHIPWRIGHT_REPOSITORY};
         if ( $cmd->repository ) {
             require Shipwright::Backend;
-            my $backend =
-              Shipwright::Backend->new( repository => $cmd->repository );
+            my $backend = Shipwright::Backend->new(
+                repository        => $cmd->repository,
+                no_sync_local_dir => 1,
+            );
 
             # this $shipwright object will do nothing, except for init logging
             my $shipwright = Shipwright->new(

commit 6f435807d728f806c5fb3a4dfcc13290c4381001
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Dec 10 12:03:43 2009 +0800

    update changes to reflect 2.4.4

diff --git a/Changes b/Changes
index 23e4a0d..aa42118 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,14 @@
 Revision history for Shipwright
 
-2.4.4
+2.4.4 Thu Dec 10 04:00:44 GMT 2009
+
+* git backend tweak: sync when Shipwright::Backend::Git->new
+* doc update(jibsheet++)
+* add suggest line when error occurs: currently we just suggest people install modules if not installed
+* handle configure_requires in M::I based Makefile.PL
+* fix the check if realink exists way on solaris
+* Checkpoint of newest jeos-build script(chmrr++)
+* add AUTHORS to manifest
 
 2.4.3 Thu Oct 15 05:53:14 GMT 2009
 

commit 4f9e4ee0a4fa253e06a4f6b399cc0fa4f8d40f9a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Dec 10 12:04:18 2009 +0800

    package file update

diff --git a/META.yml b/META.yml
index f22ecb7..1b563ef 100644
--- a/META.yml
+++ b/META.yml
@@ -52,4 +52,4 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/bestpractical/shipwright.git
-version: 2.004000
+version: 2.004004

-----------------------------------------------------------------------



More information about the Bps-public-commit mailing list