hugo 0.3.2 → 0.3.4

data/lib/hugo/app.rb

@@ -203,7 +203,7 @@ private
                     :zone => zone || ZONE, 
                     :image_id => image_id || AMI,
                     :key_name => key_name,
-                    :security_group => "default").create
+                    :security_group => security_group || "default").create
   
     new_ec2 = nil
     sleep 10

data/lib/hugo/aws/ec2.rb

@@ -40,10 +40,10 @@ module Hugo
           @status = "unknown"
         end
 
-        # @security_group = options[:security_group] || nil
-        # if options["groupSet"] and options["groupSet"]["item"] and options["groupSet"]["item"][0]
-        #   @security_group = options["groupSet"]["item"][0]["groupId"]
-        # end
+        @security_group = options[:security_group] || "default"
+        if options["groupSet"] and options["groupSet"]["item"] and options["groupSet"]["item"][0]
+          @security_group = options["groupSet"]["item"][0]["groupId"]
+        end
         
       end
       
@@ -52,7 +52,8 @@ module Hugo
         @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
         result = @ec2.run_instances(:image_id => self.image_id, :key_name => self.key_name, 
           :max_count => 1,
-          :availability_zone => self.zone) unless self.create_time
+          :availability_zone => self.zone,
+          :security_group => self.security_group) unless self.create_time
         set_attributes(result.instancesSet.item[0]) if result.instancesSet.item[0]
         self
       end
@@ -74,27 +75,27 @@ module Hugo
               ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > ~/dna.json")
             end
             commands.each do |cmd|
-              puts ssh.exec!(cmd)
+              print ssh.exec!(cmd)
             end
           end
         rescue
         end
       end
     
-      def self.find_or_create_security_group(name, description)
-        @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
-        begin
-          @security_groups = @ec2.describe_security_groups(:group_name => name)
-        rescue
-          @security_groups = @ec2.create_security_group(:group_name => name, :group_description => description)
-        end
-        @security_groups
-      end
-
-      def self.destroy_security_group(name)
-        @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
-        @ec2.delete_security_group(:group_name => name)
-      end
+      # def self.find_or_create_security_group(name, description)
+      #   @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
+      #   begin
+      #     @security_groups = @ec2.describe_security_groups(:group_name => name)
+      #   rescue
+      #     @security_groups = @ec2.create_security_group(:group_name => name, :group_description => description)
+      #   end
+      #   @security_groups
+      # end
+      # 
+      # def self.destroy_security_group(name)
+      #   @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)
+      #   @ec2.delete_security_group(:group_name => name)
+      # end
 
       def self.all
         @ec2 = AWS::EC2::Base.new(:access_key_id => ACCESS_KEY, :secret_access_key => SECRET_KEY)

data/lib/hugo/cloud.rb

@@ -60,10 +60,10 @@ class Hugo::Cloud
     if db
       puts <<REPORT
 ------------------------    
-DATABASE: #{db.db}
-  User: #{db.user}
-  Password: #{db.password}
-  Uri: #{db.uri}
+DATABASE: #{db.info[:name]}
+  User: #{db.info[:user]}
+  Password: #{db.info[:password]}
+  Uri: #{db.info[:uri]}
 REPORT
     end
     

metadata

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