httpotemkin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92d5f3c3c07552abf6abbff208200395c89cdef
-  data.tar.gz: 519d81c4e618655ddc91f7971d7d80fb3258e81a
+  metadata.gz: 48d695b887bf805db229dfd7b257639a3f98af12
+  data.tar.gz: d1469f40788c40ad3fd2944cf938895b5d886ca1
 SHA512:
-  metadata.gz: a7d91419dbf36b3a55f64dbc0968e14e496c0256fb3ae5b7ed4e1d8afce34ac0ff08f1b686ea239efe70a35e1a46c316dc7f82bbdb045dd8a049f27cf6ddcaf8
-  data.tar.gz: b130318a0db1552d3cab9946ef5cb46a7b78f7238bea060e35f2cc623b974940446805eff8dc8a86ccb65c1d151ef5d37e9ef00ab5746d5d91afe36faa3d9f00
+  metadata.gz: 2d2145a1c62b5c6fd0285596d1e0b1e39344712d7058fe099c473412c6a4106dc1cb5b1422b2f55a334e4a1d0780f00af63f54e39e041d502d71e3b4fd9ab4ad
+  data.tar.gz: fb127a608dd4192ce60600aca6691723dd8ce9583878fa8aeff487669f420e100d23701a6d550fc0a1d21c6bf7f8c4f9ac1c2b09996c63ad9a51ff90968a7ff2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log of httpotemkin
 
+## Version 0.0.3
+
+* Capture stderr and exit code when running commands on the client
+
 ## Version 0.0.2
 
 * Support running servers and clients separate from executing the test. This

data/lib/client.rb

@@ -1,23 +1,13 @@
 module Httpotemkin
   class Client
+    attr_reader :out, :err, :exit_code
+
     def initialize(containers)
       @containers = containers
     end
 
     def execute(cmd, working_directory: nil)
-      @out = @containers.exec_client(cmd, working_directory: working_directory)
-    end
-
-    def exit_code
-      0
-    end
-
-    def out
-      @out
-    end
-
-    def err
-      ""
+      @out, @err, @exit_code = @containers.exec_client(cmd, working_directory: working_directory)
     end
 
     def inject_tarball(filename)

data/lib/containers.rb

@@ -97,7 +97,15 @@ module Httpotemkin
         cmd += client_cmd
       end
       @out.puts cmd.join(" ")
-      Cheetah.run(cmd, stdout: :capture)
+      begin
+        out, err = Cheetah.run(cmd, stdout: :capture, stderr: :capture)
+        exit_code = 0
+      rescue Cheetah::ExecutionFailed => e
+        out = e.stdout
+        err = e.stderr
+        exit_code = e.status.exitstatus
+      end
+      return out, err, exit_code
     end
 
     def links

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Httpotemkin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/system/client_spec.rb

@@ -67,4 +67,19 @@ describe "client" do
       expect(client.err.empty?).to be(true)
     end
   end
+
+  it "captures stderr" do
+    out = double
+    allow(out).to receive(:puts)
+
+    test = Httpotemkin::Test.new(out: out)
+
+    test.run do |client|
+      client.execute(["ls", "iamnothere"])
+
+      expect(client.exit_code).to eq(2)
+      expect(client.out).to eq("")
+      expect(client.err).to eq("ls: cannot access iamnothere: No such file or directory\n")
+    end
+  end
 end

data/spec/system/hello_world_spec.rb

@@ -11,11 +11,11 @@ describe "hello world" do
 
       test.run do |client|
         sleep 2
-        client.execute(["curl", "server/hello"])
+        client.execute(["curl", "-s", "server/hello"])
 
         expect(client.exit_code).to eq(0)
         expect(client.out).to eq("world\n")
-        expect(client.err.empty?).to be(true)
+        expect(client.err).to eq("")
       end
     end
   end
@@ -31,19 +31,19 @@ describe "hello world" do
     end
 
     it "answers once" do
-      @client.execute(["curl", "server/hello"])
+      @client.execute(["curl", "-s", "server/hello"])
 
       expect(@client.exit_code).to eq(0)
       expect(@client.out).to eq("world\n")
-      expect(@client.err.empty?).to be(true)
+      expect(@client.err).to eq("")
     end
 
     it "answers twice" do
-      @client.execute(["curl", "server/hello"])
+      @client.execute(["curl", "-s", "server/hello"])
 
       expect(@client.exit_code).to eq(0)
       expect(@client.out).to eq("world\n")
-      expect(@client.err.empty?).to be(true)
+      expect(@client.err).to eq("")
     end
 
     after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpotemkin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cornelius Schumacher