hugo 0.1.6 → 0.1.9

data/Rakefile

@@ -4,6 +4,10 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
+    gemspec.add_dependency('amazon-ec2')
+    gemspec.add_dependency('net-ssh')
+    gemspec.add_dependency('json')
+    
     gemspec.name = "hugo"
     gemspec.summary = "Deploy Your Rack Apps to Cloud"
     gemspec.description = "A easy to understand DSL that makes it dirt simple to deploy to the cloud."

data/lib/hugo/app.rb

@@ -4,7 +4,8 @@ class Hugo::App
   include Singleton
   include Hugo::Mixin::ParamsValidate
 
-
+  attr_accessor :dna
+  
   def servers(instances=1)
     if lb
       if instances > lb.instances.length
@@ -34,6 +35,16 @@ class Hugo::App
   end
   
   
+  def add_recipe(name, options=nil)
+    run_list [] if run_list.nil?
+    run_list << "recipe[#{name}]"
+    if options
+      empty_hash = {}
+      self.dna = {} if self.dna.nil?
+      self.dna.merge!(options)
+    end
+  end
+    
   def name(arg=nil)
     set_or_return(:name, arg, :kind_of => [String]) 
   end
@@ -62,14 +73,6 @@ class Hugo::App
     set_or_return(:image_id, arg, :kind_of => [String]) 
   end
 
-  def port(arg=nil)
-    set_or_return(:port, arg, :kind_of => [String]) 
-  end
-
-  def ssl(arg=nil)
-    set_or_return(:ssl, arg, :kind_of => [String]) 
-  end
-
   def application(arg=nil)
     set_or_return(:application, arg, :kind_of => [String]) 
   end
@@ -90,34 +93,10 @@ class Hugo::App
     set_or_return(:cookbook, arg, :kind_of => [String])
   end
   
-  def key_pair_file(arg=nil)
+  def key_path(arg=nil)
     set_or_return(:key_pair_file, arg, :kind_of => [String])    
   end
-
-  def port(arg=nil)
-    set_or_return(:port, arg, :kind_of => [String])    
-  end
-  
-  def github_url(arg=nil)
-    set_or_return(:github_url, arg, :kind_of => [String])        
-  end
-  
-  def privatekey(arg=nil)
-    set_or_return(:privatekey, arg, :kind_of => [String])            
-  end
-
-  def publickey(arg=nil)
-    set_or_return(:publickey, arg, :kind_of => [String])            
-  end
-
-  def gem_list(arg=nil)
-    set_or_return(:gem_list, arg, :kind_of => [Array])            
-  end
-
-  def package_list(arg=nil)
-    set_or_return(:package_list, arg, :kind_of => [Array])            
-  end
-  
+    
   def run_list(arg=nil)
     set_or_return(:run_list, arg, :kind_of => [Array])                
   end
@@ -176,7 +155,7 @@ 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, key_pair_file)
+    Hugo::Aws::Ec2.find(instance_id).ssh(commands, nil, File.join(key_path, key_name))
   end
   
   def deploy_ec2
@@ -184,37 +163,28 @@ private
     commands = []
     commands << "cd hugo-repos && git pull"
     commands << 'sudo chef-solo -c /home/ubuntu/hugo-repos/config/solo.rb -j /home/ubuntu/dna.json'
-    
-    ports = [port]
-    ports << ssl unless ssl.nil?
-      
-    database_info = {}
+        
     database_info = { 
       :uri => db.uri, 
       :name => db.db,
       :user => db.user, 
       :password => db.password } unless db.nil?
-      
-    dna = { :run_list => run_list,
-      :package_list => package_list,
-      :gem_list => gem_list,
-
-      :application => name, 
-      :customer => cloud_name,
-      :database => database_info, 
-      :web => { :port => port, :ssl => ssl }, 
+    
+    self.dna = {} if self.dna.nil?
+    self.dna.merge!(:run_list => run_list,
       :git => cookbook,
-      :github => {  :url => github_url, 
-                    :publickey => publickey, 
-                    :privatekey => privatekey},
       :access_key => Hugo::Aws::Ec2::ACCESS_KEY,
       :secret_key => Hugo::Aws::Ec2::SECRET_KEY,
-      :apache => { :listen_ports =>  ports },
+      :database => database_info, 
+      
+      :application => name, 
+      :customer => cloud_name,
+      
       :app => deploy_info
-    }
+    )
   
     lb.instances.each do |i|
-      Hugo::Aws::Ec2.find(i).ssh(commands, dna, key_pair_file)
+      Hugo::Aws::Ec2.find(i).ssh(commands, dna, File.join(key_path, key_name))
     end
   end
   

data/spec/lib/hugo/app_spec.rb

@@ -20,6 +20,27 @@ describe "Hugo App" do
       Hugo &block
     end.should_not raise_error
   end
+  
+  it "should save dna" do
+    block = lambda do
+      cloud "my_cloud" do 
+        balancer
+        app "testapp" do 
+          add_recipe "s3fs", :s3 => {:bucket => "samIam"}
+          servers 0
+          puts run_list
+          puts dna.inspect
+        end
+      end
+    end
+    
+    lambda do
+      Hugo &block
+    end.should_not raise_error
+    
+    #puts @app.dna
+  end
+  
 
   it "should raise error for database block not wrapped in cloud block" do
     block = lambda do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/hugo")
-
-Bundler.require_env(:test)    # get rspec and webrat in here
+# 
+# Bundler.require_env(:test)    # get rspec and webrat in here
 
 
 # require 'rubygems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors: 
 - Tom Wilson
@@ -10,9 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -05:00
+date: 2010-02-02 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 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
   type: :runtime