nex_client 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9e6166df47119dad5f9ed37162f90dc09fed76
-  data.tar.gz: ba61368242bbc4c1226dfe31c7e0c1b9252134ac
+  metadata.gz: 1adedef202faa3b3708d8ddef5f23ca366e6f46b
+  data.tar.gz: cca86cabe36af8d1a17e5168ba70a09bc2c59723
 SHA512:
-  metadata.gz: c3f09ff9d2cff8c5bda7c140f2f2b5bca6eab183948dc1835ee83c211e4742717ae0b314e236884dd68ca501489816433aad2044bc24ab980d357c0d1e3c0079
-  data.tar.gz: 438a36987ec311f99257200e643d389129397565fe0e67bdb80e3b179a8e9bb14fa37641831721c0c675b4fbee942bc4495bd55cf80a51881f5bf1e6fc5ad50e
+  metadata.gz: 9e800785f3a84c6f20a84404a9e78b9f45b589e40464b3cff53c574895f5141d14349f763ba1387caca509802c9ceee05bbe69516ca6e21f702e251c972f87ec
+  data.tar.gz: 6f4ac9c0027199406a5a1765b3edbedd456e111d35ffeef198ded12ce099d0d6b39c85f069ecb5d512cdbf16014d6d87b62a806a16f1aabe60b5ae786b557152

data/lib/nex_client/cli.rb

@@ -111,6 +111,8 @@ module NexClient
         c.option '--ssl', 'list all apps with SSL enabled'
         c.option '--storage', 'list all apps with persistent storage'
         c.option '--owner HANDLE', 'list all apps for the specified owner'
+        c.option '--image IMAGE', 'list the app with this image'
+
         c.action do |args, options|
           NexClient::Commands::Apps.list(args,options)
         end
@@ -250,9 +252,12 @@ module NexClient
         c.example 'list all env variables for myapp', 'nex-cli apps:vars myapp'
         c.example 'Add env variables to myapp', 'nex-cli apps:vars myapp --add MYVAR1=VAL1,MYVAR2=VAL2'
         c.example 'Delete env variables from myapp', 'nex-cli apps:vars myapp --delete MYVAR,MYVAR'
+        c.example 'Add env variables to myapp from file', 'nex-cli apps:vars myapp --env-file ~/myenvfile'
+        c.example 'Add env variables to myapp from file and prefix all vars with foo (foo_myvar)', 'nex-cli apps:vars myapp --env-file ~/myenvfile --env-prefix foo'
         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.option '--env-file FILE', String, 'newline separated list of env variables (MYVAR=1) or YAML file. Note that YAML parsing is recursive.'
+        c.option '--env-prefix PREFIX', String, 'prefix all variables contained in the env file with the specified prefix (PREFIX_MYVAR)'
         c.action do |args, options|
           NexClient::Commands::Apps.manage_vars(args,options)
         end

data/lib/nex_client/commands/addons.rb

@@ -10,7 +10,7 @@ module NexClient
 
       def self.list(args,opts)
         filters = {}
-        filters[:status] = opts.status || 'active'
+        filters[:status] = opts.status || ['active','restarting']
         filters[:service] = opts.service if opts.service.present?
 
         # All option

data/lib/nex_client/commands/apps.rb

@@ -18,10 +18,11 @@ module NexClient
 
       def self.list(args,opts)
         filters = {}
-        filters[:status] = [opts.status || 'active']
+        filters[:status] = opts.status || ['active','restarting']
         filters[:ssl_enabled] = opts.ssl if opts.ssl.present?
         filters[:persistent_storage] = opts.storage if opts.storage.present?
         filters[:'owner.handle'] = opts.owner || '@self'
+        filters[:image] = opts.image if opts.image.present?
 
         # All option
         filters = {} if opts.all
@@ -48,6 +49,9 @@ module NexClient
           return false
         end
 
+        # Display app id
+        self.display_id(e)
+
         # Display app details
         self.display_apps(e)
 
@@ -112,7 +116,7 @@ module NexClient
         # Env variables from file
         if opts.env_file.present?
           attrs[:vars] ||= {}
-          self.vars_from_file(opts.env_file) do |key,val|
+          vars_from_file(opts.env_file) do |key,val|
             attrs[:vars][key] = val
           end
         end
@@ -292,7 +296,7 @@ module NexClient
 
           # Add vars from file
           if opts.env_file.present?
-            self.vars_from_file(opts.env_file) do |key,val|
+            vars_from_file(opts.env_file,opts.env_prefix) do |key,val|
               vars[key] = val
             end
           end
@@ -341,6 +345,14 @@ module NexClient
         self.display_scm(e.scm)
       end
 
+      def self.display_id(e)
+        table = Terminal::Table.new do |t|
+          t.add_row(['APP ID',e.id])
+        end
+        puts table
+        puts "\n"
+      end
+
       def self.display_apps(list)
         table = Terminal::Table.new title: APPS_TITLE, headings: APPS_HEADERS do |t|
           [list].flatten.compact.each do |e|
@@ -396,24 +408,6 @@ 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/commands/helpers.rb

@@ -42,7 +42,7 @@ module NexClient
         end
 
         # Get SSH details
-        username = me.handle
+        username = me.handle.downcase
         pv_key = me.private_key
 
         # Create SSH Key
@@ -60,6 +60,41 @@ module NexClient
           pv_key_file.unlink # delete tmp file
         end
       end
+
+      # Parse plain or yaml file
+      def vars_from_file(file,prefix = nil,&block)
+        # YAML file
+        if file =~ /(\.yml|\.yaml)$/
+          vars_from_yaml_file(file,prefix,&block)
+        else
+          vars_from_plain_file(file,prefix,&block)
+        end
+      end
+
+      # Accept a path to a file or a hash
+      def vars_from_yaml_file(file,prefix = nil,&block)
+        vars = file.is_a?(Hash) ? file : YAML.load_file(file)
+
+        vars.each do |k,v|
+          key = prefix.present? ? "#{prefix}_#{k}" : k
+          if v.is_a?(Hash)
+            self.vars_from_yaml_file(v,key,&block)
+          else
+            yield(key,v)
+          end
+        end
+      end
+
+      def vars_from_plain_file(file,prefix = nil,&block)
+        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)
+          key = prefix.present? ? "#{prefix}_#{key}" : key
+          yield(key,val)
+        end
+      end
     end
   end
 end

data/lib/nex_client/version.rb

@@ -1,3 +1,3 @@
 module NexClient
-  VERSION = '0.10.0'
+  VERSION ||= '0.11.0'
 end

metadata

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