dockit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e774509e3e1c4afab5a44bce1fc3eee91d7d25cf
-  data.tar.gz: daeda4ab4b09f3f9bc7b706fefb77271930ab4fb
+  metadata.gz: 05261f5509995264c5fc34a34ab776c4b70f829f
+  data.tar.gz: f91c5dd47b0c05a06d64d53227f41ae5e8e53c0a
 SHA512:
-  metadata.gz: 1d80feb61549460b39bdaa99adc5617ba09bbd75aed6e9bbe63cd20b682215d178a792682a2d202638030251595dbaf5152405b11469523b1db6f0ab3df6e7e2
-  data.tar.gz: 0867cb20ca447aec30f45524d2af9962c8639021a1282e45b7ac94bbc5ed4f1f3fd915aded2498ae38849f96c330e7049fb95066124f98c96c9d3a2503d663cf
+  metadata.gz: 45e6efa3a72503f91ceaa35d08121c3ccae584595b716f2e8ef5da833c2d5bef4867183709476ff13bf745909803f9466041bb3d02073ae9c6145f962974ff87
+  data.tar.gz: 1635bda5300478f276c069d280b62fd84d167f2b683e79b6b2f2d9e69bc45abcb0933f493b8c0f8ef74d052dea978ddd97d4485951bb836e37cb49aabb393809

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/dockit/cli.rb

@@ -91,17 +91,19 @@ class Default < Thor
   desc 'sh [SERVICE] [CMD]', 'run an interactive command (default "bash -l")'
   def sh(service=nil, *cmd)
     exec(service) do |s|
-      cmd = %w[bash -l] if cmd.length < 1
+      cmd  = %w[bash -l] if cmd.length < 1
+      name = "sh-#{s.name}"
 
       # in case image has an entrypoint, use the cmd as the entrypoint
       (entrypoint, *cmd) = cmd
+      say "Starting #{name} with #{entrypoint} #{cmd}", :green
       s.start(
         transient: true,
         verbose: options.verbose,
         create: {
           Entrypoint: [entrypoint],
           Cmd: cmd,
-          name: 'sh',
+          name: "sh-#{name}",
           Tty: true,
           AttachStdin: true,
           AttachStdout: true,

data/lib/dockit/digitalocean.rb

@@ -94,7 +94,7 @@ class DO < Thor
          desc: 'extra environment variables not defined in Dockit.yaml'
   def start(name)
     s     = service(name)
-    name  = s.config.get(:create, :name) || s.config.get(:build, :t)
+    name  = s.name
     links = config(s, :run,    :Links, 'l')
     binds = config(s, :run,    :Binds, 'v')
 

data/lib/dockit/service.rb

@@ -77,6 +77,10 @@ module Dockit
       image.id
     end
 
+    def name
+      n = config.get(:create, :name) || config.get(:build, :t).split(':')[0]
+    end
+
     private
     def merge_config(key, opts)
       (config.get(key) || {}).merge(opts||{})

data/spec/deploy/mod/Dockit.yaml

@@ -0,0 +1,2 @@
+build:
+  t: mod:tagged

data/spec/deploy/svc/Dockit.yaml

@@ -1,2 +1,4 @@
 build:
-  t: dockit-test
+  t: svc-test
+create:
+  name: a-test

data/spec/dockit/config_spec.rb

@@ -42,7 +42,9 @@ describe Dockit::Config do
   context 'file with locals' do
     let(:path) {file('locals') }
     it 'should exit with a message if a local is missing' do
-      expect { Dockit::Config.new(path) }.to raise_error(SystemExit, /forget/)
+      expect {
+        expect { Dockit::Config.new(path) }.to raise_error(SystemExit, /forget/)
+      }.to output(/^Undefined local/).to_stderr
     end
 
     it 'should expand the locals' do

data/spec/dockit/locals.yaml

@@ -1,3 +1,3 @@
 build:
   t: <%= name %>
-  e: <% ENV['TEST']
+  e: <%= ENV['TEST'] %>

data/spec/dockit_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+
 shared_examples 'a dockit config' do |meth, keys, dirs, ext|
   def dockit_files(names, ext)
     pwd = File.dirname(__FILE__)
@@ -78,3 +79,26 @@ describe Dockit::Env do
     it_should_behave_like 'a dockit config', 'services', svcs, svcs, 'yaml'
   end
 end
+
+describe Dockit::Service do
+  before do
+    @env = Dockit::Env.new
+  end
+
+  subject do
+    Dockit::Service.new(@env.services['mod'])
+  end
+
+  it 'should be created' do
+    expect(subject).to be_a Dockit::Service
+  end
+
+  it "should get it's name from the build tag" do
+    expect(subject.config.get(:build, :t)).to eq('mod:tagged')
+    expect(subject.name).to eq('mod')
+  end
+
+  it "should get it's name from the create name" do
+    expect(Dockit::Service.new(@env.services['svc']).name).to eq('a-test')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler