centurion 1.3.1 → 1.4.0

data/spec/docker_via_cli_spec.rb

@@ -3,40 +3,89 @@ require 'centurion/docker_via_cli'
 
 describe Centurion::DockerViaCli do
   let(:docker_path) { 'docker' }
-  let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375, docker_path) }
 
-  it 'pulls the latest image given its name' do
-    expect(docker_via_cli).to receive(:echo).
-                              with("docker -H=tcp://host1:2375 pull foo:latest")
-    docker_via_cli.pull('foo')
-  end
+  context 'without TLS certificates' do
+    let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375, docker_path) }
+    it 'pulls the latest image given its name' do
+      expect(docker_via_cli).to receive(:echo).
+                                with("docker -H=tcp://host1:2375 pull foo:latest")
+      docker_via_cli.pull('foo')
+    end
 
-  it 'pulls an image given its name & tag' do
-    expect(docker_via_cli).to receive(:echo).
-                              with("docker -H=tcp://host1:2375 pull foo:bar")
-    docker_via_cli.pull('foo', 'bar')
-  end
+    it 'pulls an image given its name & tag' do
+      expect(docker_via_cli).to receive(:echo).
+                                with("docker -H=tcp://host1:2375 pull foo:bar")
+      docker_via_cli.pull('foo', 'bar')
+    end
 
-  it 'tails logs on a container' do
-    id = '12345abcdef'
-    expect(docker_via_cli).to receive(:echo).
-                              with("docker -H=tcp://host1:2375 logs -f #{id}")
-    docker_via_cli.tail(id)
-  end
+    it 'tails logs on a container' do
+      id = '12345abcdef'
+      expect(docker_via_cli).to receive(:echo).
+                                with("docker -H=tcp://host1:2375 logs -f #{id}")
+      docker_via_cli.tail(id)
+    end
+
+    it 'should print all chars when one thread is running' do
+      expect(docker_via_cli).to receive(:run_with_echo)
+
+      allow(Thread).to receive(:list) {[double(:status => 'run')]}
+
+      docker_via_cli.pull('foo')
+    end
 
-  it 'should print all chars when one thread is running' do
-    expect(docker_via_cli).to receive(:run_with_echo)
+    it 'should only print lines when multiple threads are running' do
+      expect(docker_via_cli).to receive(:run_without_echo)
 
-    allow(Thread).to receive(:list) {[double(:status => 'run')]}
+      allow(Thread).to receive(:list) {[double(:status => 'run'), double(:status => 'run')]}
 
-    docker_via_cli.pull('foo')
+      docker_via_cli.pull('foo')
+    end
   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(docker_via_cli).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')
+    end
 
-  it 'should only print lines when multiple threads are running' do
-    expect(docker_via_cli).to receive(:run_without_echo)
+    it 'pulls an image given its name & tag' do
+      expect(docker_via_cli).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')
+    end
 
-    allow(Thread).to receive(:list) {[double(:status => 'run'), double(:status => 'run')]}
+    it 'tails logs on a container' do
+      id = '12345abcdef'
+      expect(docker_via_cli).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)
+    end
 
-    docker_via_cli.pull('foo')
+    it 'attach to a container' do
+      id = '12345abcdef'
+      expect(docker_via_cli).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)
+    end
   end
 end

data/spec/dogestry_spec.rb

@@ -14,44 +14,51 @@ describe Centurion::Dogestry do
 
   describe '#aws_access_key_id' do
     it 'returns correct value' do
-      registry.aws_access_key_id.should == dogestry_options[:aws_access_key_id]
+      expect(registry.aws_access_key_id).to eq(dogestry_options[:aws_access_key_id])
     end
   end
 
   describe '#aws_secret_key' do
     it 'returns correct value' do
-      registry.aws_secret_key.should == dogestry_options[:aws_secret_key]
+      expect(registry.aws_secret_key).to eq(dogestry_options[:aws_secret_key])
     end
   end
 
   describe '#s3_bucket' do
     it 'returns correct value' do
-      registry.s3_bucket.should == dogestry_options[:s3_bucket]
+      expect(registry.s3_bucket).to eq(dogestry_options[:s3_bucket])
     end
   end
 
   describe '#s3_region' do
     it 'returns correct default value' do
-      registry.s3_region.should == "us-east-1"
+      expect(registry.s3_region).to eq("us-east-1")
     end
   end
 
   describe '#s3_url' do
     it 'returns correct value' do
-      registry.s3_url.should == "s3://#{registry.s3_bucket}/?region=#{registry.s3_region}"
+      expect(registry.s3_url).to eq("s3://#{registry.s3_bucket}/?region=#{registry.s3_region}")
     end
   end
 
   describe '#exec_command' do
     it 'returns correct value' do
-      registry.exec_command('pull', repo).should start_with('dogestry')
+      expect(registry.exec_command('pull', repo)).to start_with('dogestry')
     end
   end
 
+ describe '#pull' do
+   it 'returns correct value' do
+     expect(registry).to receive(:echo).with("dogestry #{flags} pull #{registry.s3_url} #{repo}")
+     registry.pull(repo, pull_hosts)
+   end
+ end
+
   describe '#which' do
     it 'finds dogestry command line' do
       allow(File).to receive(:executable?).and_return(true)
-      registry.which('dogestry').should_not == nil
+      expect(registry.which('dogestry')).to_not be_nil
     end
   end
 end

data/spec/support/matchers/capistrano_dsl_matchers.rb

@@ -3,11 +3,11 @@ RSpec::Matchers.define :have_key_and_value do |expected_key, expected_value|
     actual.env[actual.current_environment].has_key?(expected_key.to_sym) && (actual.fetch(expected_key.to_sym) == expected_value)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual.env[actual.current_environment].keys.inspect} would include #{expected_key.inspect} with value #{expected_value.inspect}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual.env[actual.current_environment].keys.join(', ')} would not include #{expected_key.inspect} with value #{expected_value.inspect}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop