k8sflow 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3d51f7f1aad598518c94f3d9e6ba3ac2fa5991
-  data.tar.gz: 8045001672972572641603b56b2680d04c596d03
+  metadata.gz: 6bfcd17a59b7f7d4a15c1020561a9817dd028166
+  data.tar.gz: a11c8e02fccaf09c2a0cb5ef6d020832c6ea487f
 SHA512:
-  metadata.gz: f99a2579ab97dc7056b1bc3683ce272703b8a85763b059a1e4df9f084cb889230e3deef01c1cfc3d4dc7a96830a5847cd6d9878f39e412614573a87c262472da
-  data.tar.gz: 3c11f9f6c3fc1ea3657c3dbcafe35cf6fa585edfc1b6a395e710e1c5eae582a7a09048a6ea3299644954ef7045f1825d8ac833b937dc0b04a5a56667174692a2
+  metadata.gz: dec3eaab85f886f135ac2002bfec269462f4b58019e9276596beed24c0bbbd7a892ffc26d4436a9354eb7b01300bbfc2f76c5754fe2f619b94d942bf93569b16
+  data.tar.gz: 76b6f0629673cfc43a3795f32a05c0ae0edd0f91837c90809e9a2332e3e83ae02479d0477345e91788e2e171bf3302a8f8e0f27e106dda8b646fa08dfe98ef71

data/lib/k8sflow/command/{image.rb → docker/docker_image_base.rb}

@@ -1,8 +1,9 @@
 require 'erb'
+require_relative 'docker_topic'
 module K8sflow
 
-  module Image
-    class ImageBase < Clitopic::Command::Base
+  module Docker
+    class DockerImageBase < Clitopic::Command::Base
       class << self
 
         def kv_parse(list)
@@ -92,77 +93,5 @@ module K8sflow
 
       end
     end
-
-
-    class ImageTopic < Clitopic::Topic::Base
-      register name: 'image',
-      description: 'Mange image lifecylces'
-
-      option :registry, '-r', '--registry DOCKER_REPO', 'Docker registry to pull/fetch images'
-      option :path, '-p',  '--path DOCKERFILE PATH', 'dockerfiles source directory to'
-      option :docker_api, "-H", "--host", "docker api endpoint", default: "unix://"
-      option :tag, '-t', '--tag TAG', "Image tag", default: 'latest'
-
-      #dockerfile templates
-      option :files, "-f", "--files FILE1,FILE2", Array, "List files to copy in dockerfile directory, i.e 'files/*',/etc/conf.cfg'"
-      option :tpl, "-l", "--tpl=Dockerfile", "The Dockerfile Template", default: 'Dockerfile.tpl'
-      option :vars, "-x", "--vars=VARS", Array, "Variables required by the dockerfile"
-
-      #docker build options
-      option :build_opts, "--build OPTS", "docker build options"
-    end
-
-
-    class Dockerfile < ImageBase
-      register name: 'dockerfile',
-      banner: 'image:dockerfile [options]',
-      description: 'Generate a dockerfile with templated vars .',
-      topic: 'image'
-
-      def self.call
-        puts @options
-        create_dockerfile
-      end
-    end
-
-    class Build < ImageBase
-      register name: 'build',
-      description: 'build docker image',
-      banner: 'image:build [OPTIONS]',
-      topic: 'image'
-
-      option :skip_dockerfile, "--skip-dockerfile", "-s", "Skip Create dockerfile"
-      def self.call
-        puts @options
-        create_dockerfile unless @options[:skip_dockerfile]
-        dockerbuild
-      end
-    end
-
-    class Push < ImageBase
-      register name: 'push',
-      description: 'push dockerimage to docker hub',
-      banner: 'image:push [OPTIONS]',
-      topic: 'image'
-
-      option :skip_build, "--skip-build", "skip docker build"
-      option :skip_dockerfile, "--skip-dockerfile", "skip create dockerfile"
-      def self.call
-        create_dockerfile unless @options[:skip_dockerfile]
-        dockerbuild unless @options[:skip_build]
-        dockerpush
-      end
-    end
-
-
-    class List < Clitopic::Command::Base
-      register name: 'list',
-      description: 'List available tags in a registry',
-      topic: 'image'
-
-      def self.call
-      end
-    end
   end
-
 end

data/lib/k8sflow/command/docker/docker_topic.rb

@@ -0,0 +1,13 @@
+module K8sflow
+  module Docker
+    class DockerTopic < Clitopic::Topic::Base
+      register name: 'docker',
+      description: 'Mange docker image and run'
+
+      option :registry, '-r', '--registry DOCKER_REPO', 'Docker registry to pull/fetch images'
+      option :docker_api, "-H", "--host", "docker api endpoint", default: "unix://"
+      option :tag, '-t', '--tag TAG', "Image tag", default: 'latest'
+
+    end
+  end
+end

data/lib/k8sflow/command/docker/image.rb

@@ -0,0 +1,56 @@
+require_relative 'docker_image_base'
+module K8sflow
+  module Docker
+
+
+    class Dockerfile < DockerImageBase
+      register name: 'dockerfile',
+      banner: 'docker:dockerfile [options]',
+      description: 'Generate a dockerfile with templated vars .',
+      topic: 'docker'
+
+      option :files, "-f", "--files FILE1,FILE2", Array, "List files to copy in dockerfile directory, i.e 'files/*',/etc/conf.cfg'"
+      option :tpl, "-l", "--tpl=Dockerfile", "The Dockerfile Template", default: 'Dockerfile.tpl'
+      option :vars, "-x", "--vars=VARS", Array, "Variables required by the dockerfile"
+      option :path, '-p',  '--path DOCKERFILE git repositry', 'dockerfiles source directory to'
+
+      def self.call
+        create_dockerfile
+      end
+    end
+
+    class Build < DockerImageBase
+      register name: 'build',
+      description: 'build docker image',
+      banner: 'docker:build [OPTIONS]',
+      topic: 'docker'
+
+      option :build_opts, "--build OPTS", "docker build options"
+      option :skip_dockerfile, "--skip-dockerfile", "-s", "Skip Create dockerfile"
+      inherited_options :build
+
+      def self.call
+        create_dockerfile unless @options[:skip_dockerfile]
+        dockerbuild
+      end
+    end
+
+    class Push < DockerImageBase
+      register name: 'push',
+      description: 'push dockerimage to docker hub',
+      banner: 'docker:push [OPTIONS]',
+      topic: 'docker'
+
+      option :skip_build, "--skip-build", "skip docker build"
+      inherited_options :build, :dockerfile
+
+      def self.call
+        create_dockerfile unless @options[:skip_dockerfile]
+        dockerbuild unless @options[:skip_build]
+        dockerpush
+      end
+    end
+
+  end
+
+end

data/lib/k8sflow/command/{run.rb → docker/run.rb}

@@ -6,8 +6,8 @@ module K8sflow
   module Command
 
     class Run < Clitopic::Command::Base
-      register name: 'index',
-               banner: 'Usage: k8sflow run [options] CMD',
+      register name: 'run',
+               banner: 'Usage: k8sflow docker:run [options] CMD',
                description: "Run CMD on a (de)attached container
 
 Exemples:
@@ -17,21 +17,19 @@ $ k8sflow run -t 2.27.3 -r mydocker/repo -e APP_ENV=production -h tcp://docker-h
 Run a web server detached and bind container port to host port
 $ k8sflow run -t 2.10 -p 3000:3000 'run server -p 3000'
 ",
-               topic: {name: 'run', description: 'Run CMD on a (de)attached container'}
+               topic: 'docker'
 
       option :port, "-p", "--port  ctn_port:host_port", Array, "Publish a container's port(s) to the host"
       option :port_all, "-P", "--port-all", Array, "Publish all exposed ports to random ports"
       option :detach, "-d", "--detach", "daemonize container", default: false
-      option :tag, "-t", "--tag TAG", "image-tag"
-      option :registry, "-r", "--registry REPO", "image-repository"
       option :app, "-A", "--app APPNAME", "application name"
       option :envs, "-e", "--env VAR=VALUE,VAR2=VALUE2", Array, "envvars list"
       option :heroku, "--heroku APP", "get all envs from heroku"
       option :heroku_db, "--heroku-db", "get DB envs only from heroku"
       option :tty, "--[no-]tty", "Use tty"
-      option :docker_api, "-h", "--host HOST", "docker api endpoint", default: "unix://"
       option :aliases, "--aliases a=x,b=y", "commands aliases, usefull in the default file"
 
+
       class << self
         attr_accessor :aliases
 

data/lib/k8sflow/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module K8sflow
-  VERSION = '0.11.7'
+  VERSION = '0.11.8'
   VERSION_NAMES = {1 => 'France II',
     2 => 'R.C. Rickmers',
     3 => 'Thomas W. Lawson',

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: k8sflow
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-topic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,10 @@ files:
 - lib/k8sflow.rb
 - lib/k8sflow/cli.rb
 - lib/k8sflow/command.rb
-- lib/k8sflow/command/image.rb
+- lib/k8sflow/command/docker/docker_image_base.rb
+- lib/k8sflow/command/docker/docker_topic.rb
+- lib/k8sflow/command/docker/image.rb
+- lib/k8sflow/command/docker/run.rb
 - lib/k8sflow/command/maintenance.rb
 - lib/k8sflow/command/pg/backup.rb
 - lib/k8sflow/command/pg/copy.rb
@@ -93,7 +96,6 @@ files:
 - lib/k8sflow/command/pg/ps.rb
 - lib/k8sflow/command/pg/psql.rb
 - lib/k8sflow/command/pg/restore.rb
-- lib/k8sflow/command/run.rb
 - lib/k8sflow/utils/heroku.rb
 - lib/k8sflow/version.rb
 - spec/spec_helper.rb