dockit 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a78a51574f160dbd04c0f22717937257c31af83
-  data.tar.gz: a62bf6fda71fe0a1f23225a9d2ee2e3f1d7d1ae6
+  metadata.gz: bb0277e146a7b671cc39fd87acb5a4d6e7b74795
+  data.tar.gz: 18cbbcd716ef779405e0c2b068ebaf1cc5d14c66
 SHA512:
-  metadata.gz: cba2ebf7729a13e28c0722527217636f6fb45b4f0b2b0bb6fe89dfa241f2249902dd1e26f1f271c8a9665ad103f16a668675655c1f199cc6a5547b70e16d8599
-  data.tar.gz: 6a9cd2288a51eaa9e95275efe7a306755d76f2536853ecc1529e593ebd3cceacf56cd3e0c2c73d5919c192c1c9cbe3e55fcfaa31713a20689d90eda4912c42b4
+  metadata.gz: c7ca7e298d7bb0275bf2cc02fa441c530385981896d6c0522acbabeb2fcb34aadb69ee0fe0c184f574190482fe896a97c99255b610f484bc8237d1631a4d3e6b
+  data.tar.gz: 81bb618b64d904cf57625a3fcb5b831326699baf317ae9b451ce65cddcfa5756ac04914da939536ef164dda276e2620dd38869814bd49f1e8844b47568b699fa

data/VERSION

@@ -1 +1 @@
-4.1.2
+4.2.0

data/lib/dockit/cli.rb

@@ -119,11 +119,11 @@ class Default < Thor
     end
   end
 
-  desc 'sh [SERVICE] [CMD]', 'run an interactive command (default "bash -l")'
+  desc 'sh [SERVICE] [CMD]', 'run an interactive command (default "sh -l")'
   def sh(service=nil, *cmd)
     exec(service) do |s|
-      cmd  = %w[bash -l] if cmd.length < 1
-      name = "sh-#{s.name}"
+      cmd  = %w[sh -l] if cmd.empty?
+      name = ['exec', cmd.first, s.name].join('-')
 
       # in case image has an entrypoint, use the cmd as the entrypoint
       (entrypoint, *cmd) = cmd
@@ -134,7 +134,7 @@ class Default < Thor
         create: {
           Entrypoint: [entrypoint],
           Cmd: cmd,
-          name: "sh-#{name}",
+          name: name,
           Tty: true,
           AttachStdin: true,
           AttachStdout: true,

data/lib/dockit/service.rb

@@ -26,7 +26,7 @@ module Dockit
       end
 
       opts['Image'] ||= image.id if image
-      opts['name']  ||= config.get(:build, :t).gsub(/[^a-zA-Z0-9_.-]/, '-')
+      opts['name']  ||= name
 
       run = merge_config(:run, stringify(options[:run]))
 
@@ -74,7 +74,9 @@ module Dockit
     end
 
     def name
-      n = config.get(:create, :name) || config.get(:build, :t).split(':')[0]
+      (
+        config.get(:create, :name) || config.get(:build, :t).split(':')[0]
+      ).gsub(/[^a-zA-Z0-9_.-]/, '-')
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A configuration manager and builder for docker projects.