the-maestro 0.4.0 → 0.4.1

data/README.rdoc

@@ -1,4 +1,4 @@
-<b>Maestro: Conduct your clouds</b>
+== Maestro: Conduct your clouds
 
 Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.
 Simply declare the structure of your clouds via configuration files, create {Chef}[http://wiki.opscode.com/display/chef/Home]
@@ -31,6 +31,12 @@ Then run the following to install the Maestro gem:
 
     bundle install
 
+You'll interact with Maestro through custom Rake tasks that Maestro adds to your Rails 3 project.
+When running <code>rake</code> within the context of your Rails 3 application, prefix the call to rake with
+<code>bundle exec</code>. For example:
+
+    bundle exec rake maestro:validate_configs
+
 
 === Installation with Ruby On Rails 2
 
@@ -109,6 +115,7 @@ that these capabilities are enabled in your Amazon Web Services account. See the
     aws_access_key "XXXXXXXXXXXXXXXXXXXX"
     aws_secret_access_key "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     chef_bucket "maestro.yourdomain.com"
+    region "us-east"
     
     roles do
       role "web" do
@@ -157,6 +164,11 @@ The following attributes must be present within your aws_cloud declaration:
 - <b>aws_secret_access_key</b>: Your Amazon Web Services Secret Access Key
 - <b>chef_bucket</b>: The name of the Amazon S3 Bucket where you want your Chef recipes and roles stored. If this Bucket does not exist, Maestro will create it for you. Please note that the Bucket itself, and all objects stored within the Bucket use the canned 'private' access policy, meaning no one but the Bucket owner (i.e. you) may access the Bucket or the objects within it. Maestro uses query string authentication when accessing the objects to ensure the integrity of your data.
 
+The following attributes are optional within your aws_cloud declaration:
+
+- <b>region</b>: The name of an AWS region to run this cloud in. If this attribute is ommitted, the US-East region will be used.
+  Allowed values are: "us-east", "us-west", "eu", "asia-pacific".
+
 
 ==== roles
 The <code>roles</code> method allows you to apply configuration to all of the nodes in your cloud which are in a given role, rather than repeating that configuration for all nodes individually.
@@ -432,6 +444,8 @@ At this point, you can use Maestro as described above. Define your clouds, creat
 
 The {Maestro Users Google Group}[http://groups.google.com/group/maestro-users] is the recommended place to get help.
 
+An {example Rails 3 application}[http://github.com/bploetz/maestro-rails3-example] can be used as a starting point for creating your own
+application and cookbooks.
 
 == Contributing
 Please use the {Issues}[http://github.com/bploetz/maestro/issues] page on the Maestro GitHub site to report bugs or feature requests.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/maestro/cloud/aws.rb

@@ -22,6 +22,27 @@ module Maestro
       MAESTRO_NODE_PREFIX = "node."
       MAESTRO_ROLE_PREFIX = "role."
       MAESTRO_DEFAULT_ROLE = "default"
+      
+      US_EAST_REGION = "us-east"
+      US_WEST_REGION = "us-west"
+      EU_REGION = "eu"
+      ASIA_PACIFIC_REGION = "asia-pacific"
+      REGIONS = [US_EAST_REGION, US_WEST_REGION, EU_REGION, ASIA_PACIFIC_REGION]
+
+      EC2_ENDPOINTS = {US_EAST_REGION => "ec2.us-east-1.amazonaws.com",
+                       US_WEST_REGION => "ec2.us-west-1.amazonaws.com",
+                       EU_REGION => "ec2.eu-west-1.amazonaws.com",
+                       ASIA_PACIFIC_REGION => "ec2.ap-southeast-1.amazonaws.com"}
+
+      ELB_ENDPOINTS = {US_EAST_REGION => "elasticloadbalancing.us-east-1.amazonaws.com",
+                       US_WEST_REGION => "elasticloadbalancing.us-west-1.amazonaws.com",
+                       EU_REGION => "elasticloadbalancing.eu-west-1.amazonaws.com",
+                       ASIA_PACIFIC_REGION => "elasticloadbalancing.ap-southeast-1.amazonaws.com"}
+
+      RDS_ENDPOINTS = {US_EAST_REGION => "rds.us-east-1.amazonaws.com",
+                       US_WEST_REGION => "rds.us-west-1.amazonaws.com",
+                       EU_REGION => "rds.eu-west-1.amazonaws.com",
+                       ASIA_PACIFIC_REGION => "rds.ap-southeast-1.amazonaws.com"}
 
       # Array of all ec2 security groups names in this Cloud
       attr_reader :ec2_security_groups
@@ -41,7 +62,7 @@ module Maestro
       attr_reader :elb_nodes
       # Hash of Rds Nodes
       attr_reader :rds_nodes
-      dsl_property :aws_account_id, :aws_access_key, :aws_secret_access_key, :chef_bucket
+      dsl_property :aws_account_id, :aws_access_key, :aws_secret_access_key, :chef_bucket, :region
 
       def initialize(name, cfg_file=nil, &block)
         @ec2_nodes = Hash.new
@@ -98,9 +119,19 @@ module Maestro
 
       # establishes a connection to Amazon
       def connect!
-        @ec2 = AWS::EC2::Base.new(:access_key_id => aws_access_key, :secret_access_key => aws_secret_access_key, :use_ssl => true)
-        @elb = AWS::ELB::Base.new(:access_key_id => aws_access_key, :secret_access_key => aws_secret_access_key, :use_ssl => true)
-        @rds = AWS::RDS::Base.new(:access_key_id => aws_access_key, :secret_access_key => aws_secret_access_key, :use_ssl => true)
+        region.nil? || region.empty? ? region_name = US_EAST_REGION : region_name = region
+        @ec2 = AWS::EC2::Base.new(:access_key_id => aws_access_key,
+                                  :secret_access_key => aws_secret_access_key,
+                                  :use_ssl => true,
+                                  :server => EC2_ENDPOINTS[region_name])
+        @elb = AWS::ELB::Base.new(:access_key_id => aws_access_key,
+                                  :secret_access_key => aws_secret_access_key,
+                                  :use_ssl => true,
+                                  :server => ELB_ENDPOINTS[region_name])
+        @rds = AWS::RDS::Base.new(:access_key_id => aws_access_key,
+                                  :secret_access_key => aws_secret_access_key,
+                                  :use_ssl => true,
+                                  :server => RDS_ENDPOINTS[region_name])
         s3_logger = Logger.new(STDOUT)
         s3_logger.level = Logger::FATAL
         AWS::S3::Base.establish_connection!(:access_key_id => aws_access_key, :secret_access_key => aws_secret_access_key, :use_ssl => true)
@@ -886,6 +917,9 @@ module Maestro
         invalidate "Missing aws_access_key" if aws_access_key.nil?
         invalidate "Missing aws_secret_access_key" if aws_secret_access_key.nil?
         invalidate "Missing chef_bucket" if chef_bucket.nil?
+        if !region.nil? && !region.empty?
+          invalidate "Invalid region" if !REGIONS.include?(region)
+        end
       end
 
       # Ensures that the given EC2 security group exists. Creates it if it does not exist.

data/test/integration/base_aws.rb

@@ -37,6 +37,9 @@ module BaseAws
   #   
   #     # Name of the S3 bucket to store Chef assets in
   #     :chef_bucket => "maestro-tests-aws.XXXXXXXX.com"
+  #
+  #     # Name of the region to run the tests in. Must match region names in Maestro::Cloud::Aws::REGIONS
+  #     :region => "us-east"
   #  }
   #
   # Make sure you set the appropriate permissions on this file, and delete it when you're done running the integration tests.
@@ -59,10 +62,20 @@ module BaseAws
     raise "Invalid Maestro::Cloud::Aws integration test config file: ~/#{@config_file_name}. Missing :aws_access_key key" if !@credentials.has_key?(:aws_access_key)
     raise "Invalid Maestro::Cloud::Aws integration test config file: ~/#{@config_file_name}. Missing :aws_secret_access_key key" if !@credentials.has_key?(:aws_secret_access_key)
     raise "Invalid Maestro::Cloud::Aws integration test config file: ~/#{@config_file_name}. Missing :chef_bucket key" if !@credentials.has_key?(:chef_bucket)
+    raise "Invalid Maestro::Cloud::Aws integration test config file: ~/#{@config_file_name}. Missing :region key" if !@credentials.has_key?(:region)
 
-    @ec2 = AWS::EC2::Base.new(:access_key_id => @credentials[:aws_access_key], :secret_access_key => @credentials[:aws_secret_access_key], :use_ssl => true)
-    @elb = AWS::ELB::Base.new(:access_key_id => @credentials[:aws_access_key], :secret_access_key => @credentials[:aws_secret_access_key], :use_ssl => true)
-    @rds = AWS::RDS::Base.new(:access_key_id => @credentials[:aws_access_key], :secret_access_key => @credentials[:aws_secret_access_key], :use_ssl => true)
+    @ec2 = AWS::EC2::Base.new(:access_key_id => @credentials[:aws_access_key],
+                              :secret_access_key => @credentials[:aws_secret_access_key],
+                              :use_ssl => true,
+                              :server => Maestro::Cloud::Aws::EC2_ENDPOINTS[@credentials[:region]])
+    @elb = AWS::ELB::Base.new(:access_key_id => @credentials[:aws_access_key],
+                              :secret_access_key => @credentials[:aws_secret_access_key],
+                              :use_ssl => true,
+                              :server => Maestro::Cloud::Aws::ELB_ENDPOINTS[@credentials[:region]])
+    @rds = AWS::RDS::Base.new(:access_key_id => @credentials[:aws_access_key],
+                              :secret_access_key => @credentials[:aws_secret_access_key],
+                              :use_ssl => true,
+                              :server => Maestro::Cloud::Aws::RDS_ENDPOINTS[@credentials[:region]])
     AWS::S3::Base.establish_connection!(:access_key_id => @credentials[:aws_access_key], :secret_access_key => @credentials[:aws_secret_access_key], :use_ssl => true)
 
     # keep track of the Elastic IPs we started with

data/test/integration/test_aws_cloud.rb

@@ -258,7 +258,35 @@ class TestAwsCloud < Test::Unit::TestCase
     # Tests
     #######################
 
-    should "be able to connect to AWS" do
+    should "be able to connect to default AWS endpoints" do
+      assert_nothing_raised do
+        @cloud.connect!
+      end
+    end
+
+    should "be able to connect to us-east AWS endpoints" do
+      @cloud.region("us-east")
+      assert_nothing_raised do
+        @cloud.connect!
+      end
+    end
+
+    should "be able to connect to us-west AWS endpoints" do
+      @cloud.region("us-west")
+      assert_nothing_raised do
+        @cloud.connect!
+      end
+    end
+
+    should "be able to connect to eu AWS endpoints" do
+      @cloud.region("eu")
+      assert_nothing_raised do
+        @cloud.connect!
+      end
+    end
+
+    should "be able to connect to asia-pacific AWS endpoints" do
+      @cloud.region("asia-pacific")
       assert_nothing_raised do
         @cloud.connect!
       end

data/test/unit/test_aws_cloud.rb

@@ -124,6 +124,13 @@ class TestAwsCloud < Test::Unit::TestCase
       assert @cloud.validation_errors.any? {|message| !message.index("Missing chef_bucket").nil? }
     end
 
+    should "be invalid due to invalid region name" do
+      @cloud.region "foo"
+      @cloud.validate
+      assert !@cloud.valid?
+      assert @cloud.validation_errors.any? {|message| !message.index("Invalid region").nil? }
+    end
+
     should "be valid" do
       @cloud.validate
       assert @cloud.valid?

data/the-maestro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{the-maestro}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Ploetz"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2010-10-10}
   s.description = %q{Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -81,7 +81,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bploetz/maestro}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Maestro: Conduct your clouds.}
   s.test_files = [
     "test/integration/base_aws.rb",
@@ -117,7 +117,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, ["= 2.10.2"])
       s.add_runtime_dependency(%q<net-ssh>, ["= 2.0.15"])
       s.add_runtime_dependency(%q<net-scp>, ["= 1.0.2"])

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: the-maestro
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Brian Ploetz
@@ -14,144 +9,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 2
         version: 2.10.2
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 15
         version: 2.0.15
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-scp
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :runtime
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
         version: 0.5.2
-  type: :runtime
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
         version: 0.9.11
-  type: :runtime
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 2
         version: 0.6.2
-  type: :runtime
-  version_requirements: *id008
+    version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 7
         version: 1.1.7
-  type: :runtime
-  version_requirements: *id009
+    version: 
 description: Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.
 email: 
 executables: []
@@ -233,25 +183,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "Maestro: Conduct your clouds."