specinfra 2.66.5 → 2.66.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 408f0f41631bffb6459f62f1d207cd09acfd969a
-  data.tar.gz: 91fca84926d0775de1b89240bc2a25bce0ebf20a
+  metadata.gz: 8b3ab4b42d73fe5ddbe2f8a7b7b15dbf9c4cab08
+  data.tar.gz: f55c8d33ef771d0d3d37788fae05115090b18ed0
 SHA512:
-  metadata.gz: b0d9ee631452081a3cb3708218349d43e69137e71b56233f1734d46a3ef364db0344d9bac89975346b7e8cf456916f26742769cd4c940740653de020b3c3c734
-  data.tar.gz: ca6f5f7200e25b746a5add15f0f4ee2f081c7c6107ce9fbfb38145a0397d848abab0ee058f6b8fa3dcb39e987a9269e7f2731c8455505166463250f6fe46cc3e
+  metadata.gz: 0b7e4c706519eb56e678fbfc3745723884d65a335d9346f7eab94488093b773c35af336d82a27ac87176755784b8203c6ba614440a7f8c41a44f1da0cd56df50
+  data.tar.gz: d2b036de0e6b96fac03a9ad50d14f76ae2cdf04e91c29f029546884516603d232e8a97e146c02c6fde5b4051cd11b5c85b7915ee53dd27ff1819efaa5f2d31c7

data/Rakefile

@@ -10,7 +10,7 @@ if defined?(RSpec)
   task :default => 'spec:all'
 
   namespace :spec do
-    task :all => [ :helper, :backend, :configuration, :command, :host_inventory ]
+    task :all => [ :helper, :backend, :configuration, :processor, :command, :host_inventory ]
 
     RSpec::Core::RakeTask.new(:helper) do |t|
       t.pattern = "spec/helper/*_spec.rb"
@@ -33,6 +33,10 @@ if defined?(RSpec)
       t.pattern = "spec/configuration_spec.rb"
     end
 
+    RSpec::Core::RakeTask.new(:processor) do |t|
+      t.pattern = "spec/processor_spec.rb"
+    end
+
     RSpec::Core::RakeTask.new(:command) do |t|
       t.pattern = "spec/command/**/*.rb"
     end

data/lib/specinfra/processor.rb

@@ -89,14 +89,23 @@ module Specinfra
       end
 
       mount = ret.stdout.scan(/\S+/)
-      actual_attr    = { :device => mount[0], :type => mount[4] }
-      mount[5].gsub(/\(|\)/, '').split(',').each do |option|
-        name, val = option.split('=')
-        if val.nil?
-          actual_attr[name.to_sym] = true
-        else
-          val = val.to_i if val.match(/^\d+$/)
-          actual_attr[name.to_sym] = val
+      actual_attr = { }
+      actual_attr[:device] = mount[0]
+      # Output of mount depends on os:
+      # a)  proc on /proc type proc (rw,noexec,nosuid,nodev)
+      # b)  procfs on /proc (procfs, local)
+      actual_attr[:type] = mount[4] if mount[3] == 'type' # case a.
+      if match = ret.stdout.match(/\((.*)\)/)
+        options = match[1].split(',')
+        actual_attr[:type] ||= options.shift              # case b.
+        options.each do |option|
+          name, val = option.split('=')
+          if val.nil?
+            actual_attr[name.strip.to_sym] = true
+          else
+            val = val.to_i if val.match(/^\d+$/)
+            actual_attr[name.strip.to_sym] = val
+          end
         end
       end
 

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.66.5"
+  VERSION = "2.66.6"
 end

data/spec/processor_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Specinfra::Processor do
+  describe 'check_file_is_mounted' do
+    let(:path) { '/proc' }
+    let(:cmd) { Specinfra.command.get(:check_file_is_mounted, path) }
+
+    def mock_output(stdout)
+      Specinfra::CommandResult.new :stdout => stdout
+    end
+
+    context 'freebsd' do
+      before do
+        allow(Specinfra.backend).to receive(:run_command).with(cmd) { mock_output 'procfs on /proc (procfs, local)' }
+      end
+      it 'true when fs type matches' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:type => 'procfs'}, false)).to eq(true)
+      end
+      it 'false when fs type is different' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:type => 'ufs'}, false)).to eq(false)
+      end
+      it 'true when option matches' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:local => true}, false)).to eq(true)
+      end
+      it 'false when option is different' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:async => true}, false)).to eq(false)
+      end
+      context 'only_with' do
+        it 'false when extra options present' do
+          expect(Specinfra::Processor.check_file_is_mounted(path, {:local => true, :async => true}, true)).to eq(false)
+        end
+        it 'true when all options met' do
+          expect(Specinfra::Processor.check_file_is_mounted(path, {:device => "procfs", :type => "procfs", :local => true}, true)).to eq(true)
+        end
+      end
+    end
+    context 'linux' do
+      before do
+        allow(Specinfra.backend).to receive(:run_command).with(cmd) { mock_output 'proc on /proc type proc (rw,noexec,nosuid,nodev)' }
+      end
+      it 'true when fs type matches' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:type => 'proc'}, false)).to eq(true)
+      end
+      it 'false when fs type is different' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:type => 'ufs'}, false)).to eq(false)
+      end
+      it 'true when option matches' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:noexec => true, :nosuid => true}, false)).to eq(true)
+      end
+      it 'false when option is different' do
+        expect(Specinfra::Processor.check_file_is_mounted(path, {:noexec => true, :unknown => true}, false)).to eq(false)
+      end
+      context 'only_with' do
+        it 'false when extra options present' do
+          expect(Specinfra::Processor.check_file_is_mounted(path, {:noexec => true, :nosuid => true}, true)).to eq(false)
+        end
+        it 'true when all options are same' do
+          expect(Specinfra::Processor.check_file_is_mounted(path, {:noexec => true, :nosuid => true, :nodev => true, :rw => true, :device => "proc", :type => "proc"}, true)).to eq(true)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.66.5
+  version: 2.66.6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -601,6 +601,7 @@ files:
 - spec/host_inventory/openbsd/virtualization_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/host_inventory/solaris/virtualization_spec.rb
+- spec/processor_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
 homepage: https://github.com/mizzy/specinfra
@@ -721,4 +722,5 @@ test_files:
 - spec/host_inventory/openbsd/virtualization_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/host_inventory/solaris/virtualization_spec.rb
+- spec/processor_spec.rb
 - spec/spec_helper.rb