hugo 0.1.10 → 0.1.11

data/lib/hugo/app.rb

@@ -13,12 +13,19 @@ class Hugo::App
       elsif instances < lb.instances.length
         delete_ec2(lb.instances.length - instances)
       end    
+    else
+      instance(build_ec2(1)) unless instance
     end
   end
   
   def setup
-    lb.instances.each do |i|
-      setup_ec2(i)
+    if lb
+      lb.instances.each do |i|
+        setup_ec2(i)
+      end
+    else
+      puts instance
+      setup_ec2(instance)
     end
     puts "Setup Completed"
   end
@@ -44,6 +51,10 @@ class Hugo::App
       self.dna.merge!(options)
     end
   end
+
+  def instance(arg=nil)
+    set_or_return(:instance, arg, :kind_of => [String]) 
+  end
     
   def name(arg=nil)
     set_or_return(:name, arg, :kind_of => [String]) 
@@ -112,11 +123,13 @@ class Hugo::App
 private
 
   def build_ec2(i=1)
+    instance_id = nil
     i.times do
       instance_id = create_ec2
       #setup_ec2(instance_id)
-      lb.add(instance_id)
+      lb.add(instance_id) if lb
     end
+    instance_id
   end
   
   def create_ec2
@@ -155,13 +168,15 @@ private
     commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem install chef-deploy --no-ri --no-rdoc; fi'
     commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem install git --no-ri --no-rdoc; fi'
     commands << "if [ -d \"./hugo-repos\" ]; then echo \"setup already run\"; else git clone #{self.cookbook} ~/hugo-repos; fi"
-    Hugo::Aws::Ec2.find(instance_id).ssh(commands, nil, File.join(key_path, key_name))
+    ec2 = Hugo::Aws::Ec2.find(instance_id)
+    puts ec2.uri
+    ec2.ssh(commands, nil, File.join(key_path, key_name))
   end
   
   def deploy_ec2
   
     commands = []
-    commands << "cd hugo-repos && git pull"
+    commands << "cd hugo-repos && git reset --hard && git pull"
     commands << 'sudo chef-solo -c /home/ubuntu/hugo-repos/config/solo.rb -j /home/ubuntu/dna.json'
         
     database_info = { 
@@ -183,9 +198,14 @@ private
       :app => deploy_info
     )
   
-    lb.instances.each do |i|
-      Hugo::Aws::Ec2.find(i).ssh(commands, dna, File.join(key_path, key_name))
+    if lb
+      lb.instances.each do |i|
+        Hugo::Aws::Ec2.find(i).ssh(commands, dna, File.join(key_path, key_name))
+      end
+    else
+      Hugo::Aws::Ec2.find(instance).ssh(commands, dna, File.join(key_path, key_name))      
     end
+    
   end
   
   def delete_ec2(i=1)
@@ -196,5 +216,10 @@ private
 
     end  
   end
+  
+  def get_instance(uri)
+    nil
+  end
+  
 
 end

data/lib/hugo/aws/ec2.rb

@@ -102,6 +102,11 @@ module Hugo
         @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
         self.new(@ec2.describe_instances(:instance_id => instance).reservationSet.item[0].instancesSet.item[0])
       end
+
+      # def self.find(url)
+      #   @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
+      #   self.new(@ec2.describe_instances(:instance_id => instance).reservationSet.item[0].instancesSet.item[0])
+      # end
     
       def self.find_or_create(options)
         if options[:name]

data/lib/hugo/cloud.rb

@@ -86,6 +86,19 @@ Zone: #{ec2.zone}
 
 REPORT
       end
+    else
+      ec2 = Hugo::Aws::Ec2.find(cloud_app.instance)
+      puts <<REPORT
+
+Since you are not running a balancer
+you need to remember to add #{ec2.name} as the instance method in your app
+-----------------------      
+Id: #{ec2.name}
+Uri: #{ec2.uri}
+Type: #{ec2.type}
+Zone: #{ec2.zone}
+      
+REPORT
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Tom Wilson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency