specinfra 2.38.0 → 2.38.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50b6fad32f531c6ff0465166b651d714f10f844
-  data.tar.gz: 18bdbfa44d752dc45b26d22c05303b0df51db5cb
+  metadata.gz: 972b0b4d232e4437b861f29d76317693630733bf
+  data.tar.gz: 266ceb8f83189aa3730c96c3a3c986bad4ca21cb
 SHA512:
-  metadata.gz: cee38cc5a910e85c2315986f7c4fa01ba6202af0cb960e4199c7acddbc8928aa0cffaa74e0dac426e78b8ca1a40f7a421758998d5afd1e3e46d7bf530bbd649d
-  data.tar.gz: 534190a21b48b1e4d8ea883d6ab53a81755e4f9cc0f5dce0d1b8a747c5b5d007918db2ce735b30cd8a09ba21947a0bffdb7c2ccf8abd083113e9fa90faa1b60d
+  metadata.gz: c346d60997449ddb9148b252f1e766108d335e39a7a2869a8d533ae504a0e8ecb899ab4d1f86c44f8eb457b84019510e5434218a74125138c56f96e545940731
+  data.tar.gz: 891c0baffa2a8b9ee7af9e22023092e94bf833e4b9328ceb3e4a6402df8574379bd5db94c526cb14e3db7d63e23082f47c493a5497242dd372ee8b7ef0c0bf2f

data/lib/specinfra/command/freebsd/base/interface.rb

@@ -0,0 +1,15 @@
+class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::Interface 
+  class << self
+    def check_exists(name)
+      "ifconfig #{name}"
+    end
+
+    def check_has_ipv4_address(interface, ip_address)
+      "ifconfig #{interface} | grep -w inet | cut -d ' ' -f 2"
+    end
+
+    def check_has_ipv6_address(interface, ip_address)
+      "ifconfig #{interface} | grep -w inet6 | cut -d ' ' -f 2"
+    end
+  end
+end

data/lib/specinfra/command.rb

@@ -210,6 +210,7 @@ require 'specinfra/command/opensuse/base/service'
 require 'specinfra/command/freebsd'
 require 'specinfra/command/freebsd/base'
 require 'specinfra/command/freebsd/base/file'
+require 'specinfra/command/freebsd/base/interface'
 require 'specinfra/command/freebsd/base/inventory'
 require 'specinfra/command/freebsd/base/package'
 require 'specinfra/command/freebsd/base/port'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.38.0"
+  VERSION = "2.38.1"
 end

data/spec/backend/exec/child_process_spec.rb

@@ -0,0 +1,18 @@
+# Ref: https://github.com/sorah/infra_operator/blob/6259aada3fdd9d4bed5759115d39bd1df25a81f2/spec/backends/exec_spec.rb#L36
+
+require 'spec_helper'
+
+context "when executed process launches child process like a daemon, and the daemon doesn't close stdout,err" do
+  subject(:result) { Specinfra::Runner.run_command("ruby -e 'pid = fork { sleep 10; puts :bye }; Process.detach(pid); puts pid'") }
+
+  it "doesn't block" do
+    a = Time.now
+    result # exec
+    b = Time.now
+    expect((b-a) < 3).to be_truthy
+
+    expect(result.stderr).to be_empty
+    expect(result.stdout.chomp).to match(/\A\d+\z/)
+    Process.kill :TERM, result.stdout.chomp.to_i
+  end
+end

data/spec/backend/exec/read_noblock_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+def command(cmd)
+  Specinfra::Runner.run_command(cmd)
+end
+
+shared_examples "IO checks" do
+    let (:generator) { "seq 1 #{max}" }
+    let (:expected) { (1..max).map { |x| x.to_s }.join("\n") << "\n" }
+
+    it "stdout only" do
+        out = command(generator).stdout
+        expect(out).to eq expected
+    end
+
+    it "stderr only" do
+        out = command("#{generator} >&2" ).stderr
+        expect(out).to eq expected
+    end
+
+    it "stdout then stderr" do
+        cmd = command("#{generator}; #{generator} >&2" )
+        expect(cmd.stdout).to eq expected
+        expect(cmd.stderr).to eq expected
+    end
+
+    it "stderr then stdout" do
+        cmd = command("#{generator} >&2; #{generator}" )
+        expect(cmd.stdout).to eq expected
+        expect(cmd.stderr).to eq expected
+    end
+
+    it "stdout and stderr" do
+        cmd = command("(#{generator} &); #{generator} >&2; sleep 2" )
+        expect(cmd.stdout).to eq expected
+        expect(cmd.stderr).to eq expected
+    end
+end
+
+describe "buffer overflow problem" do
+    context "with small output amount" do
+        let (:max) { 10 }
+        include_examples "IO checks"
+    end
+
+    context "with huge output amount" do
+        let (:max) { 999999 }
+        include_examples "IO checks"
+    end
+end

data/spec/backend/exec/stdxxx_handler_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+backend = Specinfra::Backend::Exec.new
+
+context 'Output of stdout_handler' do
+  subject(:stdout) do
+    out = ''
+    backend.stdout_handler = Proc.new {|o| out += o }
+    backend.run_command('echo foo')
+    out
+  end
+
+  it { expect(stdout).to eq "foo\n" }
+end
+
+context 'Output of stderr_handler' do
+  subject(:stderr) do
+    err = ''
+    backend.stderr_handler = Proc.new {|e| err += e }
+    backend.run_command('echo foo 1>&2')
+    err
+  end
+
+  it { expect(stderr).to eq "foo\n" }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.38.0
+  version: 2.38.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -252,6 +252,7 @@ files:
 - lib/specinfra/command/freebsd.rb
 - lib/specinfra/command/freebsd/base.rb
 - lib/specinfra/command/freebsd/base/file.rb
+- lib/specinfra/command/freebsd/base/interface.rb
 - lib/specinfra/command/freebsd/base/inventory.rb
 - lib/specinfra/command/freebsd/base/package.rb
 - lib/specinfra/command/freebsd/base/port.rb
@@ -439,7 +440,10 @@ files:
 - lib/specinfra/runner.rb
 - lib/specinfra/version.rb
 - spec/backend/exec/build_command_spec.rb
+- spec/backend/exec/child_process_spec.rb
 - spec/backend/exec/env_spec.rb
+- spec/backend/exec/read_noblock_spec.rb
+- spec/backend/exec/stdxxx_handler_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/amazon/interface_spec.rb
 - spec/command/amazon/package_spec.rb
@@ -525,7 +529,10 @@ specification_version: 4
 summary: Common layer for serverspec and itamae
 test_files:
 - spec/backend/exec/build_command_spec.rb
+- spec/backend/exec/child_process_spec.rb
 - spec/backend/exec/env_spec.rb
+- spec/backend/exec/read_noblock_spec.rb
+- spec/backend/exec/stdxxx_handler_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/amazon/interface_spec.rb
 - spec/command/amazon/package_spec.rb
@@ -584,3 +591,4 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
+has_rdoc: