nodespec 0.1.10 → 1.0.0

data/spec/configuration_binding_spec.rb

@@ -0,0 +1,167 @@
+require 'nodespec/configuration_binding'
+
+module NodeSpec
+  describe ConfigurationBinding do
+    subject {ConfigurationBinding.new(configuration)}
+
+    let(:configuration) { double('configuration') }
+    let(:existing_session) {double('existing session')}
+    let(:new_session) {double('new session')}
+
+    describe '#bind_ssh_session_for' do
+      shared_examples 'bind ssh session' do
+        it 'binds the session' do
+          allow(new_session).to receive(:host).and_return('test.host.name')
+          allow(new_session).to receive(:options).and_return({port: 1234})
+          expect(configuration).to receive(:ssh=).with(new_session)
+          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}
+          expect(session).to be(new_session)
+        end
+      end
+
+      context 'different or no session' do
+        before do
+          expect(configuration).to receive(:ssh=).with(nil)
+          expect(configuration).to receive(:ssh_options=).with(nil)
+          expect(configuration).to receive(:host=).with(nil)
+        end
+
+        context 'not existing session' do
+          before do
+            allow(configuration).to receive(:ssh).and_return(nil)
+          end
+
+          include_examples 'bind ssh session'
+        end
+
+        context 'different existing session' do
+          before do
+            allow(configuration).to receive(:ssh).and_return(existing_session)
+            expect(existing_session).to receive(:close)
+          end
+
+          context 'different host' do
+            before do
+              allow(existing_session).to receive(:host).and_return('test.anotherhost.name')
+              allow(existing_session).to receive(:options).and_return({port: 1234})
+            end
+
+            include_examples 'bind ssh session'
+          end
+
+          context 'different port' do
+            before do
+              allow(existing_session).to receive(:host).and_return('test.host.name')
+              allow(existing_session).to receive(:options).and_return({port: 5678})
+            end
+
+            include_examples 'bind ssh session'
+          end
+        end
+      end
+
+      context 'same session' do
+        before do
+          allow(configuration).to receive(:ssh).and_return(existing_session)
+          allow(existing_session).to receive(:host).and_return('test.host.name')
+          allow(existing_session).to receive(:options).and_return({port: 1234})
+          expect(existing_session).not_to receive(:close)
+          expect(configuration).not_to receive(:ssh=)
+          expect(configuration).not_to receive(:ssh_options=)
+          expect(configuration).not_to receive(:host=)
+        end
+
+        it 'does not change the exisintg session' do
+          session = subject.bind_ssh_session_for('test.host.name', 1234) {new_session}
+          expect(session).to be(existing_session)
+        end
+      end
+    end
+
+    describe '#unbind_ssh_session' do
+      before do
+        allow(configuration).to receive(:ssh).and_return(existing_session)
+        expect(existing_session).to receive(:host)
+        expect(existing_session).to receive(:options).and_return({})
+        expect(existing_session).to receive(:close)
+        expect(configuration).to receive(:ssh=).with(nil)
+        expect(configuration).to receive(:ssh_options=).with(nil)
+        expect(configuration).to receive(:host=).with(nil)
+      end
+
+      it 'removes ssh session from the configuration' do
+        subject.unbind_ssh_session
+      end
+    end
+
+    describe '#bind_winrm_session_for' do
+      shared_examples 'bind winrm session' do
+        it 'binds the session' do
+          allow(new_session).to receive(:endpoint).and_return('test.endpoint')
+          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}
+          expect(session).to be(new_session)
+        end
+      end
+
+      context 'different or no session' do
+        before do
+          expect(configuration).to receive(:winrm=).with(nil)
+          expect(configuration).to receive(:host=).with(nil)
+        end
+
+        context 'not existing session' do
+          before do
+            allow(configuration).to receive(:winrm).and_return(nil)
+          end
+
+          include_examples 'bind winrm session'
+        end
+
+        context 'different existing session' do
+          before do
+            allow(configuration).to receive(:winrm).and_return(existing_session)
+          end
+
+          context 'different host' do
+            before do
+              allow(existing_session).to receive(:endpoint).and_return('test.anotherendpoint')
+            end
+
+            include_examples 'bind winrm session'
+          end
+        end
+      end
+
+      context 'same session' do
+        before do
+          allow(configuration).to receive(:winrm).and_return(existing_session)
+          allow(existing_session).to receive(:endpoint).and_return('test.endpoint')
+          expect(configuration).not_to receive(:winrm=)
+          expect(configuration).not_to receive(:host=)
+        end
+
+        it 'does not change the exisintg session' do
+          session = subject.bind_winrm_session_for('test.host.name', 'test.endpoint') {new_session}
+          expect(session).to be(existing_session)
+        end
+      end
+    end
+
+    describe '#unbind_winrm_session' do
+      before do
+        expect(configuration).to receive(:winrm=).with(nil)
+        expect(configuration).to receive(:host=).with(nil)
+      end
+
+      it 'removes winrm session from the configuration' do
+        subject.unbind_winrm_session
+      end
+    end
+  end
+end

data/spec/local_command_runner_spec.rb

@@ -3,7 +3,7 @@ require 'nodespec/local_command_runner'
 
 module NodeSpec
   describe LocalCommandRunner do
-    let(:subject) {Object.new.extend LocalCommandRunner}
+    subject {Object.new.extend LocalCommandRunner}
     let(:cmd_status) { double('status') }
 
     before do
@@ -13,13 +13,13 @@ module NodeSpec
 
     it 'returns true if the command succeeds' do
       allow(cmd_status).to receive(:success?).and_return(true)
-      
+
       expect(subject.run_command('test command')).to be_truthy
     end
 
     it 'returns false if the command fails' do
       allow(cmd_status).to receive(:success?).and_return(false)
-      
+
       expect(subject.run_command('test command')).to be_falsy
     end
   end

data/spec/node_spec.rb

@@ -11,40 +11,40 @@ module NodeSpec
     shared_examples 'run commands' do
       it "runs a command through the backend proxy" do
         expect(backend_proxy).to receive(:execute).with('test command')
-        
+
         subject.execute('test command')
       end
 
       it "creates a directory with a path relative to the temporary directory" do
         expect(backend_proxy).to receive(:temp_directory).ordered.and_return('/temp/dir')
         expect(backend_proxy).to receive(:create_directory).ordered.with('/temp/dir/test_dir')
-        
+
         expect(subject.create_temp_directory('test_dir')).to eq('/temp/dir/test_dir')
       end
 
       it "creates a directory with a path relative to the node working directory" do
         expect(backend_proxy).to receive(:create_directory).ordered.with('.nodespec')
         expect(backend_proxy).to receive(:create_directory).ordered.with('.nodespec/test_dir')
-        
+
         expect(subject.create_directory('test_dir')).to eq('.nodespec/test_dir')
       end
 
       it "writes to a file with a path relative to the node working directory" do
         expect(backend_proxy).to receive(:create_directory).ordered.with('.nodespec')
         expect(backend_proxy).to receive(:create_file).ordered.with('.nodespec/test/file', 'test content')
-        
+
         expect(subject.create_file('test/file', 'test content')).to eq('.nodespec/test/file')
       end
 
       it "creates a directory with an absolute path" do
         expect(backend_proxy).to receive(:create_directory).with('/test/dir')
-        
+
         expect(subject.create_directory('/test/dir')).to eq('/test/dir')
       end
 
       it "writes to a file with an absolute path" do
         expect(backend_proxy).to receive(:create_file).with('/test/file', 'test content')
-        
+
         expect(subject.create_file('/test/file', 'test content')).to eq('/test/file')
       end
     end
@@ -85,10 +85,10 @@ module NodeSpec
       end
 
       context 'no os given' do
-        let(:subject) {Node.new('test_node', 'adapter' => 'test_adapter', 'foo' => 'bar')}
+        subject {Node.new('test_node', 'adapter' => 'test_adapter', 'foo' => 'bar')}
 
         before do
-          allow(CommunicationAdapters).to receive(:get_communicator).with('test_node', nil, 'test_adapter', 'foo' => 'bar').and_return(communicator)
+          allow(CommunicationAdapters).to receive(:get_communicator).with('test_node', 'test_adapter', 'foo' => 'bar').and_return(communicator)
         end
 
         include_examples 'node os', nil
@@ -96,10 +96,10 @@ module NodeSpec
       end
 
       context 'os given' do
-        let(:subject) {Node.new('test_node', 'os' => 'test_os', 'adapter' => 'test_adapter', 'foo' => 'bar')}
+        subject {Node.new('test_node', 'os' => 'test_os', 'adapter' => 'test_adapter', 'foo' => 'bar')}
 
         before do
-          allow(CommunicationAdapters).to receive(:get_communicator).with('test_node', 'test_os', 'test_adapter', 'foo' => 'bar').and_return(communicator)
+          allow(CommunicationAdapters).to receive(:get_communicator).with('test_node', 'test_adapter', 'foo' => 'bar').and_return(communicator)
         end
 
         include_examples 'node os', 'test_os'

data/spec/provisioning_spec.rb

@@ -9,13 +9,13 @@ module NodeSpec
       'shellscript' => Provisioning::Shellscript
     }
 
-    let(:subject) {Object.new.extend Provisioning}
+    subject {Object.new.extend Provisioning}
     let(:provisioning_block) {Proc.new {}}
-    
+
     before do
       allow(NodeSpec).to receive(:current_node).and_return('current node')
     end
-    
+
     context 'multiple invocations to same provisioner' do
       let(:provisioner_instance){double('provisioner instance')}
       available_provisioners.each do |name, clazz|

data/spec/support/backend.rb

@@ -1,10 +1,10 @@
-shared_examples 'providing a backend' do |expected_backend|
-  it "returns #{expected_backend} backend" do
-    expect(subject.backend).to eq(expected_backend)
+shared_examples 'providing a backend' do |backend_identifier, backend_class|
+  it "returns a #{backend_identifier} backend" do
+    expect(subject.backend).to eq(backend_identifier)
   end
 
-  it "returns BackendProxy::#{expected_backend} as backend proxy" do
-    expect(subject.backend_proxy).to be_a(NodeSpec::BackendProxy.const_get(expected_backend))
+  it "returns #{backend_class.name} as backend proxy" do
+    expect(subject.backend_proxy).to be_a(backend_class)
   end
 end
 

data/spec/support/communicator_adapters.rb

@@ -0,0 +1,23 @@
+shared_context 'new_ssh_communicator' do |hostname, options|
+  before do
+    allow(NodeSpec::CommunicationAdapters::SshCommunicator).to receive(:new).with(hostname, options).and_return('ssh communicator')
+  end
+end
+
+shared_context 'new_winrm_communicator' do |hostname, options|
+  before do
+    allow(NodeSpec::CommunicationAdapters::WinrmCommunicator).to receive(:new).with(hostname, options).and_return('winrm communicator')
+  end
+end
+
+shared_examples 'new_communicator' do |adapter_clazz, connection|
+  include_context "new_#{connection}_communicator", 'test.host.name', 'foo' => 'bar'
+
+  it 'returns communicator with the host name from the node name' do
+    expect(adapter_clazz.communicator_for('test.host.name', 'foo' => 'bar')).to eq("#{connection} communicator")
+  end
+
+  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

data/spec/support/init_with_current_node.rb

@@ -1,4 +1,4 @@
 shared_context 'initialize with current node', init_with_current_node: true do
   let(:current_node) {double('current node')}
-  let(:subject) {described_class.new(current_node)}
+  subject {described_class.new(current_node)}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nodespec
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 1.0.0
 platform: ruby
 authors:
 - Silvio Montanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -28,44 +28,58 @@ dependencies:
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: specinfra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -136,24 +150,23 @@ files:
 - README.md
 - Rakefile
 - lib/nodespec.rb
+- lib/nodespec/backend_proxy.rb
 - lib/nodespec/backend_proxy/base.rb
 - lib/nodespec/backend_proxy/cmd.rb
 - lib/nodespec/backend_proxy/exec.rb
 - lib/nodespec/backend_proxy/ssh.rb
 - lib/nodespec/backend_proxy/unixshell_utility.rb
 - lib/nodespec/backend_proxy/winrm.rb
-- lib/nodespec/backends.rb
 - lib/nodespec/command_execution.rb
 - lib/nodespec/communication_adapters.rb
 - lib/nodespec/communication_adapters/aws_ec2.rb
-- lib/nodespec/communication_adapters/local_backend.rb
 - lib/nodespec/communication_adapters/native_communicator.rb
-- lib/nodespec/communication_adapters/remote_backend.rb
 - lib/nodespec/communication_adapters/ssh.rb
 - lib/nodespec/communication_adapters/ssh_communicator.rb
 - lib/nodespec/communication_adapters/vagrant.rb
 - lib/nodespec/communication_adapters/winrm.rb
 - lib/nodespec/communication_adapters/winrm_communicator.rb
+- lib/nodespec/configuration_binding.rb
 - lib/nodespec/local_command_runner.rb
 - lib/nodespec/node.rb
 - lib/nodespec/node_configurations.rb
@@ -175,15 +188,14 @@ files:
 - spec/backend_proxy/winrm_spec.rb
 - spec/command_execution_spec.rb
 - spec/communication_adapters/aws_ec2_spec.rb
-- spec/communication_adapters/local_backend_spec.rb
 - spec/communication_adapters/native_communicator_spec.rb
-- spec/communication_adapters/remote_backend_spec.rb
 - spec/communication_adapters/ssh_communicator_spec.rb
 - spec/communication_adapters/ssh_spec.rb
 - spec/communication_adapters/vagrant_spec.rb
 - spec/communication_adapters/winrm_communicator_spec.rb
 - spec/communication_adapters/winrm_spec.rb
 - spec/communication_adapters_spec.rb
+- spec/configuration_binding_spec.rb
 - spec/local_command_runner_spec.rb
 - spec/node_configurations_spec.rb
 - spec/node_spec.rb
@@ -195,13 +207,13 @@ files:
 - spec/runtime_gem_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/backend.rb
+- spec/support/communicator_adapters.rb
 - spec/support/init_with_current_node.rb
 - spec/support/local_command.rb
 - spec/support/node_command.rb
-- spec/support/ssh_communicator.rb
-- spec/support/winrm_communicator.rb
 homepage: https://github.com/smontanari/nodespec
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -232,15 +244,14 @@ test_files:
 - spec/backend_proxy/winrm_spec.rb
 - spec/command_execution_spec.rb
 - spec/communication_adapters/aws_ec2_spec.rb
-- spec/communication_adapters/local_backend_spec.rb
 - spec/communication_adapters/native_communicator_spec.rb
-- spec/communication_adapters/remote_backend_spec.rb
 - spec/communication_adapters/ssh_communicator_spec.rb
 - spec/communication_adapters/ssh_spec.rb
 - spec/communication_adapters/vagrant_spec.rb
 - spec/communication_adapters/winrm_communicator_spec.rb
 - spec/communication_adapters/winrm_spec.rb
 - spec/communication_adapters_spec.rb
+- spec/configuration_binding_spec.rb
 - spec/local_command_runner_spec.rb
 - spec/node_configurations_spec.rb
 - spec/node_spec.rb
@@ -252,8 +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/init_with_current_node.rb
 - spec/support/local_command.rb
 - spec/support/node_command.rb
-- spec/support/ssh_communicator.rb
-- spec/support/winrm_communicator.rb

data/lib/nodespec/backends.rb

@@ -1,13 +0,0 @@
-require 'specinfra/helper'
-%w[exec cmd ssh winrm].each {|f| require_relative "backend_proxy/#{f}"}
-
-module NodeSpec
-  module Backends
-    class SpecInfraCompatibilityError < StandardError; end
-
-    %w[Exec Ssh Cmd WinRM].each do |name|
-      raise SpecInfraCompatibilityError.new("module SpecInfra::Helper::#{name} is not defined!") unless SpecInfra::Helper.const_defined?(name)
-      const_set(name, name)
-    end
-  end
-end

data/lib/nodespec/communication_adapters/local_backend.rb

@@ -1,15 +0,0 @@
-require 'nodespec/backends'
-
-module NodeSpec
-  module CommunicationAdapters
-    module LocalBackend
-      def backend_proxy
-        BackendProxy.const_get(backend).new
-      end
-
-      def backend
-        os == 'Windows' ? Backends::Cmd : Backends::Exec
-      end
-    end
-  end
-end

data/lib/nodespec/communication_adapters/remote_backend.rb

@@ -1,15 +0,0 @@
-require 'nodespec/backends'
-
-module NodeSpec
-  module CommunicationAdapters
-    module RemoteBackend
-      def backend_proxy
-        BackendProxy.const_get(backend).new(session)
-      end
-
-      def backend
-        os == 'Windows' ? Backends::WinRM : Backends::Ssh
-      end
-    end
-  end
-end

data/spec/communication_adapters/local_backend_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-require 'nodespec/communication_adapters/local_backend'
-
-module NodeSpec
-  module CommunicationAdapters
-    describe LocalBackend do
-      let(:subject) {Object.new.extend LocalBackend}
-
-      context 'no os' do
-        before do
-          def subject.os
-          end
-        end
-        it_behaves_like 'providing a backend', 'Exec'
-      end
-      
-      context 'UN*X os' do
-        before do
-          def subject.os
-            'CentOS'
-          end
-        end
-
-        it_behaves_like 'providing a backend', 'Exec'
-      end
-
-      context 'Windows os' do
-        before do
-          def subject.os
-            'Windows'
-          end
-        end
-
-        it_behaves_like 'providing a backend', 'Cmd'
-      end
-    end
-  end
-end

data/spec/communication_adapters/remote_backend_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'nodespec/communication_adapters/remote_backend'
-
-module NodeSpec
-  module CommunicationAdapters
-    describe RemoteBackend do
-      let(:subject) {
-        Object.new.tap do |obj|
-          obj.extend RemoteBackend
-          def obj.session
-            'session'
-          end
-        end
-      }
-
-      context 'no os' do
-        before do
-          def subject.os
-          end
-        end
-
-        it_behaves_like 'providing a backend', 'Ssh'
-      end
-
-      context 'UN*X os' do
-        before do
-          def subject.os
-            'CentOS'
-          end
-        end
-
-        it_behaves_like 'providing a backend', 'Ssh'
-      end
-
-      context 'Windows os' do
-        before do
-          def subject.os
-            'Windows'
-          end
-        end
-
-        it_behaves_like 'providing a backend', 'WinRM'
-      end
-    end
-  end
-end

data/spec/support/ssh_communicator.rb

@@ -1,9 +0,0 @@
-require 'nodespec/communication_adapters/ssh_communicator'
-
-shared_examples 'new_ssh_communicator' do |hostname, os, options|
-  before do
-    allow(NodeSpec::CommunicationAdapters::SshCommunicator).to receive(:new).with(
-      hostname, os, options
-    ).and_return('ssh communicator')
-  end
-end

data/spec/support/winrm_communicator.rb

@@ -1,9 +0,0 @@
-require 'nodespec/communication_adapters/winrm_communicator'
-
-shared_context 'new_winrm_communicator' do |hostname, os, options|
-  before do
-    allow(NodeSpec::CommunicationAdapters::WinrmCommunicator).to receive(:new).with(
-      hostname, os, options
-    ).and_return('winrm communicator')
-  end
-end