MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

data/spec/Content_spec.rb

@@ -24,8 +24,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Content::Base do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -343,7 +343,9 @@ RSpec.describe MrMurano::Content::Base do
         :get, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ'
       ).to_return(body: 'FOOOOOOOOOOOO')
 
-      expect { |b| @ct.download('TODO.taskpaper', &b) }.to yield_with_args('FOOOOOOOOOOOO')
+      expect do |b|
+        @ct.download('TODO.taskpaper', &b)
+      end.to yield_with_args('FOOOOOOOOOOOO')
     end
 
     it "something that isn't there" do
@@ -371,7 +373,7 @@ RSpec.describe MrMurano::Content::Base do
 
       ret = @ct.download('Notthere')
       expect(ret).to match(Net::HTTPNotFound)
-      expect($stderr.string).to eq("\e[31mRequest Failed: 404: " + resp + "\e[0m\n")
+      expect($stderr.string).to eq("\e[31mRequest Failed: 404: #{resp}\e[0m\n")
       $stderr = saved
     end
 

data/spec/GatewayBase_spec.rb

@@ -15,8 +15,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Gateway::GweBase do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'

data/spec/GatewayDevice_spec.rb

@@ -6,6 +6,8 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
+require 'webmock'
+
 require 'MrMurano/version'
 require 'MrMurano/HttpAuthed'
 require 'MrMurano/Gateway'
@@ -15,8 +17,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Gateway::Device do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -29,7 +31,10 @@ RSpec.describe MrMurano::Gateway::Device do
 
   it 'initializes' do
     uri = @gw.endpoint('/')
-    expect(uri.to_s).to eq('https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/')
+    expect(uri.to_s).to eq(
+      'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2/identity/'
+    )
+    WebMock.reset!
   end
 
   context 'listing' do
@@ -65,6 +70,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
       ret = @gw.list
       expect(ret).to eq(body)
+
+      WebMock.reset!
     end
 
     it 'lists with limit' do
@@ -89,6 +96,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
       ret = @gw.list(1)
       expect(ret).to eq(body)
+
+      WebMock.reset!
     end
 
     it 'lists with before' do
@@ -136,6 +145,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.fetch(58)
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   it 'enables one' do
@@ -158,6 +169,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.enable(58)
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   it 'enables with options' do
@@ -180,6 +193,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.enable(58, type: :certificate, expire: '123456')
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   it 'enables with extra options' do
@@ -202,6 +217,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.enable(58, go: :blueteam, type: :certificate, expire: 123_456, bob: :built)
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   it 'removes one' do
@@ -224,6 +241,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.remove(58)
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   context 'activates' do
@@ -236,6 +255,11 @@ RSpec.describe MrMurano::Gateway::Device do
         'https://bizapi.hosted.exosite.io/api:1/service/XYZ/device2'
       ).to_return(body: { fqdn: 'xxxxx.m2.exosite-staging.io' }.to_json)
     end
+
+    after(:example) do
+      WebMock.reset!
+    end
+
     it 'succeeds' do
       stub_request(
         :post,
@@ -255,11 +279,11 @@ RSpec.describe MrMurano::Gateway::Device do
       saved = $stderr
       $stderr = StringIO.new
 
-      #@gw.activate(58)
-      #expect($stderr.string).to eq("\e[31mRequest Failed: 409: nil\e[0m\n")
       expect do
         @gw.activate(58)
-      end.to raise_error(SystemExit).and output("\e[31mThe specified device is already activated.\e[0m\n").to_stderr
+      end.to raise_error(SystemExit).and output(
+        "\e[31mThe specified device is already activated.\e[0m\n"
+      ).to_stderr
       $stderr = saved
     end
 
@@ -288,6 +312,7 @@ RSpec.describe MrMurano::Gateway::Device do
         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')
+      WebMock.reset!
     end
 
     it 'but file is missing' do
@@ -303,8 +328,11 @@ RSpec.describe MrMurano::Gateway::Device do
       saved = $stderr
       $stderr = StringIO.new
       @gw.enable_batch('ids.csv')
-      expect($stderr.string).to eq(%(\e[31mRequest Failed: 400: CSV file format invalid\e[0m\n))
+      expect($stderr.string).to eq(
+        %(\e[31mRequest Failed: 400: CSV file format invalid\e[0m\n)
+      )
       $stderr = saved
+      WebMock.reset!
     end
 
     it 'but file is missing header' do
@@ -318,8 +346,11 @@ RSpec.describe MrMurano::Gateway::Device do
       saved = $stderr
       $stderr = StringIO.new
       @gw.enable_batch('ids.csv')
-      expect($stderr.string).to eq(%(\e[31mRequest Failed: 400: CSV file format invalid\e[0m\n))
+      expect($stderr.string).to eq(
+        %(\e[31mRequest Failed: 400: CSV file format invalid\e[0m\n)
+      )
       $stderr = saved
+      WebMock.reset!
     end
   end
 
@@ -332,6 +363,8 @@ RSpec.describe MrMurano::Gateway::Device do
 
     ret = @gw.read(56)
     expect(ret).to eq(body)
+
+    WebMock.reset!
   end
 
   context 'writes state' do
@@ -343,6 +376,8 @@ RSpec.describe MrMurano::Gateway::Device do
       ).with(body: body.to_json)
 
       @gw.write(56, bob: 'fuzz')
+
+      WebMock.reset!
     end
 
     it 'fails' do
@@ -356,8 +391,12 @@ RSpec.describe MrMurano::Gateway::Device do
       $stderr = StringIO.new
 
       @gw.write(56, bob: 'fuzz')
-      expect($stderr.string).to eq("\e[31mRequest Failed: 400: Value is not settable\e[0m\n")
+      expect($stderr.string).to eq(
+        "\e[31mRequest Failed: 400: Value is not settable\e[0m\n"
+      )
       $stderr = saved
+
+      WebMock.reset!
     end
   end
 end

data/spec/GatewayResource_spec.rb

@@ -17,8 +17,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Gateway::Resources do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'

data/spec/GatewaySettings_spec.rb

@@ -15,8 +15,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Gateway::Settings do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'

data/spec/HttpAuthed_spec.rb

@@ -14,6 +14,10 @@ require 'MrMurano/HttpAuthed'
 #   MuranoCLI/spec/HttpAuthed_spec.rb:10: warning: previous definition of
 #     stub_request_email_password_from_cfg was here
 
+unless defined? LEGIT_LOOKING_TOKEN
+  LEGIT_LOOKING_TOKEN = '0123456789ABCDEF0123456789ABCDEF01234567'
+end
+
 unless defined? stub_request_email_password_from_cfg
   def stub_request_email_password_from_cfg
     stub_request(
@@ -26,7 +30,7 @@ unless defined? stub_request_email_password_from_cfg
       }.to_json
     ).to_return(
       status: 200,
-      body: { token: 'TTTTTTTTTT' }.to_json,
+      body: { token: LEGIT_LOOKING_TOKEN }.to_json,
       headers: {}
     )
   end
@@ -44,7 +48,7 @@ unless defined? stub_request_email_password_from_bob
       }.to_json
     ).to_return(
       status: 200,
-      body: { token: 'TTTTTTTTTT' }.to_json,
+      body: { token: LEGIT_LOOKING_TOKEN }.to_json,
       headers: {}
     )
   end
@@ -54,7 +58,7 @@ unless defined? stub_request_token_verification
   def stub_request_token_verification
     stub_request(
       :get,
-      "#{$cfg['net.protocol']}://#{$cfg['net.host']}/api:1/token/TTTTTTTTTT"
+      "#{$cfg['net.protocol']}://#{$cfg['net.host']}/api:1/token/#{LEGIT_LOOKING_TOKEN}"
     ).to_return(
       status: 200,
       body: {}.to_json,
@@ -71,3 +75,13 @@ unless defined? stub_request_email_password
   end
 end
 
+unless defined? create_instance_double_passwords
+  def create_instance_double_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)
+    pswd
+  end
+end
+

data/spec/ProjectFile_spec.rb

@@ -5,9 +5,7 @@
 # vim:tw=0:ts=2:sw=2:et:ai
 # Unauthorized copying of this file is strictly prohibited.
 
-#require 'erb'
 require 'fileutils'
-#require 'tempfile'
 require 'MrMurano/version'
 require 'MrMurano/Config'
 require 'MrMurano/ProjectFile'
@@ -32,7 +30,9 @@ RSpec.describe MrMurano::ProjectFile do
         it 'Info' do
           expect(@pjf.get('info.name')).to eq('project')
           expect(@pjf.get('info.summary')).to eq('One line summary of project')
-          expect(@pjf.get('info.description')).to eq("In depth description of project\n\nWith lots of details.")
+          expect(@pjf.get('info.description')).to eq(
+            "In depth description of project\n\nWith lots of details."
+          )
           expect(@pjf.get('info.authors')).to eq(['bob@builder.co'])
           expect(@pjf.get('info.version')).to eq('1.0.0')
         end
@@ -40,55 +40,85 @@ RSpec.describe MrMurano::ProjectFile do
         it 'Assets' do
           # Because defaults before load() are all nil, the default_value_for method
           # is called.
-          expect(@pjf).to receive(:default_value_for).with('assets.location').and_return('here')
-          expect(@pjf.get('assets.location')).to eq('here')
-
-          expect(@pjf).to receive(:default_value_for).with('assets.include').and_return(['here'])
-          expect(@pjf.get('assets.include')).to eq(['here'])
-
-          expect(@pjf).to receive(:default_value_for).with('assets.exclude').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('assets.location').and_return('here')
+          expect(@pjf.get(
+            'assets.location'
+          )).to eq('here')
+
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('assets.include').and_return(['here'])
+          expect(@pjf.get(
+            'assets.include'
+          )).to eq(['here'])
+
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('assets.exclude').and_return(['here'])
           expect(@pjf.get('assets.exclude')).to eq(['here'])
 
-          expect(@pjf).to receive(:default_value_for).with('assets.default_page').and_return('here')
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('assets.default_page').and_return('here')
           expect(@pjf.get('assets.default_page')).to eq('here')
         end
 
         it 'Modules' do
           # Because defaults before load() are all nil, the default_value_for method
           # is called.
-          expect(@pjf).to receive(:default_value_for).with('modules.location').and_return('here')
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('modules.location').and_return('here')
           expect(@pjf.get('modules.location')).to eq('here')
 
-          expect(@pjf).to receive(:default_value_for).with('modules.include').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('modules.include').and_return(['here'])
           expect(@pjf.get('modules.include')).to eq(['here'])
 
-          expect(@pjf).to receive(:default_value_for).with('modules.exclude').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('modules.exclude').and_return(['here'])
           expect(@pjf.get('modules.exclude')).to eq(['here'])
         end
 
         it 'Routes' do
           # Because defaults before load() are all nil, the default_value_for method
           # is called.
-          expect(@pjf).to receive(:default_value_for).with('routes.location').and_return('here')
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('routes.location').and_return('here')
           expect(@pjf.get('routes.location')).to eq('here')
 
-          expect(@pjf).to receive(:default_value_for).with('routes.include').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('routes.include').and_return(['here'])
           expect(@pjf.get('routes.include')).to eq(['here'])
 
-          expect(@pjf).to receive(:default_value_for).with('routes.exclude').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('routes.exclude').and_return(['here'])
           expect(@pjf.get('routes.exclude')).to eq(['here'])
         end
 
         it 'Services' do
           # Because defaults before load() are all nil, the default_value_for method
           # is called.
-          expect(@pjf).to receive(:default_value_for).with('services.location').and_return('here')
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('services.location').and_return('here')
           expect(@pjf.get('services.location')).to eq('here')
 
-          expect(@pjf).to receive(:default_value_for).with('services.include').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('services.include').and_return(['here'])
           expect(@pjf.get('services.include')).to eq(['here'])
 
-          expect(@pjf).to receive(:default_value_for).with('services.exclude').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('services.exclude').and_return(['here'])
           expect(@pjf.get('services.exclude')).to eq(['here'])
         end
       end
@@ -135,8 +165,12 @@ RSpec.describe MrMurano::ProjectFile do
           expect($cfg).to receive(:get).with('endpoints.searchFor').and_return('beef')
           expect(@pjf.default_value_for('routes.include')).to eq(['beef'])
 
-          expect($cfg).to receive(:get).with('endpoints.searchFor').and_return('beef and potatoes')
-          expect(@pjf.default_value_for('routes.include')).to eq(%w[beef and potatoes])
+          expect($cfg).to receive(:get).with(
+            'endpoints.searchFor'
+          ).and_return('beef and potatoes')
+          expect(@pjf.default_value_for(
+            'routes.include'
+          )).to eq(%w[beef and potatoes])
         end
       end
     end
@@ -161,7 +195,9 @@ RSpec.describe MrMurano::ProjectFile do
         end
 
         it 'fails back to $cfg' do
-          expect(@pjf).to receive(:default_value_for).with('routes.include').and_return(['here'])
+          expect(@pjf).to receive(
+            :default_value_for
+          ).with('routes.include').and_return(['here'])
           expect(@pjf.get('routes.include')).to eq(['here'])
         end
       end

data/spec/Setting_spec.rb

@@ -26,14 +26,15 @@ module ::MrMurano
       end
     end
   end
+
   module Testsettwo
   end
 end
 
 RSpec.describe MrMurano::Setting do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'