centurion 1.8.10 → 1.9.0

data/spec/docker_via_cli_spec.rb

@@ -4,27 +4,33 @@ require 'centurion/docker_via_cli'
 describe Centurion::DockerViaCli do
   let(:docker_path) { 'docker' }
 
-  context 'without TLS certificates' do
-    let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375, docker_path) }
+  shared_examples 'docker CLI' do
     it 'pulls the latest image given its name' do
       expect(Centurion::Shell).to receive(:echo).
-                                with("docker -H=tcp://host1:2375 pull foo:latest")
+                                with("docker #{prefix} pull foo:latest")
       docker_via_cli.pull('foo')
     end
 
     it 'pulls an image given its name & tag' do
       expect(Centurion::Shell).to receive(:echo).
-                                with("docker -H=tcp://host1:2375 pull foo:bar")
+                                with("docker #{prefix} pull foo:bar")
       docker_via_cli.pull('foo', 'bar')
     end
 
     it 'tails logs on a container' do
       id = '12345abcdef'
       expect(Centurion::Shell).to receive(:echo).
-                                with("docker -H=tcp://host1:2375 logs -f #{id}")
+                                with("docker #{prefix} logs -f #{id}")
       docker_via_cli.tail(id)
     end
 
+    it 'attach to a container' do
+      id = '12345abcdef'
+      expect(Centurion::Shell).to receive(:echo).
+                                with("docker #{prefix} attach #{id}")
+      docker_via_cli.attach(id)
+    end
+
     it 'should print all chars when one thread is running' do
       expect(Centurion::Shell).to receive(:run_with_echo)
 
@@ -41,51 +47,63 @@ describe Centurion::DockerViaCli do
       docker_via_cli.pull('foo')
     end
   end
+
+  context 'without TLS certificates' do
+    let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375, docker_path) }
+    let(:prefix) { "-H=tcp://host1:2375" }
+
+    it_behaves_like 'docker CLI'
+  end
+
   context 'with TLS certificates' do
     let(:tls_args) { { tls: true, tlscacert: '/certs/ca.pem',
                        tlscert: '/certs/cert.pem', tlskey: '/certs/key.pem' } }
     let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375,
                                                        docker_path, tls_args) }
-    it 'pulls the latest image given its name' do
-      expect(Centurion::Shell).to receive(:echo).
-                                with('docker -H=tcp://host1:2375 ' \
-                                     '--tlsverify ' \
-                                     '--tlscacert=/certs/ca.pem ' \
-                                     '--tlscert=/certs/cert.pem ' \
-                                     '--tlskey=/certs/key.pem pull foo:latest')
-      docker_via_cli.pull('foo')
+    let(:prefix) { "-H=tcp://host1:2375 --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/cert.pem --tlskey=/certs/key.pem" }
+
+    it_behaves_like 'docker CLI'
+  end
+
+  context 'with a SSH connection' do
+    let(:hostname) { 'host1' }
+    let(:ssh_user) { 'myuser' }
+    let(:ssh_log_level) { nil }
+    let(:docker_via_cli) { Centurion::DockerViaCli.new(hostname, nil, docker_path, params) }
+    let(:prefix) { "-H=unix:///tmp/socket/path" }
+    let(:params) do
+      p = { ssh: true}
+      p[:ssh_user] = ssh_user if ssh_user
+      p[:ssh_log_level] = ssh_log_level if ssh_log_level
+      p
     end
 
-    it 'pulls an image given its name & tag' do
-      expect(Centurion::Shell).to receive(:echo).
-                                with('docker -H=tcp://host1:2375 ' \
-                                     '--tlsverify ' \
-                                     '--tlscacert=/certs/ca.pem ' \
-                                     '--tlscert=/certs/cert.pem ' \
-                                     '--tlskey=/certs/key.pem pull foo:bar')
-      docker_via_cli.pull('foo', 'bar')
+    context 'with no log level' do
+      before do
+        expect(Centurion::SSH).to receive(:with_docker_socket).with(hostname, ssh_user, nil).and_yield('/tmp/socket/path')
+      end
+
+      it_behaves_like 'docker CLI'
     end
 
-    it 'tails logs on a container' do
-      id = '12345abcdef'
-      expect(Centurion::Shell).to receive(:echo).
-                                with('docker -H=tcp://host1:2375 ' \
-                                     '--tlsverify ' \
-                                     '--tlscacert=/certs/ca.pem ' \
-                                     '--tlscert=/certs/cert.pem ' \
-                                     "--tlskey=/certs/key.pem logs -f #{id}")
-      docker_via_cli.tail(id)
+    context 'with no user' do
+      let(:ssh_user) { nil }
+
+      before do
+        expect(Centurion::SSH).to receive(:with_docker_socket).with(hostname, nil, nil).and_yield('/tmp/socket/path')
+      end
+
+      it_behaves_like 'docker CLI'
     end
 
-    it 'attach to a container' do
-      id = '12345abcdef'
-      expect(Centurion::Shell).to receive(:echo).
-                                with('docker -H=tcp://host1:2375 ' \
-                                     '--tlsverify ' \
-                                     '--tlscacert=/certs/ca.pem ' \
-                                     '--tlscert=/certs/cert.pem ' \
-                                     "--tlskey=/certs/key.pem attach #{id}")
-      docker_via_cli.attach(id)
+    context 'with a log level set' do
+      let(:ssh_log_level) { Logger::DEBUG }
+
+      before do
+        expect(Centurion::SSH).to receive(:with_docker_socket).with(hostname, ssh_user, Logger::DEBUG).and_yield('/tmp/socket/path')
+      end
+
+      it_behaves_like 'docker CLI'
     end
   end
 end

data/spec/service_spec.rb

@@ -17,6 +17,7 @@ describe Centurion::Service do
     set(:binds, [ Centurion::Service::Volume.new('/foo', '/foo/bar') ])
     set(:port_bindings, [ Centurion::Service::PortBinding.new(12340, 80, 'tcp') ])
     set(:labels, labels)
+    set(:security_opt, ['seccomp=unconfined'])
 
     svc = Centurion::Service.from_env
     expect(svc.name).to eq('mycontainer')
@@ -27,6 +28,7 @@ describe Centurion::Service do
     expect(svc.port_bindings.size).to eq(1)
     expect(svc.port_bindings.first.container_port).to eq(80)
     expect(svc.labels).to eq(labels)
+    expect(svc.security_opt).to eq(['seccomp=unconfined'])
   end
 
   it 'starts with a command' do
@@ -171,6 +173,7 @@ describe Centurion::Service do
     service.cap_adds = ['IPC_BIND', 'NET_RAW']
     service.cap_drops = ['DAC_OVERRIDE']
     service.add_volume('/volumes/redis.8000', '/data')
+    service.security_opt = 'seccomp=unconfined'
 
     expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 10))).to eq({
       'Binds' => ['/volumes/redis.8000:/data'],
@@ -184,7 +187,8 @@ describe Centurion::Service do
       'RestartPolicy' => {
         'Name' => 'on-failure',
         'MaximumRetryCount' => 10
-      }
+      },
+      'SecurityOpt' => 'seccomp=unconfined'
     })
   end
 

data/spec/spec_helper.rb

@@ -3,5 +3,18 @@ SimpleCov.start do
   add_filter '/spec'
 end
 
+require 'excon'
+
+RSpec.configure do |config|
+  # Mock by default
+  config.before(:all) do
+    Excon.defaults[:mock] = true
+  end
+
+  config.after(:each) do
+    Excon.stubs.clear
+  end
+end
+
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each {|f| require f}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.9.0
 platform: ruby
 authors:
 - Nic Benders
@@ -20,118 +20,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
   name: logger-colors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sshkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -155,8 +183,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -178,6 +206,7 @@ files:
 - lib/centurion/logging.rb
 - lib/centurion/service.rb
 - lib/centurion/shell.rb
+- lib/centurion/ssh.rb
 - lib/centurion/version.rb
 - lib/core_ext/numeric_bytes.rb
 - lib/tasks/centurion.rake
@@ -208,17 +237,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A deployment tool for Docker. Takes containers from a Docker registry and