foreplay 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfb1f3845240c583bf00361262de1f57479a097
-  data.tar.gz: b62dea61a2453d174a06f02641c02a1fee73520e
+  metadata.gz: 88819e9e2b64f99fe34c4f2db6644ebba55e9ad6
+  data.tar.gz: 4e8818325e534443f4e066fc3157d7496dc07a38
 SHA512:
-  metadata.gz: e8208dff717e38de326be2b8fd34ea846c998b227c0840c64f53d59739405b7c1323fc4d5080f8a6a91c029b8e96363cb7e6ec027aa3516b9501e86b9e966dc4
-  data.tar.gz: a3722cfb412a6661a305a745f91a4d4e7dfb7a6e02e59eec90ad15f4cbb9f3e30a7e94e2afbe16bb0db1572ca98c3301ece39d66a273648bf127b2c4be38ad75
+  metadata.gz: fe138f745c09e417df8a3548dc9e8e0d756336930c4d0b646a04e5a880ce1f15d1ef4cbd73596192150cd50505d2bf4a5acc6fbdadd221ba5dea670a54596640
+  data.tar.gz: 27a1ec20a0f06a3c374c30904518b1e1c7ca221a604a654ea4393ee0b0bdbe639495a2fbda7926ba4ce76655341058886bcd495c418a1f6e1c8f127c8645e5fc

data/lib/foreplay/engine/remote.rb

@@ -14,6 +14,8 @@ module Foreplay
         @server = s
         @steps = st
         @instructions = i
+
+        @options = nil
       end
 
       def deploy

data/lib/foreplay/engine/server.rb

@@ -9,6 +9,11 @@ module Foreplay
         @mode         = m
         @instructions = i
         @server       = s
+
+        @path = nil
+        @host = nil
+        @port_details = nil
+        @current_port_remote = nil
       end
 
       def execute

data/lib/foreplay/engine/step.rb

@@ -8,6 +8,9 @@ module Foreplay
         @host = h
         @step = s
         @instructions = i
+
+        @commands = nil
+        @redirect = nil
       end
 
       def commands

data/lib/foreplay/engine/steps.yml

@@ -67,20 +67,20 @@
   commentary:   "Setting the port for the new instance to <%= current_port %>"
 - command:      'sleep 60'
   commentary:   'Waiting 60s to give service time to start'
-- command:      "sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port <%= current_port %>"
-  commentary:   "Adding firewall rule to direct incoming traffic on port 80 to port <%= current_port %>"
-- command:      "sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port <%= former_port %>"
-  commentary:   "Removing previous firewall rule directing traffic to port <%= former_port %>"
-  ignore_error: true
-- command:      'sudo iptables-save > /etc/iptables/rules.v4'
-  commentary:   'Attempting to save firewall rules to /etc/iptables/rules.v4'
-  ignore_error: true
-- command:      'sudo iptables-save > /etc/iptables.up.rules'
-  commentary:   'Attempting to save firewall rules to /etc/iptables.up.rules'
-  ignore_error: true
-- command:      'sudo iptables-save -c | egrep REDIRECT --color=never'
-  ignore_error: true
-  commentary:   'Current firewall NAT configuration:'
+#- command:      "sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port <%= current_port %>"
+#  commentary:   "Adding firewall rule to direct incoming traffic on port 80 to port <%= current_port %>"
+#- command:      "sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port <%= former_port %>"
+#  commentary:   "Removing previous firewall rule directing traffic to port <%= former_port %>"
+#  ignore_error: true
+#- command:      'sudo iptables-save > /etc/iptables/rules.v4'
+#  commentary:   'Attempting to save firewall rules to /etc/iptables/rules.v4'
+#  ignore_error: true
+#- command:      'sudo iptables-save > /etc/iptables.up.rules'
+#  commentary:   'Attempting to save firewall rules to /etc/iptables.up.rules'
+#  ignore_error: true
+#- command:      'sudo iptables-save -c | egrep REDIRECT --color=never'
+#  ignore_error: true
+#  commentary:   'Current firewall NAT configuration:'
 - command:      "sudo stop <%= former_service %> || echo 'No previous instance running'"
   commentary:   'Stopping the previous instance'
   ignore_error: true

data/lib/foreplay/engine.rb

@@ -17,6 +17,9 @@ module Foreplay
     def initialize(e, f)
       @environment  = e
       @filters      = f
+
+      @defaults = nil
+      @roles_all = nil
     end
 
     [:deploy, :check].each { |m| define_method(m) { execute m } }

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.10.3'
+  VERSION = '0.11.0'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -171,11 +171,11 @@ describe Foreplay::Launcher do
       'mkdir -p .foreplay/foreplay && touch .foreplay/foreplay/current_port && cat .foreplay/foreplay/current_port',
       'echo 50000 > $HOME/.foreplay/foreplay/current_port',
       'sleep 60',
-      'sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 50000',
-      'sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 51000',
-      'sudo iptables-save > /etc/iptables/rules.v4',
-      'sudo iptables-save > /etc/iptables.up.rules',
-      'sudo iptables-save -c | egrep REDIRECT --color=never',
+      #- 'sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 50000',
+      #- 'sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 51000',
+      #- 'sudo iptables-save > /etc/iptables/rules.v4',
+      #- 'sudo iptables-save > /etc/iptables.up.rules',
+      #- 'sudo iptables-save -c | egrep REDIRECT --color=never',
       'sudo stop foreplay-51000 || echo \'No previous instance running\''
     ].each do |command|
       expect(shell).to receive(:execute).with(command).and_return(process)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman