rstuk 0.0.1 → 0.0.2

data/lib/rstuk.rb

@@ -1,14 +1,23 @@
 require 'open3'
+require 'socket'
+require 'timeout'
+
+class SSHFail < RuntimeError
+  def initialize server, port
+    super "Couldn't get connection to #{server}:#{port}"
+  end
+end
 
 class Shell
 
-  def self.remote server, port, cmd, expected_exit_status = 0
-    # We want to avoid host key interactive accept question
-    # And avoid test failures due to non English Locale
+  def self.remote server, port, cmd, opts = {}
+    defaults = {exit_code: 0, timeout: 90}
+    opts = defaults.merge opts
+    self.wait_for server, port, opts[:timeout]
     puts "ssh: #{cmd}"
     self.do \
       "ssh root@#{server}  #{self.ssh_options} -p #{port} \"#{cmd}\"",
-      expected_exit_status
+      opts[:exit_code]
   end
 
   def self.local cmd, expected_exit_status = 0
@@ -24,6 +33,7 @@ class Shell
 private
 
   def self.do cmd, expected_exit_status
+    # We want to avoid test failures due to non English Locale
     self.verify \
       expected_exit_status,
       *(Open3.capture3 "LANG=C; #{cmd}")
@@ -41,7 +51,26 @@ private
   end
 
   def self.ssh_options
+    # We want to avoid host key interactive accept question
     "-o 'UserKnownHostsFile /dev/null' -o StrictHostKeyChecking=no"
   end
 
+  def self.wait_for server, port, seconds
+    puts "Waiting for ssh."
+    Timeout::timeout(seconds) do
+      tcp_banner = nil
+      until tcp_banner =~ /^SSH-2.0-OpenSSH.*/
+        begin
+          socket = TCPSocket.new server, port
+          tcp_banner = socket.readline.strip
+          socket.close
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, EOFError, Errno::ETIMEDOUT
+          # Go through the loop again
+        end
+      end
+    end
+  rescue Timeout::Error
+    raise SSHFail.new server, port
+  end
+
 end

data/rstuk.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "rstuk"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.date        = "2013-04-10"
   s.summary     = %q{Common library for kiwi_spec and studio_spec}
   s.description = %q{Common library for kiwi_spec and studio_spec}

metadata

@@ -1,48 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rstuk
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Yury Tsarev
 - Theo Chatzimichos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fuubar
-  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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common library for kiwi_spec and studio_spec
-email: 
+email:
 - ytsarev@suse.com
 - tchatzimichos@suse.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - COPYING
 - Gemfile
@@ -52,36 +45,26 @@ files:
 - rstuk.gemspec
 homepage: 
 licenses: []
-
 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: rstuk
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Common library for kiwi_spec and studio_spec
 test_files: []
-