Changeset 6f31bfb in lab.git for Dev

Timestamp:

Aug 18, 2013 5:28:12 AM (11 years ago)

Author:

Ken-ichi Mito <mitty@…>

Branches:

master

Children:

682d2d9

Parents:

19df400

Message:

remove Class::Accessor::Fast

• handle directory path correctly

File:

• Dev/github/GitHubBackup.pm (modified) (10 diffs)

Dev/github/GitHubBackup.pm

@@ -24 +24 @@
 
 package GitHubBackup;
-use base qw(Class::Accessor::Fast);
 
 use strict;
@@ -30 +29 @@
 use utf8;
 use Carp qw(croak);
-
-__PACKAGE__->mk_accessors( qw(
-    directory
-));
+use File::Spec;
 
 
@@ -39 +35 @@
 sub new {
     my $class = shift;
-    
     my $args = (ref $_[0] eq 'HASH') ? $_[0] : {@_};
-    if (! $args->{directory}) {
-        $args->{directory} = ".";
-    }
-    
-    return $class->SUPER::new($args);
+    
+    return bless $args, $class;
 }
 
@@ -70 +62 @@
     
     return $self->{repository};
+}
+
+sub directory {
+    my $self = shift;
+    my $args = shift;
+    
+    if (defined $args) {
+        $self->{directory} = File::Spec->rel2abs($args);
+    }
+    
+    return $self->{directory};
 }
 
@@ -126 +129 @@
 
 package GitHubBackup::Repository;
-use base qw(Class::Accessor::Fast);
 
 use strict;
@@ -134 +136 @@
 use Git::Repository;
 use File::chdir;
-
+use File::Spec;
+use File::Path qw(mkpath);
 
 sub new {
@@ -145 +148 @@
     }
     
-    return $class->SUPER::new($args);
+    return bless $args, $class;
 }
 
@@ -151 +154 @@
     my $self = shift;
     
-    return $self->{directory}->();
+    my $path = $self->{full_name};
+    if (my $base = $self->{directory}->()) {
+        $path = File::Spec->catfile($base, $path);
+    }
+    
+    return $path;
 }
 
@@ -157 +165 @@
     my $self = shift;
     
-    my $dir = $self->directory .'/'. $self->{full_name};
+    my $dir = $self->directory;
     if (-d "$dir") {
         local $CWD = $dir;
@@ -166 +174 @@
     
     print "clone ", $dir, "\n";
+    mkpath $dir;
     Git::Repository->run(clone => '--mirror' => $self->{clone_url} => $dir);
     return $self;