[carton] 349/472: rename lockfile variable so that later refactoring gets easier

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository carton.

commit da21622e16d7c6be99ff33d1afd7f22beaf3e4aa
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Tue Jul 23 15:25:34 2013 -0700

    rename lockfile variable so that later refactoring gets easier
---
 lib/Carton/Builder.pm      | 4 ++--
 lib/Carton/CLI.pm          | 4 ++--
 lib/Carton/Requirements.pm | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Carton/Builder.pm b/lib/Carton/Builder.pm
index 9aaa85b..b642b56 100644
--- a/lib/Carton/Builder.pm
+++ b/lib/Carton/Builder.pm
@@ -28,9 +28,9 @@ sub custom_mirror {
 }
 
 sub bundle {
-    my($self, $path, $cache_path, $lock) = @_;
+    my($self, $path, $cache_path, $lockfile) = @_;
 
-    for my $dist ($lock->distributions) {
+    for my $dist ($lockfile->distributions) {
         my $source = $path->child("cache/authors/id/" . $dist->pathname);
         my $target = $cache_path->child("authors/id/" . $dist->pathname);
 
diff --git a/lib/Carton/CLI.pm b/lib/Carton/CLI.pm
index 83953ff..3e1f551 100644
--- a/lib/Carton/CLI.pm
+++ b/lib/Carton/CLI.pm
@@ -257,7 +257,7 @@ sub cmd_tree {
     $env->lockfile->load;
 
     my $cpanfile = Module::CPANfile->load($env->cpanfile);
-    my $requirements = Carton::Requirements->new(lock => $env->lockfile, prereqs => $cpanfile->prereqs);
+    my $requirements = Carton::Requirements->new(lockfile => $env->lockfile, prereqs => $cpanfile->prereqs);
 
     my %seen;
     my $dumper = sub {
@@ -285,7 +285,7 @@ sub cmd_check {
 
     # TODO remove lockfile
     # TODO pass git spec to Requirements?
-    my $requirements = Carton::Requirements->new(lock => $env->lockfile, prereqs => $prereqs);
+    my $requirements = Carton::Requirements->new(lockfile => $env->lockfile, prereqs => $prereqs);
     $requirements->walk_down(sub { });
 
     my @missing;
diff --git a/lib/Carton/Requirements.pm b/lib/Carton/Requirements.pm
index 94c2597..66873fa 100644
--- a/lib/Carton/Requirements.pm
+++ b/lib/Carton/Requirements.pm
@@ -4,7 +4,7 @@ use Carton::Dependency;
 use Moo;
 use CPAN::Meta::Requirements;
 
-has lock => (is => 'ro');
+has lockfile => (is => 'ro');
 has prereqs => (is => 'ro');
 has all => (is => 'ro', default => sub { CPAN::Meta::Requirements->new });
 
@@ -52,7 +52,7 @@ sub dependency_for {
     $dep->module($module);
     $dep->requirement($requirement);
 
-    if (my $dist = $self->lock->find_or_core($module)) {
+    if (my $dist = $self->lockfile->find_or_core($module)) {
         $dep->dist($dist);
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/carton.git