dklet 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc6111b694731072d22d3426582177a180aa902423ce8c2af7faa5283dcdafc
-  data.tar.gz: 249d9bb8b05a2741936dd99acd4ef78d12d157c37bfa8715b88b91522dca5a64
+  metadata.gz: cef224e6d8e6c819c7a76c4c71b06632f99f7902205a5b4ad8b199ee53907d4a
+  data.tar.gz: fd493858e93bcf28cf2f91ac847f4fa0ed9350f860b1309fa931fe653399e4e7
 SHA512:
-  metadata.gz: d505c3c32b784077240277ee45a88a0c2caba292b49ab432db1742b5f8e6ce7be689ea0f0e19069c811c101946c387f4314411d25740b4391b6ae5225ffabc92
-  data.tar.gz: ba52933fa1c49eab057d81d7e860c802cf3fae233100afe08f20ae5eeb145e226fe270fa790d2864aec66ec9e1f528dbdfba4d558de127f1a56926710db84765
+  metadata.gz: 147dbf5105f07740e17891439964cfdf12fef2626dda6bc97f50390362fa7c68cc21a600c33643adf66da4d5a9dd0cba1002239bb3b42d9648be031089538d71
+  data.tar.gz: 8d28fbee29f3aacbdf1c0655ac83e591686b807b287fb6776803fd3df67ebd15322be7c3591ae4739355165c93416ae084b908af2ea8df3a13a3eb4aba66f399

data/Rakefile

@@ -4,22 +4,3 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-desc 'test dklet gem'
-task :test do
-  app_path = 'tmp/hidklet'
-  result = system <<~Desc
-    mkdir -p #{File.dirname(app_path)}
-    rm -f #{app_path}
-    mkdklet #{app_path}
-    #{app_path} help
-    #{app_path} # main task
-    #{app_path} clean --image
-  Desc
-
-  if result
-    puts 'everything ok' 
-  else
-    puts 'something wrong'
-  end
-end

data/dklet.rc

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash 
-if [ ! -z $BOOTER_DKLET_RC ];then
+if [ -z $BOOTER_DKLET_RC ];then
+  BOOTER_DKLET_RC=$( ruby -e "puts File.realpath('${BASH_SOURCE[0]}')")
+  BOOTER_DKLET_HOME=$(dirname $BOOTER_DKLET_RC)
+  export PATH=$PATH:$BOOTER_DKLET_HOME/exe
+else
   if [ -z $FORCE_RC ]; then
     echo Warning: has sourced $BOOTER_DKLET_RC!
     return 1 
   fi
 fi
-BOOTER_DKLET_RC=$( ruby -e "puts File.realpath('${BASH_SOURCE[0]}')")
-BOOTER_DKLET_HOME=$(dirname $BOOTER_DKLET_RC)
-
-export PATH=$PATH:$BOOTER_DKLET_HOME/exe
 
 function dklet(){
   tp=${1:-cd}
@@ -42,10 +42,10 @@ function dklet(){
     gem)
       gem query dklet -l
       ;;
-    gemrelease)
+    gemrelease|release)
       $FUNCNAME cd && rake release
       ;;
-    gemup)
+    gemup|install)
       $FUNCNAME cd && rake install:local --trace
       ;;
     gemdown)
@@ -54,8 +54,21 @@ function dklet(){
     status|st)
       type -a rundklet
       ;;
-    test)
-      $FUNCNAME cd && rake test
+    test|try)
+      demo=/tmp/dklet-demo
+      mkdir -p $(dirname $demo)
+      rm -f $demo
+      mkdklet $demo
+      $demo help
+      $demo build
+      $demo inspect_info
+      $demo clean --image
+      echo ==demo file at: $demo
+      ;;
+    demo)
+      demo=/tmp/dklet-demo
+      [ -f $demo ] || $FUNCNAME test
+      cat $demo
       ;;
     *)
       $FUNCNAME help

data/lib/dklet/cli.rb

@@ -30,6 +30,7 @@ class DockletCLI < Thor
   desc 'console', 'get ruby console'
   def console
     pp registry
+    require 'byebug'
     byebug 
     puts "=ok"
   end
@@ -50,41 +51,7 @@ class DockletCLI < Thor
   option :opts, banner: 'docker run options'
   option :tmp, type: :boolean, default: false, banner: 'allow run tmp container'
   def runsh(cid = ops_container)
-    tmprun = options[:tmp]
-    if tmprun
-      dkcmd = "docker run -t -d" 
-      dkcmd += " --network #{netname}" if netname
-      dkcmd += " #{options[:opts]}" if options[:opts]
-      cid = `#{dkcmd} #{docker_image} sleep 3d`.chomp
-      puts "==run tmp container: #{cid}" unless options[:quiet]
-    end
-
-    abort "No container found!" unless cid
-
-    cmd = options[:cmd] || 'sh'
-    puts "run : #{cmd}" unless options[:quiet]
-
-    if cmd == 'sh' # simple case
-      cmds = <<~Desc
-        docker exec -it #{options[:opts]} #{cid} #{cmd}
-      Desc
-    else
-      tfile = Dklet::Util.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 #{options[:opts]} #{cid} sh -c 'sh #{dst_file} && rm -f #{dst_file}'
-      Desc
-    end
-    puts cmds unless options[:quiet]
-    system cmds unless options[:dry]
-
-    if tmprun
-      system <<~Desc
-        docker rm -f #{cid}
-      Desc
-    end
+    container_run(options[:cmd], options.merge(cid: cid))
   end
   map "sh" => :runsh
 
@@ -338,10 +305,43 @@ class DockletCLI < Thor
       klass.new.invoke(task, args, options)
     end
 
-    def container_run(cmds, opts = nil)
+    def container_run(cmds, opts = {})
+      cid = opts[:cid] || ops_container
+      tmprun = opts[:tmp]
+      if tmprun
+        dkcmd = "docker run -t -d" 
+        dkcmd += " --network #{netname}" if netname
+        dkcmd += " #{opts[:opts]}" if opts[:opts]
+        cid = `#{dkcmd} #{docker_image} sleep 3d`.chomp
+        puts "==run tmp container: #{cid}" unless opts[:quiet]
+      end
+      abort "No container found!" unless cid
+
       cmds = cmds.join("\n") if cmds.is_a?(Array)
-      opts = (opts||{}).merge(cmd: cmds).merge(options.slice('quiet', 'dry'))
-      invoke :runsh, [], opts
+      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
+      end
+      puts cmds unless opts[:quiet]
+      system cmds unless opts[:dry]
+
+      if tmprun
+        system <<~Desc
+          docker rm -f #{cid}
+        Desc
+      end
     end
 
     # encapsulate run commands behaviors in system

data/lib/dklet/dsl.rb

@@ -128,9 +128,13 @@ module Dklet::DSL
     pname = script_path.basename.to_s
     "#{pname}_#{name}"
   end
+
+  def tmpfile_for(str)
+    Dklet::Util.tmpfile_for(str)
+  end
   
   def set_file_for(name, str)
-    register name, Dklet::Util.tmpfile_for(str)
+    register name, tmpfile_for(str)
   end
 
   def file_for(name)
@@ -155,7 +159,7 @@ module Dklet::DSL
     return unless tmpl
     erb = ERB.new(tmpl, nil, '%<>')
     rendered = erb.result(in_binding)
-    Dklet::Util.tmpfile_for(rendered)
+    tmpfile_for(rendered)
   end
 
   # Dockerfile for image build

data/lib/dklet/util.rb

@@ -4,7 +4,7 @@ require 'socket'
 module Dklet::Util
   module_function
 
-  def tmpfile_for(str, prefix: 'kc-tmp')
+  def tmpfile_for(str, prefix: 'dklet-tmp')
     file = Tempfile.new(prefix)
     file.write str
     file.close # save to disk

data/lib/dklet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dklet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ruijian Cao