hugo 0.4.0 → 0.4.1

data/lib/hugo/app.rb

@@ -290,7 +290,7 @@ private
   end
   
   def ec2(instance_id)
-    Hugo::Aws::Ec2.find(instance, aws_access_key_id, aws_secret_access_key)
+    Hugo::Aws::Ec2.find(instance_id, @aws_access_key_id, @aws_secret_access_key)
   end
   
     

data/lib/hugo/aws/ec2.rb

@@ -108,6 +108,7 @@ module Hugo
       end
     
       def self.find(instance, access_key_id, secret_access_key)
+        raise ArgumentError, "Instance Required" unless instance
         @ec2 = AWS::EC2::Base.new(:access_key_id => access_key_id, :secret_access_key => secret_access_key)
         self.new(@ec2.describe_instances(:instance_id => instance).reservationSet.item[0].instancesSet.item[0])
       end
@@ -119,7 +120,7 @@ module Hugo
     
       def self.find_or_create(options)
         if options[:name]
-          self.find(options[:name]) 
+          self.find(options[:name], options[:access_key_id], options[:secret_access_key]) 
         else
           self.new(options).create
         end

data/lib/hugo/aws/elb.rb

@@ -99,7 +99,7 @@ module Hugo
       
     private
       def elb
-        AWS::ELB::Base.new(:access_key_id => @aws_access_key_id, :secret_access_key => @aws_secret_access_key)
+        AWS::ELB::Base.new(:access_key_id => self.aws_access_key_id, :secret_access_key => self.aws_secret_access_key)
       end
       
     end

data/lib/hugo/cloud.rb

@@ -88,7 +88,7 @@ Balancer: #{lb.name}
 REPORT
   
       lb.instances.each do |i|
-        ec2 = Hugo::Aws::Ec2.find(i)
+        ec2 = Hugo::Aws::Ec2.find(i, @aws_access_key_id, @aws_secret_access_key)
         puts <<REPORT
 -----------------------      
 Id: #{ec2.name}
@@ -99,7 +99,7 @@ Zone: #{ec2.zone}
 REPORT
       end
     else
-      ec2 = Hugo::Aws::Ec2.find(cloud_app.instance)
+      ec2 = Hugo::Aws::Ec2.find(cloud_app.instance, @aws_access_key_id, @aws_secret_access_key)
       puts <<REPORT
 
 Since you are not running a balancer

data/lib/hugo/database.rb

@@ -48,6 +48,9 @@ class Hugo::Database
     @user = nil
     @password = nil
     @server = nil
+    @aws_access_key_id = nil
+    @aws_secret_access_key = nil
+    
   end
   
   def help

data/spec/lib/hugo/database_spec.rb

@@ -94,7 +94,10 @@ describe Hugo::Database do
     db.name "mydb"
     db.user "admin"
     db.password "test"
+    db.aws_access_key_id '12'
+    db.aws_secret_access_key '34'
     db.deploy.should be_a_kind_of(Hugo::Database)
+    db.clear
   end
   
   it "should clear required attributes" do
@@ -123,12 +126,15 @@ describe Hugo::Database do
     db.name "mydb"
     db.user "admin"
     db.password "test"
+    db.aws_access_key_id '12'
+    db.aws_secret_access_key '34'
+    
     db.deploy
     db.info[:user].should == "user"
     db.info[:password].should == "test"
     db.info[:uri].should == "test.cwrzj6lxowfj.us-east-1.rds.amazonaws.com"
     db.info[:name].should == "mydb"
-
+    db.clear
   end
   
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tom Wilson
@@ -10,69 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -05:00
+date: 2010-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 16
         version: 2.0.16
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: Deploy your apps to the EC2 cloud.
 email: tom@jackhq.com
 executables: []
@@ -107,18 +130,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Deploy Your Rack Apps to EC2 Cloud