dew 0.2.2 → 0.2.3

data/lib/dew/commands/ami.rb

@@ -28,16 +28,6 @@ class AMIsCommand < Clamp::Command
 
   end
 
-  subcommand "show", "Show an AMI" do
-
-    parameter "AMI_NAME", "Name of AMI"
-
-    def execute
-      controller.show(ami_name)
-    end
-
-  end
-
   subcommand "create", "Create a new AMI" do
 
     parameter "PUPPET_NODE_NAME", "Puppet node (in puppet/manifests/nodes/*.pp) to run on AMI" do |puppet_node_name|
@@ -46,8 +36,10 @@ class AMIsCommand < Clamp::Command
       end
       puppet_node_name
     end
+    
     parameter "AMI_NAME", "What to call the newly created AMI"
-
+    option ['-p', '--prototype-profile'], "AMI_PROTOTYPE_NAME", "Profile to use as a prototype for the AMI", :default => 'ami-prototype'
+    
     def execute
       controller.create(ami_name, puppet_node_name)
     end

data/lib/dew/controllers/amis_controller.rb

@@ -2,13 +2,11 @@ require 'dew/controllers/environments_controller'
 
 class AMIsController
 
-  AMI_PROFILE = 'ami-prototype'
-
-  def create ami_name, puppet_node_name
+  def create(ami_name, puppet_node_name, prototype_profile_name)
     Inform.info("Creating new AMI %{ami_name} using puppet node %{puppet}", :ami_name => ami_name, :puppet => puppet_node_name)
     environment_name = ami_name + '-prototype-' + $$.to_s
 
-    environment = Environment.create(environment_name, Profile.read(AMI_PROFILE))
+    environment = Environment.create(environment_name, Profile.read(prototype_profile_name))
     @prototype = environment.servers.first
     Inform.debug("Using server %{id} at %{ip} as our prototype.", :id => @prototype.id, :ip => @prototype.public_ip_address)
 

data/lib/dew/models/environment.rb

@@ -117,9 +117,9 @@ class Environment
     end
   end
 
-  def add_server ami, size, keypair, groups, username
-    Inform.info "Adding server using AMI %{ami} of size %{size}, keypair %{keypair} and security groups %{groups.join(',')}",
-      :ami => ami, :size => size, :keypair => keypair, :groups => groups do
+  def add_server(ami, size, keypair, groups, username)
+    Inform.info "Adding server using AMI %{ami} of size %{size}, keypair %{keypair} and security groups %{groups}",
+      :ami => ami, :size => size, :keypair => keypair, :groups => groups.join(',') do
       server = Server.create!( ami, size, keypair, groups )
       server.add_tag('Environment', name)
       server.add_tag('Creator', ENV['USER'])

data/lib/dew/models/profile.rb

@@ -9,8 +9,7 @@ class Profile
   AWS_RESOURCES = YAML.load(File.read(File.join(File.dirname(__FILE__), '..', 'aws_resources.yaml')))
 
   def self.read(profile_name)
-    file = File.read(File.join(ENV['HOME'], '.dew', 'profiles', "#{profile_name}.yaml"))
-    yaml = YAML.load(file)
+    yaml = YAML.load_file(File.join(ENV['HOME'], '.dew', 'profiles', "#{profile_name}.yaml"))
     profile = new(profile_name)
     profile.username = 'ubuntu'
     if yaml['instances']

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/dew/controllers/amis_controller_spec.rb

@@ -3,8 +3,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
 describe AMIsController do
 
   let (:controller) { AMIsController.new }
-  let (:ami_name) { 'my-ami' }
-  let (:puppet_node_name) { 'puppet-node-name' }
+  let (:ami_name) { "my-ami-#{Time.now.to_i}" }
+  let (:puppet_node_name) { "puppet-node-name-#{Time.now.to_i}" }
+  let (:prototype_profile_name) { "ami-prototype-#{Time.now.to_i}" }
   let (:ssh) { double('SSH', :run => nil, :upload => nil) }
   let (:server) { double('Server', :id => 'i-12345', :ssh => ssh, :public_ip_address => '127.0.0.1', :create_ami => nil) }
   let (:environment) { double('Environment', :servers => [server], :destroy => nil) }
@@ -13,30 +14,39 @@ describe AMIsController do
 
   before { Cloud.stub(:compute => double('Compute', :images => images)) }
 
-  describe :create do
-    before :each do
+  describe '#create' do
+    before do
       Profile.stub(:read => nil)
       Environment.stub(:create => environment)
     end
-    after :each do
-      controller.create(ami_name, puppet_node_name)
-    end
-    it "should create a new environment using the ami-prototype profile" do
-      Profile.should_receive(:read).with('ami-prototype').and_return('ami_profile')
+    
+    subject { controller.create(ami_name, puppet_node_name, prototype_profile_name) }
+    
+    it "should create a new environment using the supplied profile" do
+      Profile.should_receive(:read).with(prototype_profile_name).and_return('ami_profile')
       Environment.should_receive(:create).with(/#{ami_name}/, 'ami_profile').and_return environment
+      subject
     end
+    
     # Not all elements of the script are tested - just the important bits
     it "should upload our puppet configuration to the instance" do
       ssh.should_receive(:upload)#.with(File.join(ROOT_DIR, 'puppet'), '/tmp/puppet')
+      subject
     end
+
     it "should run puppet using the node name we specified" do
       ssh.should_receive(:run).with(%r{puppet.+/etc/puppet/manifests/nodes/#{puppet_node_name}.pp})
+      subject
     end
+
     it "should create an AMI from the resulting server" do
       server.should_receive(:create_ami).with(ami_name)
+      subject
     end
+
     it "should finally destroy the environment" do
       environment.should_receive(:destroy)
+      subject
     end
   end
 

data/spec/dew/models/profile_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
 describe Profile do
 
   it "should look for profile file in the profiles dir" do
-    File.should_receive(:read).with("#{ENV['HOME']}/.dew/profiles/puge.yaml").and_return("---")
+    YAML.should_receive(:load_file).with("#{ENV['HOME']}/.dew/profiles/puge.yaml").and_return({})
     Profile.read('puge')
   end
 
@@ -11,10 +11,10 @@ describe Profile do
 
     # TODO: This can be refactored to use subject to reduce lines of code.
 
-    let (:yaml) { "blank: blank" }
+    let(:profile) { { 'blank' => 'blank' } }
 
     before :each do
-      File.stub(:read).and_return(yaml)
+      YAML.stub(:load_file).and_return(profile)
       Cloud.stub(:region => 'ap-southeast-1')
       Cloud.stub_chain(:compute, :flavors, :detect => double(:flavor, :ram => 1.7, :cores => 5, :disk => 350, :bits => 32 ))
     end
@@ -22,19 +22,20 @@ describe Profile do
     subject { Profile.read('development') }
 
     describe "with an instances section" do
-      let (:yaml) {
-        "
-        instances:
-           amis:
-              ap-southeast-1: ami-ccf405a5
-           size: c1.medium
-           count: 2
-           security-groups:
-            - non_default
-           keypair: id_revo
-           username: myusername
-        "
-      }
+      let(:profile) do
+        {
+          'instances' => {
+            'amis' => {
+              'ap-southeast-1' => 'ami-ccf405a5'
+            },
+            'size' => 'c1.medium',
+            'count' => 2,
+            'security-groups' => ['non_default'],
+            'keypair' => 'id_revo',
+            'username' => 'myusername'
+          }
+        }
+      end
       
       it { subject.ami.should == 'ami-ccf405a5' }
       it { subject.count.should == 2 }
@@ -65,25 +66,27 @@ EOF
     end
     
     describe "with an elb section" do
-      let (:yaml) {
-        "
-        elb:
-          listener_ports:
-            - 80
-            - 443
-            "
-      }
+      let(:profile) do
+        {
+          'elb' => {
+            'listener_ports' => [80, 443]
+          }
+        }
+      end
+      
       it { subject.has_elb?.should be_true }
       it { subject.elb_listener_ports.should == [80, 443] }
     end
     
     describe "with an RDS section" do
-      let (:yaml) {
-        "
-        rds:
-          size: db.m1.small
-        "
-      }
+      let(:profile) do
+        {
+          'rds' => {
+            'size' => 'db.m1.small'
+          }
+        }
+      end
+      
       it { subject.has_rds?.should be_true }
       it { subject.rds_size.should == 'db.m1.small' }
     end

metadata

@@ -1,297 +1,293 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dew
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - PlayUp Devops
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-08 00:00:00.000000000 +10:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: inform
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &18902180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: clamp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18902180
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: &18901680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *18901680
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &18901220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: gofer
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *18901220
+- !ruby/object:Gem::Dependency
+  name: gofer
+  requirement: &18900760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *18900760
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &18900300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *18900300
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: &18899840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: opensrs
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *18899840
+- !ruby/object:Gem::Dependency
+  name: opensrs
+  requirement: &18899460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *18899460
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &18899000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *18899000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &18898500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *18898500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18898000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *18898000
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &18897540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.10.3
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *18897540
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &18897080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: flay
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *18897080
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: &18896620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: geminabox
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *18896620
+- !ruby/object:Gem::Dependency
+  name: geminabox
+  requirement: &18896240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-description: |
-  Dew is a layer between fog and the ground
+  prerelease: false
+  version_requirements: *18896240
+description: ! 'Dew is a layer between fog and the ground
 
-email: 
+'
+email:
 - devops@playup.com
-executables: 
+executables:
 - dew
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/dew/commands.rb
-- lib/dew/controllers/deploy_controller.rb
-- lib/dew/controllers/environments_controller.rb
-- lib/dew/controllers/amis_controller.rb
+files:
+- lib/tasks/spec.rake
+- lib/dew.rb
 - lib/dew/base_command.rb
-- lib/dew/models/deploy/puge.rb
-- lib/dew/models/deploy/run.rb
-- lib/dew/models/deploy.rb
-- lib/dew/models/server.rb
-- lib/dew/models/profile.rb
-- lib/dew/models/environment.rb
-- lib/dew/models/account.rb
-- lib/dew/models/database.rb
-- lib/dew/models/fog_model.rb
-- lib/dew/password.rb
-- lib/dew/controllers.rb
+- lib/dew/commands/tidy.rb
+- lib/dew/commands/environments.rb
+- lib/dew/commands/deploy.rb
 - lib/dew/commands/ami.rb
-- lib/dew/commands/deploy/templates/known_hosts
 - lib/dew/commands/deploy/templates/rvmrc
+- lib/dew/commands/deploy/templates/known_hosts
 - lib/dew/commands/deploy/templates/apache.conf.erb
-- lib/dew/commands/deploy.rb
-- lib/dew/commands/environments.rb
 - lib/dew/commands/console.rb
-- lib/dew/commands/tidy.rb
 - lib/dew/commands/console/irb_override.rb
-- lib/dew/tasks/spec.rake
-- lib/dew/view.rb
 - lib/dew/models.rb
-- lib/dew/aws_resources.yaml
+- lib/dew/models/database.rb
+- lib/dew/models/account.rb
+- lib/dew/models/deploy.rb
+- lib/dew/models/fog_model.rb
+- lib/dew/models/deploy/puge.rb
+- lib/dew/models/deploy/run.rb
+- lib/dew/models/server.rb
+- lib/dew/models/environment.rb
+- lib/dew/models/profile.rb
+- lib/dew/commands.rb
+- lib/dew/view.rb
+- lib/dew/controllers/environments_controller.rb
+- lib/dew/controllers/deploy_controller.rb
+- lib/dew/controllers/amis_controller.rb
 - lib/dew/version.rb
-- lib/dew/validations.rb
+- lib/dew/password.rb
 - lib/dew/cloud.rb
-- lib/tasks/spec.rake
-- lib/dew.rb
+- lib/dew/tasks/spec.rake
+- lib/dew/validations.rb
+- lib/dew/controllers.rb
+- lib/dew/aws_resources.yaml
 - README.md
 - LICENSE
-- example/dew/profiles/test-full.yaml
 - example/dew/profiles/template.yaml
 - example/dew/profiles/test-light.yaml
+- example/dew/profiles/test-full.yaml
 - example/dew/accounts/development.yaml
 - Rakefile
-- spec/dew/controllers/deploy_controller_spec.rb
-- spec/dew/controllers/amis_controller_spec.rb
-- spec/dew/controllers/environments_controller_spec.rb
-- spec/dew/models/profile_spec.rb
+- spec/dew/view_spec.rb
+- spec/dew/models/fog_model_spec.rb
+- spec/dew/models/server_spec.rb
+- spec/dew/models/account_spec.rb
 - spec/dew/models/deploy/puge_spec.rb
 - spec/dew/models/deploy/run_spec.rb
 - spec/dew/models/environment_spec.rb
-- spec/dew/models/fog_model_spec.rb
-- spec/dew/models/account_spec.rb
-- spec/dew/models/server_spec.rb
+- spec/dew/models/profile_spec.rb
 - spec/dew/models/database_spec.rb
+- spec/dew/controllers/deploy_controller_spec.rb
+- spec/dew/controllers/amis_controller_spec.rb
+- spec/dew/controllers/environments_controller_spec.rb
 - spec/dew/password_spec.rb
-- spec/dew/cloud_spec.rb
 - spec/dew/spec_helper.rb
-- spec/dew/view_spec.rb
+- spec/dew/cloud_spec.rb
+- features/deploy-puge.feature
+- features/create-ami.feature
+- features/create-environments.feature
 - features/support/hooks.rb
 - features/support/env.rb
-- features/deploy-puge.feature
 - features/step_definitions/deploy-puge-steps.rb
 - features/step_definitions/aws-steps.rb
-- features/create-ami.feature
-- features/create-environments.feature
 - config/cucumber.yaml
 - bin/dew
+has_rdoc: true
 homepage: http://github.com/playup/dew
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Uses fog to access the cloud
-test_files: 
+test_files:
 - Rakefile
-- spec/dew/controllers/deploy_controller_spec.rb
-- spec/dew/controllers/amis_controller_spec.rb
-- spec/dew/controllers/environments_controller_spec.rb
-- spec/dew/models/profile_spec.rb
+- spec/dew/view_spec.rb
+- spec/dew/models/fog_model_spec.rb
+- spec/dew/models/server_spec.rb
+- spec/dew/models/account_spec.rb
 - spec/dew/models/deploy/puge_spec.rb
 - spec/dew/models/deploy/run_spec.rb
 - spec/dew/models/environment_spec.rb
-- spec/dew/models/fog_model_spec.rb
-- spec/dew/models/account_spec.rb
-- spec/dew/models/server_spec.rb
+- spec/dew/models/profile_spec.rb
 - spec/dew/models/database_spec.rb
+- spec/dew/controllers/deploy_controller_spec.rb
+- spec/dew/controllers/amis_controller_spec.rb
+- spec/dew/controllers/environments_controller_spec.rb
 - spec/dew/password_spec.rb
-- spec/dew/cloud_spec.rb
 - spec/dew/spec_helper.rb
-- spec/dew/view_spec.rb
+- spec/dew/cloud_spec.rb
+- features/deploy-puge.feature
+- features/create-ami.feature
+- features/create-environments.feature
 - features/support/hooks.rb
 - features/support/env.rb
-- features/deploy-puge.feature
 - features/step_definitions/deploy-puge-steps.rb
 - features/step_definitions/aws-steps.rb
-- features/create-ami.feature
-- features/create-environments.feature
 - config/cucumber.yaml