dklet 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd62d9e1e833237c0ad745846ebca53657d8d050930b299ad59cc15cee316c2
-  data.tar.gz: 41322b580ebeb1dfcd381a325be7b3ccb29ab2315b6e9434db7cffec1ea69926
+  metadata.gz: cbc1976787fa72c2f0f1807718ba0fec1e8f2183a8c08b899d0a5751d132ebc4
+  data.tar.gz: 016a805f3bc3786eb515ee60feec68c26bd3440566b4641c0a8396d4c3e863e0
 SHA512:
-  metadata.gz: 2b317d7d44c67c7d8bae36858d86b681f84ebdc5a67c09f7dd2d3f24bf7569648620a432c9cd2916aa80ab7f56a339c14e72423899f59d2f05ec59bb9f75361b
-  data.tar.gz: fe49b4cb5e65ede0270e4a978fdecf1ca88258a77516767af54bba9cbd6ede77d1597b585144307b60390a8e09a311476b2cb0545eb8507a11bc7312c74203b3
+  metadata.gz: 77c3f37998fea48b4d1783da526f6ffbd1e1d54bc54e1940c3196add1b855b29944091e2259823c32bf282778428141c9a71aa08f2ce4c8e81a3126c31c3a560
+  data.tar.gz: d7661aa2cb86358a197cc06b45cd0ba8165d53310889f921a06f7321ac1a6ed787b3b06941156d3f049afa47e127cbe45d887b54e3070457d862d40b60d9be44

data/Rakefile

@@ -4,3 +4,22 @@ 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.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{practical DSL for daily container life}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/dailyops/kc/dklet"
+  spec.homepage      = "https://github.com/dailyops/dklet"
   spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.

data/dklet.rc

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+if [ -z $BOOTER_DKLET_RC ]; then
+  : # do nothing
+else
+  if [ -z $FORCE_RC ]; then
+    echo Warning: has sourced $BOOTER_DKLET_RC!
+    return 1 
+  fi
+fi
+BOOTER_DKLET_RC=$(evar=${BASH_SOURCE[0]} ruby -e "puts File.realpath(ENV['evar'])")
+BOOTER_DKLET_HOME=$(dirname $BOOTER_DKLET_RC)
+#[ -d "$BOOTER_DKLET_HOME/bin" ] && PATH=$PATH:$BOOTER_DKLET_HOME/bin
+# default use exe
+export PATH=$PATH:$BOOTER_DKLET_HOME/exe
+
+function dklet(){
+  tp=${1:-cd}
+  case "$tp" in
+    home|root)
+      echo $BOOTER_DKLET_HOME
+      ;;
+    cd)
+      cd "$BOOTER_DKLET_HOME"
+      ;;
+    rc|vi)
+      vi "$BOOTER_DKLET_RC"
+      $FUNCNAME reload
+      ;;
+    show)
+      cat "$BOOTER_DKLET_RC"
+      ;;
+    reload|source)
+      FORCE_RC=1 source "$BOOTER_DKLET_RC"
+      echo ==has sourced "$BOOTER_DKLET_RC"
+      ;;
+    help|h)
+      type $FUNCNAME 
+      ;;
+    ## app related
+    gem)
+      gem query dklet -l
+      ;;
+    gemrelease)
+      $FUNCNAME cd && rake release
+      ;;
+    gemup)
+      $FUNCNAME cd && rake install:local --trace
+      ;;
+    gemdown)
+      gem uninstall dklet --all -x
+      ;;
+    status|st)
+      type -a rundklet
+      ;;
+    test)
+      $FUNCNAME cd && rake test
+      ;;
+    *)
+      $FUNCNAME help
+      ;;
+  esac
+}

data/exe/mkdklet

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'dklet'
 
 rbfile = ARGV[0]
 abort "rbfile required!" if rbfile.nil?
@@ -10,6 +9,10 @@ abort "rbfile #{rpath.to_s} existed!" if rpath.exist?
 rpath.parent.mkpath
 extra = ARGV[1..-1].join(' ')
 
+lib_path = File.join(__dir__, '../lib')
+$:.unshift lib_path unless $:.include?(lib_path) 
+
+require 'dklet'
 handler = File.basename(__FILE__)
 tmpl = Dklet.lib_path.join('template/dklet.erb').read
 

data/exe/rundklet

@@ -16,6 +16,9 @@ if idx
   ENV['APP_RELEASE'] ||= argv[idx+1]
 end
 
+lib_path = File.join(__dir__, '../lib')
+$:.unshift lib_path unless $:.include?(lib_path) 
+
 require "dklet"
 extend Dklet::DSL
 load file

data/lib/dklet/dsl.rb

@@ -61,21 +61,17 @@ module Dklet::DSL
   end
 
   def default_image_labels
-    app_labels = image_label_hash.map{|k, v| [k,v].join('=') }.join(' ')
-    "maintainer=dailyops built_from=docklet #{app_labels}"
+    "maintainer=dailyops built_from=dklet"
   end
 
-  def image_label_hash
+  def release_label_hash
     {
+      dklet_env: env,
       dklet_app: appname,
-      dklet_env: env
+      dklet_release: app_release
     }
   end
 
-  def release_label_hash
-    image_label_hash.merge(dklet_release: app_release)
-  end
-
   # maybe from external image
   def dkrun_cmd(labeled: true, opts: nil, named: false)
     cmd = "docker run"

data/lib/dklet/version.rb

@@ -1,5 +1,5 @@
 module Dklet
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dklet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ruijian Cao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - bin/console
 - bin/setup
 - dklet.gemspec
+- dklet.rc
 - exe/mkdklet
 - exe/rundklet
 - lib/dklet.rb
@@ -96,7 +97,7 @@ files:
 - lib/dklet/util.rb
 - lib/dklet/version.rb
 - lib/template/dklet.erb
-homepage: https://github.com/dailyops/kc/dklet
+homepage: https://github.com/dailyops/dklet
 licenses:
 - MIT
 metadata: {}