hugo 0.1.1 → 0.1.2

data/Rakefile

@@ -4,10 +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.add_dependency('amazon-ec2', '= 0.7.5')
+    gemspec.add_dependency('json', '= 1.2.0')
+    gemspec.add_dependency('net-ssh', '= 2.0.16')
+
     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/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/hugo/aws/ec2.rb

@@ -65,13 +65,16 @@ module Hugo
     
       def ssh(commands, dna=nil, key_pair_file=nil)
         raise ArgumentError.new("Key Pair File is required") if key_pair_file.nil?
-        Net::SSH.start(self.uri, "ubuntu", :keys => key_pair_file) do |ssh|
-          if dna
-            ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > ~/dna.json")
-          end
-          commands.each do |cmd|
-            puts ssh.exec!(cmd)
+        begin
+          Net::SSH.start(self.uri, "ubuntu", :keys => key_pair_file) do |ssh|
+            if dna
+              ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > ~/dna.json")
+            end
+            commands.each do |cmd|
+              puts ssh.exec!(cmd)
+            end
           end
+        rescue
         end
       end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hugo
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tom Wilson
@@ -19,41 +19,34 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.7.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: net-ssh
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.16
     version: 
 description: A easy to understand DSL that makes it dirt simple to deploy to the cloud.
 email: tom@jackhq.com
-executables: 
-- autospec
-- ec2-gem-example.rb
-- ec2-gem-profile.rb
-- ec2sh
-- edit_json.rb
-- prettify_json.rb
-- setup.rb
-- spec
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -64,17 +57,9 @@ files:
 - Gemfile
 - Rakefile
 - VERSION
-- bin/autospec
-- bin/ec2-gem-example.rb
-- bin/ec2-gem-profile.rb
-- bin/ec2sh
-- bin/setup.rb
-- bin/spec
 - config/hugo.yml.example
 - example/myhugo.rb
-- hugo.gemspec
 - lib/.DS_Store
-- lib/hugo.old
 - lib/hugo.rb
 - lib/hugo/.DS_Store
 - lib/hugo/app.rb
@@ -85,7 +70,6 @@ files:
 - lib/hugo/cloud.rb
 - lib/hugo/database.rb
 - lib/hugo/mixin/params_validate.rb
-- pkg/hugo-0.1.0.gem
 - readme.md
 - spec/.DS_Store
 - spec/lib/hugo/app_spec.rb
@@ -97,11 +81,6 @@ files:
 - spec/lib/hugo_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- vendor/gems/cache/amazon-ec2-0.7.9.gem
-- vendor/gems/cache/json-1.2.0.gem
-- vendor/gems/cache/net-ssh-2.0.17.gem
-- vendor/gems/cache/rspec-1.2.9.gem
-- vendor/gems/cache/xml-simple-1.0.12.gem
 has_rdoc: true
 homepage: http://github.com/twilson63/hugo
 licenses: []

data/hugo.gemspec

@@ -1,96 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{hugo}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Wilson", "Barrett Little"]
-  s.date = %q{2010-01-27}
-  s.description = %q{A easy to understand DSL that makes it dirt simple to deploy to the cloud.}
-  s.email = %q{tom@jackhq.com}
-  s.executables = ["autospec", "ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "edit_json.rb", "prettify_json.rb", "setup.rb", "spec"]
-  s.files = [
-    ".DS_Store",
-     ".gitignore",
-     "Gemfile",
-     "Rakefile",
-     "VERSION",
-     "bin/autospec",
-     "bin/ec2-gem-example.rb",
-     "bin/ec2-gem-profile.rb",
-     "bin/ec2sh",
-     "bin/setup.rb",
-     "bin/spec",
-     "config/hugo.yml.example",
-     "example/myhugo.rb",
-     "hugo.gemspec",
-     "lib/.DS_Store",
-     "lib/hugo.old",
-     "lib/hugo.rb",
-     "lib/hugo/.DS_Store",
-     "lib/hugo/app.rb",
-     "lib/hugo/aws/ec2.rb",
-     "lib/hugo/aws/elb.rb",
-     "lib/hugo/aws/rds.rb",
-     "lib/hugo/balancer.rb",
-     "lib/hugo/cloud.rb",
-     "lib/hugo/database.rb",
-     "lib/hugo/mixin/params_validate.rb",
-     "pkg/hugo-0.1.0.gem",
-     "readme.md",
-     "spec/.DS_Store",
-     "spec/lib/hugo/app_spec.rb",
-     "spec/lib/hugo/aws/ec2_spec.rb",
-     "spec/lib/hugo/aws/elb_spec.rb",
-     "spec/lib/hugo/aws/rds_spec.rb",
-     "spec/lib/hugo/balancer_spec.rb",
-     "spec/lib/hugo/database_spec.rb",
-     "spec/lib/hugo_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "vendor/gems/cache/amazon-ec2-0.7.9.gem",
-     "vendor/gems/cache/json-1.2.0.gem",
-     "vendor/gems/cache/net-ssh-2.0.17.gem",
-     "vendor/gems/cache/rspec-1.2.9.gem",
-     "vendor/gems/cache/xml-simple-1.0.12.gem"
-  ]
-  s.homepage = %q{http://github.com/twilson63/hugo}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Deploy Your Rack Apps to Cloud}
-  s.test_files = [
-    "spec/lib/hugo/app_spec.rb",
-     "spec/lib/hugo/aws/ec2_spec.rb",
-     "spec/lib/hugo/aws/elb_spec.rb",
-     "spec/lib/hugo/aws/rds_spec.rb",
-     "spec/lib/hugo/balancer_spec.rb",
-     "spec/lib/hugo/database_spec.rb",
-     "spec/lib/hugo_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0"])
-      s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<amazon-ec2>, [">= 0"])
-      s.add_dependency(%q<net-ssh>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<amazon-ec2>, [">= 0"])
-    s.add_dependency(%q<net-ssh>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-  end
-end
-

data/lib/hugo.old

@@ -1,123 +0,0 @@
-# This makes sure the bundled gems are in our $LOAD_PATH
-require File.expand_path(File.join(File.dirname(__FILE__) + "/..", 'vendor', 'gems', 'environment'))
-
-# This actually requires the bundled gems
-Bundler.require_env
-
-require 'AWS'
-require 'net/ssh'
-require File.dirname(__FILE__) + '/hugo/rds'
-require File.dirname(__FILE__) + '/hugo/elb'
-require File.dirname(__FILE__) + '/hugo/ec2'
-
-module Hugo
-  
-  class << self
-    def build(infrastructure, application, instances = 1)
-      app_config = YAML.load_file("config/#{application}.yml")
-      @rds = Rds.new(:server => infrastructure, :db => application, 
-        :user => app_config['database']['master_username'], 
-        :pwd => app_config['database']['master_user_password']
-      )
-      @rds.save
-      @elb = Elb.new(:name => infrastructure)
-      @elb.save
-      
-      instances.times do 
-        @ec2 = Ec2.new()
-        @ec2.save
-        @elb.add(@ec2.name)
-      end
-      
-      setup(infrastructure, application)
-      
-      deploy(infrastructure, application)
-      
-    end
-    
-    def drop(infrastructure)
-      Rds.find(infrastructure).destroy
-      @elb = Elb.find(infrastructure)
-      @elb.instances.each do |i|
-        Ec2.find(i).destroy
-      end
-      @elb.destroy
-    end
-    
-    def setup(infrastructure, application)
-      hugo_config = YAML.load_file("config/hugo.yml")
-
-      commands = []
-      commands << 'sudo apt-get update -y'
-      commands << 'sudo apt-get install ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs -y'
-      commands << 'wget http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz && tar zxf rubygems-1.3.5.tgz'
-      commands << 'cd rubygems-1.3.5 && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem'
-      commands << 'sudo gem update --system'
-      commands << 'sudo gem install gemcutter --no-ri --no-rdoc'
-      commands << 'sudo gem tumble'
-      commands << 'sudo gem install chef ohai --no-ri --no-rdoc'
-      commands << 'sudo gem source -a http://gems.github.com'
-      commands << 'sudo gem install chef-deploy --no-ri --no-rdoc'
-      commands << 'sudo gem install git --no-ri --no-rdoc'
-      commands << "git clone #{hugo_config['git']} ~/hugo-repos"
-      # Setup base role
-      dna = { :run_list => ["role[web-base]"],
-        :package_list => hugo_config['package_list'],
-        :gem_list => hugo_config['gem_list'],
-        :git => hugo_config['git'],
-        :github => hugo_config['github'],
-        :access_key => Ec2::ACCESS_KEY,
-        :secret_key => Ec2::SECRET_KEY,
-        :apache => hugo_config['apache']
-
-      }
-
-      commands << 'sudo chef-solo -c /home/ubuntu/hugo-repos/config/solo.rb -j /home/ubuntu/dna.json'
-
-      @elb = Elb.find(infrastructure)
-      @elb.instances.each do |i|
-        Ec2.find(i).ssh(commands, dna)
-      end
-      
-    end
-    
-    def deploy(infrastructure, application)
-      hugo_config = YAML.load_file("config/hugo.yml")
-      app_config = YAML.load_file("config/#{application}.yml")
-      
-      commands = []
-      #commands << "git clone #{@@hugo_config['git']} ~/hugo-repos"
-      commands << "cd hugo-repos && git pull"
-      commands << 'sudo chef-solo -c /home/ubuntu/hugo-repos/config/solo.rb -j /home/ubuntu/dna.json'
-
-      dna = { :run_list => app_config['run_list'],
-        :package_list => app_config['package_list'] || {},
-        :gem_list => app_config['gem_list'] || {},
-        :application => application, 
-        :customer => infrastructure,
-        :database => { 
-          :uri => Rds.find(infrastructure).uri, 
-          :user => app_config['database']['master_username'], 
-          :password => app_config['database']['master_user_password'] }, 
-        :web => { :port => "8080", :ssl => "8443" }, 
-        :git => hugo_config['git'],
-        :github => hugo_config['github'],
-        :access_key => Ec2::ACCESS_KEY,
-        :secret_key => Ec2::SECRET_KEY,
-        :app => app_config['app'] || nil
-      }
-      
-      @elb = Elb.find(infrastructure)
-      @elb.instances.each do |i|
-        Ec2.find(i).ssh(commands, dna)
-      end
-    end
-  
-    def add(infrastructure, application)
-      @elb = Elb.find(infrastructure)
-      
-    end
-    
-  end
-  
-end