optica-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e231b226e1fd51fcf8a57d0e03c644e006a352a8
-  data.tar.gz: 36c245aaffdd8dfbe13bffdf24a8c9d717f24b56
+  metadata.gz: acc987011dd7c2b81f2ba79e53830647562976ac
+  data.tar.gz: b3752eaf4cb62e5fd27e7067619caa7081e6b3bc
 SHA512:
-  metadata.gz: 7395337003e0e80229826b0a9aef7a036faca0df9dbb773c6006e655ef574f2493e4508b3ac702ef98377b0a5e359a1ed9de848e189592c34b38d3167d2b06d1
-  data.tar.gz: f6cd27ba9404d9d858d118196c9b42978aec4328265b36e76b58cdd5023ea0e552e7fe91e873dad08b12f0b8b3afedcb5551f7b499a59d7debc04da54885d365
+  metadata.gz: 74f13d76aafedcee686e023b0915ecba1b0d4decff838ece48668cf84dbb5901d0b8830b9a6e57b02a789bfbb14384777cf97ceee8075b245433b89467bfa7b8
+  data.tar.gz: c7f09d76d19fd0e740ccd591091b6623262435fa109c646b8a92ff14e582c3af554b4c39d5449337b1cc9f15d856b11ce1a8876b64fbcbe9faf11af691942bc3

data/README.md

@@ -29,10 +29,12 @@ Usage: optical [options] [FIELD=FILTER] [FIELD2=FILTER2...]
 Options:
     -s, --select a,b,c               Retrieve the given fields, in addition to the defaults
     -a, --all                        Retrieve all fields (default is just role,id,hostname)
+    -j, --just a,b,c                 Print just the given fields as tab-seperated strings,
+                                     instead of outputting json. Implies selecting those fields.
     -v, --verbose                    Print debug information to STDERR
     -p, --pretty[=false]             Pretty-print JSON (default true when STDOUT is a TTY)
     -r, --refresh                    Delete cache before performing request.
-    -h, --host URI                   Optica host (default "https://optica.d.musta.ch")
+    -h, --host URI                   Optica host (default "https://example.com")
     -H, --set-default-host URI       Set the default optica host
 
 Examples:
@@ -46,7 +48,7 @@ Examples:
     optical --all launched_by=`whoami`
 
   SSH into the first matched node:
-    ssh $(optical role=example branch=jake-test | head -n 1 | jq -r .hostname)
+    ssh $(optical --just hostname role=example branch=jake-test | head -n 1)
 ```
 
 ## Development

data/lib/optica/client/cli.rb

@@ -33,6 +33,7 @@ module Optica
         @config = ::Optica::Client::Config.from_file(CONFIG_PATH)
         @host = nil
         @fields = []
+        @outs = []
         @verbose = false
         @pretty = data_pipe.tty?
         @cache = ::FileCache.new(
@@ -80,6 +81,16 @@ module Optica
             @fields = nil if all
           end
 
+          o.on(
+            '-j',
+            '--just a,b,c',
+            ::Array,
+            'Print just the given fields as tab-seperated strings, instead of outputting json. Implies selecting those fields.'
+          ) do |outs|
+            @outs.concat(outs)
+            @fields.concat(outs)
+          end
+
           o.on(
             '-v',
             '--verbose',
@@ -133,7 +144,7 @@ module Optica
     optical --all launched_by=`whoami`
 
   SSH into the first matched node:
-    ssh $(optical role=example branch=jake-test | head -n 1 | jq -r .hostname)
+    ssh $(optical --just hostname role=example branch=jake-test | head -n 1)
           EOS
         end
       end
@@ -161,6 +172,10 @@ module Optica
           return ERR_INVALID
         end
 
+        if @outs.any? && @verbose
+          ui_pipe.puts "Will print only: #{@outs}"
+        end
+
         manage_cache
 
         req = ::Optica::Client::Request.new(host).where(filters)
@@ -204,7 +219,11 @@ module Optica
         end
 
         json.each do |_ip, node|
-          string = @pretty ? JSON.pretty_generate(node) : JSON.fast_generate(node)
+          if @outs.any?
+            string = node.values_at(*@outs.uniq).join("\t")
+          else
+            string = @pretty ? JSON.pretty_generate(node) : JSON.fast_generate(node)
+          end
           data_pipe.puts string
           # easier Ctrl-C in Tmux
           sleep TTY_TIMEOUT if use_sleep

data/lib/optica/client/version.rb

@@ -1,5 +1,5 @@
 module Optica
   module Client
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optica-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jake Teton-Landis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filecache