MuranoCLI 3.0.0 → 3.0.1

data/lib/MrMurano/makePretty.rb

@@ -1,20 +1,27 @@
+# Last Modified: 2017.08.20 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'date'
 require 'json'
 require 'highline'
 
 module MrMurano
   module Pretties
-
-    HighLine::Style.new(:name=>:on_aliceblue, :code=>"\e[48;5;231m", :rgb=>[240, 248, 255])
+    HighLine::Style.new(name: :on_aliceblue, code: "\e[48;5;231m", rgb: [240, 248, 255])
     PRETTIES_COLORSCHEME = HighLine::ColorScheme.new do |cs|
-      cs[:subject] = [:red, :on_aliceblue]
+      cs[:subject] = %i[red on_aliceblue]
       cs[:timestamp] = [:blue]
       cs[:json] = [:magenta]
     end
     HighLine.color_scheme = PRETTIES_COLORSCHEME
 
+    # rubocop:disable Style/MethodName: "Use snake_case for method names."
     def self.makeJsonPretty(data, options)
-      if options.pretty then
+      if options.pretty
         ret = JSON.pretty_generate(data).to_s
         ret[0] = HighLine.color(ret[0], :json)
         ret[-1] = HighLine.color(ret[-1], :json)
@@ -31,9 +38,9 @@ module MrMurano
       out += HighLine.color("#{line[:type] || '--'} ".upcase, :subject)
       out += HighLine.color("[#{line[:subject] || ''}]", :subject)
       out += ' '
-      if line.has_key?(:timestamp) then
-        if line[:timestamp].kind_of? Numeric then
-          if options.localtime then
+      if line.key?(:timestamp)
+        if line[:timestamp].is_a? Numeric
+          if options.localtime
             curtime = Time.at(line[:timestamp]).localtime.to_datetime.iso8601(3)
           else
             curtime = Time.at(line[:timestamp]).gmtime.to_datetime.iso8601(3)
@@ -46,11 +53,11 @@ module MrMurano
       end
       out += HighLine.color(curtime, :timestamp)
       out += ":\n"
-      if line.has_key?(:data) then
+      if line.key?(:data)
         data = line[:data]
 
-        if data.kind_of?(Hash) then
-          if data.has_key?(:request) and data.has_key?(:response) then
+        if data.is_a?(Hash)
+          if data.key?(:request) && data.key?(:response)
             out += "---------\nrequest:"
             out += makeJsonPretty(data[:request], options)
 
@@ -71,7 +78,6 @@ module MrMurano
       end
       out
     end
-
   end
 end
-#  vim: set ai et sw=2 ts=2 :
+

data/lib/MrMurano/progress.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.02 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -32,6 +32,13 @@ module MrMurano
       '▗',
     ].freeze
 
+    EXO_QUADRANTS_7 = [
+      '-',
+      '\\',
+      '|',
+      '/',
+    ].freeze
+
     def whirly_start(msg)
       if $cfg['tool.verbose']
         whirly_pause if @whirly_users > 0
@@ -54,7 +61,7 @@ module MrMurano
 
     def whirly_show
       Whirly.start(
-        spinner: EXO_QUADRANTS,
+        spinner: $cfg['tool.ascii'] && EXO_QUADRANTS_7 || EXO_QUADRANTS,
         status: @whirly_msg,
         append_newline: false,
         #remove_after_stop: false,

data/lib/MrMurano/verbosing.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -149,7 +149,7 @@ module MrMurano
         return true
       end
       confirmed = MrMurano::Verbose.ask_yes_no(
-        "Really delete ‘#{name}’? [y/N] ", false
+        "Really delete #{MrMurano::Verbose.fancy_ticks(name)}? [y/N] ", false
       )
       MrMurano::Verbose.warning(exit_msg) if !confirmed && exit_msg
       if block_given?
@@ -172,6 +172,18 @@ module MrMurano
       MrMurano::Verbose.pluralize?(word, count)
     end
 
+    def self.fancy_ticks(obj)
+      if $cfg.nil? || $cfg['tool.ascii']
+        "'#{obj}'"
+      else
+        "‘#{obj}’"
+      end
+    end
+
+    def fancy_ticks(obj)
+      MrMurano::Verbose.fancy_ticks(obj)
+    end
+
     # 2017-07-01: Whirly wrappers. Maybe delete someday
     #   (after replacing all MrMurano::Verbose.whirly_*
     #   with MrMurano::Progress.whirly_*).

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.18 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/GatewayDevice_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.23 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
 require 'MrMurano/version'
 require 'MrMurano/Gateway'
@@ -25,31 +32,33 @@ RSpec.describe MrMurano::Gateway::Device do
   context "listing" do
     it "lists" do
       body = {
-        :mayLoadMore=>false,
-        :devices=>
-        [{:identity=>"58",
-          :auth=>{:type=>"cik"},
-          :state=>{},
-          :locked=>false,
-          :reprovision=>false,
-          :devmode=>false,
-          :lastip=>"",
-          :lastseen=>1487021743864000,
-          :status=>"provisioned",
-          :online=>false},
-         {:identity=>"56",
-          :auth=>{:type=>"cik"},
-          :state=>{},
-          :locked=>false,
-          :reprovision=>false,
-          :devmode=>false,
-          :lastip=>"",
-          :lastseen=>1487021650584000,
-          :status=>"provisioned",
-          :online=>false},
+        mayLoadMore: false,
+        devices:
+        [{identity: "58",
+          auth: {type: "cik"},
+          state: {},
+          locked: false,
+          reprovision: false,
+          devmode: false,
+          lastip: "",
+          lastseen: 1487021743864000,
+          status: "provisioned",
+          online: false},
+         {identity: "56",
+          auth: {type: "cik"},
+          state: {},
+          locked: false,
+          reprovision: false,
+          devmode: false,
+          lastip: "",
+          lastseen: 1487021650584000,
+          status: "provisioned",
+          online: false},
         ]}
-       stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/").
-         to_return(:body=>body.to_json)
+       stub_request(
+         :get,
+         "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/"
+       ).to_return(body: body.to_json)
 
       ret = @gw.list
       expect(ret).to eq(body)
@@ -57,22 +66,24 @@ RSpec.describe MrMurano::Gateway::Device do
 
     it "lists with limit" do
       body = {
-        :mayLoadMore=>false,
-        :devices=>
-        [{:identity=>"58",
-          :auth=>{:type=>"cik"},
-          :state=>{},
-          :locked=>false,
-          :reprovision=>false,
-          :devmode=>false,
-          :lastip=>"",
-          :lastseen=>1487021743864000,
-          :status=>"provisioned",
-          :online=>false},
+        mayLoadMore: false,
+        devices:
+        [{identity: "58",
+          auth: {type: "cik"},
+          state: {},
+          locked: false,
+          reprovision: false,
+          devmode: false,
+          lastip: "",
+          lastseen: 1487021743864000,
+          status: "provisioned",
+          online: false},
         ]}
-       stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/").
-         with(:query=>{:limit=>'1'}).
-         to_return(:body=>body.to_json)
+       stub_request(
+         :get,
+         "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/"
+       ).with(query: {limit: '1'}
+       ).to_return(body: body.to_json)
 
       ret = @gw.list(1)
       expect(ret).to eq(body)
@@ -80,22 +91,24 @@ RSpec.describe MrMurano::Gateway::Device do
 
     it "lists with before" do
       body = {
-        :mayLoadMore=>false,
-        :devices=>
-        [{:identity=>"58",
-          :auth=>{:type=>"cik"},
-          :state=>{},
-          :locked=>false,
-          :reprovision=>false,
-          :devmode=>false,
-          :lastip=>"",
-          :lastseen=>1487021743864000,
-          :status=>"provisioned",
-          :online=>false},
+        mayLoadMore: false,
+        devices:
+        [{identity: "58",
+          auth: {type: "cik"},
+          state: {},
+          locked: false,
+          reprovision: false,
+          devmode: false,
+          lastip: "",
+          lastseen: 1487021743864000,
+          status: "provisioned",
+          online: false},
         ]}
-       stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/").
-         with(:query=>{:limit=>'1', :before=>'1487021743864000'}).
-         to_return(:body=>body.to_json)
+       stub_request(
+         :get,
+         "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/"
+       ).with(query: { limit: '1', before: '1487021743864000' }
+       ).to_return(body: body.to_json)
 
       ret = @gw.list(1, 1487021743864000)
       expect(ret).to eq(body)
@@ -104,18 +117,20 @@ RSpec.describe MrMurano::Gateway::Device do
 
   it "fetches one" do
     body = {
-      :identity=>"58",
-      :auth=>{:type=>"cik"},
-      :state=>{},
-      :locked=>false,
-      :reprovision=>false,
-      :devmode=>false,
-      :lastip=>"",
-      :lastseen=>1487021743864000,
-      :status=>"provisioned",
-      :online=>false}
-    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58").
-      to_return(:body=>body.to_json)
+      identity: "58",
+      auth: {type: "cik"},
+      state: {},
+      locked: false,
+      reprovision: false,
+      devmode: false,
+      lastip: "",
+      lastseen: 1487021743864000,
+      status: "provisioned",
+      online: false}
+    stub_request(
+      :get,
+      "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58"
+    ).to_return(body: body.to_json)
 
     ret = @gw.fetch(58)
     expect(ret).to eq(body)
@@ -123,18 +138,20 @@ RSpec.describe MrMurano::Gateway::Device do
 
   it "enables one" do
     body = {
-      :identity=>"58",
-      :auth=>{:type=>"cik"},
-      :state=>{},
-      :locked=>false,
-      :reprovision=>false,
-      :devmode=>false,
-      :lastip=>"",
-      :lastseen=>1487021743864000,
-      :status=>"provisioned",
-      :online=>false}
-    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58").
-      to_return(:body=>body.to_json)
+      identity: "58",
+      auth: {type: "cik"},
+      state: {},
+      locked: false,
+      reprovision: false,
+      devmode: false,
+      lastip: "",
+      lastseen: 1487021743864000,
+      status: "provisioned",
+      online: false}
+    stub_request(
+      :put,
+      "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58"
+    ).to_return(body: body.to_json)
 
     ret = @gw.enable(58)
     expect(ret).to eq(body)
@@ -142,58 +159,64 @@ RSpec.describe MrMurano::Gateway::Device do
 
   it "enables with options" do
     body = {
-      :identity=>"58",
-      :auth=>{:type=>"cik"},
-      :state=>{},
-      :locked=>false,
-      :reprovision=>false,
-      :devmode=>false,
-      :lastip=>"",
-      :lastseen=>1487021743864000,
-      :status=>"provisioned",
-      :online=>false}
-    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58").
-      with(:body=>{:type=>:certificate,:expire=>123456}.to_json).
-      to_return(:body=>body.to_json)
-
-    ret = @gw.enable(58, :type=>:certificate, :expire=>123456)
+      identity: "58",
+      auth: {type: "cik"},
+      state: {},
+      locked: false,
+      reprovision: false,
+      devmode: false,
+      lastip: "",
+      lastseen: 1487021743864000,
+      status: "provisioned",
+      online: false}
+    stub_request(
+      :put,
+      "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58"
+    ). with(body: { auth: { expire: 123456, type: :certificate }, locked: false }.to_json
+    ).to_return(body: body.to_json)
+
+    ret = @gw.enable(58, type: :certificate, expire: '123456')
     expect(ret).to eq(body)
   end
 
   it "enables with extra options" do
     body = {
-      :identity=>"58",
-      :auth=>{:type=>"cik"},
-      :state=>{},
-      :locked=>false,
-      :reprovision=>false,
-      :devmode=>false,
-      :lastip=>"",
-      :lastseen=>1487021743864000,
-      :status=>"provisioned",
-      :online=>false}
-    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58").
-      with(:body=>{:type=>:certificate,:expire=>123456}.to_json).
-      to_return(:body=>body.to_json)
-
-    ret = @gw.enable(58, :go=>:blueteam, :type=>:certificate, :expire=>123456, :bob=>:built)
+      identity: "58",
+      auth: {type: "cik"},
+      state: {},
+      locked: false,
+      reprovision: false,
+      devmode: false,
+      lastip: "",
+      lastseen: 1487021743864000,
+      status: "provisioned",
+      online: false}
+    stub_request(
+      :put,
+      "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58"
+    ).with(body: {auth: { expire: 123456, type: :certificate }, locked: false }.to_json
+    ).to_return(body: body.to_json)
+
+    ret = @gw.enable(58, go: :blueteam, type: :certificate, expire: 123456, bob: :built)
     expect(ret).to eq(body)
   end
 
   it "removes one" do
     body = {
-      :identity=>"58",
-      :auth=>{:type=>"cik"},
-      :state=>{},
-      :locked=>false,
-      :reprovision=>false,
-      :devmode=>false,
-      :lastip=>"",
-      :lastseen=>1487021743864000,
-      :status=>"provisioned",
-      :online=>false}
-    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58").
-      to_return(:body=>body.to_json)
+      identity: "58",
+      auth: {type: "cik"},
+      state: {},
+      locked: false,
+      reprovision: false,
+      devmode: false,
+      lastip: "",
+      lastseen: 1487021743864000,
+      status: "provisioned",
+      online: false}
+    stub_request(
+      :delete,
+      "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/58"
+    ).to_return(body: body.to_json)
 
     ret = @gw.remove(58)
     expect(ret).to eq(body)
@@ -205,20 +228,26 @@ RSpec.describe MrMurano::Gateway::Device do
       allow(@bgw).to receive(:token).and_return("TTTTTTTTTT")
       expect(MrMurano::Gateway::GweBase).to receive(:new).and_return(@bgw)
       allow(@gw).to receive(:token).and_return("TTTTTTTTTT")
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2").
-        to_return(:body=>{:fqdn=>"xxxxx.m2.exosite-staging.io"}.to_json)
+      stub_request(
+        :get,
+        "https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2"
+      ).to_return(body: { fqdn: "xxxxx.m2.exosite-staging.io" }.to_json)
     end
     it "succeeds" do
-      stub_request(:post, "https://xxxxx.m2.exosite-staging.io/provision/activate").
-        to_return(:body=>'XXXXXXXX')
+      stub_request(
+        :post,
+        "https://xxxxx.m2.exosite-staging.io/provision/activate"
+      ).to_return(body: 'XXXXXXXX')
 
       ret = @gw.activate(58)
       expect(ret).to eq('XXXXXXXX')
     end
 
     it "was already activated" do
-      stub_request(:post, "https://xxxxx.m2.exosite-staging.io/provision/activate").
-        to_return(:status => 409)
+      stub_request(
+        :post,
+        "https://xxxxx.m2.exosite-staging.io/provision/activate"
+      ).to_return(status: 409)
 
       saved = $stderr
       $stderr = StringIO.new
@@ -232,8 +261,10 @@ RSpec.describe MrMurano::Gateway::Device do
     end
 
     it "wasn't enabled" do
-      stub_request(:post, "https://xxxxx.m2.exosite-staging.io/provision/activate").
-        to_return(:status => 404)
+      stub_request(
+        :post,
+        "https://xxxxx.m2.exosite-staging.io/provision/activate"
+      ).to_return(status: 404)
 
       saved = $stderr
       $stderr = StringIO.new
@@ -247,8 +278,10 @@ RSpec.describe MrMurano::Gateway::Device do
   context "enables batch" do
     it "enables from cvs" do
       File.open('ids.csv', 'w') {|io| io << "ID\n1\n2\n3\n4\n5"}
-      stub_request(:post, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities').
-        with(:headers=>{'Content-Type'=>%r{^multipart/form-data.*}}) do |request|
+      stub_request(
+        :post,
+        'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities'
+      ).with(headers: { 'Content-Type' => %r{^multipart/form-data.*} }) do |request|
           request.body.to_s =~ %r{Content-Type: text/csv\r\n\r\nID\r?\n1\r?\n2\r?\n3\r?\n4\r?\n5}
       end
       @gw.enable_batch('ids.csv')
@@ -260,8 +293,10 @@ RSpec.describe MrMurano::Gateway::Device do
 
     it "but file is not text" do
       File.open('ids.csv', 'wb') {|io| io << "\0\0\0\0"}
-      stub_request(:post, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities').
-        to_return(:status=>400, :body => "CSV file format invalid")
+      stub_request(
+        :post,
+        'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities'
+      ).to_return(status: 400, body: "CSV file format invalid")
       saved = $stderr
       $stderr = StringIO.new
       @gw.enable_batch('ids.csv')
@@ -271,10 +306,12 @@ RSpec.describe MrMurano::Gateway::Device do
 
     it "but file is missing header" do
       File.open('ids.csv', 'w') {|io| io << "1\n2\n3\n4\n5"}
-      stub_request(:post, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities').
-        with(:headers=>{'Content-Type'=>%r{^multipart/form-data.*}}) do |request|
+      stub_request(
+        :post,
+        'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identities'
+      ).with(headers: { 'Content-Type' => %r{^multipart/form-data.*} }) do |request|
           request.body.to_s =~ %r{Content-Type: text/csv\r\n\r\n1\r?\n2\r?\n3\r?\n4\r?\n5}
-      end.to_return(:status=>400, :body => "CSV file format invalid")
+      end.to_return(status: 400, body: "CSV file format invalid")
       saved = $stderr
       $stderr = StringIO.new
       @gw.enable_batch('ids.csv')
@@ -284,9 +321,11 @@ RSpec.describe MrMurano::Gateway::Device do
   end
 
   it "reads state" do
-    body = {:bob=>{:reported=>"9", :set=>"9", :timestamp=>1487021046160363}}
-    stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state').
-      to_return(:body=>body.to_json)
+    body = {bob: {reported: "9", set: "9", timestamp: 1487021046160363}}
+    stub_request(
+      :get,
+      'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state'
+    ).to_return(body: body.to_json)
 
     ret = @gw.read(56)
     expect(ret).to eq(body)
@@ -294,28 +333,30 @@ RSpec.describe MrMurano::Gateway::Device do
 
   context "writes state" do
     it "succeeds" do
-      body = {:bob=>"fuzz"}
-      stub_request(:patch, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state').
-        with(:body=>body.to_json)
+      body = {bob: "fuzz"}
+      stub_request(
+        :patch,
+        'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state'
+      ).with(body: body.to_json)
 
-      @gw.write(56, :bob=>'fuzz')
+      @gw.write(56, bob: 'fuzz')
     end
 
     it "fails" do
-      body = {:bob=>"fuzz"}
-      stub_request(:patch, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state').
-        with(:body=>body.to_json).
-        to_return(:status=> 400, :body => 'Value is not settable')
+      body = {bob: "fuzz"}
+      stub_request(
+        :patch,
+        'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/56/state'
+      ).with(body: body.to_json
+      ).to_return(status: 400, body: 'Value is not settable')
 
       saved = $stderr
       $stderr = StringIO.new
 
-      @gw.write(56, :bob=>'fuzz')
+      @gw.write(56, bob: 'fuzz')
       expect($stderr.string).to eq("\e[31mRequest Failed: 400: Value is not settable\e[0m\n")
       $stderr = saved
     end
   end
-
 end
 
-#  vim: set ai et sw=2 ts=2 :