egon 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI4YzRiNTE3ZTlkOThjOTRmODczN2Q3MDNhMTkyZTAyYTdlNDY3OA==
+    NDUzYWU0NTIxMzExM2UzODBiMzY4YmJkYzBiODYyNGEwYTQxNDY3Mg==
   data.tar.gz: !binary |-
-    NDViMDZiNGE1NWQyNzAxNWJlNDNjMTc2NDllYzM4NjBhZjNjN2VmNQ==
+    YWUxNWFmM2RkZWNiNDQwZTdlYTkyNWUyMDlhNDg3ZGIwZmMyZjk4Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZDYzN2E2ZTk5MWFjZGY0YTc5NTU1ZDIwMDYyNzIxMDRhYzU2MTNjNDk4NmE4
-    NGE3ZjkzZDU5MmU2OWIwODQ3MDU5Y2YxYWZjZGU2ZmM5ZGE2ZDFjZThjMTZi
-    MTUwYzg1Mjc4MmE1ZThiODNkNjEyM2Y0YmExMmE2YmRmMmVhNGQ=
+    ZjAzMDQwNDVjNjgxZGU4ZTMyYjRhOWM4OTQ0MTE5NTQ4MDE5NTE0OTQxMjc1
+    ZDEyMGRjZWM4NTJjYTE3ZjIyODVhYjQzN2I4NTBkMDVhMDVhYTY3M2UyZjc4
+    NTJmOTBmNzVmNmU3OWRjNDlhNDM5NWU5MTkxOGNlZmVkZmZhODE=
   data.tar.gz: !binary |-
-    ODFhNjJiOWJlMzQxODY5NTU3N2ViOGIxM2YyYWI4NDgzNDU1NDc0MTk2MDZk
-    MjMyODEzODJkZjQ4OGEyMDUwYjYxNjU3ZjU3MDBkMzQ3ZDQ5ZmZjMDBjMGIx
-    MDEzY2VjZWJkNmI3ZTA4MzU3ZjI1MTY0NjI1ZTI1MWEwYTFjZTM=
+    YzlkNmNiMmNiNjc2ZGRhMzY5NzFiNTlmNTJlYzgzMzkxZmQyMTQ1MWUyZTQ4
+    MWJmNzU3NGFhOTAzOWM4MDczZDJiZDUyZTQ4Y2ZmN2JlNGVmMmJjNzVlNGM4
+    NWZiMjkzZjNmZTliNDliOGQ3YjgyYmI2YmY4MWVkNWI3NWU1ZWY=

data/lib/egon/undercloud/installer.rb

@@ -27,7 +27,7 @@ module Egon
         @failure = bool
       end
     
-      def install(commands)
+      def install(commands, stringio=nil)
         @started = true
         @completed = false
              
@@ -35,15 +35,15 @@ module Egon
         @connection.on_failure(lambda { set_failure(true) })
     
         Thread.new {
-          @connection.execute(commands)
+          @connection.execute(commands, stringio)
         }
       end
 
-      def check_ports
+      def check_ports(stringio=nil)
         # closed ports 5385, 36357
         ports = [8774, 9292, 8777, 9696, 8004, 5000, 8585, 15672]
         ports.each do |p|
-          if !@connection.port_open?(p)
+          if !@connection.port_open?(p, stringio)
             set_failure(true)
           end
         end

data/lib/egon/undercloud/ssh-connection.rb

@@ -14,7 +14,12 @@ module Egon
         @password = password
       end
 
-      def port_open?(port, local_ip="127.0.0.1", remote_ip="192.0.2.1", seconds=1)
+      def stringio_write(stringio, text)
+        $stdout.puts text if stringio.nil?
+        stringio.puts text unless stringio.nil?
+      end
+
+      def port_open?(port, stringio=nil, local_ip="127.0.0.1", remote_ip="192.0.2.1", seconds=1)
         t = Thread.new {
           begin
             Net::SSH.start(@host, @user, :password => @password, :timeout => seconds,
@@ -25,23 +30,23 @@ module Egon
             session.loop { true }
           end
           rescue => e
-            puts e.message
+            stringio_write(stringio, e.message)
           end
         }
 
         sleep 1
         begin
           url = "http://#{local_ip}:#{port}"
-          puts "Testing #{url}"
+          stringio_write(stringio, "Testing #{url}")
           res = Net::HTTP.get_response(URI(url))
-          puts res.body
-          puts "Port #{port} is open"
+          stringio_write(stringio, res.body)
+          stringio_write(stringio, "Port #{port} is open")
           t.kill
           true
         rescue => e
-          puts e.message
-          puts e.backtrace
-          puts "Port #{port} is closed"
+          stringio_write(stringio, e.message)
+          stringio_write(stringio, e.backtrace)
+          stringio_write(stringio, "Port #{port} is closed")
           t.kill
           false
         end
@@ -84,14 +89,13 @@ module Egon
       
                 # "on_data" is called when the process writes something to stdout
                 ch.on_data do |c, data|
-                  $stdout.print data if stringio.nil?
-                  stringio.puts data unless stringio.nil?
+                  stringio_write(stringio, data)
                 end
       
                 # "on_extended_data" is called when the process writes something to stderr
                 ch.on_extended_data do |c, type, data|
                   $stderr.print data if stringio.nil?
-                  stringio.puts data unless stringio.nil?
+                  stringio_write(stringio, data)
                   call_failure
                 end
       
@@ -107,7 +111,7 @@ module Egon
           puts e.backtrace.inspect
           call_failure
           call_complete
-          stringio.puts e.message unless stringio.nil?
+          stringio_write(stringio, e.message)
           e.message if stringio.nil?
         end
       end

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/test_undercloud.rb

@@ -45,6 +45,18 @@ describe "undercloud installer" do
     @installer.check_ports
     expect(@installer.failure?).to be true
   end
-  
+
+  it "consume stdout and stderr from commands" do
+    io = StringIO.new
+    @installer.install("time", io)
+    while !@installer.completed?
+      sleep 1
+    end
+    expect(io.string).to include("execution expired")
+
+    io = StringIO.new
+    @installer.check_ports(io)
+    expect(io.string).to include("Testing")
+  end
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler