taste_tester 0.0.4 → 0.0.5

data/lib/taste_tester/host.rb

@@ -33,7 +33,9 @@ module TasteTester
       @name = name
       @user = ENV['USER']
       @server = server
-      @tunnel = TasteTester::Tunnel.new(@name, @server)
+      if TasteTester::Config.use_ssh_tunnels
+        @tunnel = TasteTester::Tunnel.new(@name, @server)
+      end
     end
 
     def runchef
@@ -69,11 +71,14 @@ module TasteTester
     def test
       logger.warn("Taste-testing on #{@name}")
 
-      # Nuke any existing tunnels that may be there
-      TasteTester::Tunnel.kill(@name)
+      if TasteTester::Config.use_ssh_tunnels
+        # Nuke any existing tunnels that may be there
+        TasteTester::Tunnel.kill(@name)
+
+        # Then setup the tunnel
+        @tunnel.run
+      end
 
-      # Then setup the tunnel
-      @tunnel.run
       @serialized_config = Base64.encode64(config).gsub(/\n/, '')
 
       # Then setup the testing
@@ -105,7 +110,9 @@ module TasteTester
     def untest
       logger.warn("Removing #{@name} from taste-tester")
       ssh = TasteTester::SSH.new(@name)
-      TasteTester::Tunnel.kill(@name)
+      if TasteTester::Config.use_ssh_tunnels
+        TasteTester::Tunnel.kill(@name)
+      end
       ssh << 'rm -vf /etc/chef/client.rb'
       ssh << 'rm -vf /etc/chef/client-taste-tester.rb'
       ssh << 'ln -vs /etc/chef/client-prod.rb /etc/chef/client.rb'
@@ -154,9 +161,16 @@ module TasteTester
     def keeptesting
       logger.warn("Renewing taste-tester on #{@name} until" +
         " #{TasteTester::Config.testing_end_time}")
-      TasteTester::Tunnel.kill(@name)
-      @tunnel = TasteTester::Tunnel.new(@name, @server)
-      @tunnel.run
+      if TasteTester::Config.use_ssh_tunnels
+        TasteTester::Tunnel.kill(@name)
+        @tunnel = TasteTester::Tunnel.new(@name, @server)
+        @tunnel.run
+      else
+        ssh = TasteTester::SSH.new(@name)
+        ssh << "touch -t #{TasteTester::Config.testing_end_time}" +
+          " #{TasteTester::Config.timestamp_file}"
+        ssh.run!
+      end
     end
 
     private

data/lib/taste_tester/server.rb

@@ -50,8 +50,18 @@ module TasteTester
       # If we are using SSH tunneling listen on localhost, otherwise listen
       # on all addresses - both v4 and v6. Note that on localhost, ::1 is
       # v6-only, so we default to 127.0.0.1 instead.
-      @addr = TasteTester::Config.use_ssh_tunnels ? '127.0.0.1' : '::'
-      @host = 'localhost'
+      if TasteTester::Config.use_ssh_tunnels
+        @addr = '127.0.0.1'
+        @host = 'localhost'
+      else
+        @addr = '::'
+        begin
+          @host = Socket.gethostname
+        rescue
+          logger.error('Unable to find fqdn')
+          exit 1
+        end
+      end
     end
 
     def start

data/lib/taste_tester/tunnel.rb

@@ -48,8 +48,9 @@ module TasteTester
       " touch -t #{TasteTester::Config.testing_end_time}" +
       " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
       cmd = "ssh -T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
-        "-o ExitOnForwardFailure=yes -f -R #{@port}:localhost:" +
-        "#{@server.port} root@#{@host} \"#{cmds}\""
+        '-o ServerAliveInterval=10 -o ServerAliveCountMax=6 ' +
+        "-f -R #{@port}:localhost:#{@server.port} " +
+        "root@#{@host} \"#{cmds}\""
       cmd
     end
 
@@ -60,7 +61,7 @@ module TasteTester
       # to true so it doesn't mess up other things... even though this is
       # the only thing we're currently executing in this SSH.
       ssh << "( [ -s #{TasteTester::Config.timestamp_file} ]" +
-        " && kill -- -\$(cat #{TasteTester::Config.timestamp_file}); true )"
+        " && kill -9 -- -\$(cat #{TasteTester::Config.timestamp_file}); true )"
       ssh.run!
     end
   end

metadata

@@ -1,75 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: taste_tester
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Phil Dibowitz
 - Marcin Sawicki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-09-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mixlib-config
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colorize
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: between_meals
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: between_meals
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility for testing Chef changes using chef-zero
 email: 
-executables: 
+executables:
 - taste-tester
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - README.md
 - LICENSE
 - lib/taste_tester/host.rb
@@ -85,37 +84,28 @@ files:
 - bin/taste-tester
 - scripts/taste-untester
 homepage: https://github.com/facebook/taste-tester
-licenses: 
+licenses:
 - Apache
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Taste Tester
 test_files: []
-