dockerkit 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d86496cbd0e9083e210e5981cd130abebb0ded
-  data.tar.gz: 4c0e6b94c8919ff2b3ed81e1bf42189818b394be
+  metadata.gz: f8bb1f3647305e3a620cecf5bcdce1ae2d2ccadb
+  data.tar.gz: d7bb0c78407e7542ad906045ec9f14d1ae6f7f05
 SHA512:
-  metadata.gz: 85012d617f6732684bf749e57464fcd7cbb43c4094029ca9ddbadcf52081c3a808a04bf3506b13b67b51caedaaec682de8cf339a6cc925e2f99a45e9780225fe
-  data.tar.gz: b5b9c9f227a410a2c042db5d1ac0612deff1b39070dc8afbc0a316c5242f95c82b6fd3b0140bff3557aa61234258486dca7f5359edf04ab622de0f0dafeda012
+  metadata.gz: 93557fb4dd9f3c9709c6980d991f0f47f2f2a97b65dbc5ffd714c838eb8aed56bd91358cf7968198c4fb05fae81613411ddfd084d640cfeefba333d5782a92ab
+  data.tar.gz: 85d3854fdb004bef2e5e8821a4981a4c958bba6a0395b2107bda79598d40c54e7ad194a0fa1c330302fe4a402646f83cd9f998f8e20fb5fa1352dcfc243230e6

data/lib/concerns/dkcomposer_task.rb

@@ -0,0 +1,141 @@
+module DkComposerTasks
+  extend ActiveSupport::Concern
+  module ClassMethods
+  end
+
+  included do
+    desc 'lsa [KEYWORD]  [-I loadpath] ', <<-LONG
+    'list all applications which app name match the patten'
+    example:
+      dk lsa                    #list all apps
+      dk lsa test               #search all apps which's name include string test;
+      dk lsa -I somepath        #list all apps include with your specific path
+    LONG
+    method_option :loadpaths, type: :array, aliases: 'I'
+    def lsa(keyword = nil)
+      auto_load(options[:loadpaths])
+      ret = DkComposer::STACK.select { |_k, v| /#{keyword}/ =~ v.name.to_s }
+      print_table ret.to_table(:name, :shortdesc)
+      ret
+    end
+
+    desc 'lsi [KEYWORD]  [-I loadpath] ', <<-LONG
+    'list all images which  name match the patten'
+    example:
+      dk lsi                    #list all images
+      dk lsi test               #search all images which's name include string test;
+      dk lsi test -f            #search all images which's name include string test and only output dockerfile;
+      dk lsi -I somepath        #list all images include with your specific path
+    LONG
+    method_option :loadpaths, type: :array, aliases: 'I'
+    method_option :dockerfile, type: :boolean, aliases: 'f'
+
+    def lsi(keyword = nil)
+      auto_load(options[:loadpaths])
+      ret = DkComposer::IMAGE.select { |k, v| /#{keyword}/ =~ k.to_s && v && /:latest$/ !~ k.to_s }
+      if options[:dockerfile]
+
+        ret.each do |k, v|
+          puts ["#-------------image:#{k}--------------",
+                v.to_docker_file,
+                ''].join("\n")
+        end
+      else
+        print_table ret.to_table(:name, :tag, :from, :use, :repos, :shortdesc)
+      end
+      ret
+    end
+
+    desc 'image [name] [build,pull,push]', <<-LONG
+    'image actions'
+    example:
+      dk image                    #list all apps and ask one for image
+      dk image test param1 param2 #list all apps which's name include string test and ask one for image and pass the params in;
+      dk image -I somepath        #list all apps and ask one for image and include with your specific path
+    LONG
+    method_option :loadpaths, type: :array, aliases: 'I'
+
+    def image(*params)
+      name, action, = params
+      auto_load(options[:loadpaths])
+      ret = DkComposer::IMAGE.select { |k, v| /#{name}/ =~ k.to_s && v && /:latest$/ !~ k.to_s }
+      return say('There is no image avaliable'.red) if ret.empty?
+      img = if ret.count > 1
+              ask_and_select(ret, :name, :tag, :from, :use, :repos, :shortdesc)
+            else
+              print_table ret.to_table(:name, :tag, :from, :use, :repos, :shortdesc)
+              ret.to_a.first.last
+            end
+      return unless img
+      actions = %w[pull build push]
+      action = ask('pls input a correct action to the image', limited_to: actions.unshift('q')) if action.nil? || !actions.include?(action.to_s)
+      return if action == 'q'
+      say(img.send(action.to_sym))
+    end
+
+    desc 'up [KEYWORD]', <<-LONG
+    'up application which app name match the patten'
+    example:
+      dk up                    #list all apps and ask one for up
+      dk up test param1 param2 #list all apps which's name include string test and ask one for up and pass the params in;
+      dk up -I somepath        #list all apps and ask one for up and include with your specific path
+    LONG
+    method_option :loadpaths, type: :array, aliases: 'I'
+
+    def up(*params)
+      name, params = params
+      if name && name.start_with?('-')
+        params ||= []
+        params.unshift name
+        name = nil
+      end
+      auto_load(options[:loadpaths])
+      ret = DkComposer::STACK.select { |_k, v| /#{keyword}/ =~ v.name.to_s }
+      return say('There is no app avaliable'.red) if ret.empty?
+      app = if ret.count > 1
+              ask_and_select(ret)
+            else
+              ret.to_a.first.last
+            end
+      return unless app
+      app.run *params
+    end
+
+    desc 'create appname', <<-LONG
+    'create application with name'
+    example:
+      dk create test                    #create an app with name 'test'
+    LONG
+    def create(name)
+      auto_load(options[:loadpaths])
+      @opt = { name: name }
+      ret = DkComposer::SERVICE
+      print_table ret.to_table(:name, :shortdesc, :longdesc)
+      answers = multi_ask('Add a service into the app,input the service name', limited_to: ret.keys.map(&:to_s).unshift(''))
+      @opt[:services] = answers.uniq
+      template("#{self.class.source_root}/templates/stack.dk.rb", "#{name}.dk.rb")
+    end
+
+    private
+
+    def ask_and_select(h, *cols)
+      cols = %i[name shortdesc] if cols.empty?
+      print_table h.to_table(*cols, with_index: true)
+      say('which app you want to up?'.blue)
+      answer = ask('(q=QUIT;n=)', limited_to: ['q', *('1'..h.count.to_s).to_a])
+      return nil if answer == 'q'
+      h.to_a[answer.to_i - 1].last
+    end
+
+    def auto_load(loadpaths = [])
+      loadpaths ||= []
+      loadpaths.unshift '.'
+      loadpaths.concat(ENV['DK_LOAD_PATH'].split(':')).uniq!
+      loadpaths.each do |path|
+        $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+        dk_pattern = "#{path}/*.dk.rb"
+        Dir[dk_pattern].each { |dkfile| require dkfile }
+      end
+    end
+  end
+end

data/lib/dockerkit/version.rb

@@ -1,3 +1,3 @@
 module Dockerkit
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/dockerkit.rb

@@ -10,7 +10,8 @@ require 'models/base'
 require 'models/alias'
 require 'models/container'
 require 'models/image'
-
+require 'ext'
+require 'dkcomposer'
 # Dir[File.dirname(__FILE__) + '/models/*.rb'].each { |file| require file }
 Dir[File.dirname(__FILE__) + '/concerns/*.rb'].each { |file| require file }
 
@@ -27,7 +28,7 @@ module Dockerkit
     include Thor::Actions
     include ContainerTasks
     include ImageTasks
-
+    include DkComposerTasks
     source_root File.dirname(__FILE__)
 
     desc 'alias [NAME] [CMD]', <<-LONG
@@ -131,11 +132,11 @@ module Dockerkit
       !File.exist?(file)
     end
 
-    def multi_ask(question)
+    def multi_ask(question, **opt)
       ret = []
       answer = 'start'
       until answer.empty?
-        answer = ask("#{question.red},(ENTER directly will end the question)").chomp
+        answer = ask("#{question.red},(null input to end the question)", opt).chomp
         ret.push answer unless answer.empty?
       end
       ret

data/lib/ext.rb

@@ -0,0 +1,10 @@
+class Hash
+  def to_table(*headers, **opts)
+    data = each_with_index.map do |(_key, item), index|
+      ret = headers.map { |field| item.send(field) }
+      ret[0] = "[#{index + 1}] #{ret[0]}" if opts[:with_index]
+      ret
+    end.uniq
+    data.unshift(headers.map(&:upcase))
+  end
+end

data/lib/templates/stack.dk.rb

@@ -0,0 +1,13 @@
+desc '<%=@opt[:name]%> image', ''
+image(:"<%= @opt[:name] %>")
+
+desc '<%=@opt[:name]%> service', ''
+service(:"<%=@opt[:name]%>") do
+  image :"<%=@opt[:name]%>"
+end
+
+desc '<%=@opt[:name]%> stack', ''
+stack(:"<%=@opt[:name]%>", version: '2.1') do
+  service(:"<%=@opt[:name]%>")
+  <%=@opt[:services].map{|s| "service(:#{s})"}.join("\n")%>
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerkit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - shaoyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dkcomposer
+  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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -150,15 +164,18 @@ files:
 - lib/alias.yml
 - lib/concerns/constants.rb
 - lib/concerns/container_tasks.rb
+- lib/concerns/dkcomposer_task.rb
 - lib/concerns/image_tasks.rb
 - lib/dockerkit.rb
 - lib/dockerkit/version.rb
+- lib/ext.rb
 - lib/models/alias.rb
 - lib/models/base.rb
 - lib/models/container.rb
 - lib/models/image.rb
 - lib/templates/Dockerfile
 - lib/templates/docker-compose.yml
+- lib/templates/stack.dk.rb
 homepage: http://github.com/yushaoyang
 licenses:
 - MIT