MuranoCLI 3.0.2 → 3.0.4

data/lib/MrMurano/verbosing.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.28 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -9,6 +9,7 @@ require 'csv'
 require 'highline'
 require 'inflecto'
 require 'json'
+require 'os'
 require 'paint'
 require 'pp'
 require 'terminal-table'
@@ -173,7 +174,7 @@ module MrMurano
     end
 
     def self.fancy_ticks(obj)
-      if $cfg.nil? || $cfg['tool.ascii']
+      if $cfg.nil? || $cfg['tool.ascii'] || OS.windows?
         "'#{obj}'"
       else
         "‘#{obj}’"

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.13 /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.2'
+  VERSION = '3.0.4'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/Account-Passwords_spec.rb

@@ -1,4 +1,5 @@
-# Last Modified: 2017.07.05 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
+# frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
 # License: MIT. See LICENSE.txt.
@@ -9,12 +10,12 @@ require 'MrMurano/version'
 require 'MrMurano/Account'
 require '_workspace'
 
-RSpec.describe MrMurano::Passwords, "#pwd" do
-  # Weird: This tests works on its own without the "WORKSPACE",
+RSpec.describe MrMurano::Passwords, '#pwd' do
+  # Weird: This tests works on its own without the 'WORKSPACE',
   # but when run with other tests, it fails. (2017-07-05: I think
   # I just added the $cfg lines, because MrMurano::Passwords
   # expects $cfg to be loaded... [lb].)
-  include_context "WORKSPACE"
+  include_context 'WORKSPACE'
 
   before(:example) do
     @saved_cfg = ENV['MURANO_CONFIGFILE']
@@ -31,13 +32,13 @@ RSpec.describe MrMurano::Passwords, "#pwd" do
     ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
-  it "Creates a file " do
+  it 'Creates a file ' do
     tmpfile = Dir.tmpdir + '/pwtest' # This way because Tempfile.new creates.
     begin
-      pwd = MrMurano::Passwords.new( tmpfile )
+      pwd = MrMurano::Passwords.new(tmpfile)
       pwd.save
 
-      expect( FileTest.exist?(tmpfile) )
+      expect(FileTest.exist?(tmpfile))
     ensure
       File.unlink(tmpfile) if File.exist? tmpfile
     end
@@ -46,31 +47,31 @@ RSpec.describe MrMurano::Passwords, "#pwd" do
   it "Creates a file in a directory that doesn't exist." do
     tmpfile = Dir.tmpdir + '/deeper/pwtest' # This way because Tempfile.new creates.
     begin
-      pwd = MrMurano::Passwords.new( tmpfile )
+      pwd = MrMurano::Passwords.new(tmpfile)
       pwd.save
 
-      expect( FileTest.exist?(tmpfile) )
+      expect(FileTest.exist?(tmpfile))
     ensure
       File.unlink(tmpfile) if File.exist? tmpfile
     end
   end
 
-  it "Loads a file" do
+  it 'Loads a file' do
     Tempfile.open('test') do |tf|
-      tf << %{---
+      tf << %(---
 this.is.a.host:
   user: password
-}
+)
       tf.close
 
-      pwd = MrMurano::Passwords.new( tf.path )
+      pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       ps = pwd.get('this.is.a.host', 'user')
       expect(ps).to eq('password')
     end
   end
 
-  it "Saves a file" do
+  it 'Saves a file' do
     Tempfile.open('pstest') do |tf|
       tf.close
 
@@ -80,34 +81,31 @@ this.is.a.host:
 
       File.open(tf.path) do |io|
         data = io.read
-        expect(data).to eq(%{---
+        expect(data).to eq(%(---
 this.is.a.host:
   user3: passwords4
-})
+))
       end
     end
   end
 
-  it "Writes multiple hosts" do
+  it 'Writes multiple hosts' do
     Tempfile.open('pwtest') do |tf|
       tf.close
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.set('this.is.a.host', 'user3', 'passwords4')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       ps = pwd.get('this.is.a.host', 'user3')
       expect(ps).to eq('passwords4')
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       pwd.set('another.host', 'user9', 'passwords2')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
@@ -115,25 +113,21 @@ this.is.a.host:
       expect(ps).to eq('passwords4')
       ps = pwd.get('another.host', 'user9')
       expect(ps).to eq('passwords2')
-      pwd = nil
-
     end
   end
 
-  it "Write multiple users to same host" do
+  it 'Write multiple users to same host' do
     Tempfile.open('pwstest') do |tf|
       tf.close
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.set('this.is.a.host', 'user3', 'passwords4')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       pwd.set('this.is.a.host', 'user9', 'passwords2')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
@@ -141,65 +135,57 @@ this.is.a.host:
       expect(ps).to eq('passwords4')
       ps = pwd.get('this.is.a.host', 'user9')
       expect(ps).to eq('passwords2')
-      pwd = nil
-
     end
   end
 
-  it "lists usernames" do
+  it 'lists usernames' do
     Tempfile.open('pwstest') do |tf|
       tf.close
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.set('this.is.a.host', 'user3', 'passwords4')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       pwd.set('this.is.a.host', 'user9', 'passwords2')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       ret = pwd.list
-      expect(ret).to match({
-        "this.is.a.host"=>a_collection_containing_exactly("user9", "user3")
-      })
+      expect(ret).to match(
+        'this.is.a.host' => a_collection_containing_exactly('user9', 'user3')
+      )
     end
   end
 
-
-  it "removes username" do
+  it 'removes username' do
     Tempfile.open('pwstest') do |tf|
       tf.close
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.set('this.is.a.host', 'user3', 'passwords4')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       pwd.set('this.is.a.host', 'user9', 'passwords2')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       pwd.remove('this.is.a.host', 'user3')
       pwd.save
-      pwd = nil
 
       pwd = MrMurano::Passwords.new(tf.path)
       pwd.load
       ret = pwd.list
-      expect(ret).to match({ "this.is.a.host"=>["user9"] })
+      expect(ret).to match('this.is.a.host' => ['user9'])
     end
   end
 
-  context "Uses ENV" do
+  context 'Uses ENV' do
     before(:example) do
       ENV['MR_PASSWORD'] = nil
     end
@@ -207,16 +193,16 @@ this.is.a.host:
       ENV['MR_PASSWORD'] = nil
     end
 
-    it "Uses ENV instead" do
+    it 'Uses ENV instead' do
       Tempfile.open('test') do |tf|
-        tf << %{---
+        tf << %(---
 this.is.a.host:
   user: password
-        }
+        )
         tf.close
 
         ENV['MURANO_PASSWORD'] = 'a test!'
-        pwd = MrMurano::Passwords.new( tf.path )
+        pwd = MrMurano::Passwords.new(tf.path)
         pwd.load
         expect(pwd).not_to receive(:warning)
         ps = pwd.get('this.is.a.host', 'user')
@@ -225,12 +211,12 @@ this.is.a.host:
       end
     end
 
-    it "Uses ENV instead, even with empty file" do
+    it 'Uses ENV instead, even with empty file' do
       Tempfile.open('test') do |tf|
         tf.close
 
         ENV['MURANO_PASSWORD'] = 'a test!'
-        pwd = MrMurano::Passwords.new( tf.path )
+        pwd = MrMurano::Passwords.new(tf.path)
         pwd.load
         expect(pwd).not_to receive(:warning)
         ps = pwd.get('this.is.a.host', 'user')
@@ -242,12 +228,12 @@ this.is.a.host:
       end
     end
 
-    it "Warns about migrating" do
+    it 'Warns about migrating' do
       Tempfile.open('test') do |tf|
         tf.close
 
         ENV['MR_PASSWORD'] = 'a test!'
-        pwd = MrMurano::Passwords.new( tf.path )
+        pwd = MrMurano::Passwords.new(tf.path)
         pwd.load
         expect(pwd).to receive(:warning).once
         ps = pwd.get('this.is.a.host', 'user')

data/spec/Account_spec.rb

@@ -1,4 +1,5 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
+# frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
 # License: MIT. See LICENSE.txt.
@@ -11,8 +12,8 @@ require 'MrMurano/Config'
 require 'MrMurano/ProjectFile'
 require '_workspace'
 
-RSpec.describe MrMurano::Account, "token" do
-  include_context "WORKSPACE"
+RSpec.describe MrMurano::Account, 'token' do
+  include_context 'WORKSPACE'
   before(:example) do
     @saved_cfg = ENV['MURANO_CONFIGFILE']
     ENV['MURANO_CONFIGFILE'] = nil
@@ -33,43 +34,39 @@ RSpec.describe MrMurano::Account, "token" do
     ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
-  context "Get login info" do
+  context 'Get login info' do
     before(:example) do
-      @pswd = instance_double("MrMurano::Passwords")
+      @pswd = instance_double('MrMurano::Passwords')
       allow(@pswd).to receive(:load).and_return(nil)
       allow(@pswd).to receive(:save).and_return(nil)
       allow(MrMurano::Passwords).to receive(:new).and_return(@pswd)
     end
 
-    it "Asks for nothing" do
-      $cfg['user.name'] = "bob"
-      expect(@pswd).to receive(:get).once.and_return("built")
+    it 'Asks for nothing' do
+      $cfg['user.name'] = 'bob'
+      expect(@pswd).to receive(:get).once.and_return('built')
 
       ret = @acc.login_info
-      expect(ret).to eq({
-        :email => "bob", :password=>"built"
-      })
+      expect(ret).to eq(email: 'bob', password: 'built')
     end
 
-    it "Asks for user name" do
+    it 'Asks for user name' do
       $cfg['user.name'] = nil
       expect($terminal).to receive(:ask).once.and_return('bob')
       expect(@acc).to receive(:error).once
       expect($cfg).to receive(:set).with('user.name', 'bob', :user).once.and_call_original
-      expect(@pswd).to receive(:get).once.and_return("built")
+      expect(@pswd).to receive(:get).once.and_return('built')
 
       ret = @acc.login_info
-      expect(ret).to eq({
-        :email => "bob", :password=>"built"
-      })
+      expect(ret).to eq(email: 'bob', password: 'built')
     end
 
-    it "Asks for password" do
-      $cfg['user.name'] = "bob"
+    it 'Asks for password' do
+      $cfg['user.name'] = 'bob'
       expect(@pswd).to receive(:get).with('bizapi.hosted.exosite.io', 'bob').once.and_return(nil)
       expect(@acc).to receive(:error).once
       expect($terminal).to receive(:ask).once.and_return('dog')
-      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io','bob','dog')
+      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob', 'dog')
       # 2017-07-31: login_info may exit unless the command okays prompting for the password.
       #   (If we don't set this, login_info exits, which we'd want to
       #   catch with
@@ -77,28 +74,28 @@ RSpec.describe MrMurano::Account, "token" do
       expect($cfg).to receive(:prompt_if_logged_off).and_return(true)
 
       ret = @acc.login_info
-      expect(ret).to eq(email: "bob", password: "dog")
+      expect(ret).to eq(email: 'bob', password: 'dog')
     end
   end
 
-  context "token" do
+  context 'token' do
     before(:example) do
-      allow(@acc).to receive(:login_info).and_return({:email=>'bob',:password=>'v'})
+      allow(@acc).to receive(:login_info).and_return(email: 'bob', password: 'v')
     end
 
-    it "gets a token" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/token/").
-        with(:body => {:email=>'bob', :password=>'v'}.to_json).
-        to_return(body: {:token=>"ABCDEFGHIJKLMNOP"}.to_json)
+    it 'gets a token' do
+      stub_request(:post, 'https://bizapi.hosted.exosite.io/api:1/token/')
+        .with(body: { email: 'bob', password: 'v' }.to_json)
+        .to_return(body: { token: 'ABCDEFGHIJKLMNOP' }.to_json)
 
       ret = @acc.token
-      expect(ret).to eq("ABCDEFGHIJKLMNOP")
+      expect(ret).to eq('ABCDEFGHIJKLMNOP')
     end
 
-    it "gets an error" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/token/").
-        with(:body => {:email=>'bob', :password=>'v'}.to_json).
-        to_return(status: 401, body: {}.to_json)
+    it 'gets an error' do
+      stub_request(:post, 'https://bizapi.hosted.exosite.io/api:1/token/')
+        .with(body: { email: 'bob', password: 'v' }.to_json)
+        .to_return(status: 401, body: {}.to_json)
 
       expect(@acc).to receive(:error).twice.and_return(nil)
       ret = @acc.token
@@ -111,23 +108,23 @@ RSpec.describe MrMurano::Account, "token" do
       #}.to raise_error(SystemExit).and output("\e[31mNot logged in!\e[0m\n").to_stderr
     end
 
-    it "uses existing token" do
-      @acc.token_reset("quxx")
+    it 'uses existing token' do
+      @acc.token_reset('quxx')
       ret = @acc.token
-      expect(ret).to eq("quxx")
+      expect(ret).to eq('quxx')
     end
 
-    it "uses existing token, even with new instance" do
-      @acc.token_reset("quxx")
+    it 'uses existing token, even with new instance' do
+      @acc.token_reset('quxx')
       acc = MrMurano::Account.instance
       ret = acc.token
-      expect(ret).to eq("quxx")
+      expect(ret).to eq('quxx')
     end
   end
 end
 
 RSpec.describe MrMurano::Account do
-  include_context "WORKSPACE"
+  include_context 'WORKSPACE'
   before(:example) do
     @saved_cfg = ENV['MURANO_CONFIGFILE']
     ENV['MURANO_CONFIGFILE'] = nil
@@ -138,32 +135,30 @@ RSpec.describe MrMurano::Account do
     $cfg['product.id'] = 'XYZ'
 
     @acc = MrMurano::Account.instance
-    allow(@acc).to receive(:token).and_return("TTTTTTTTTT")
+    allow(@acc).to receive(:token).and_return('TTTTTTTTTT')
   end
   after(:example) do
     ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
-  it "initializes" do
+  it 'initializes' do
     uri = @acc.endpoint('')
-    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/")
+    expect(uri.to_s).to eq('https://bizapi.hosted.exosite.io/api:1/')
   end
 
-  context "lists business" do
-    it "for user.name" do
+  context 'lists business' do
+    it 'for user.name' do
       # http.rb::json_opts() sets :symbolize_names=>true, so use symbols, not strings.
       bizlist = [
-        {:bizid=>"YYY",
-         :role=>"admin",
-         :name=>"MAE",
-        },
-        {:bizid=>"XXX",
-         :role=>"admin",
-         :name=>"MPS",
-        },
+        { bizid: 'YYY',
+          role: 'admin',
+          name: 'MAE', },
+        { bizid: 'XXX',
+          role: 'admin',
+          name: 'MPS', },
       ]
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/").
-        to_return(body: bizlist)
+      stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/')
+        .to_return(body: bizlist)
 
       buslist = []
       buslist << MrMurano::Business.new(bizlist[0])
@@ -174,24 +169,24 @@ RSpec.describe MrMurano::Account do
       expect(ret).to eq(buslist)
     end
 
-    it "asks for account when missing" do
+    it 'asks for account when missing' do
       bizlist = [
-        {:bizid=>"YYY",
-         :role=>"admin",
-         :name=>"MAE"},
-        {:bizid=>"XXX",
-         :role=>"admin",
-         :name=>"MPS"},
+        { bizid: 'YYY',
+          role: 'admin',
+          name: 'MAE', },
+        { bizid: 'XXX',
+          role: 'admin',
+          name: 'MPS', },
       ]
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/").
-        to_return(body: bizlist)
+      stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/')
+        .to_return(body: bizlist)
 
       buslist = []
       buslist << MrMurano::Business.new(bizlist[0])
       buslist << MrMurano::Business.new(bizlist[1])
 
       $cfg['user.name'] = nil
-      expect(@acc).to receive(:login_info) do |arg|
+      expect(@acc).to receive(:login_info) do |_arg|
         $cfg['user.name'] = 'BoB@place.net'
       end