foreplay 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c4e4ef9917372b4901006e36a215e5bf514f8d
-  data.tar.gz: 8bfcbbdc5fff86836495c6e3be78ef7eb310b373
+  metadata.gz: 40ecad41c642ecdf2e8d7065abd53ecbfbdeff89
+  data.tar.gz: 3b799e936ea62c6a037142d03b239cdf1888108e
 SHA512:
-  metadata.gz: 43c279b50720c5fa48d703f3bbcdd50a9ba59992f53747bdb18f980ed389eec677d25b7a2e58e56a0a1e1e34b2b023fdfad3f6fffbe988cd3c079fbeb5509b7f
-  data.tar.gz: adb7c65e9572ca25ee5d51908a3bd6c78d8137f8f1b11b77a1eea1f6d5dd29df22b18204766cd155fc2c9feb21e72151629b45c58455fefaa3c8ed3f7991c0a5
+  metadata.gz: dd8f8adc7ca2f3645ae6f6d0fed910524a60343909bd6f97d8ffeaf3d5ef648ca775161625c5ae5011e76e5f60361ce56c4c44ac93da83ad5a9390ce1ac4e9db
+  data.tar.gz: 5b718a0c95491f62035a6a3665cb11029ba5e3e03c4f5fc132a85de1141dca528b935d970d49fa77aa83707ed06afda40ec6d8ed20fa01ec8057ec20adb902c3

data/README.md

@@ -12,15 +12,12 @@ I noticed with surprise on [RubyGems](https://rubygems.org/gems/foreplay) that m
 There's now a CLI for the gem so you can use it as follows. To check what it's going to do:
 
     foreplay check production
-    
+
 ...and if you're brave enough to try it for real:
 
     foreplay deploy production
-    
-...after you've set it up by creating a `config/foreplay.yml` file.
-
-Don't read any further. It's all rubbish below here :-)
 
+...after you've set it up by creating a `config/foreplay.yml` file.
 
 ## Installation
 
@@ -36,17 +33,6 @@ Or install it yourself as:
 
     $ gem install foreplay
 
-## Usage
-
-    ENV=production rake foreplay:push
-
-or
-
-    ENV=production ROLE=web rake foreplay:push
-
-You can set the environment variables `ENV` and `ROLE` elsewhere if you wish.
-If `ROLE` is not defined then we deploy all roles.
-
 ### How it works
 
 Foreplay does this:

data/lib/foreplay/deploy.rb

@@ -199,7 +199,7 @@ module Foreplay
     end
 
     def execute_on_server steps, instructions
-      server      = instructions[:server]
+      server_port = instructions[:server]
       user        = instructions[:user]
       password    = instructions[:password]
       keyfile     = instructions[:keyfile]
@@ -207,8 +207,12 @@ module Foreplay
 
       keyfile.sub! '~', ENV['HOME'] || '/' unless keyfile.blank? # Remote shell won't expand this for us
 
+      # Parse server + port
+      server, port = server_port.split(':')
+      port ||= 22
+
       # SSH authentication methods
-      options = { :verbose => :warn }
+      options = { :verbose => :warn, :port => port }
 
       if password.blank?
         # If there's no password we must supply a private key
@@ -231,12 +235,12 @@ module Foreplay
       output = ''
 
       if mode == :deploy
-        puts "#{INDENT}Connecting to #{server}"
+        puts "#{INDENT}Connecting to #{server} on port #{port}"
 
         # SSH connection
         begin
           Net::SSH.start(server, user, options) do |session|
-            puts "#{INDENT}Successfully connected to #{server}"
+            puts "#{INDENT}Successfully connected to #{server} on port #{port}"
 
             session.shell do |sh|
               steps.each do |step|
@@ -265,7 +269,7 @@ module Foreplay
             end
           end
         rescue SocketError => e
-          terminate "There was a problem starting an ssh session on #{server}:\n#{e.message}"
+          terminate "There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
         end
       else
         # Deployment check: just say what we would have done

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -60,7 +60,7 @@ describe Foreplay::Deploy do
   end
 
   it "should deploy to the environment" do
-    Net::SSH.should_receive(:start).with('web.example.com', 'fred', { :verbose => :warn, :password => 'trollope' }).and_yield(session)
+    Net::SSH.should_receive(:start).with('web.example.com', 'fred', { :verbose => :warn, :port => 22, :password => 'trollope' }).and_yield(session)
 
     [
       'mkdir -p .foreplay && touch .foreplay/foreplay/current_port && cat .foreplay/foreplay/current_port',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Xenapto