rebase moo on master, fix things, merge to master.

Makefile.PL

@@ -15,7 +15,8 @@ requires        'URI'                  => 0;
 requires        'URI::Escape'          => 0;
 requires        'Params::Validate'     => 0;
 requires        'XML::Simple'          => 2.18;
-requires        'Moose'                => 0.38;
+requires        'Moo'                  => '1.000006';
+requires        'MooX::Types::MooseLike' => '0.16';
 requires        'Carp'                 => 0;
 build_requires  'Test::More'           => 0;
 build_requires  'Test::Exception'      => 0;

lib/Net/Amazon/EC2.pm

@@ -1,5 +1,6 @@
 package Net::Amazon::EC2;
-use Moose;
+use Moo;
+use MooX::Types::MooseLike::Base qw(Str Int Bool);
 
 use strict;
 use vars qw($VERSION);
@@ -170,61 +171,43 @@ If you want/need the old behavior, set this attribute to a true value.
 
 =cut
 
-has 'AWSAccessKeyId' => (
-	is => 'ro',
-	isa => 'Str',
-	required => 1,
-	lazy => 1,
-	default => sub {
-		if (defined($_[0]->temp_creds)) {
-			return $_[0]->temp_creds->{'AccessKeyId'};
-		} else {
-			return undef;
-		}
-	}
-);
-has 'SecretAccessKey' => ( 
-	is => 'ro',
-	isa => 'Str',
-	required => 1,
-	lazy => 1,
-	default => sub {
-		if (defined($_[0]->temp_creds)) {
-			return $_[0]->temp_creds->{'SecretAccessKey'};
-		} else {
-			return undef;
-		}
-	}
-);
-has 'SecurityToken' => ( 
-	is => 'ro',
-	isa => 'Str',
-	required => 0,
-	lazy => 1,
-	predicate => 'has_SecurityToken',
-	default => sub {
-		if (defined($_[0]->temp_creds)) {
-			return $_[0]->temp_creds->{'Token'};
-		} else {
-			return undef;
-		}
-	}
-);
-has 'debug'             => ( is => 'ro', isa => 'Str', required => 0, default => 0 );
-has 'signature_version' => ( is => 'ro', isa => 'Int', required => 1, default => 2 );
-has 'version'           => ( is => 'ro', isa => 'Str', required => 1, default => '2014-06-15' );
-has 'region'            => ( is => 'ro', isa => 'Str', required => 1, default => 'us-east-1' );
-has 'ssl'               => ( is => 'ro', isa => 'Bool', required => 1, default => 1 );
-has 'return_errors'     => ( is => 'ro', isa => 'Bool', default => 0 );
-has 'base_url'          => (
-	is       => 'ro',
-	isa      => 'Str',
-	required => 1,
-	lazy     => 1,
-	default  => sub {
-		return 'http' . ($_[0]->ssl ? 's' : '') . '://ec2.' . $_[0]->region . '.amazonaws.com';
-	}
-);
+has 'AWSAccessKeyId'	=> ( is => 'ro', isa => Str, required => 1, lazy => 1,
+                             default => sub {
+                                 if (defined($_[0]->temp_creds)) {
+                                     return $_[0]->temp_creds->{'AccessKeyId'};
+                                 } else {
+                                     return undef;
+                                 }
+                             }  );
+has 'SecretAccessKey'	=> ( is => 'ro', isa => Str, required => 1, lazy => 1,
+                             default => sub {
+                                 if (defined($_[0]->temp_creds)) {
+                                     return $_[0]->temp_creds->{'SecretAccessKey'};
+                                 } else {
+                                     return undef;
+                                 }
+                             } );
+has 'SecurityToken' => (is => 'ro', isa => Str, required => 0, lazy => 1,
+                        predicate => 'has_SecurityToken',
+                        default => sub {
+                            if (defined($_[0]->temp_creds)) {
+                                return $_[0]->temp_creds->{'Token'};
+                            } else {
+                                return undef;
+                            }
+                        }
+                       );
+has 'debug'				=> ( is => 'ro', isa => Str, required => 0, default => sub {0} );
+has 'signature_version'	=> ( is => 'ro', isa => Int, required => 1, default => sub {2} );
+has 'version'			=> ( is => 'ro', isa => Str, required => 1, default => sub {'2012-07-20'} );
+has 'region'			=> ( is => 'ro', isa => Str, required => 1, default => sub {'us-east-1'} );
+has 'ssl'				=> ( is => 'ro', isa => Bool, required => 1, default => sub {1} );
+has 'return_errors'     => ( is => 'ro', isa => Bool, default => sub {0} );
+has 'base_url'			=> ( is => 'ro', isa => Str, required => 1, lazy => 1,
+                             default => sub {
+                                 return 'http' . ($_[0]->ssl ? 's' : '') . '://ec2.' . $_[0]->region . '.amazonaws.com';
+                             }
+                           );
 has 'temp_creds' => (
 	is      => 'ro',
 	lazy    => 1,
@@ -4989,7 +4972,6 @@ sub unmonitor_instances {
 	}
 }
 
-no Moose;
 1;
 
 __END__

lib/Net/Amazon/EC2/Attachment.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::Attachment;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -41,14 +41,12 @@ This boolean indicates if an volume is terminated upon instance termination.
 
 =cut
 
-has 'volume_id'				=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'instance_id'			=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-has 'device'				=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'status'				=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'attach_time'			=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'delete_on_termination'	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'volume_id'				=> ( is => 'ro', required => 1 );
+has 'instance_id'			=> ( is => 'ro', required => 0 );
+has 'device'				=> ( is => 'ro', required => 1 );
+has 'status'				=> ( is => 'ro', required => 1 );
+has 'attach_time'			=> ( is => 'ro', required => 1 );
+has 'delete_on_termination'	=> ( is => 'ro', required => 0 );
 
 =head1 AUTHOR
 
@@ -61,5 +59,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/AvailabilityZone.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::AvailabilityZone;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -33,12 +33,10 @@ An array ref of Net::Amazon::EC2::AvailabilityZoneMessage objects representing m
 
 =cut
 
-has 'zone_name'		=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'zone_state'	=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'region_name'	=> ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
-has 'messages'		=> ( is => 'ro', isa => 'ArrayRef[Net::Amazon::EC2::AvailabilityZoneMessage]|Undef', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'zone_name'		=> ( is => 'ro', required => 1 );
+has 'zone_state'	=> ( is => 'ro', required => 1 );
+has 'region_name'	=> ( is => 'ro', required => 1 );
+has 'messages'		=> ( is => 'ro', required => 0 );
 
 =head1 AUTHOR
 
@@ -51,5 +49,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
 1;

lib/Net/Amazon/EC2/AvailabilityZoneMessage.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::AvailabilityZoneMessage;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -19,9 +19,7 @@ The message itself.
 
 =cut
 
-has 'message'  => ( is => 'ro', isa => 'Str', required => 1 );
-
-__PACKAGE__->meta->make_immutable();
+has 'message'  => ( is => 'ro', required => 1 );
 
 =back
 
@@ -36,5 +34,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/BlockDeviceMapping.pm

@@ -1,6 +1,5 @@
 package Net::Amazon::EC2::BlockDeviceMapping;
-use strict;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -34,12 +33,10 @@ Specifies the device name to suppress during instance launch.
 
 =cut
 
-has 'device_name'	=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'ebs'			=> ( is => 'ro', isa => 'Maybe[Net::Amazon::EC2::EbsBlockDevice]|Maybe[Net::Amazon::EC2::EbsInstanceBlockDeviceMapping]', required => 0 );
-has 'virtual_name'	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-has 'no_device'		=> ( is => 'ro', isa => 'Maybe[Int]', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'device_name'	=> ( is => 'ro', required => 1 );
+has 'ebs'			=> ( is => 'ro', required => 0 );
+has 'virtual_name'	=> ( is => 'ro', required => 0 );
+has 'no_device'		=> ( is => 'ro', required => 0 );
 
 =head1 AUTHOR
 
@@ -52,5 +49,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/BundleInstanceResponse.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::BundleInstanceResponse;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -69,21 +69,19 @@ Error message associated with bundle failure.
 
 =cut
 
-has 'instance_id'					=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'bundle_id'						=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'state'							=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'start_time'					=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'update_time'					=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'progress'						=> ( is => 'ro', isa => 'Str', required => 1 );
-has 's3_bucket'						=> ( is => 'ro', isa => 'Str', required => 1 );
-has 's3_prefix'						=> ( is => 'ro', isa => 'Str', required => 1 );
-has 's3_aws_access_key_id'			=> ( is => 'ro', isa => 'Str', required => 1 );
-has 's3_upload_policy'				=> ( is => 'ro', isa => 'Str', required => 1 );
-has 's3_policy_upload_signature'	=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'bundle_error_code'				=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-has 'bundle_error_message'			=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'instance_id'					=> ( is => 'ro', required => 1 );
+has 'bundle_id'						=> ( is => 'ro', required => 1 );
+has 'state'							=> ( is => 'ro', required => 1 );
+has 'start_time'					=> ( is => 'ro', required => 1 );
+has 'update_time'					=> ( is => 'ro', required => 1 );
+has 'progress'						=> ( is => 'ro', required => 1 );
+has 's3_bucket'						=> ( is => 'ro', required => 1 );
+has 's3_prefix'						=> ( is => 'ro', required => 1 );
+has 's3_aws_access_key_id'			=> ( is => 'ro', required => 1 );
+has 's3_upload_policy'				=> ( is => 'ro', required => 1 );
+has 's3_policy_upload_signature'	=> ( is => 'ro', required => 1 );
+has 'bundle_error_code'				=> ( is => 'ro', required => 0 );
+has 'bundle_error_message'			=> ( is => 'ro', required => 0 );
 
 =head1 AUTHOR
 
@@ -96,5 +94,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm

@@ -1,6 +1,5 @@
 package Net::Amazon::EC2::ConfirmProductInstanceResponse;
-use strict;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -28,10 +27,8 @@ is sucessfully attached to the instance.
 
 =cut
 
-has 'return'	=> ( is => 'ro', isa => 'Str', required => 1 );
-has 'owner_id'	=> ( is => 'ro', isa => 'Str', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'return'	=> ( is => 'ro', required => 1 );
+has 'owner_id'	=> ( is => 'ro', required => 0 );
 
 =head1 AUTHOR
 
@@ -44,5 +41,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/ConsoleOutput.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::ConsoleOutput;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -29,11 +29,9 @@ The console output itself.
 
 =cut
 
-has 'instance_id'   => ( is => 'ro', isa => 'Str', required => 1 );
-has 'timestamp'     => ( is => 'ro', isa => 'Str', required => 1 );
-has 'output'        => ( is => 'ro', isa => 'Str', required => 1 );
-
-__PACKAGE__->meta->make_immutable();
+has 'instance_id'   => ( is => 'ro', required => 1 );
+has 'timestamp'     => ( is => 'ro', required => 1 );
+has 'output'        => ( is => 'ro', required => 1 );
 
 =head1 AUTHOR
 
@@ -46,5 +44,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;

lib/Net/Amazon/EC2/CreateVolumePermission.pm

@@ -1,5 +1,5 @@
 package Net::Amazon::EC2::CreateVolumePermission;
-use Moose;
+use Moo;
 
 =head1 NAME
 
@@ -23,10 +23,8 @@ Group that is allowed to create volumes from the snapshot (currently supports "a
 
 =cut
 
-has 'user_id'       => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-has 'group'			=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
-
-__PACKAGE__->meta->make_immutable();
+has 'user_id'       => ( is => 'ro', required => 0 );
+has 'group'			=> ( is => 'ro', required => 0 );
 
 =back
 
@@ -41,5 +39,4 @@ under the same terms as Perl itself.
 
 =cut
 
-no Moose;
-1;
+1;