specinfra 2.39.1 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c455c30dee44a48bc7b869cc369e7885963a5fce
-  data.tar.gz: 7c866f042201d3844a8fb1d4eb72eed3e5de2356
+  metadata.gz: 69a45c26015f312d20024e8ac669efc4a45832eb
+  data.tar.gz: 074bd53241292533b4f7f99218108e173d31fdfa
 SHA512:
-  metadata.gz: c9443ecf7e5f2548c8d62b197a0f7a396bce804989fb5505be520c180a1810b31ed5ec8e5b79b3f5641f7563312b83417e2c5f4e5a49b9629c8c276a340cfec5
-  data.tar.gz: f243f37ed9de43d32db9e31e86ef85f38120345ff4824e449d86315c61d21c537c4a1ee032c84875710786a8926906a13bdbddcdaa817509a4144f4a72335d21
+  metadata.gz: 22bc007008faf15f07afe3d0d12dc34e61eba875b8e748b4616a78dc1da080cccd3cd56de9b08e4fcea7aa0628a912d5a2f19b7e1eb32321d8a68462c89daee6
+  data.tar.gz: e5bca1a7d5f6c32275a69c8ee599cae8adb44da320612640ad42a55e2c05b9152a2ef4c086dc373a940aab837a55ff114eb42c77ca06bea81810953f6bbf7f4e

data/Rakefile

@@ -37,7 +37,7 @@ if defined?(RSpec)
     end
 
     RSpec::Core::RakeTask.new(:host_inventory) do |t|
-      t.pattern = "spec/host_inventory/*_spec.rb"
+      t.pattern = "spec/host_inventory/**/*_spec.rb"
     end
   end
 end

data/appveyor.yml

@@ -33,7 +33,6 @@ cache:
 install:
   - git submodule update --init --recursive
   - ps: Enable-PSRemoting -Force
-  - ps: Set-ExecutionPolicy RemoteSigned
   - winrm quickconfig -q
   - winrm set winrm/config/client @{TrustedHosts="*"}
   - winrm set winrm/config/client/auth @{Basic="true"}

data/lib/specinfra/command/linux/base/inventory.rb

@@ -23,5 +23,9 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
     def get_filesystem
       'df -P'
     end
+
+    def get_kernel
+      'uname -s -r'
+    end
   end
 end

data/lib/specinfra/command/module/ss.rb

@@ -23,13 +23,14 @@ module Specinfra
         end
 
         def command_options(protocol)
-          case protocol
-          when /\Atcp/
-            "-tnl"
-          when /\Audp/
-            "-unl"
+          case protocol.to_s
+          when 'tcp'  then "-tnl4"
+          when 'tcp6' then "-tnl6"
+          when 'udp'  then "-unl4"
+          when 'udp6' then "-unl6"
+          when ''     then "-tunl"
           else
-            "-tunl"
+            raise ArgumentError, "Unknown protocol [#{protocol}]"
           end
         end
       end

data/lib/specinfra/host_inventory/kernel.rb

@@ -5,8 +5,23 @@ module Specinfra
         kernel = {}
         kernel['machine'] = backend.os_info[:arch]
 
+        cmd = backend.command.get(:get_inventory_kernel)
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+          kernel = kernel.merge(parse_uname(ret.stdout))
+        end
         kernel
       end
+
+      def parse_uname(ret)
+        match = ret.match(/^(\w+) (((\d+\.\d+)\.\d+).*)$/)
+        if match
+          name, release, version, major = match.captures
+          Hash['name', name, "release", release, "version", version, "version_major", major]
+        else
+          nil
+        end
+      end
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.39.1"
+  VERSION = "2.40.0"
 end

data/spec/command/linux/inventory_spec.rb

@@ -9,3 +9,7 @@ end
 describe get_command(:get_inventory_cpu) do
   it { should eq 'cat /proc/cpuinfo' }
 end
+
+describe get_command(:get_inventory_kernel) do
+  it { should eq 'uname -s -r' }
+end

data/spec/command/module/ss_spec.rb

@@ -6,12 +6,23 @@ describe Specinfra::Command::Module::Ss do
   end
   let(:klass) { Specinfra::Command::Module::Ss::Test }
   it { expect(klass.check_is_listening('80')).to eq 'ss -tunl | grep -- :80\ ' }
-  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp'})).to eq 'ss -tnl | grep -- :80\ ' }
-  it { expect(klass.check_is_listening('80', options={:protocol => 'udp'})).to eq 'ss -unl | grep -- :80\ ' }
+
+  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'udp'})).to eq 'ss -unl4 | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'udp6'})).to eq 'ss -unl6 | grep -- :80\ ' }
+
   it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0'})).to eq 'ss -tunl | grep -- \ \*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp'})).to eq 'ss -tnl | grep -- \ \*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl | grep -- \ \*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- \ \*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- \ \*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl4 | grep -- \ \*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -- \ \*:80\ ' }
+
   it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4'})).to eq 'ss -tunl | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp'})).to eq 'ss -unl | grep -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp'})).to eq 'ss -unl4 | grep -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -- \ 1.2.3.4:80\ ' }
+
+  it { expect{klass.check_is_listening('80', options={:protocol => 'bad_proto'})}.to raise_error(ArgumentError, 'Unknown protocol [bad_proto]') }
 end

data/spec/host_inventory/linux/kernel_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Specinfra::HostInventory::Kernel do
+  describe 'Example of CentOS 6.6 Kernel version 2.6.32-504.30.3.el6.x86_64' do
+    str = 'Linux 2.6.32-504.30.3.el6.x86_64'
+
+    let(:host_inventory) { nil }
+    ret = Specinfra::HostInventory::Kernel.new(host_inventory).parse_uname(str)
+    example "name" do
+      expect(ret["name"]).to eq("Linux")
+    end
+    example "release" do
+      expect(ret["release"]).to eq("2.6.32-504.30.3.el6.x86_64")
+    end
+    example "version" do
+      expect(ret["version"]).to eq("2.6.32")
+    end
+    example "major" do
+      expect(ret["version_major"]).to eq("2.6")
+    end
+  end
+
+  describe 'Example of unparseable output' do
+    str = 'unparseable output'
+
+    let(:host_inventory) { nil }
+    ret = Specinfra::HostInventory::Kernel.new(host_inventory).parse_uname(str)
+
+    example 'is nil' do
+      expect(ret).to be(nil)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.39.1
+  version: 2.40.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -496,6 +496,7 @@ files:
 - spec/host_inventory/freebsd/filesystem_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb
+- spec/host_inventory/linux/kernel_spec.rb
 - spec/host_inventory/linux/memory_spec.rb
 - spec/host_inventory/linux/virtualization_docker_spec.rb
 - spec/host_inventory/linux/virtualization_kvm_spec.rb
@@ -585,10 +586,10 @@ test_files:
 - spec/host_inventory/freebsd/filesystem_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb
+- spec/host_inventory/linux/kernel_spec.rb
 - spec/host_inventory/linux/memory_spec.rb
 - spec/host_inventory/linux/virtualization_docker_spec.rb
 - spec/host_inventory/linux/virtualization_kvm_spec.rb
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
-has_rdoc: