specinfra 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf80a1d196b4626e0c11c472722e9b4031b1b82
-  data.tar.gz: f00d376640817bc57efc20e02f260ce3ba0490a4
+  metadata.gz: a8317b4e00efd9907dddad5e4d1340efac89d245
+  data.tar.gz: 0b54192a51afecf9c70db4dafb49a82a43cf924f
 SHA512:
-  metadata.gz: 8debd47886f2ad58a2745b5b5ba918f2ffa59641bb8a4ff832a6217e26394c195732cfec39d1caec87a9296a7d4698c143cc2eb2e09f24c01156e18b766b954a
-  data.tar.gz: 83b73b2092f2ffe5969837dc7ac8cdcd7cb2017434452a4cb563ccaef1118d2264d3575642bf07beeb928f9919031103348cbef0ff9bca7545232a1c96669fba
+  metadata.gz: cdf9c71716d2d99b75c8c4933cac891e7a44a1dea10df3eb65f243d153ba4d9b4b75482d1a4e710dff06b687c72b3dc39cc4ecd58e72773ed730734fd0d7bab8
+  data.tar.gz: ab98c78e4600c2c099c9cc2dc0fdf910d44f7a54d83a0589cb6636f58c1ec2562972838058424080aa6a9649324170fd8f200a85052a00db99b739f7d54d5024

data/lib/specinfra/command/fedora.rb

@@ -2,8 +2,8 @@ module SpecInfra
   module Command
     class Fedora < RedHat
       def check_enabled(service, target="multi-user.target")
-        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
-        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+        host_port = SpecInfra.configuration.ssh ? [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]] : ['localhost', nil]
+        if property.has_key?(:os_by_host) && property[:os_by_host][host_port][:release].to_i < 15
           super
         else
           # Fedora 15+ uses systemd which no longer has runlevels but targets
@@ -17,8 +17,8 @@ module SpecInfra
       end
 
       def check_running(service)
-        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
-        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+        host_port = SpecInfra.configuration.ssh ? [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]] : ['localhost', nil]
+        if property.has_key?(:os_by_host) && property[:os_by_host][host_port][:release].to_i < 15
           super
         else
           "systemctl is-active #{escape(service)}.service"

data/lib/specinfra/helper/detect_os.rb

@@ -7,18 +7,29 @@ module SpecInfra
 
       def os
         property[:os_by_host] = {} if ! property[:os_by_host]
-        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
+        host_port = current_host_and_port
 
-        if property[:os_by_host][host]
-          os_by_host = property[:os_by_host][host]
+        if property[:os_by_host][host_port]
+          os_by_host = property[:os_by_host][host_port]
         else
           # Set command object explicitly to avoid `stack too deep`
           os_by_host = backend(SpecInfra::Command::Base.new).check_os
-          property[:os_by_host][host] = os_by_host
+          property[:os_by_host][host_port] = os_by_host
         end
 
         os_by_host
       end
+
+      private
+
+      # put this in a module for better reuse
+      def current_host_and_port
+        if SpecInfra.configuration.ssh
+          [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]]
+        else
+          ['localhost', nil]
+        end
+      end
     end
   end
-end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.18.3"
+  VERSION = "1.18.4"
 end

data/spec/helper/detect_os_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe SpecInfra::Helper::DetectOS do
+  shared_context 'no ssh connection' do
+    before do
+      SpecInfra.stub_chain(:configuration, :ssh).and_return(nil)
+    end
+  end
+  shared_context 'existing ssh connection' do |hostname, port|
+    before do
+      ssh_session.stub(:host).and_return(hostname)
+      ssh_session.stub(:options).and_return({:port => port})
+      SpecInfra.stub_chain(:configuration, :ssh).and_return(ssh_session)
+    end
+  end
+  shared_examples 'derive os from backend' do |os|
+    before do
+      backend.stub(:check_os).and_return(os)
+    end
+
+    it 'returns the os derived by the backend ' do
+      expect(subject.os).to eq os
+    end
+  end
+  shared_examples 'derive os from cached property' do |os|
+    it 'returns the os derived by the property ' do
+      expect(subject.os).to eq os
+    end
+  end
+
+  let(:subject) { Object.new.extend SpecInfra::Helper::DetectOS }
+  let(:backend) { double('backend') }
+  let(:ssh_session) { double('ssh') }
+
+  before do
+    subject.stub(:backend).and_return(backend)
+  end
+  
+  describe '#os' do
+    context 'using the backend to retrieve the os' do
+      context 'no cached values' do
+        before do
+          subject.property[:os_by_host] = nil
+        end
+
+        context 'with localhost' do
+          include_context 'no ssh connection'
+          after do
+            expect(subject.property[:os_by_host]).to eq({['localhost', nil] => 'test os'})
+          end
+
+          include_examples 'derive os from backend', 'test os'
+        end
+    
+        context 'with ssh' do
+          include_context 'existing ssh connection', 'test.host', 123
+          after do
+            expect(subject.property[:os_by_host]).to eq({['test.host', 123] => 'test os'})
+          end
+
+          include_examples 'derive os from backend', 'test os'
+        end
+      end
+
+      context 'existing cached values' do
+        before do
+          subject.property[:os_by_host] = {['test.host', 123] => 'cached os'}
+        end
+
+        context 'with localhost' do
+          include_context 'no ssh connection'
+          after do
+            expect(property[:os_by_host]).to eq({['test.host', 123] => 'cached os', ['localhost', nil] => 'test os'})
+          end
+
+          include_examples 'derive os from backend', 'test os'
+        end
+
+        context 'with ssh' do
+          include_context 'existing ssh connection', 'test.another.host', 456
+          after do
+            expect(property[:os_by_host]).to eq({['test.host', 123] => 'cached os', ['test.another.host', 456] => 'test os'})
+          end
+
+          include_examples 'derive os from backend', 'test os'
+        end
+
+        context 'same host with different ports' do
+          include_context 'existing ssh connection', 'test.host', 456
+          
+          after do
+            subject.property[:os_by_host] = {['test.host', 123] => 'cached os', ['test.host', 456] => 'test os'}
+          end
+
+          include_examples 'derive os from backend', 'test os'
+        end
+      end
+    end
+
+    context 'using cached values to retrieve the os' do
+      before do
+        subject.property[:os_by_host] = {['test.host', 123] => 'test os', ['localhost', nil] => 'local os'}
+      end
+      context 'with localhost' do
+        include_context 'no ssh connection'
+
+        include_examples 'derive os from cached property', 'local os'
+      end
+
+      context 'with ssh' do
+        include_context 'existing ssh connection', 'test.host', 123
+
+        include_examples 'derive os from cached property', 'test os'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - spec/backend/ssh/build_command_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
+- spec/helper/detect_os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
@@ -165,5 +166,6 @@ test_files:
 - spec/backend/ssh/build_command_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
+- spec/helper/detect_os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/spec_helper.rb