nodespec 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c521201ce3c84255c9eadcf6f4e120601f2c6782
-  data.tar.gz: b5128627491fd84aae37789dca3560d77531284d
+  metadata.gz: f8247290f8693f24e63078e9d02fade2c040fe5f
+  data.tar.gz: c2e28b72b7015f6646632cbe6a0a7edacc4891bc
 SHA512:
-  metadata.gz: 6e08d0e4dc3acf0545ec32f0e4ada934e7899df36d6225028995589b8a8ffa992dc2b19760afefa90faa2d55a9bfa973c13f47c41cb055a3af3bb32468f71ce7
-  data.tar.gz: f5e3b4ae194e6f943ba560e33abb43d4bc823f0309f09d7e0a8bd2a4ce07077ee8a0f1fb106aba5cfc61cf8532a484a72edf2c394633f771dfb7f5becc9fabf4
+  metadata.gz: 20acb8ed594cbb3aca4648ddf7f2424c045ca9809e26b11211b08555173e053c15373ecda9c9ff6921416d45c330fea9ded126827e1eda9e53fe5c4342797188
+  data.tar.gz: f5a76255ea11a6d108c828f3f7555dfe91821bda499b13cd1c4b4afba26152fea42b933526f2876eded41b9705807b593acbe37fad674a1c656894a142960fe4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nodespec (1.0.0)
+    nodespec (1.0.1)
       net-ssh
       os
       serverspec (~> 2.3)

data/lib/nodespec.rb

@@ -24,9 +24,9 @@ RSpec.configure do |config|
         property[:os] = nil # prevent os caching so we can switch os for any node test
         config.os = Specinfra::Helper::DetectOs.const_get(node.os).detect if node.os
 
-        Specinfra.configuration.backend = node.backend
+        Specinfra.configuration.backend = node.communicator.backend
 
-        node.communicator.bind_to(NodeSpec::ConfigurationBinding.new(config))
+        node.communicator.init_session(NodeSpec::ConfigurationBinding.new(config))
       end
     end
   end

data/lib/nodespec/communication_adapters/aws_ec2.rb

@@ -13,9 +13,9 @@ module NodeSpec
 
           raise "EC2 Instance #{instance_name} is not reachable" unless ec2_instance.exists? && ec2_instance.status == :running
           if options.has_key?('winrm')
-            WinrmCommunicator.new(ec2_instance.public_dns_name, options['winrm'])
+            WinrmCommunicator.new(ec2_instance.public_ip_address, options['winrm'])
           else
-            SshCommunicator.new(ec2_instance.public_dns_name, options['ssh'] || {})
+            SshCommunicator.new(ec2_instance.public_ip_address, options['ssh'] || {})
           end
         end
       end

data/lib/nodespec/communication_adapters/native_communicator.rb

@@ -7,7 +7,7 @@ module NodeSpec
     class NativeCommunicator
       include VerboseOutput
 
-      def bind_to(configuration)
+      def init_session(configuration)
         configuration.unbind_ssh_session
         configuration.unbind_winrm_session
         verbose_puts "\nRunning on local host..."

data/lib/nodespec/communication_adapters/ssh_communicator.rb

@@ -17,10 +17,10 @@ module NodeSpec
         end
       end
 
-      def bind_to(configuration)
+      def init_session(configuration)
         configuration.unbind_winrm_session
 
-        @session = configuration.bind_ssh_session_for(@host, @ssh_options[:port]) do
+        @session = configuration.bind_ssh_session_for({host: @host, port: @ssh_options[:port]}) do
           msg = "\nConnecting to #{@host}"
           msg << ":#{@ssh_options[:port]}" if @ssh_options[:port]
           msg << " as #{@user}..."

data/lib/nodespec/communication_adapters/winrm_communicator.rb

@@ -29,10 +29,10 @@ module NodeSpec
         @options = @options.inject({}) {|h,(k,v)| h[k.to_sym] = v; h}
       end
 
-      def bind_to(configuration)
+      def init_session(configuration)
         configuration.unbind_ssh_session
 
-        @session = configuration.bind_winrm_session_for(@host, @endpoint) do
+        @session = configuration.bind_winrm_session_for({host: @host, endpoint: @endpoint}) do
           RuntimeGemLoader.require_or_fail('winrm') do
             verbose_puts "\nConnecting to #{@endpoint}..."
             WinRM::WinRMWebService.new(@endpoint, @transport, @options)

data/lib/nodespec/configuration_binding.rb

@@ -4,31 +4,24 @@ module NodeSpec
   class ConfigurationBinding
     include VerboseOutput
 
+    BACKEND_ACTIONS = {
+      ssh: {
+        diff_session: lambda { |ssh, params| ssh.host != params[:host] || ssh.options[:port] != params[:port] },
+        bind_attributes: lambda { |ssh, config| config.ssh_options = ssh.options }
+      },
+      winrm: {
+        diff_session: lambda { |winrm, params| winrm.endpoint != params[:endpoint] }
+      }
+    }
+
     def initialize(configuration)
       @configuration = configuration
     end
 
-    def bind_ssh_session_for(host, port)
-      current_session = @configuration.ssh
-      if current_session.nil? || current_session.host != host || current_session.options[:port] != port
-        unbind_ssh_session
-        current_session = yield
-        @configuration.ssh = current_session
-        @configuration.ssh_options = current_session.options
-        @configuration.host = current_session.host
-      end
-      current_session
-    end
-
-    def bind_winrm_session_for(host, endpoint)
-      current_session = @configuration.winrm
-      if current_session.nil? || current_session.endpoint != endpoint
-        unbind_winrm_session
-        current_session = yield
-        @configuration.winrm = current_session
-        @configuration.host = host
+    BACKEND_ACTIONS.keys.each do |backend|
+      define_method("bind_#{backend}_session_for") do |params, &block|
+        bind_session_for(backend, params, &block)
       end
-      current_session
     end
 
     def unbind_ssh_session
@@ -42,7 +35,22 @@ module NodeSpec
     end
 
     def unbind_winrm_session
+      verbose_puts "\nClosing connection to #{@configuration.winrm.endpoint}" if @configuration.winrm
       @configuration.winrm = @configuration.host = nil
     end
+
+    private
+
+    def bind_session_for(backend, params)
+      current_session = @configuration.send(backend)
+      if current_session.nil? || BACKEND_ACTIONS[backend][:diff_session].call(current_session, params)
+        send("unbind_#{backend}_session")
+        current_session = yield
+        @configuration.send("#{backend}=", current_session)
+        @configuration.host = params[:host]
+        BACKEND_ACTIONS[backend][:bind_attributes].call(current_session, @configuration) if BACKEND_ACTIONS[backend][:bind_attributes]
+      end
+      current_session
+    end
   end
 end

data/lib/nodespec/node.rb

@@ -15,10 +15,6 @@ module NodeSpec
       @communicator = CommunicationAdapters.get_communicator(@name, adapter_name, opts)
     end
 
-    def backend
-      @communicator.backend
-    end
-
     [:create_directory, :create_file].each do |met|
       define_method(met) do |*args|
         path_argument = args.shift

data/lib/nodespec/version.rb

@@ -1,3 +1,3 @@
 module NodeSpec
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/communication_adapters/aws_ec2_spec.rb

@@ -17,12 +17,12 @@ module NodeSpec
         before do
           allow(ec2_instance).to receive(:exists?).ordered.and_return(true)
           allow(ec2_instance).to receive(:status).ordered.and_return(:running)
-          allow(ec2_instance).to receive(:public_dns_name).ordered.and_return('test.host.name')
+          allow(ec2_instance).to receive(:public_ip_address).ordered.and_return('ip_address')
         end
 
         %w[ssh winrm].each do |connection|
           describe "#{connection} communicator" do
-            include_context "new_#{connection}_communicator", 'test.host.name', 'foo' => 'bar'
+            include_context "new_#{connection}_communicator", 'ip_address', 'foo' => 'bar'
 
             it 'returns communicator with the instance name from the node name' do
               expect(AwsEc2.communicator_for('test-instance', connection => {'foo' => 'bar'})).to eq("#{connection} communicator")
@@ -35,7 +35,7 @@ module NodeSpec
         end
 
         describe 'openssh default connection' do
-          include_context "new_ssh_communicator", 'test.host.name', {}
+          include_context "new_ssh_communicator", 'ip_address', {}
 
           it 'returns an ssh communicator' do
             expect(AwsEc2.communicator_for('test-instance')).to eq("ssh communicator")

data/spec/communication_adapters/native_communicator_spec.rb

@@ -21,13 +21,13 @@ module NodeSpec
         end
       end
 
-      describe '#bind_to' do
+      describe '#init_session' do
         let(:configuration) {double('configuration')}
 
         it 'unbinds other sessions' do
           expect(configuration).to receive(:unbind_ssh_session)
           expect(configuration).to receive(:unbind_winrm_session)
-          subject.bind_to(configuration)
+          subject.init_session(configuration)
         end
       end
     end

data/spec/communication_adapters/ssh_communicator_spec.rb

@@ -10,30 +10,22 @@ module NodeSpec
         before do
           expect(configuration).to receive(:unbind_winrm_session)
           allow(Net::SSH).to receive(:start).with(hostname, 'testuser', options).and_return('session')
-          allow(configuration).to receive(:bind_ssh_session_for) do |host, port, &block|
-            expect(host).to eq hostname
-            expect(port).to eq port
+          allow(configuration).to receive(:bind_ssh_session_for) do |params, &block|
+            expect(params[:host]).to eq hostname
+            expect(params[:port]).to eq options[:port]
             block.call
           end
         end
       end
 
-      shared_examples 'binding session' do
-        it 'returns a session' do
-          subject.bind_to(configuration)
-
-          expect(subject.session).to eq('session')
-        end
-      end
-
-      describe 'binding the session' do
+      describe 'init the session' do
         context 'default options' do
           subject {SshCommunicator.new('test.host.name')}
           before do
             allow(Net::SSH).to receive(:configuration_for).and_return({someoption: 'somevalue', user: 'testuser'})
           end
           include_context 'creating new session', 'test.host.name', someoption: 'somevalue', user: 'testuser'
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
 
         context 'custom options' do
@@ -42,17 +34,17 @@ module NodeSpec
             allow(Net::SSH).to receive(:configuration_for).and_return({someoption: 'somevalue', port: 22, user: 'testuser'})
           end
           include_context 'creating new session', 'test.host.name', someoption: 'somevalue', port: 1234, user: 'testuser', password: 'testpassword', keys: 'testkeys'
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
 
         context 'same session' do
           subject {SshCommunicator.new('test.host.name', 'port' => 1234, 'user' => 'testuser')}
           before do
             expect(configuration).to receive(:unbind_winrm_session)
-            allow(configuration).to receive(:bind_ssh_session_for).with('test.host.name', 1234).and_return('session')
+            allow(configuration).to receive(:bind_ssh_session_for).with({host: 'test.host.name', port: 1234}).and_return('session')
           end
 
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
       end
 

data/spec/communication_adapters/winrm_communicator_spec.rb

@@ -10,43 +10,35 @@ module NodeSpec
         before do
           expect(configuration).to receive(:unbind_ssh_session)
           allow(WinRM::WinRMWebService).to receive(:new).with("http://#{hostname}:#{port}/wsman", transport, options).and_return('session')
-          allow(configuration).to receive(:bind_winrm_session_for) do |host, endpoint, &block|
-            expect(host).to eq hostname
-            expect(endpoint).to eq "http://#{hostname}:#{port}/wsman"
+          allow(configuration).to receive(:bind_winrm_session_for) do |params, &block|
+            expect(params[:host]).to eq hostname
+            expect(params[:endpoint]).to eq "http://#{hostname}:#{port}/wsman"
             block.call
           end
         end
       end
 
-      shared_examples 'binding session' do
-        it 'returns a session' do
-          subject.bind_to(configuration)
-
-          expect(subject.session).to eq('session')
-        end
-      end
-
-      describe 'binding the session' do
+      describe 'init the session' do
         context 'default port and transport' do
           subject {WinrmCommunicator.new('test.host.name', 'foo' => 'bar')}
           include_context 'creating new session', 'test.host.name', 5985, :plaintext, {foo: 'bar', disable_sspi: true}
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
 
         context 'custom port and transport' do
           subject {WinrmCommunicator.new('test.host.name', 'port' => 1234, 'transport' => 'test_transport', 'foo' => 'bar')}
           include_context 'creating new session', 'test.host.name', 1234, :test_transport, {foo: 'bar'}
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
 
         context 'same session' do
           subject {WinrmCommunicator.new('test.host.name', 'foo' => 'bar')}
           before do
             expect(configuration).to receive(:unbind_ssh_session)
-            allow(configuration).to receive(:bind_winrm_session_for).with('test.host.name', "http://test.host.name:5985/wsman").and_return('session')
+            allow(configuration).to receive(:bind_winrm_session_for).with({host: 'test.host.name', endpoint: "http://test.host.name:5985/wsman"}).and_return('session')
           end
 
-          include_examples 'binding session'
+          include_examples 'initializing communicator session'
         end
       end
 

data/spec/configuration_binding_spec.rb

@@ -17,7 +17,7 @@ module NodeSpec
           expect(configuration).to receive(:ssh_options=).with({port: 1234})
           expect(configuration).to receive(:host=).with('test.host.name')
 
-          session = subject.bind_ssh_session_for('test.host.name', 1234) {new_session}
+          session = subject.bind_ssh_session_for({host: 'test.host.name', port: 1234}) {new_session}
           expect(session).to be(new_session)
         end
       end
@@ -75,7 +75,7 @@ module NodeSpec
         end
 
         it 'does not change the exisintg session' do
-          session = subject.bind_ssh_session_for('test.host.name', 1234) {new_session}
+          session = subject.bind_ssh_session_for({host: 'test.host.name', port: 1234}) {new_session}
           expect(session).to be(existing_session)
         end
       end
@@ -104,7 +104,7 @@ module NodeSpec
           expect(configuration).to receive(:winrm=).with(new_session)
           expect(configuration).to receive(:host=).with('test.host.name')
 
-          session = subject.bind_winrm_session_for('test.host.name', 'test.endpoint') {new_session}
+          session = subject.bind_winrm_session_for({host: 'test.host.name', endpoint: 'test.endpoint'}) {new_session}
           expect(session).to be(new_session)
         end
       end
@@ -147,7 +147,7 @@ module NodeSpec
         end
 
         it 'does not change the exisintg session' do
-          session = subject.bind_winrm_session_for('test.host.name', 'test.endpoint') {new_session}
+          session = subject.bind_winrm_session_for({host: 'test.host.name', endpoint: 'test.endpoint'}) {new_session}
           expect(session).to be(existing_session)
         end
       end
@@ -155,6 +155,7 @@ module NodeSpec
 
     describe '#unbind_winrm_session' do
       before do
+        expect(configuration).to receive(:winrm)
         expect(configuration).to receive(:winrm=).with(nil)
         expect(configuration).to receive(:host=).with(nil)
       end

data/spec/support/{communicator_adapters.rb → communication_adapters.rb}

@@ -20,4 +20,12 @@ shared_examples 'new_communicator' do |adapter_clazz, connection|
   it 'returns communicator with the host name from the options' do
     expect(adapter_clazz.communicator_for('test_node', 'host' => 'test.host.name', 'foo' => 'bar')).to eq("#{connection} communicator")
   end
-end
+end
+
+shared_examples 'initializing communicator session' do
+  it 'returns a session' do
+    subject.init_session(configuration)
+
+    expect(subject.session).to eq('session')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nodespec
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Silvio Montanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -207,7 +207,7 @@ files:
 - spec/runtime_gem_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/backend.rb
-- spec/support/communicator_adapters.rb
+- spec/support/communication_adapters.rb
 - spec/support/init_with_current_node.rb
 - spec/support/local_command.rb
 - spec/support/node_command.rb
@@ -263,7 +263,7 @@ test_files:
 - spec/runtime_gem_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/backend.rb
-- spec/support/communicator_adapters.rb
+- spec/support/communication_adapters.rb
 - spec/support/init_with_current_node.rb
 - spec/support/local_command.rb
 - spec/support/node_command.rb