dew 0.2.5 → 0.2.6

data/lib/dew/models/server.rb

@@ -32,8 +32,12 @@ class Server < FogModel
     fog_object.tags['Username'] || 'ubuntu'
   end
 
+  def ssh_port
+    fog_object.tags['SSHPort'] || '22'
+  end
+
   def ssh
-    Gofer::Host.new(public_ip_address, username, :key_data => [File.read(Cloud.keyfile_path(key_name))], :paranoid => false, :quiet => true)
+    Gofer::Host.new(public_ip_address, username, :port => ssh_port, :key_data => [File.read(Cloud.keyfile_path(key_name))], :paranoid => false, :quiet => true)
   end
 
   def wait_until_ready ssh_timeout=THREE_MINUTES
@@ -73,7 +77,7 @@ class Server < FogModel
 
       sanitize_key_file(key_name, keyfile_path)
 
-      "-i #{keyfile_path} -o StrictHostKeyChecking=no #{username}@#{public_ip_address}"
+      "-i #{keyfile_path} -o Port=#{ssh_port} -o StrictHostKeyChecking=no #{username}@#{public_ip_address}"
     else
       Inform.warning("Server %{id} has no key and therefore can not be accessed.", :id => id)
       false

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/dew/models/server_spec.rb

@@ -99,7 +99,7 @@ describe Server do
             File.should_receive(:chmod).with(0600, @path).and_return(true)
           end
 
-          it { @server.credentials.should == "-i /key/path -o StrictHostKeyChecking=no ubuntu@10.4.5.6" }
+          it { @server.credentials.should == "-i /key/path -o Port=22 -o StrictHostKeyChecking=no ubuntu@10.4.5.6" }
         end
 
         context "key file does not exist" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dew
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 +10:00
-default_executable: 
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inform
-  requirement: &23690700 !ruby/object:Gem::Requirement
+  requirement: &70192214744020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *23690700
+  version_requirements: *70192214744020
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &23739920 !ruby/object:Gem::Requirement
+  requirement: &70192214743520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *23739920
+  version_requirements: *70192214743520
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &23739460 !ruby/object:Gem::Requirement
+  requirement: &70192214743060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *23739460
+  version_requirements: *70192214743060
 - !ruby/object:Gem::Dependency
   name: gofer
-  requirement: &23739000 !ruby/object:Gem::Requirement
+  requirement: &70192214742600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *23739000
+  version_requirements: *70192214742600
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &23738540 !ruby/object:Gem::Requirement
+  requirement: &70192214742100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *23738540
+  version_requirements: *70192214742100
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &23738080 !ruby/object:Gem::Requirement
+  requirement: &70192214741640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *23738080
+  version_requirements: *70192214741640
 - !ruby/object:Gem::Dependency
   name: opensrs
-  requirement: &23737700 !ruby/object:Gem::Requirement
+  requirement: &70192214741260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23737700
+  version_requirements: *70192214741260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23737240 !ruby/object:Gem::Requirement
+  requirement: &70192214740800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23737240
+  version_requirements: *70192214740800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23736740 !ruby/object:Gem::Requirement
+  requirement: &70192214740260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *23736740
+  version_requirements: *70192214740260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23736240 !ruby/object:Gem::Requirement
+  requirement: &70192214739760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +120,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *23736240
+  version_requirements: *70192214739760
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &23735780 !ruby/object:Gem::Requirement
+  requirement: &70192214739300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +131,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *23735780
+  version_requirements: *70192214739300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &23735320 !ruby/object:Gem::Requirement
+  requirement: &70192214738780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +142,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *23735320
+  version_requirements: *70192214738780
 - !ruby/object:Gem::Dependency
   name: flay
-  requirement: &23734860 !ruby/object:Gem::Requirement
+  requirement: &70192214719240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +153,10 @@ dependencies:
         version: 1.4.2
   type: :development
   prerelease: false
-  version_requirements: *23734860
+  version_requirements: *70192214719240
 - !ruby/object:Gem::Dependency
   name: geminabox
-  requirement: &23734480 !ruby/object:Gem::Requirement
+  requirement: &70192214718760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23734480
+  version_requirements: *70192214718760
 description: ! 'Dew is a layer between fog and the ground
 
 '
@@ -176,72 +175,71 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tasks/spec.rake
-- lib/dew.rb
+- lib/dew/aws_resources.yaml
 - lib/dew/base_command.rb
-- lib/dew/commands/tidy.rb
-- lib/dew/commands/environments.rb
-- lib/dew/commands/deploy.rb
+- lib/dew/cloud.rb
 - lib/dew/commands/ami.rb
-- lib/dew/commands/deploy/templates/rvmrc
-- lib/dew/commands/deploy/templates/known_hosts
-- lib/dew/commands/deploy/templates/apache.conf.erb
-- lib/dew/commands/console.rb
 - lib/dew/commands/console/irb_override.rb
-- lib/dew/models.rb
-- lib/dew/models/database.rb
+- lib/dew/commands/console.rb
+- lib/dew/commands/deploy/templates/apache.conf.erb
+- lib/dew/commands/deploy/templates/known_hosts
+- lib/dew/commands/deploy/templates/rvmrc
+- lib/dew/commands/deploy.rb
+- lib/dew/commands/environments.rb
+- lib/dew/commands/tidy.rb
+- lib/dew/commands.rb
+- lib/dew/controllers/amis_controller.rb
+- lib/dew/controllers/deploy_controller.rb
+- lib/dew/controllers/environments_controller.rb
+- lib/dew/controllers.rb
 - lib/dew/models/account.rb
-- lib/dew/models/deploy.rb
-- lib/dew/models/fog_model.rb
+- lib/dew/models/database.rb
 - lib/dew/models/deploy/puge.rb
 - lib/dew/models/deploy/run.rb
-- lib/dew/models/server.rb
+- lib/dew/models/deploy.rb
 - lib/dew/models/environment.rb
+- lib/dew/models/fog_model.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/models/server.rb
+- lib/dew/models.rb
 - lib/dew/password.rb
-- lib/dew/cloud.rb
 - lib/dew/tasks/spec.rake
 - lib/dew/validations.rb
-- lib/dew/controllers.rb
-- lib/dew/aws_resources.yaml
+- lib/dew/version.rb
+- lib/dew/view.rb
+- lib/dew.rb
+- lib/tasks/spec.rake
 - README.md
 - LICENSE
+- example/dew/accounts/development.yaml
 - example/dew/profiles/template.yaml
-- example/dew/profiles/test-light.yaml
 - example/dew/profiles/test-full.yaml
-- example/dew/accounts/development.yaml
+- example/dew/profiles/test-light.yaml
 - Rakefile
-- spec/dew/view_spec.rb
-- spec/dew/models/fog_model_spec.rb
-- spec/dew/models/server_spec.rb
+- spec/dew/cloud_spec.rb
+- spec/dew/controllers/amis_controller_spec.rb
+- spec/dew/controllers/deploy_controller_spec.rb
+- spec/dew/controllers/environments_controller_spec.rb
 - spec/dew/models/account_spec.rb
+- spec/dew/models/database_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/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/models/server_spec.rb
 - spec/dew/password_spec.rb
 - spec/dew/spec_helper.rb
-- spec/dew/cloud_spec.rb
-- features/deploy-puge.feature
+- spec/dew/view_spec.rb
 - features/create-ami.feature
 - features/create-environments.feature
-- features/support/hooks.rb
-- features/support/env.rb
-- features/step_definitions/deploy-puge-steps.rb
+- features/deploy-puge.feature
 - features/step_definitions/aws-steps.rb
+- features/step_definitions/deploy-puge-steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
 - config/cucumber.yaml
 - bin/dew
-has_rdoc: true
 homepage: http://github.com/playup/dew
 licenses: []
 post_install_message: 
@@ -262,32 +260,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Uses fog to access the cloud
 test_files:
 - Rakefile
-- spec/dew/view_spec.rb
-- spec/dew/models/fog_model_spec.rb
-- spec/dew/models/server_spec.rb
+- spec/dew/cloud_spec.rb
+- spec/dew/controllers/amis_controller_spec.rb
+- spec/dew/controllers/deploy_controller_spec.rb
+- spec/dew/controllers/environments_controller_spec.rb
 - spec/dew/models/account_spec.rb
+- spec/dew/models/database_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/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/models/server_spec.rb
 - spec/dew/password_spec.rb
 - spec/dew/spec_helper.rb
-- spec/dew/cloud_spec.rb
-- features/deploy-puge.feature
+- spec/dew/view_spec.rb
 - features/create-ami.feature
 - features/create-environments.feature
-- features/support/hooks.rb
-- features/support/env.rb
-- features/step_definitions/deploy-puge-steps.rb
+- features/deploy-puge.feature
 - features/step_definitions/aws-steps.rb
+- features/step_definitions/deploy-puge-steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
 - config/cucumber.yaml