dockerkit 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b94964a03ee3803c4dc02662433988442da938c
-  data.tar.gz: 13601633d71d63f59e34371e9653d5a10faa8817
+  metadata.gz: 6dcd2fb82a188ffdf1ed8210c65f47840996f634
+  data.tar.gz: 87d043af753bbbe561083cfba8798f12b3437850
 SHA512:
-  metadata.gz: ef72736657d6fd207d32b614d9a58329701d5f4d9dbd3878738e0ed8496bf9ecfeb7be18d73d7b68dd7cbd81011db4fbfc71ee1d118ffc8b231f4a2cb0187381
-  data.tar.gz: 0d48891b7f8d20cf78820f6b9544770488768ab8307509a54c6aeea9d221f486647879492d3b5e8d5a55e1ce1071db4dc7909c126cdf060da1e529fac08fceed
+  metadata.gz: dc639a2cdbbaffa71a63ba3e08f43c8a9b68f1949eced4cf9c7ecaf01980c2ba430a2b978e6697a39021523a3e19d1f3ae586e851a1c4f21d335dde0c913c4cd
+  data.tar.gz: 68e9b94a77e8976613619a100aab868be2818c2370f1ef91647d9f6b7ea92d849eb47a9db2a9e3fd0e2a0ad050ece1c003a530196e16581d36ff5a892e8d6a98

data/lib/concerns/container_tasks.rb

@@ -50,9 +50,7 @@ module ContainerTasks
     map rm: :del
     map rmc: :del
 
-
-
-  desc 'exec [KEYWORD] [-n nk] [-i ik] [--opts] [--cmd] [-s]', <<-LONG
+    desc 'exec [KEYWORD] [-n nk] [-i ik] [--opts] [--cmd] [-s]', <<-LONG
     select container which container_name match the patten and select some to run
     example:
       dk exec\
@@ -87,7 +85,6 @@ module ContainerTasks
 
     def exec(keyword = nil)
       ret = Container.find(keyword: keyword, name: options['name'], image: options['image'])
-
       if ret.count > 1
         Container.print_table(ret) { |item, index| "[#{index + 1}]#{item}" }
         question = ['please select one container to run:'].unshift(' ').unshift(' ').join("\n")
@@ -98,12 +95,10 @@ module ContainerTasks
 
       command = options['cmd'] || ask_with_default('Any command you want to run?', 'echo hello')
       opts = options['opts'] || ask_with_default('Any option you want to set?', '-it')
-      index=(answer&.to_i||1)-1
-      xcommand=ret[index].exec(opts, command)
-      run(["dk","alias",options['alias'],xcommand].join(" ")) if options['alias']
-      run(xcommand.join(" "))
+      index = (answer ? answer.to_i : 1) - 1
+      xcommand = ret[index].exec(opts, command)
+      run(['dk', 'alias', options['alias'], xcommand].join(' ')) if options['alias']
+      run(xcommand.join(' '))
     end
-
-
   end
 end

data/lib/dockerkit.rb

@@ -1,7 +1,7 @@
 require 'dockerkit/version'
 require 'thor'
 require 'colorize'
-#require 'pry-byebug'
+# require 'pry-byebug'
 require 'active_support'
 require 'active_support/core_ext'
 require 'yaml'

data/lib/dockerkit/version.rb

@@ -1,3 +1,3 @@
 module Dockerkit
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.2.8'.freeze
 end

data/lib/models/container.rb

@@ -28,6 +28,7 @@ class Container
 
   def self.create(line)
     id, image_str, command, created, status, ports, name = line.chomp.split(' ' * 2).reject(&:empty?).map(&:strip)
+    name, ports = ports, name if name.nil?
     ret = new(
       id: id,
       image_str: image_str,
@@ -60,7 +61,7 @@ class Container
     [
       'docker exec',
       exec_opts,
-      name,
+      id,
       command
     ]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerkit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - shaoyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler