dklet 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef224e6d8e6c819c7a76c4c71b06632f99f7902205a5b4ad8b199ee53907d4a
-  data.tar.gz: fd493858e93bcf28cf2f91ac847f4fa0ed9350f860b1309fa931fe653399e4e7
+  metadata.gz: fc26a08b87b0a21b92d09c1b8d13b645b70ce6aad5363b5806fd5eab78f42519
+  data.tar.gz: 3a8a3992d33903a639429882e425cc50f68f2d1775aa30c75f80d8f35b4393b0
 SHA512:
-  metadata.gz: 147dbf5105f07740e17891439964cfdf12fef2626dda6bc97f50390362fa7c68cc21a600c33643adf66da4d5a9dd0cba1002239bb3b42d9648be031089538d71
-  data.tar.gz: 8d28fbee29f3aacbdf1c0655ac83e591686b807b287fb6776803fd3df67ebd15322be7c3591ae4739355165c93416ae084b908af2ea8df3a13a3eb4aba66f399
+  metadata.gz: 79e9cdf2077d7797dbfae77fc5950da8c6b70e539f989dbb0f885bd6a08c23d2310803f6fd8192a0a3bf7dc948092d45d1f6e7f7e599b99092fd520eb85c25ee
+  data.tar.gz: '048429c1495c95995b960121929844411ac7ee9e0fea8eef410044101a329295362e0af7398fdd6eb9897406ca6ea7d86f48be47da6c0b82ecd0f2603c48bcaf'

data/.gitignore

@@ -1 +1,2 @@
 pkg
+.rspec_status

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dklet (0.1.0)
+    dklet (0.1.5)
       thor
 
 GEM

data/lib/dklet/cli.rb

@@ -47,11 +47,11 @@ class DockletCLI < Thor
   end
 
   desc 'runsh [CONTAINER]', 'run into container'
-  option :cmd, banner: 'run command in container'
-  option :opts, banner: 'docker run options'
+  option :cid, banner: 'target container id or name'
   option :tmp, type: :boolean, default: false, banner: 'allow run tmp container'
-  def runsh(cid = ops_container)
-    container_run(options[:cmd], options.merge(cid: cid))
+  option :opts, banner: 'docker run options'
+  def runsh(cmds = 'sh')
+    container_run(cmds)
   end
   map "sh" => :runsh
 
@@ -305,7 +305,19 @@ class DockletCLI < Thor
       klass.new.invoke(task, args, options)
     end
 
+    # encapsulate run commands behaviors in system
+    def system_run(cmds, opts={})
+      unless options[:quiet]
+        puts cmds
+      end
+      unless options[:dry]
+        system cmds
+      end
+    end
+
     def container_run(cmds, opts = {})
+      opts = options.merge(opts)
+      # get target container
       cid = opts[:cid] || ops_container
       tmprun = opts[:tmp]
       if tmprun
@@ -317,25 +329,31 @@ class DockletCLI < Thor
       end
       abort "No container found!" unless cid
 
-      cmds = cmds.join("\n") if cmds.is_a?(Array)
-      cmd = cmds || 'sh'
-      puts "run : #{cmd}" unless opts[:quiet]
-
-      if cmd == 'sh' # simple case
-        cmds = <<~Desc
-          docker exec -it #{opts[:opts]} #{cid} #{cmd}
-        Desc
-      else
-        tfile = tmpfile_for(cmd)
-        dst_file = "/tmp/dklet-#{File.basename(tfile)}-#{rand(10000)}"
-        # todo user permissions for pg
-        cmds = <<~Desc
-          docker cp --archive #{tfile} #{cid}:#{dst_file}
-          docker exec -it #{opts[:opts]} #{cid} sh -c 'sh #{dst_file} && rm -f #{dst_file}'
-        Desc
+      # how to run
+      new_cmds = if Dklet::Util.single_line?(cmds)
+          <<~Desc
+            docker exec -it #{opts[:opts]} #{cid} #{cmds}
+          Desc
+        else
+          cmds = cmds.join("\n") if cmds.is_a?(Array)
+          tfile = tmpfile_for(cmds)
+          dst_file = "/tmp/dklet-#{File.basename(tfile)}-#{rand(10000)}"
+          <<~Desc
+            docker cp --archive #{tfile} #{cid}:#{dst_file}
+            docker exec -it #{opts[:opts]} #{cid} sh #{'-x' if opts[:debug]} #{dst_file}
+            docker exec #{cid} rm -f #{dst_file}
+          Desc
+        end
+      unless opts[:quiet]
+        puts "==commands to run on #{cid}"
+        puts cmds
+        if opts[:debug]
+          puts "====by run on host"
+          puts new_cmds 
+        end
+        puts "==end of print commands" 
       end
-      puts cmds unless opts[:quiet]
-      system cmds unless opts[:dry]
+      system new_cmds unless opts[:dry]
 
       if tmprun
         system <<~Desc
@@ -343,15 +361,5 @@ class DockletCLI < Thor
         Desc
       end
     end
-
-    # encapsulate run commands behaviors in system
-    def system_run(cmds, opts={})
-      unless options[:quiet]
-        puts cmds
-      end
-      unless options[:dry]
-        system cmds
-      end
-    end
   end # of no_commands
 end

data/lib/dklet/util.rb

@@ -4,6 +4,10 @@ require 'socket'
 module Dklet::Util
   module_function
 
+  def human_timestamp(t = Time.now)
+    t.strftime("%Y%m%d%H%M%S")
+  end
+
   def tmpfile_for(str, prefix: 'dklet-tmp')
     file = Tempfile.new(prefix)
     file.write str
@@ -12,11 +16,16 @@ module Dklet::Util
     file.path
   end
 
-  def human_timestamp(t = Time.now)
-    t.strftime("%Y%m%d%H%M%S")
-  end
-
   def host_ip
     Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
   end
+
+  def single_line?(cmds)
+    cmds = cmds.chomp
+    return false if cmds.is_a? Array
+    return false if cmds =~ /\n/
+    return true if cmds =~ /^\s*(bash|sh)/ 
+    return false if cmds =~ /.+;/
+    true
+  end
 end

data/lib/dklet/version.rb

@@ -1,5 +1,5 @@
 module Dklet
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dklet
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ruijian Cao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler