Merge branch 'master' of git.shadowcat.co.uk:Oyster

Conflicts:
	lib/Dist/Zilla/App/Command/provision.pm

diff --combined lib/Dist/Zilla/App/Command/provision.pm
index 001edad,963f9a5..7f4160a
--- 1/lib/Dist/Zilla/App/Command/provision.pm
--- 2/lib/Dist/Zilla/App/Command/provision.pm
+++ b/lib/Dist/Zilla/App/Command/provision.pm
@@@ -8,7 -8,6 +8,7 @@@ BEGIN 
  use Dist::Zilla::App -command;
  use Moose;
  use Config::Any;
 +use Hash::Merge 'merge';
  
  sub abstract { 'provision a new Oyster VM' }
  
@@@ -25,25 -24,21 +25,25 @@@ sub execute 
      or die "No name provided!";
    my @config_files = ( './oyster.conf' ); # TODO make configurable
  
 -  my $cfg = Config::Any->load_files({ files => \@config_files });
 +  my $cfg = Config::Any->load_files({ files => \@config_files, use_ext => 0 });
    ($cfg) = values %{ $cfg->[0] }; # FIX with ::JFDI or similar
  
    my $Provision = $cfg->{Provision} or die "No <Provision> section";
 -  my $target = $Provision->{$name}  or die "No section for <Provision> <$name>";
  
 -  my $type = $target->{type} || 'Rackspace';
 +  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} || 'Rackspace';
 +  $hash{pub_ssh} ||= "$ENV{HOME}/.ssh/id_rsa.pub";
-   $hash{size}    ||= 128;
-   $hash{image}   ||= 'meerkat'; # TODO, should this be determined on backend?
++  $hash{size}    ||= 1;  # id 1 - ram 256 MiB - disk 10 GiB
++  $hash{image}   ||= 69; # id 69 - Ubuntu 10.10 (meerkat)
  
    use Oyster::Provision;
    my $server = Oyster::Provision->new(
 -    name              => $name,
 -    size              => 1,                              # id 1 - ram 256 MiB - disk 10 GiB
 -    image             => 69,                             # id 69 - Ubuntu 10.10 (meerkat)
 -    pub_ssh           => "$ENV{HOME}/.ssh/id_rsa.pub",
 -    provision_backend => $type,
 +        name => $name,
 +        %hash,
    );
    $server->create;
    print "Instance $name created! ($server)\n";