dew 0.1.6 → 0.1.7

data/README.md

@@ -59,7 +59,7 @@ Don't worry about setting permissions for the key - **dew** will manage that its
     
 And perform a basic self-test:
 
-    $ dew environments
+    $ dew env
 
 ## Creating a Simple Environment
 
@@ -75,15 +75,15 @@ If your keypair isn't called 'default', you'll need to edit this file and change
 
 Now, run:
 
-    dew -v environments create test-light my-first-environment
+    dew -v env create test-light my-first-environment
     
 You'll be shown a summary of the environment that you're about to create. Type 'y' to confirm its creation and watch as it's created.
 
 Once complete you can run the following commands to interact with your environment:
 
-    dew environments ssh my-first-environment
-    dew environments show my-first-environment
-    dew environments destroy my-first-environment
+    dew env ssh my-first-environment
+    dew env show my-first-environment
+    dew env destroy my-first-environment
 
 ## Creating an AMI for a new Environment
 

data/bin/dew

@@ -12,7 +12,7 @@ class DewCommand < DewBaseCommand
     exit(0)
   end
 
-  subcommand "environments", "perform subcommands on the environments", EnvironmentsCommand
+  subcommand "env", "perform subcommands on the environments", EnvironmentsCommand
   subcommand "amis", "perform subcommands on the AMIs", AMIsCommand
   subcommand "deploy", "deploy to an environment", DeployCommand
   subcommand "console", "open an IRB session with Cloud loaded", ConsoleCommand
@@ -36,8 +36,12 @@ class DewCommand < DewBaseCommand
     rescue Clamp::HelpWanted => e
       raise
     rescue Clamp::UsageError => e
-      Inform.error(e.message)
-      puts e.command.help
+      if e.message =~ /No such sub-command 'environments'/
+        Inform.error("'environments' is now 'env' - please run 'dew env' instead")
+      else
+        Inform.error(e.message)
+        puts e.command.help
+      end
       exit(1)
     rescue Interrupt => e
       # If receive ^C Just exit the script...

data/features/step_definitions/aws-steps.rb

@@ -21,7 +21,7 @@ Given /^I specify the puppet configuration "([^"]*)"$/ do |puppet_config|
 end
 
 When /^I run the create\-environment script$/ do
-  @log = run_and_capture("./bin/dew --region #{@region} --account #{@account_name} --debug --verbose environments create -f #{@profile} #{@environment_name}", "create-environment.#{@profile}")
+  @log = run_and_capture("./bin/dew --region #{@region} --account #{@account_name} --debug --verbose env create -f #{@profile} #{@environment_name}", "create-environment.#{@profile}")
 end
 
 When /^I run the create\-ami script$/ do

data/features/support/hooks.rb

@@ -1,7 +1,7 @@
 After("@aws") do
   if !ENV['KEEP_TEST_ARTIFACTS']
     if @environment_name
-      run_and_capture("./bin/dew --region #{@region} --account #{@account_name} environments destroy -f #{@environment_name}", 'destroy-environment')
+      run_and_capture("./bin/dew --region #{@region} --account #{@account_name} env destroy -f #{@environment_name}", 'destroy-environment')
     end
     if @ami_name
       run_and_capture("./bin/dew --region #{@region} --account #{@account_name} amis destroy -f #{@ami_name}", 'destroy-ami')

data/lib/dew/commands/environments.rb

@@ -92,10 +92,12 @@ class EnvironmentsCommand < Clamp::Command
   subcommand "run", "Run a script or command on each instance in the environment" do
     parameter "ENVIRONMENT_NAME", "Name of the environment"
     option ['-s', '--script'], "FILENAME", "Script to run on each instance"
+    option ['-a', '--args'], "ARGUMENTS", "Optional arguments to the script provided in --script", :default => ''
     option ['-c', '--command'], "COMMAND", "Command to run on each instance"
     
     def execute
       raise "Please supply either -s or -c" unless script or command
+      raise "--args only compatiable with --script" if command and args
       
       env = Environment.get(environment_name)
       
@@ -106,7 +108,7 @@ class EnvironmentsCommand < Clamp::Command
           if script
             ssh.upload(script, '/tmp/script')
             ssh.run("chmod +x /tmp/script")
-            ssh.run("/tmp/script", :quiet => false)
+            ssh.run("/tmp/script #{args}", :quiet => false)
             ssh.run("rm /tmp/script")
           else
             ssh.run(command, :quiet => false)

data/lib/dew/models/environment.rb

@@ -34,7 +34,7 @@ class Environment
     environment.add_database(profile.rds_size, password) if profile.has_rds?
 
     (1..profile.count).each do
-      environment.add_server(profile.ami, profile.size, profile.keypair, profile.security_groups)
+      environment.add_server(profile.ami, profile.size, profile.keypair, profile.security_groups, profile.username)
     end
   
     environment.add_elb(profile.elb_listener_ports) if profile.has_elb?
@@ -104,7 +104,7 @@ class Environment
     end
   end
 
-  def add_server ami, size, keypair, groups
+  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 do
       server = Server.create!( ami, size, keypair, groups )
@@ -112,6 +112,7 @@ class Environment
       server.add_tag('Creator', ENV['USER'])
       server_name = "#{name} #{servers.count + 1}"
       server.add_tag('Name', server_name)
+      server.add_tag('Username', username) # Needed for SSH
       Inform.debug("%{name} ID: %{id} AZ: %{az}", :name => server_name, :id =>server.id, :az => server.availability_zone)
       servers << server
     end

data/lib/dew/models/profile.rb

@@ -4,7 +4,7 @@ class Profile
 
   attr_reader :profile_name
   attr_accessor :ami, :size, :security_groups, :keypair, :count
-  attr_accessor :rds_size, :elb_listener_ports
+  attr_accessor :rds_size, :elb_listener_ports, :username
 
   AWS_RESOURCES = YAML.load(File.read(File.join(File.dirname(__FILE__), '..', 'aws_resources.yaml')))
 
@@ -12,12 +12,14 @@ class Profile
     file = File.read(File.join(ENV['HOME'], '.dew', 'profiles', "#{profile_name}.yaml"))
     yaml = YAML.load(file)
     profile = new(profile_name)
+    profile.username = 'ubuntu'
     if yaml['instances']
       profile.ami = yaml['instances']['amis'][Cloud.region]
       profile.size = yaml['instances']['size']
-      profile.security_groups = yaml['instances']['security-groups'] || ['default']
+      profile.security_groups = yaml['instances']['security-groups'] || ['default'] #XXX is this fallback tested?
       profile.keypair = yaml['instances']['keypair']
       profile.count = yaml['instances']['count'].to_i
+      profile.username = yaml['instances']['username'] if yaml['instances'].include?('username')
     end
     if yaml['elb']
       profile.elb_listener_ports = yaml['elb']['listener_ports']

data/lib/dew/models/server.rb

@@ -29,7 +29,7 @@ class Server < FogModel
   end
 
   def username
-    'ubuntu'
+    tags['Username'] || 'ubuntu'
   end
 
   def ssh

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/dew/models/environment_spec.rb

@@ -51,7 +51,7 @@ describe Environment do
 
   describe ".create" do
     let (:security_groups) { %w(non_default) }
-    let(:profile) { double(:profile, :keypair => 'default', :security_groups => security_groups, :ami => 'i-1234', :has_rds? => false, :has_elb? => false, :count => 2, :size => 'small' ) }
+    let(:profile) { double(:profile, :username => 'username', :keypair => 'default', :security_groups => security_groups, :ami => 'i-1234', :has_rds? => false, :has_elb? => false, :count => 2, :size => 'small' ) }
 
     context "when environment name is invalid" do
       it "should raise an error" do
@@ -80,7 +80,7 @@ describe Environment do
         let(:profile_count) { 2 }
 
         it "should add two instances to that environment with the chosen AMI, size and keypair" do
-          @env.should_receive(:add_server).with(profile.ami, profile.size, profile.keypair, profile.security_groups).twice
+          @env.should_receive(:add_server).with(profile.ami, profile.size, profile.keypair, profile.security_groups, profile.username).twice
         end
       end
 
@@ -223,27 +223,28 @@ EOF
 
     it "should create a Server from the provided ami, size and keypair" do
       Server.should_receive(:create!).with(*@args)
-      @environment.add_server(*@args)
+      @environment.add_server(*@args, 'username')
     end
 
     it "should add the Server to its servers array" do
-      @environment.add_server(*@args)
-      @environment.add_server(*@args)
+      @environment.add_server(*@args, 'username')
+      @environment.add_server(*@args, 'username')
       @environment.servers.should == [server, server]
     end
 
-    it "should tag the server with the environment name and creator" do
+    it "should tag the server with the environment name, creator and username" do
       server.should_receive(:add_tag).with('Environment', name)
       server.should_receive(:add_tag).with('Creator', ENV['USER'])
-      @environment.add_server(*@args)
+      server.should_receive(:add_tag).with('Username', 'username')
+      @environment.add_server(*@args, 'username')
     end
 
     it "should tag the server with an indexed name" do
       server.should_receive(:add_tag).with('Name', "#{name} 1")
-      @environment.add_server(*@args)
+      @environment.add_server(*@args, 'username')
 
       server.should_receive(:add_tag).with('Name', "#{name} 2")
-      @environment.add_server(*@args)
+      @environment.add_server(*@args, 'username')
     end
   end
 

data/spec/dew/models/profile_spec.rb

@@ -32,6 +32,7 @@ describe Profile do
            security-groups:
             - non_default
            keypair: id_revo
+           username: myusername
         "
       }
       
@@ -40,6 +41,7 @@ describe Profile do
       it { subject.size.should == 'c1.medium' }
       it { subject.security_groups.should == %w{non_default} }
       it { subject.keypair.should == 'id_revo' }
+      it { subject.username.should == 'myusername' }
       
       it "should have a to_s" do
         subject.to_s.should == <<EOF
@@ -53,6 +55,10 @@ EOF
       end
     end
 
+    it "should default to 'ubuntu' as the username" do
+      subject.username.should == 'ubuntu'
+    end
+    
     describe "without an elb or RDS section" do
       it { subject.has_elb?.should be_false }
       it { subject.has_rds?.should be_false }

data/spec/dew/models/server_spec.rb

@@ -51,7 +51,17 @@ describe Server do
     end
 
     describe :username do
-      it "should always be 'ubuntu'" do
+      context "with a username tag" do
+        before :each do
+          fog_server.should_receive(:tags).and_return({'Username' => 'bob'})
+        end
+        
+        it "should use the username in the tag" do
+          @server.username.should == 'bob'
+        end
+      end
+      
+      it "should default to 'ubuntu' if no Username tag is present" do
         @server.username.should == 'ubuntu'
       end
     end
@@ -98,7 +108,7 @@ describe Server do
             File.should_receive(:stat).with(@path).and_raise(Errno::ENOENT)
           end
 
-          it { lambda { @server.credentials }.should raise_error /Can't find keyfile/ }
+          it { lambda { @server.credentials }.should raise_error %r{Can't find keyfile} }
         end
       end
     end
@@ -147,7 +157,7 @@ describe Server do
       it "should open a new Gofer::Host connection using the hostname, default username and key data" do
         Cloud.should_receive(:keyfile_path).with(key_name).and_return('/key/path')
         File.should_receive(:read).with('/key/path').and_return('key data')
-        Gofer::Host.should_receive(:new).with(endpoint, 'ubuntu', hash_including(:key_data => ['key data'])).and_return 'ssh'
+        Gofer::Host.should_receive(:new).with(endpoint, @server.username, hash_including(:key_data => ['key data'])).and_return 'ssh'
         @server.ssh.should == 'ssh'
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: dew
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - PlayUp Devops
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inform