dklet 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc26a08b87b0a21b92d09c1b8d13b645b70ce6aad5363b5806fd5eab78f42519
-  data.tar.gz: 3a8a3992d33903a639429882e425cc50f68f2d1775aa30c75f80d8f35b4393b0
+  metadata.gz: 80c8bea6a6beb21fb1d624b3ce1c1d06e948d2f80d03bd20357307b1a4cd9de9
+  data.tar.gz: 145108f1c7a6c1bdb376cb54d0d738a68321c7666920e999cf65f0401e35fed5
 SHA512:
-  metadata.gz: 79e9cdf2077d7797dbfae77fc5950da8c6b70e539f989dbb0f885bd6a08c23d2310803f6fd8192a0a3bf7dc948092d45d1f6e7f7e599b99092fd520eb85c25ee
-  data.tar.gz: '048429c1495c95995b960121929844411ac7ee9e0fea8eef410044101a329295362e0af7398fdd6eb9897406ca6ea7d86f48be47da6c0b82ecd0f2603c48bcaf'
+  metadata.gz: 2ba973d1e510eefba8a9763f3d0dd8728267392d3222dd9905f013a460f118b305e5feb6dbb25d7fdeb0295706f5de368f04df0e1d81501d20f0fa5c914da032
+  data.tar.gz: d722b0c4652dba445846d7fa5b77b81cab8afd429eb403005d5d731b1e0c97c04280eda93196f17df0c30faa25015c3a85c10406e72381a98d085d61f4dcb32d

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    dklet (0.1.5)
+    dklet (0.1.6)
+      os
       thor
 
 GEM
@@ -9,6 +10,7 @@ GEM
   specs:
     byebug (10.0.2)
     diff-lcs (1.3)
+    os (1.0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -23,7 +25,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    thor (0.20.0)
+    thor (0.20.3)
 
 PLATFORMS
   ruby

data/dklet.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "thor" #, "~> 0.20.0"
+  spec.add_dependency "os"
 end

data/dklet.rc

@@ -2,6 +2,7 @@
 if [ -z $BOOTER_DKLET_RC ];then
   BOOTER_DKLET_RC=$( ruby -e "puts File.realpath('${BASH_SOURCE[0]}')")
   BOOTER_DKLET_HOME=$(dirname $BOOTER_DKLET_RC)
+  # put exe/ into path, how to fix gem version 
   export PATH=$PATH:$BOOTER_DKLET_HOME/exe
 else
   if [ -z $FORCE_RC ]; then
@@ -54,6 +55,14 @@ function dklet(){
     status|st)
       type -a rundklet
       ;;
+    cli|irb)
+      (cd $BOOTER_DKLET_HOME && bundle install)
+      demo=/tmp/dklet-demo
+      mkdir -p $(dirname $demo)
+      rm -f $demo
+      mkdklet $demo
+      $demo console
+      ;;
     test|try)
       demo=/tmp/dklet-demo
       mkdir -p $(dirname $demo)

data/lib/dklet/cli.rb

@@ -3,12 +3,15 @@ class DockletCLI < Thor
   #include Thor::Actions
   default_command :main
 
-  class_option :debug, type: :boolean, default: false, banner: 'in debug mode, more log'
-  class_option :dry, type: :boolean, default: false, banner: 'dry run'
-  class_option :quiet, type: :boolean, default: false, banner: 'keep quiet'
-  class_option :force, type: :boolean, default: false, banner: 'force do'
-  class_option :env, banner: 'app env', aliases: ['-e']
-  class_option :release, banner: 'what app release for', aliases: ['-r']
+  # main dimension parameters
+  class_option :env, banner: 'app env', aliases: [:e]
+  class_option :release, banner: 'what app release for', aliases: [:r]
+  # common options 
+  class_option :force, type: :boolean, banner: 'force do', aliases: [:f]
+  class_option :dry, type: :boolean, banner: 'dry run'
+  class_option :debug, type: :boolean, banner: 'in debug mode, more log', aliases: [:d]
+  class_option :verbose, type: :boolean, banner: 'show verbose info', aliases: [:V]
+  class_option :quiet, type: :boolean, banner: 'keep quiet', aliases: [:q]
 
   desc 'version', 'show dklet version'
   def version
@@ -48,12 +51,19 @@ class DockletCLI < Thor
 
   desc 'runsh [CONTAINER]', 'run into container'
   option :cid, banner: 'target container id or name'
-  option :tmp, type: :boolean, default: false, banner: 'allow run tmp container'
+  option :tmp, type: :boolean, aliases: [:t], banner: 'allow run tmp container'
   option :opts, banner: 'docker run options'
-  def runsh(cmds = 'sh')
+  option :oneline, type: :boolean, default: true, banner: 'docker run options'
+  def runsh(*cmds)
+    if cmds.empty?
+      cmds = 'sh' 
+    else
+      cmds = cmds.join(' ') if options[:oneline]
+    end
     container_run(cmds)
   end
   map "sh" => :runsh
+  map "run" => :runsh
 
   desc 'daemon', 'docker run in daemon'
   option :opts, banner: 'run extra options'
@@ -94,7 +104,7 @@ class DockletCLI < Thor
 
   desc 'clean', 'clean container artifacts'
   # keep cache reused
-  option :image, type: :boolean, default: false, banner: 'clean user-derived images'
+  option :image, type: :boolean, banner: 'clean user-derived images'
   def clean
     invoke_hooks_for(:clean, type: :before)
 
@@ -144,7 +154,7 @@ class DockletCLI < Thor
   end 
 
   desc 'ps', 'ps related containers'
-  option :imaged, type: :boolean, default: false, banner: 'same image digest'
+  option :imaged, type: :boolean, banner: 'same image digest'
   def ps
     cmd = if options[:imaged]
         "docker ps -f ancestor=#{docker_image} -a"
@@ -218,15 +228,27 @@ class DockletCLI < Thor
   desc 'clear_app_volumes', 'clear app volumes'
   def clear_app_volumes
     if app_volumes.directory?
-      if options[:force] || yes?("Remove app volumes dir data?")
+      if options[:force] || yes?("Remove app volumes dir: #{app_volumes} (y/n)?")
         app_volumes.rmtree
       end
     end
   end
 
+  desc '', 'reset if need'
+  def reset
+    if env =~ /^prod/
+      return unless (options[:force] || yes?("RESET #{full_release_name}?"))
+    end
+    system <<~Desc
+      #{dklet_script} clean
+      #{dklet_script} clear_app_volumes
+      #{dklet_script}
+    Desc
+  end
+
   desc 'inspect_info', 'inspect info'
-  option :image, type: :boolean, default: false, aliases: ['-i'], banner: 'inspect image'
-  option :container, type: :boolean, default: false, aliases: ['-c'], banner: 'inspect container'
+  option :image, type: :boolean, aliases: ['-i'], banner: 'inspect image'
+  option :container, type: :boolean, aliases: ['-c'], banner: 'inspect container'
   def inspect_info
     cmd = nil
     if options[:image]
@@ -252,7 +274,7 @@ class DockletCLI < Thor
         network: netname,
         voluemes_root: volumes_root,
         app_volumes: app_volumes,
-        domain: proxy_domain,
+        domains: proxy_domains,
         dsl_methods: dsl_methods,
         registry: registry
       }
@@ -324,8 +346,8 @@ class DockletCLI < Thor
         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]
+        img = opts[:image] || docker_image
+        cid = `#{dkcmd} #{img} sleep 3d`.chomp
       end
       abort "No container found!" unless cid
 
@@ -345,7 +367,7 @@ class DockletCLI < Thor
           Desc
         end
       unless opts[:quiet]
-        puts "==commands to run on #{cid}"
+        puts "==commands to run on #{'tmp' if tmprun} container #{cid.size == 64 ? cid[0..11] : cid}"
         puts cmds
         if opts[:debug]
           puts "====by run on host"
@@ -357,7 +379,7 @@ class DockletCLI < Thor
 
       if tmprun
         system <<~Desc
-          docker rm -f #{cid}
+          docker rm -f #{cid} >/dev/null
         Desc
       end
     end

data/lib/dklet/dsl.rb

@@ -361,6 +361,14 @@ module Dklet::DSL
     ENV['APP_ENV'] || fetch(:default_env) || 'dev'
   end
 
+  def in_dev?
+    env =~ /^dev/
+  end
+
+  def in_prod?
+    env =~ /^prod/
+  end
+
   # 标识一次运行发布的用途, 如redis for hirails-only
   def app_release
     ENV['APP_RELEASE'] || 'default'
@@ -383,19 +391,49 @@ module Dklet::DSL
     volumes_root.join(release_path_name)
   end
 
-  ## top proxy domain part
-  def proxy_domain
-    ENV['LOCAL_DKLET_DOMAIN'] || 'lh'
+  ## domain
+  def register_domain(*doms)
+    register :domains, doms
   end
 
-  def domain_for(*doms)
-    doms.map{|d| "#{d}.#{proxy_domain}" }.join(',')
+  # top proxy domain part
+  def proxy_domain_base
+    ENV['PROXY_DOMAIN_BASE'] || 'lh'
+  end
+
+  def proxy_domains(*doms)
+    if doms.empty?
+      doms = fetch(:domains)
+      doms = [appname] if doms.nil? or doms.empty?
+    end
+
+    denv = env
+    denv = nil if denv =~ /^prod/
+
+    doms.map do |d| 
+      [d, denv, proxy_domain_base].compact.join('.')
+    end.join(',') 
   end
 
-  # ref dklet/mac/
+  # ref dklet/mac/hostnet
   def host_domain_in_container
     ENV['HOST_DOMAIN_IN_CONTAINER'] || 'host.dokcer.internal'
   end
+
+  # 0.0.0.0:32879
+  def host_with_port_for(cport, host_ip: true, only_port: false )
+    str = `docker port #{ops_container} #{cport}`.chomp 
+    return if str.empty?
+    if only_port
+      return str.split(':').last
+    end
+    return str unless host_ip
+    str.sub('0.0.0.0', Dklet::Util.host_ip)
+  end
+
+  def host_port_for(cport)
+    host_with_port_for(cport, only_port: true)
+  end
 end
 
 %i(

data/lib/dklet/util.rb

@@ -1,5 +1,7 @@
 require 'tempfile'
 require 'socket'
+require 'securerandom'
+require 'os'
 
 module Dklet::Util
   module_function
@@ -20,12 +22,25 @@ module Dklet::Util
     Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
   end
 
+  def host_os
+    ::OS
+  end
+
+  def on_mac?
+    host_os.mac?
+  end
+
   def single_line?(cmds)
-    cmds = cmds.chomp
     return false if cmds.is_a? Array
+    cmds = cmds.chomp
     return false if cmds =~ /\n/
     return true if cmds =~ /^\s*(bash|sh)/ 
     return false if cmds =~ /.+;/
     true
   end
+
+  ## secure
+  def gen_password(len = 10)
+    SecureRandom.alphanumeric(len)
+  end
 end

data/lib/dklet/version.rb

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

data/lib/template/dklet.erb

@@ -25,3 +25,5 @@ custom_commands do
 end
 
 # Generated with dklet version: <%=Dklet.version%>
+
+__END__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dklet
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ruijian Cao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: practical DSL for daily container life
 email:
 - cao7113@hotmail.com