nex_client 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e474dbd2d706429e88588528a051b2a6ad13b9
-  data.tar.gz: 752ea05fe2035617a3109c9f40561f608c22b358
+  metadata.gz: 3837e3133c42a8c3735aae86123e048b5ec939d0
+  data.tar.gz: 2942fc4186c219f2d5759528bad9d14ed8d12d02
 SHA512:
-  metadata.gz: ddb0bde5e0b11d5638d11813c6e09f88fd8a57821ab1a2c1e1eb2c6aef91f56274b676f70ad62552344a662b4fd907c8f576c6bab2a5450395efa8e75da9d556
-  data.tar.gz: 61194baa999f2fdf7cedbb34b981f8bc0bbc28369ec534e7eff9a0f0f02d511f34f0bb05e5ea0a2f97d993a65d61ab3edec90dab7e579267cb4ee445f0785061
+  metadata.gz: 68749c7e6061043bc4671add57f9d9cd4630cfa66df639b5332e318c1ed49e8779042f6bea0f1328fbff77780d10afd7caba75283578048feb2f7ce5a034f899
+  data.tar.gz: 28b49d85667fcde6ed8e08d036e601417aebac98ccd00a5c9ffb22c28f7c7f4bfe63475875b31c03c505cad5e8c8a7b1b22a0021bf38f0e82dfb25f06d5efe82

data/lib/nex_client/cli.rb

@@ -121,7 +121,7 @@ module NexClient
         c.description = 'Create new docker applications'
         c.example 'create new rails application', 'nex-cli apps:create rails'
         c.option '--env MYVAR=value,MYVAR2=value,...', Array, 'comma separated list of env variables'
-        c.option '--env-file FILE', 'newline separated list of env variables'
+        c.option '--env-file FILE', String, 'newline separated list of env variables (MYVAR=1) or YAML file'
         c.option '--no-ssl', 'disable SSL support (enabled by default)'
         c.option '--storage', 'enable persistent storage (/!\ only one node allowed)'
         c.option '--owner ORGANIZATION_HANDLE', 'specify an organisation as owner (organization admin only)'
@@ -238,6 +238,7 @@ module NexClient
         c.example 'Delete env variables from myapp', 'nex-cli apps:vars myapp --delete MYVAR,MYVAR'
         c.option '--add MYVAR=value,MYVAR2=value,...', Array, 'comma separated list of env variables'
         c.option '--delete MYVAR,MYVAR2,...', Array, 'comma separated list of env variables'
+        c.option '--env-file FILE', String, 'newline separated list of env variables (MYVAR=1) or YAML file'
         c.action do |args, options|
           NexClient::Commands::Apps.manage_vars(args,options)
         end

data/lib/nex_client/commands/apps.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'yaml'
 
 module NexClient
   module Commands
@@ -109,10 +110,8 @@ module NexClient
 
         # Env variables from file
         if opts.env_file.present?
-          f = File.read(opts.env_file)
           attrs[:vars] ||= {}
-          f.split('\n').each do |e|
-            key,val = e.split('=',2)
+          self.vars_from_file(opts.env_file) do |key,val|
             attrs[:vars][key] = val
           end
         end
@@ -260,7 +259,7 @@ module NexClient
         end
 
         # Add/Delete vars
-        if opts.add.present? || opts.delete.present?
+        if opts.add.present? || opts.delete.present? || opts.env_file.present?
           vars = (e.vars || {}).dup
 
           # Add vars
@@ -269,6 +268,13 @@ module NexClient
             vars[key] = val
           end
 
+          # Add vars from file
+          if opts.env_file.present?
+            self.vars_from_file(opts.env_file) do |key,val|
+              vars[key] = val
+            end
+          end
+
           # Delete vars
           (opts.delete || []).each { |k| vars.delete(k) }
 
@@ -367,6 +373,24 @@ module NexClient
         return '-' unless record.node_count && record.max_node_count
         "#{record.node_count}/#{record.max_node_count}"
       end
+
+      def self.vars_from_file(file,&block)
+        # YAML file
+        if file =~ /(\.yml|\.yaml)$/
+          vars = YAML.load_file(file)
+          vars.each do |k,v|
+            yield(k,v)
+          end
+        else
+          f = File.read(file)
+          f.split("\n").each do |e|
+            line = e.strip
+            next if line.empty? || line.start_with?('#')
+            key,val = e.split('=',2)
+            yield(key,val)
+          end
+        end
+      end
     end
   end
 end

data/lib/nex_client/version.rb

@@ -1,3 +1,3 @@
 module NexClient
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client