Clarified what name is needed to be provided

[p5sagit/Oyster.git] / lib / Dist / Zilla / App / Command / provision.pm

diff --git a/lib/Dist/Zilla/App/Command/provision.pm b/lib/Dist/Zilla/App/Command/provision.pm
index 3df6420..1c0abfe 100644 (file)
--- a/lib/Dist/Zilla/App/Command/provision.pm
+++ b/lib/Dist/Zilla/App/Command/provision.pm
@@ -4,16 +4,19 @@ package Dist::Zilla::App::Command::provision;
 BEGIN {
   $Dist::Zilla::App::Command::provision::VERSION = '0.1';
 }
-# ABSTRACT: release your dist to the CPAN
+# ABSTRACT: provision a new Oyster VM
 use Dist::Zilla::App -command;
 use Moose;
 use Config::Any;
 use Hash::Merge 'merge';
+Hash::Merge::set_behavior( 'RIGHT_PRECEDENT' );
+use Oyster::Provision;
 
 sub abstract { 'provision a new Oyster VM' }
 
 sub opt_spec {
   [ 'name=s'     => 'the name of the VM to create' ],
+  [ 'config=s'   => 'the name of the config file to use, default ./oyster.conf' ],
 }
 
 sub execute {
@@ -22,8 +25,8 @@ sub execute {
   my $zilla = $self->zilla;
 
   my $name = $opt->name
-    or die "No name provided!";
-  my @config_files = ( './oyster.conf' ); # TODO make configurable
+    or die "No virtual machine name provided!";
+  my @config_files = ($opt->name or './oyster.conf');
 
   my $cfg = Config::Any->load_files({ files => \@config_files, use_ext => 0 });
   ($cfg) = values %{ $cfg->[0] }; # FIX with ::JFDI or similar
@@ -32,15 +35,19 @@ sub execute {
 
   my @hashes = grep $_, $Provision->{Default}, $Provision->{$name}
       or die "No section for <Provision> <$name>, and no <default>";
-    
-  my %hash = @hashes > 1 ? %{ merge( @hashes ) } : $hashes[0];
 
-  $hash{provision_backend} = delete $hash{type} || 'Oyster::Provision::Rackspace';
+  warn Dumper(\@hashes);
+
+  my %hash = @hashes > 1 ? %{ merge( @hashes ) } : %{ $hashes[0] };
+
+  my $type = delete $hash{type} || 'Oyster::Provision::Rackspace';
+  $hash{provision_backend} = $type =~/^Oyster::Provision::/ ? $type : "Oyster::Provision::$type";
   $hash{pub_ssh} ||= "$ENV{HOME}/.ssh/id_rsa.pub";
   $hash{size}    ||= 1;  # id 1 - ram 256 MiB - disk 10 GiB
   $hash{image}   ||= 69; # id 69 - Ubuntu 10.10 (meerkat)
 
-  use Oyster::Provision;
+  use Data::Dumper; warn "Config hash: ", Dumper(\%hash);
+
   my $server = Oyster::Provision->new(
         name => $name,
         config => \%hash,