k8sflow 0.11.12 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e1487e613debcaa706e2eec2c6e91c5768db81
-  data.tar.gz: 80d1d3ee53c42ec5d3e936e6d7fb6b1d4ca743a3
+  metadata.gz: fe138974923c31af7ba91c03df92e17cc81177be
+  data.tar.gz: 038750df85f202b69a429b791b5c4df0a236c725
 SHA512:
-  metadata.gz: ac71854031189817ac1d47e58d4d3c131196ef55e790195fb1ac31efa2d6b0c02d19d081fcdfaa08811fa1f0d69201ff8565d69b06d46d65d18d62c622ba3532
-  data.tar.gz: c25959a635e66ba2c44a8abf3b9d1a88c0189385083daa32d562cb31705683ad2e5489718ad1ad713367975fafa3d9c739933d4ef907f8a7ee58be6b1d3f76f9
+  metadata.gz: 73003a7f4c67b31ac43839211e8c43b01cea661b1dbefca53d7519a71bfb022ca64768b990c48ecf7c4e0ad451ccc38e226f3d454040c7a6dce5a514b6dd82d7
+  data.tar.gz: d05d5e563948faeb5b0f8070b54636c1fd6247348ed5e15f161e9e4852e7f496608998da32f05c498e9be25a046da09f040e8167784f01518bb05874865302e3

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

@@ -5,7 +5,7 @@ module K8sflow
       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 :docker_api, "-H", "--host host", "docker api endpoint", default: "unix://"
       option :tag, '-t', '--tag TAG', "Image tag", default: 'latest'
 
     end

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

@@ -1,7 +1,8 @@
 require 'optparse'
 require 'optparse/time'
 require 'docker'
-require 'k8sflow/utils/heroku'
+require 'k8sflow/utils/varager'
+
 require_relative 'docker_image_base'
 
 module K8sflow
@@ -23,10 +24,11 @@ $ k8sflow run -t 2.10 -p 3000:3000 'run server -p 3000'
       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 :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 :app, "-A", "--app APP", "app name"
+      option :varager_api, "--varager-api API", "varager api endpoint with token, include http(s)://"
+      option :varager_token, "--varager-token API-TOKEN", "varager api auth token"
+      option :varager_db, "--heroku-db", "get DB envs only from heroku"
       option :tty, "--[no-]tty", "Use tty"
       option :aliases, "--aliases a=x,b=y", "commands aliases, usefull in the default file"
 
@@ -62,15 +64,19 @@ $ k8sflow run -t 2.10 -p 3000:3000 'run server -p 3000'
               envs[key] = value
             end
           end
-          if options.has_key?(:heroku)
-            envs.merge!( K8sflow::Utils::HerokuClient.envs(options[:heroku], options[:heroku_db]))
+
+          if options.has_key?(:varager_api) && options[:varager_api] != nil
+            uri = options[:varager_api]
+            token = options[:varager_token]
+            client = K8sflow::Utils::Varager.new(token, uri)
+            envs.merge!(client.envs(options[:app], false))
           end
           pp envs
           return envs
         end
 
         def docker_run(cmd, envs, options)
-          Docker.url = options[:docker_api]
+          ::Docker.url = options[:docker_api]
           container_info =  {
             'Cmd' => cmd.split(" "),
             'Image' => "#{options[:registry]}:#{options[:tag]}",
@@ -90,7 +96,7 @@ $ k8sflow run -t 2.10 -p 3000:3000 'run server -p 3000'
             container_info["PublishAllPorts"] = true
           end
           pp container_info
-          container = Docker::Container.create(container_info)
+          container = ::Docker::Container.create(container_info)
           container.start
           puts "container created with id: #{container.id}"
           if !options[:detach]

data/lib/k8sflow/utils/varager.rb

@@ -0,0 +1,38 @@
+require 'pp'
+require 'varager'
+require 'json'
+
+module K8sflow
+  module Utils
+    class Varager
+      attr_reader :client
+
+      def initialize(token, endpoint)
+        ::Varager.logger.level = 1
+        @client = ::Varager::Client.new
+        puts "TOKEN"
+        puts token
+        @client.auth_token.update(:token => token)
+        puts @client.auth_token.options
+        @client.site = endpoint
+      end
+
+      def envs(app, db_only=true)
+        envs = @client.get_env(params: {id: app}).vars
+        #pp "overrided vars: #{@options.envvars}"
+        db_vars = ["DATABASE_URL",
+                   "MEMCACHIER_PASSWORD",
+                   "MEMCACHIER_SERVERS",
+                   "MEMCACHIER_USERNAME",
+                   "REDISTOGO_URL",
+                   "REDIS_PROVIDER"]
+        if db_only == true
+          envs.select!{|k,v| db_vars.index(k) != nil}
+        end
+        pp envs
+        return envs
+      end
+
+    end
+  end
+end

data/lib/k8sflow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8sflow
 version: !ruby/object:Gem::Version
-  version: 0.11.12
+  version: 0.12.0
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-topic
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: varager
+  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: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - lib/k8sflow/command/pg/psql.rb
 - lib/k8sflow/command/pg/restore.rb
 - lib/k8sflow/utils/heroku.rb
+- lib/k8sflow/utils/varager.rb
 - lib/k8sflow/version.rb
 - spec/spec_helper.rb
 homepage: http://gitlab.com/ant31