hugo 0.1.11 → 0.2.0

data/lib/hugo/app.rb

@@ -3,9 +3,16 @@ module Hugo; end
 class Hugo::App
   include Singleton
   include Hugo::Mixin::ParamsValidate
+  
+  AMI = ENV['EC2_AMI_ID'] || 'ami-1515f67c'
+  ZONE = "us-east-1c"
+  TYPE = "m1.small"
+  
 
   attr_accessor :dna
   
+  # How many servers do you want in your cloud
+  # This function will give and take away servers
   def servers(instances=1)
     if lb
       if instances > lb.instances.length
@@ -18,30 +25,50 @@ class Hugo::App
     end
   end
   
+  # Setup will install chef-solo on server instance
   def setup
     if lb
       lb.instances.each do |i|
         setup_ec2(i)
       end
     else
-      puts instance
       setup_ec2(instance)
     end
-    puts "Setup Completed"
+    # puts "Setup Completed"
   end
   
+  # deploy will run you json with chef-sole against your cookbooks
   def deploy
+    raise ArgumentError, "app.key_name Required" unless key_name
+    raise ArgumentError, "app.key_path Required" unless key_path
+    raise ArgumentError, "app.cookbook Required" unless cookbook
+    raise ArgumentError, "app.run_list Required" unless run_list
+    
     deploy_ec2
-    puts "Deploy Completed"    
+    #puts "Deploy Completed"    
   end
   
+  # will kill all app servers
   def destroy
-    lb.instances.each do |i|
-      Hugo::Aws::Ec2.find(i).destroy
-    end    
+    if lb
+      lb.instances.each do |i|
+        Hugo::Aws::Ec2.find(i).destroy
+      end    
+    else
+      Hugo::Aws::Ec2.find(instance).destroy
+    end
+    
+  end
+  
+  def clear
+    @key_name = nil
+    @key_path = nil
+    @cookbook = nil
+    @run_list = nil
   end
   
   
+  # Dyanamically add recipes to your json
   def add_recipe(name, options=nil)
     run_list [] if run_list.nil?
     run_list << "recipe[#{name}]"
@@ -52,29 +79,34 @@ class Hugo::App
     end
   end
 
+  # Set the instance if you only are deploying one server
   def instance(arg=nil)
     set_or_return(:instance, arg, :kind_of => [String]) 
   end
     
+  # Name of app - should relate to github repository
   def name(arg=nil)
     set_or_return(:name, arg, :kind_of => [String]) 
   end
   
+  # Load Balancer Object
   def lb(arg=nil)
     set_or_return(:lb, arg, :kind_of => [Hugo::Aws::Elb]) 
   end
   
+  # Database Object
   def db(arg=nil)
-    set_or_return(:db, arg, :kind_of => [Hugo::Aws::Rds]) 
+    set_or_return(:db, arg, :kind_of => [Hugo::Database]) 
   end
   
-  def uri(arg=nil)
-    set_or_return(:uri, arg, :kind_of => [String]) 
-  end
+  # URI of 
+  # def uri(arg=nil)
+  #   set_or_return(:uri, arg, :kind_of => [String]) 
+  # end
   
-  def type(arg=nil)
-    set_or_return(:type, arg, :kind_of => [String]) 
-  end
+  # def type(arg=nil)
+  #   set_or_return(:type, arg, :kind_of => [String]) 
+  # end
 
   def zone(arg=nil)
     set_or_return(:zone, arg, :kind_of => [String]) 
@@ -84,18 +116,10 @@ class Hugo::App
     set_or_return(:image_id, arg, :kind_of => [String]) 
   end
 
-  def application(arg=nil)
-    set_or_return(:application, arg, :kind_of => [String]) 
-  end
-
   def security_group(arg=nil)
     set_or_return(:security_group, arg, :kind_of => [String]) 
   end
-    
-  def cloud_name(arg=nil)
-    set_or_return(:cloud_name, arg, :kind_of => [String])
-  end
-  
+      
   def key_name(arg=nil)
     set_or_return(:key_name, arg, :kind_of => [String])
   end
@@ -105,19 +129,61 @@ class Hugo::App
   end
   
   def key_path(arg=nil)
-    set_or_return(:key_pair_file, arg, :kind_of => [String])    
+    set_or_return(:key_path, arg, :kind_of => [String])    
   end
     
   def run_list(arg=nil)
     set_or_return(:run_list, arg, :kind_of => [Array])                
   end
+    
   
-  def deploy_info(arg=nil)
-    set_or_return(:deploy_info, arg, :kind_of => [Hash])                    
-  end
-  
-  
-  
+  def help
+    x = <<HELP
+
+Hugo app 
+-----------------
+There are two ways to run hugo app, a single instance mode, or 
+with a balancer.  If you do not use a balancer, then after your 
+initial run, which creates the server instance, you need to enter
+the server instance into your config, so it will not create a new
+ec2 everytime
+
+Required attributes
+-----------------
+key_name
+key_path
+cookbook
+run_list
+
+Methods
+------------------
+servers
+
+deploy
+
+add_recipe
+
+destroy
+
+help
+
+Optional Attributes
+-----------------
+
+instance
+lb
+db
+uri
+type
+zone
+image_id
+
+
+
+HELP
+    puts x
+    x
+  end  
   
   
 private
@@ -133,9 +199,9 @@ private
   end
   
   def create_ec2
-    ec2 = Hugo::Aws::Ec2.new(:type => type, 
-                    :zone => zone, 
-                    :image_id => image_id,
+    ec2 = Hugo::Aws::Ec2.new(:type => type || TYPE, 
+                    :zone => zone || ZONE, 
+                    :image_id => image_id || AMI,
                     :key_name => key_name,
                     :security_group => "default").create
   
@@ -169,7 +235,7 @@ private
     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"
     ec2 = Hugo::Aws::Ec2.find(instance_id)
-    puts ec2.uri
+    #puts ec2.uri
     ec2.ssh(commands, nil, File.join(key_path, key_name))
   end
   
@@ -179,25 +245,16 @@ private
     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 = { 
-      :uri => db.uri, 
-      :name => db.db,
-      :user => db.user, 
-      :password => db.password } unless db.nil?
     
     self.dna = {} if self.dna.nil?
-    self.dna.merge!(:run_list => run_list,
+    self.dna.merge!(
+      :run_list => run_list,
       :git => cookbook,
       :access_key => Hugo::Aws::Ec2::ACCESS_KEY,
       :secret_key => Hugo::Aws::Ec2::SECRET_KEY,
-      :database => database_info, 
-      
-      :application => name, 
-      :customer => cloud_name,
-      
-      :app => deploy_info
+      :database => db ? db.info : {} 
     )
-  
+          
     if lb
       lb.instances.each do |i|
         Hugo::Aws::Ec2.find(i).ssh(commands, dna, File.join(key_path, key_name))
@@ -216,10 +273,6 @@ private
 
     end  
   end
-  
-  def get_instance(uri)
-    nil
-  end
-  
+    
 
 end

data/lib/hugo/aws/ec2.rb

@@ -21,16 +21,19 @@ module Hugo
       
         if options["placement"] and options["placement"]["availabilityZone"]
           @zone = options["placement"]["availabilityZone"] 
+        elsif options[:zone]
+          @zone = option[:zone]
         else
           @zone = ZONE
         end
       
         @uri = options["dnsName"] || ""
-        @type = options["instanceType"] || TYPE
-        @image_id = options["imageId"] || AMI
+        @type = options[:type] || options["instanceType"]
+        @image_id = options[:image_id] || options["imageId"]
+        @key_name = options[:key_name] || options["keyName"]
+
         @create_time = options["launchTime"] || nil
       
-        @key_name = options[:key_name] || options["keyName"] || KEY_NAME
         if options["instanceState"] and options["instanceState"]["name"]
           @status = options["instanceState"]["name"]
         else

data/lib/hugo/aws/rds.rb

@@ -108,7 +108,7 @@ module Hugo
         rescue
           @security_groups = @rds.create_db_security_group(:db_security_group_name => name, :db_security_group_description => description)
         end
-        puts @security_groups
+        #puts @security_groups
         @security_groups
       end
 

data/lib/hugo/balancer.rb

@@ -28,6 +28,38 @@ class Hugo::Balancer
     )
   end
   
+  def help
+    x = <<HELP
+
+Hugo balancer 
+-----------------
+
+optional attributes
+-----------------
+zone - zone
+port - app server port 
+web - balancer port
+ssl_port - ssl app server port
+ssl_web - ssl balancer port
+type - port type
+
+
+defaults
+-----------------
+DEFAULT_ZONE = 'us-east-1c'
+DEFAULT_PORT = '8080'
+DEFAULT_WEB = '80'
+DEFAULT_TYPE = 'http'
+DEFAULT_SSL_PORT = '8443'
+DEFAULT_SSL_WEB = '443'
+
+
+
+HELP
+    puts x
+    x
+  end
+  
   def name(arg=nil)
     set_or_return(:name, arg, :kind_of => [String])     
   end

data/lib/hugo/cloud.rb

@@ -9,7 +9,7 @@ class Hugo::Cloud
 
   end
 
-  def database(db_name, &block)
+  def database(db_name, &block)    
     database = Hugo::Database.instance
     
     database.db_security_group name
@@ -18,8 +18,7 @@ class Hugo::Cloud
     
     database.instance_eval(&block) if block_given? 
     db database.deploy 
-    
-    
+  
   end
   
   def balancer(&block)
@@ -34,7 +33,7 @@ class Hugo::Cloud
     app_info.name name
     app_info.lb lb
     app_info.db db
-    app_info.cloud_name name
+    #app_info.cloud_name name
     app_info.instance_eval(&block) if block_given? 
     cloud_app app_info
     
@@ -49,9 +48,10 @@ class Hugo::Cloud
   end
   
   def delete
-    [db, cloud_app, lb].each do |s|
+    [cloud_app, lb].each do |s|
       s.destroy if s
     end
+    db.rds.destroy
   end
   
   
@@ -108,7 +108,7 @@ REPORT
   end
   
   def db(arg=nil)
-    set_or_return(:db, arg, :kind_of => [Hugo::Aws::Rds])
+    set_or_return(:db, arg, :kind_of => [Hugo::Database])
   end
   
   def lb(arg=nil)

data/lib/hugo/database.rb

@@ -1,5 +1,6 @@
 module Hugo; end
 
+# Lauch Database Servers 
 class Hugo::Database
   include Singleton
   include Hugo::Mixin::ParamsValidate
@@ -8,16 +9,25 @@ class Hugo::Database
   DEFAULT_SIZE = 5
   DEFAULT_ZONE = 'us-east-1c'
   
+  attr_accessor :rds
 
+  # initialize defaults
   def initialize
     size DEFAULT_SIZE
     zone DEFAULT_ZONE
     server DEFAULT_SERVER
     db_security_group "default"
   end
-  
+
+  # deploy using AWS RDS
   def deploy
-    Hugo::Aws::Rds.find_or_create( :name => name,
+    raise ArgumentError, "database.name Required" unless name
+    raise ArgumentError, "database.server Required" unless server
+    raise ArgumentError, "database.user Required" unless user
+    raise ArgumentError, "database.password Required" unless password
+    
+    
+    @rds = Hugo::Aws::Rds.find_or_create( :name => name,
                               :server => server,
                               :user => user,
                               :password => password,
@@ -25,8 +35,50 @@ class Hugo::Database
                               :zone => zone,
                               :db_security_group => db_security_group
                                )
+    self
+  end
+  
+  # clear attributes of database object
+  def clear
+    @user = nil
+    @password = nil
+    @server = nil
+  end
+  
+  def help
+    
+    x = <<HELP
+Welcome to Hugo::Database
+-------------------------
+
+Required Methods:
+-------------------------
+name - Name of Database
+server - Name of Server
+user - A Valid User of RDS Server
+password - A Valid Password of RDS Server    
+
+Optional Methods:
+-------------------------
+size - Storage Size of you db server
+zone - Zone of the AWS:RDS
+
+HELP
+    puts x
+    x
   end
   
+  def info
+    { 
+      :uri => @rds.uri, 
+      :name => @rds.db,
+      :user => @rds.user, 
+      :password => @rds.password 
+      } 
+    
+  end
+  
+  
   def name(arg=nil)
     set_or_return(:name, arg, :kind_of => [String])     
   end

data/spec/lib/hugo/app_spec.rb

@@ -9,10 +9,25 @@ describe "Hugo App" do
     
     block = lambda do
       cloud "my_cloud" do 
+        database "my_db" do
+          server "my_server"
+          user "hello"
+          password "world"
+        end
+        
         balancer
+        
         app "testapp" do 
+          clear
+          
+          key_name "ec2-keypair"
+          key_path "~/.ec2"
+          cookbook "git@github.com:jackhq/hugo-cookbooks.git"
+          
           servers 0
         end
+        #deploy
+        #print
       end
     end
     
@@ -21,6 +36,55 @@ describe "Hugo App" do
     end.should_not raise_error
   end
   
+  it "should raise error requiring key_name" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          app "testapp" do 
+            clear
+            key_path "~/.ec2"
+            cookbook "my_cookbook"
+            run_list ["role[base_rack_apache]"]
+          end 
+          deploy         
+        end        
+      end
+    end.should raise_error('app.key_name Required')
+  end
+
+  it "should raise error requiring key_path" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          app "testapp" do 
+            clear
+            key_name "ec2-keypair"
+            cookbook "my_cookbook"
+            run_list ["role[base_rack_apache]"]
+          end 
+          deploy         
+        end        
+      end
+    end.should raise_error('app.key_path Required')
+  end
+
+  it "should raise error requiring cookbook" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          app "testapp" do 
+            clear
+            key_name "ec2-keypair"
+            key_path "~/.ec2"
+            run_list ["role[base_rack_apache]"]
+          end 
+          deploy         
+        end        
+      end
+    end.should raise_error('app.cookbook Required')
+  end
+  
+  
   it "should save dna" do
     block = lambda do
       cloud "my_cloud" do 
@@ -28,8 +92,8 @@ describe "Hugo App" do
         app "testapp" do 
           add_recipe "s3fs", :s3 => {:bucket => "samIam"}
           servers 0
-          puts run_list
-          puts dna.inspect
+          #puts run_list
+          #puts dna.inspect
         end
       end
     end

data/spec/lib/hugo/balancer_spec.rb

@@ -16,6 +16,7 @@ describe "Hugo Balancer" do
       Hugo &block
     end.should_not raise_error
   end
+  
 
   it "should raise error for balancer block not wrapped in cloud block" do
     block = lambda do
@@ -34,4 +35,11 @@ describe "Hugo Balancer" do
     
   end
 
+  it "should print help for balancer" do
+    lb = Hugo::Balancer.instance
+    lb.name "myserver"
+    lb.help.should =~ /^Hugo balancer/
+    
+  end
+
 end

data/spec/lib/hugo/database_spec.rb

@@ -5,46 +5,80 @@ describe "Hugo Database" do
     mocks
   end
 
+  it "should raise error requiring user" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          database "testapp" do 
+            clear
+            server "server"
+            password "test_password"
+          end          
+        end        
+      end
+    end.should raise_error('database.user Required')
+  end
+
+  it "should raise error requiring password" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          database "testapp" do
+            clear
+            server "server"
+            user "test_user"
+          end          
+        end        
+      end
+    end.should raise_error('database.password Required')
+  end
+
+  it "should raise error requiring server" do
+    lambda do
+      Hugo do
+        cloud "my_cloud" do
+          database "testapp" do
+            clear
+            password "test_password"
+            user "test_user"
+          end          
+        end        
+      end
+    end.should raise_error('database.server Required')
+  end
+
   it "should be valid" do
-    
-    block = lambda do
-      cloud "my_cloud" do 
-        database "testapp" do 
-          server "serverx"
-          user "test_user"
-          password "test_password"
+        
+    lambda do
+      Hugo do
+        cloud "my_cloud" do 
+          database "testapp" do 
+            server "serverx"
+            user "test_user"
+            password "test_password"
+          end
         end
       end
-    end
-    
-    lambda do
-      Hugo &block
     end.should_not raise_error
   end
 
   it "should raise error for database block not wrapped in cloud block" do
-    block = lambda do
-      database "mydb" do end
-    end
-    
     lambda do
-      Hugo &block
+      Hugo { database "mydb" }
     end.should raise_error
   end
 
   it "should not raise error for database block wrapped in cloud block" do
-    block = lambda do
-      cloud "mycloud" do
-        database "mydb" do end
-      end
-    end
-    
     lambda do
-      Hugo &block
+      Hugo do
+        cloud "mycloud" do
+          database "mydb" do end
+        end      
+      end
     end.should be_true
   end
 end
-
+# 
 describe Hugo::Database do
   before(:each) do
     mocks
@@ -58,9 +92,40 @@ describe Hugo::Database do
     db.name "mydb"
     db.user "admin"
     db.password "test"
-    db.deploy.should be_a_kind_of(Hugo::Aws::Rds)
+    db.deploy.should be_a_kind_of(Hugo::Database)
   end
   
+  it "should clear required attributes" do
+    db = Hugo::Database.instance
+    db.server "myserver"
+    db.name "mydb"
+    db.user "admin"
+    db.password "test"
+    db.clear
+    db.server.should be_nil
+    db.user.should be_nil
+    db.password.should be_nil
+    
+  end
+  
+  it "should print help for database" do
+    db = Hugo::Database.instance
+    db.name "myserver"
+    db.help.should =~ /^Welcome to Hugo/
+    
+  end
+  
+  it "should return an info hash" do
+    db = Hugo::Database.instance
+    db.server "myserver"
+    db.name "mydb"
+    db.user "admin"
+    db.password "test"
+    db.deploy
+    db.info.inspect.should == '{:user=>"user", :uri=>"test.cwrzj6lxowfj.us-east-1.rds.amazonaws.com", :password=>"test", :name=>"mydb"}'
+  end
+  
+  
   
 end
   

data/spec/lib/hugo_spec.rb

@@ -23,6 +23,31 @@ describe "Hugo DSL" do
     end.should be_true
   end
   
+  it "should deploy a single server app" do
+    block = lambda do
+      cloud "my_cloud" do                         
+        database "db_name" do 
+          server     "db_server"
+          user       "admin"
+          password   "mypassword"  
+        end
+        
+        balancer 
+        
+        app "app_name" do
+          
+                            
+        end
+      end
+    end
+    
+    lambda do
+      Hugo &block
+    end.should be_true
+ 
+  end
+  
+  
   
   
   it "should deploy infrastructure" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Wilson