hugo 0.3.0 → 0.3.1

data/Rakefile

@@ -10,19 +10,14 @@ begin
     
     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."
+    gemspec.description = "Deploy your apps to the cloud."
     gemspec.email = "tom@jackhq.com"
-    gemspec.homepage = "http://github.com/twilson63/hugo"
+    gemspec.homepage = "http://github.com/twilson63/hugo2"
     gemspec.authors = ["Tom Wilson", "Barrett Little"]
 
     gemspec.add_dependency('amazon-ec2', '>= 0.7.5')
     gemspec.add_dependency('json', '>= 1.2.0')
     gemspec.add_dependency('net-ssh', '>= 2.0.16')
-    gemspec.add_dependency('builder', '>= 0')
-    gemspec.add_dependency('i18n', '>= 0')
-    gemspec.add_dependency('activesupport', '>= 2.3.5')
-    gemspec.add_dependency('activeresource', '>= 2.3.5')
-    gemspec.add_dependency('zerigo_dns', '>= 1.0.0')
 
     gemspec.files = FileList['spec/*.rb'] + FileList['lib/**/*.rb'] + ['README.rdoc', 'LICENSE', 'VERSION.yml', 'Rakefile']
   end

data/lib/hugo/app.rb

@@ -223,17 +223,17 @@ private
   def setup_ec2(instance_id)
     
     commands = []
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo apt-get update -y; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo apt-get install ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs -y; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else wget http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz && tar zxf rubygems-1.3.5.tgz; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else cd rubygems-1.3.5 && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem update --system; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem install gemcutter --no-ri --no-rdoc; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem install chef ohai --no-ri --no-rdoc; fi'
-    commands << 'if [ -d "./hugo-repos" ]; then echo "setup already run"; else sudo gem source -a http://gems.github.com; fi'
-    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"
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo apt-get update -y; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo apt-get install ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs -y; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else wget http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz && tar zxf rubygems-1.3.5.tgz; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else cd rubygems-1.3.5 && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem update --system; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem install gemcutter --no-ri --no-rdoc; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem install chef ohai --no-ri --no-rdoc; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem source -a http://gems.github.com; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem install chef-deploy --no-ri --no-rdoc; fi'
+    commands << 'if [ -d "./hugo-repos" ]; then echo "."; else sudo gem install git --no-ri --no-rdoc; fi'
+    commands << "if [ -d \"./hugo-repos\" ]; then echo \".\"; else git clone #{self.cookbook} ~/hugo-repos; fi"
     ec2 = Hugo::Aws::Ec2.find(instance_id)
     #puts ec2.uri
     ec2.ssh(commands, nil, File.join(key_path, key_name))

data/lib/hugo/cloud.rb

@@ -38,14 +38,7 @@ class Hugo::Cloud
     cloud_app app_info
     
   end
-  
-  def dns(hostname, &block)
-    dns_info = Hugo::Dns.instance
-    dns_info.hostname hostname
-    dns_info.instance_eval(&block) if block_given? 
-    dns_info.deploy
-  end
-  
+    
   def deploy
     if cloud_app
       cloud_app.setup

data/lib/hugo.rb

@@ -1,16 +1,13 @@
-begin
-  # Require the preresolved locked set of gems.
-  require File.expand_path('../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fallback on doing the resolve at runtime.
-  require "rubygems"
-  require "bundler"
-  Bundler.setup
-end
+# begin
+#   # Require the preresolved locked set of gems.
+#   require File.expand_path('../.bundle/environment', __FILE__)
+# rescue LoadError
+#   # Fallback on doing the resolve at runtime.
+#   require "rubygems"
+#   require "bundler"
+#   Bundler.setup
+# end
 
-require 'active_support'
-require 'active_resource'
-require 'zerigo_dns'  
 require 'AWS'
 require 'net/ssh'
 require 'json'
@@ -20,7 +17,6 @@ require File.dirname(__FILE__) + '/hugo/cloud'
 require File.dirname(__FILE__) + '/hugo/balancer'
 require File.dirname(__FILE__) + '/hugo/database'
 require File.dirname(__FILE__) + '/hugo/app'
-require File.dirname(__FILE__) + '/hugo/dns'
 require File.dirname(__FILE__) + '/hugo/aws/rds'
 require File.dirname(__FILE__) + '/hugo/aws/elb'
 require File.dirname(__FILE__) + '/hugo/aws/ec2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tom Wilson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,57 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.16
     version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activeresource
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: zerigo_dns
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-description: A easy to understand DSL that makes it dirt simple to deploy to the cloud.
+description: Deploy your apps to the cloud.
 email: tom@jackhq.com
 executables: []
 
@@ -141,12 +91,11 @@ files:
 - lib/hugo/balancer.rb
 - lib/hugo/cloud.rb
 - lib/hugo/database.rb
-- lib/hugo/dns.rb
 - lib/hugo/mixin/params_validate.rb
 - lib/hugo/mongo.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/twilson63/hugo
+homepage: http://github.com/twilson63/hugo2
 licenses: []
 
 post_install_message: 

data/lib/hugo/dns.rb

@@ -1,57 +0,0 @@
-module Hugo; end
-
-class Hugo::Dns
-  include Singleton
-  include Hugo::Mixin::ParamsValidate
-
-  attr_accessor :host
-
-  def deploy
-
-    # Initialize Resouce
-    Zerigo::DNS::Base.user = user
-    Zerigo::DNS::Base.password = token
-
-    # find or create domain
-    zone = Zerigo::DNS::Zone.find_or_create(domain)
-
-    # find or create host
-    host = Zerigo::DNS::Host.update_or_create(
-          :zone     => zone.id, 
-          :host     => hostname, 
-          :type     => type,
-          :ttl      => ttl,
-          :data     => data  
-      )
-  end
-  
-  def user(arg=nil)
-    set_or_return(:user, arg, :kind_of => [String]) 
-  end
-
-  def token(arg=nil)
-    set_or_return(:token, arg, :kind_of => [String]) 
-  end
-
-  def hostname(arg=nil)
-    set_or_return(:hostname, arg, :kind_of => [String]) 
-  end
-
-  def domain(arg=nil)
-    set_or_return(:domain, arg, :kind_of => [String]) 
-  end
-
-  def type(arg=nil)
-    set_or_return(:type, arg, :kind_of => [String]) 
-  end
-
-  def ttl(arg=nil)
-    set_or_return(:ttl, arg, :kind_of => [Integer]) 
-  end
-
-  def data(arg=nil)
-    set_or_return(:data, arg, :kind_of => [String]) 
-  end
-  
-  
-end