MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/spec/Http_spec.rb

@@ -9,53 +9,44 @@ require 'MrMurano/version'
 require 'MrMurano/http'
 require 'MrMurano/verbosing'
 require 'MrMurano/Account'
+require 'MrMurano/HttpAuthed'
 require '_workspace'
 
-class Tst
-  include MrMurano::Verbose
-  include MrMurano::Http
-
-  def initialize
-    @token = nil
-  end
-end
-
 RSpec.describe MrMurano::Http do
   include_context 'WORKSPACE'
 
   before(:example) do
     $cfg = MrMurano::Config.new
     $cfg.load
-    @tst = Tst.new
+    @hauth = MrMurano::HttpAuthed.instance
   end
 
   context 'gets a token' do
     before(:example) do
       @acc = instance_double('MrMurano::Account')
-      #allow(MrMurano::Account).to receive(:new).and_return(@acc)
-      allow(MrMurano::Account).to receive(:instance).and_return(@acc)
+      allow(MrMurano::Account).to receive(:new).and_return(@acc)
     end
 
     it 'already has one' do
-      @tst.instance_variable_set(:@token, 'ABCDEFG')
-      ret = @tst.token
+      @hauth.instance_variable_set(:@token_biz, 'ABCDEFG')
+      ret = @hauth.token
       expect(ret).to eq('ABCDEFG')
     end
 
     it 'gets one' do
-      expect(@acc).to receive(:token).and_return('ABCDEFG')
-      ret = @tst.token
+      expect(@hauth).to receive(:token).and_return('ABCDEFG')
+      ret = @hauth.token
       expect(ret).to eq('ABCDEFG')
     end
 
     it 'raises when not logged in' do
-      expect(@acc).to receive(:token).and_return(nil)
+      expect(@hauth).to receive(:token).and_return(nil)
       # 2017-07-13: The token command used to raise an error, but [lb]
       # doesn't like seeing the "use --trace" message that Ruby spits
       # out. So write to stderr and exit instead. Here, use check that
       # the function exits by expecting it to raise SystemExit.
       expect do
-        @tst.token
+        @hauth.ensure_token!
       end.to raise_error(SystemExit).and output("\e[31mNot logged in!\e[0m\n").to_stderr
     end
   end
@@ -69,7 +60,7 @@ RSpec.describe MrMurano::Http do
     it 'puts nothing' do
       $cfg['tool.curldebug'] = false
       $stdout = StringIO.new
-      @tst.curldebug(@req)
+      @hauth.curldebug(@req)
       expect($stdout.string).to eq('')
     end
 
@@ -77,7 +68,7 @@ RSpec.describe MrMurano::Http do
       $cfg['tool.curldebug'] = true
       $cfg.curlfile_f = nil
       $stdout = StringIO.new
-      @tst.curldebug(@req)
+      @hauth.curldebug(@req)
       expect($stdout.string).to eq(
         %(curl -s -H 'User-Agent: test' -H 'Content-Type: application/json' -X GET 'https://test.host/this/is/a/test'\n)
       )
@@ -88,7 +79,7 @@ RSpec.describe MrMurano::Http do
       $cfg.curlfile_f = nil
       $stdout = StringIO.new
       @req['Authorization'] = 'LetMeIn'
-      @tst.curldebug(@req)
+      @hauth.curldebug(@req)
       expect($stdout.string).to eq(
         %(curl -s -H 'Authorization: LetMeIn' -H 'User-Agent: test' -H 'Content-Type: application/json' -X GET 'https://test.host/this/is/a/test'\n)
       )
@@ -99,7 +90,7 @@ RSpec.describe MrMurano::Http do
       $cfg.curlfile_f = nil
       $stdout = StringIO.new
       @req.body = 'builder'
-      @tst.curldebug(@req)
+      @hauth.curldebug(@req)
       expect($stdout.string).to eq(
         %(curl -s -H 'User-Agent: test' -H 'Content-Type: application/json' -X GET 'https://test.host/this/is/a/test' -d 'builder'\n)
       )
@@ -108,13 +99,13 @@ RSpec.describe MrMurano::Http do
 
   context 'checks if JSON' do
     it 'is JSON' do
-      ok, data = @tst.isJSON(%({"one": "two", "three":[1,2,3,4,5,6]}))
+      ok, data = @hauth.isJSON(%({"one": "two", "three":[1,2,3,4,5,6]}))
       expect(ok).to be true
       expect(data).to eq(one: 'two',
                          three: [1, 2, 3, 4, 5, 6])
     end
     it 'is not JSON' do
-      ok, data = @tst.isJSON(%(woeiutepoxam))
+      ok, data = @hauth.isJSON(%(woeiutepoxam))
       expect(ok).to be false
       expect(data).to eq('woeiutepoxam')
     end
@@ -134,9 +125,9 @@ RSpec.describe MrMurano::Http do
       $stderr = StringIO.new
 
       allow(@rsp).to receive(:body).and_return('ok')
-      expect(@tst).to receive(:error).once.with('Request Failed: 410: ok')
+      expect(@hauth).to receive(:error).once.with('Request Failed: 410: ok')
 
-      @tst.showHttpError(@req, @rsp)
+      @hauth.showHttpError(@req, @rsp)
       expect($stdout.string).to eq(%(Sent GET https://test.host/this/is/a/test
          > Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3
          > Accept: */*
@@ -155,9 +146,9 @@ RSpec.describe MrMurano::Http do
 
       allow(@req).to receive(:body).and_return('this is my body')
       allow(@rsp).to receive(:body).and_return('ok')
-      expect(@tst).to receive(:error).once.with('Request Failed: 410: ok')
+      expect(@hauth).to receive(:error).once.with('Request Failed: 410: ok')
 
-      @tst.showHttpError(@req, @rsp)
+      @hauth.showHttpError(@req, @rsp)
       expect($stdout.string).to eq(%(Sent GET https://test.host/this/is/a/test
          > Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3
          > Accept: */*
@@ -176,9 +167,9 @@ RSpec.describe MrMurano::Http do
       $stderr = StringIO.new
 
       allow(@rsp).to receive(:body).and_return(%({"statusCode": 123, "message": "ok"}))
-      expect(@tst).to receive(:error).once.with('Request Failed: 410: [123] ok')
+      expect(@hauth).to receive(:error).once.with('Request Failed: 410: [123] ok')
 
-      @tst.showHttpError(@req, @rsp)
+      @hauth.showHttpError(@req, @rsp)
       expect($stdout.string).to eq(%(Sent GET https://test.host/this/is/a/test
          > Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3
          > Accept: */*
@@ -196,11 +187,11 @@ RSpec.describe MrMurano::Http do
       $stderr = StringIO.new
 
       allow(@rsp).to receive(:body).and_return(%({"statusCode": 123, "message": "ok"}))
-      expect(@tst).to receive(:error).once.with(
+      expect(@hauth).to receive(:error).once.with(
         "Request Failed: 410: {\n  \"statusCode\": 123,\n  \"message\": \"ok\"\n}"
       )
 
-      @tst.showHttpError(@req, @rsp)
+      @hauth.showHttpError(@req, @rsp)
       expect($stdout.string).to eq('')
       expect($stderr.string).to eq('')
     end
@@ -211,10 +202,16 @@ RSpec.describe MrMurano::Http do
 
       idhttp = instance_double('Net::HTTP')
       expect(idhttp).to receive(:request).once.and_return(@rsp)
-      expect(@tst).to receive(:http).once.and_return(idhttp)
-      expect(@rsp).to receive(:body).and_return(%({"statusCode": 123, "message": "gone"}))
+      expect(@hauth).to receive(:http).once.and_return(idhttp)
+
+      # To test this:
+      #   $cfg['tool.curldebug'] = false
+      times = $cfg['tool.curldebug'] && 2 || 1
+      expect(@rsp).to receive(:body).exactly(times).times.and_return(
+        (%({"statusCode": 123, "message": "gone"}))
+      )
 
-      @tst.workit(@req)
+      @hauth.workit(@req)
       expect($stdout.string).to eq('')
       expect($stderr.string).to eq("\e[31mRequest Failed: 410: [123] gone\e[0m\n")
     end

data/spec/ProjectFile_spec.rb

@@ -14,7 +14,7 @@ require 'MrMurano/ProjectFile'
 require '_workspace'
 
 RSpec.describe MrMurano::ProjectFile do
-  context 'Basics ' do
+  context 'Basics' do
     include_context 'WORKSPACE'
     before(:example) do
       $cfg = MrMurano::Config.new

data/spec/Solution-ServiceConfig_spec.rb

@@ -7,10 +7,12 @@
 
 require 'tempfile'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Solution-ServiceConfig'
 require 'MrMurano/SyncRoot'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::ServiceConfig do
   include_context 'WORKSPACE'
@@ -24,11 +26,12 @@ RSpec.describe MrMurano::ServiceConfig do
     # serviceconfig works on all solution types.
     $cfg['product.id'] = 'XYZ'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     # ServiceConfig needs an api_id, else one could instantiate
     # ServiceConfigApplication or ServiceConfigProduct.
     @srv = MrMurano::ServiceConfig.new('XYZ')
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
   it 'initializes' do

data/spec/Solution-ServiceEventHandler_spec.rb

@@ -8,9 +8,11 @@
 require 'pathname'
 require 'tempfile'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Solution-Services'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::EventHandler do
   include_context 'WORKSPACE'
@@ -21,6 +23,7 @@ RSpec.describe MrMurano::EventHandler do
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     # 2017-06-23: EventHandler is an intermediate class now, and we
     # cannot use it because its @project_section is not defined.
@@ -29,7 +32,7 @@ RSpec.describe MrMurano::EventHandler do
     # the only different is if it uses application.id or product.id.
     @srv = MrMurano::EventHandlerSolnApp.new
     #@srv = MrMurano::EventHandlerSolnPrd.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
   it 'initializes' do
@@ -346,7 +349,7 @@ end
           event: 'datapoint',
           svc_alias: nil,
           type: nil,
-          line: 0,
+          line_beg: 0,
           line_end: 3,
           local_path: Pathname.new(tio.path),
           script: %(--#EVENT device datapoint\n-- do something.\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n)
@@ -383,7 +386,7 @@ end
             event: 'datapoint',
             svc_alias: nil,
             type: nil,
-            line: 1,
+            line_beg: 1,
             line_end: 3,
             local_path: Pathname.new(tio.path),
             script: %(--#EVENT device datapoint\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n),

data/spec/Solution-ServiceModules_spec.rb

@@ -8,9 +8,11 @@
 require 'pathname'
 require 'tempfile'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Solution-Services'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Module do
   include_context 'WORKSPACE'
@@ -21,9 +23,10 @@ RSpec.describe MrMurano::Module do
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Module.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
   it 'initializes' do

data/spec/Solution-UsersRoles_spec.rb

@@ -9,9 +9,11 @@ require 'pathname'
 require 'tempfile'
 require 'MrMurano/hash'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/Solution-Users'
 require 'MrMurano/SyncRoot'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Role do
   include_context 'WORKSPACE'
@@ -21,9 +23,10 @@ RSpec.describe MrMurano::Role do
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Role.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
   it 'initializes' do

data/spec/Solution_spec.rb

@@ -8,10 +8,12 @@
 require 'tempfile'
 require 'yaml'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Solution'
 require 'MrMurano/SyncRoot'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Solution do
   include_context 'WORKSPACE'
@@ -24,13 +26,14 @@ RSpec.describe MrMurano::Solution do
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['product.id'] = 'XYZ'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     # NOTE: This test works on either Product or Application.
     # MAYBE: Add Application to this test.
     @srv = MrMurano::Product.new
     #@srv = MrMurano::Application.new
 
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
   it 'initializes' do

data/spec/SyncUpDown_spec.rb

@@ -34,7 +34,7 @@ class TSUD
     @valid_api_id
   end
 
-  def fetch(id)
+  def fetch(id, _untainted=false)
   end
 
   def self.description

data/spec/Webservice-Cors_spec.rb

@@ -8,10 +8,12 @@
 require 'tempfile'
 require 'yaml'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/SyncRoot'
 require 'MrMurano/Webservice-Cors'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::Cors do
   include_context 'WORKSPACE'
@@ -21,9 +23,10 @@ RSpec.describe MrMurano::Webservice::Cors do
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Webservice::Cors.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
 
     @base_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors'
   end

data/spec/Webservice-Endpoint_spec.rb

@@ -9,8 +9,10 @@ require 'pathname'
 require 'tempfile'
 require '_workspace'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Webservice-Endpoint'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::Endpoint do
   include_context 'WORKSPACE'
@@ -21,9 +23,10 @@ RSpec.describe MrMurano::Webservice::Endpoint do
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Webservice::Endpoint.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
 
     @base_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint'
   end
@@ -483,7 +486,7 @@ RSpec.describe MrMurano::Webservice::Endpoint do
           path: '/one/two',
           content_type: 'application/json',
           local_path: Pathname.new(tio.path),
-          line: 0,
+          line_beg: 0,
           script: "--#ENDPOINT GET /one/two\nreturn request\n",
           line_end: 2,
         }
@@ -512,7 +515,7 @@ RSpec.describe MrMurano::Webservice::Endpoint do
               path: '/one/two',
               content_type: 'application/json',
               local_path: Pathname.new(tio.path),
-              line: 0,
+              line_beg: 0,
               script: "--#ENDPOINT GET /one/two\nreturn request\n",
               line_end: 2,
             },
@@ -521,7 +524,7 @@ RSpec.describe MrMurano::Webservice::Endpoint do
               path: '/one/two',
               content_type: 'application/json',
               local_path: Pathname.new(tio.path),
-              line: 2,
+              line_beg: 2,
               script: "--#ENDPOINT PUT /one/two\nreturn request\n",
               line_end: 4,
             },
@@ -530,7 +533,7 @@ RSpec.describe MrMurano::Webservice::Endpoint do
               path: '/three/two',
               content_type: 'application/json',
               local_path: Pathname.new(tio.path),
-              line: 4,
+              line_beg: 4,
               script: "--#ENDPOINT DELETE /three/two\nreturn request\n",
               line_end: 6,
             },
@@ -568,7 +571,7 @@ RSpec.describe MrMurano::Webservice::Endpoint do
           path: '/one/two',
           content_type: 'application/json',
           local_path: Pathname.new(tio.path),
-          line: 1,
+          line_beg: 1,
           script: "--#ENDPOINT GET /one/two\nreturn request\n",
           line_end: 3,
         }

data/spec/Webservice-File_spec.rb

@@ -7,9 +7,11 @@
 
 require 'pathname'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/Webservice-File'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::File do
   include_context 'WORKSPACE'
@@ -21,9 +23,10 @@ RSpec.describe MrMurano::Webservice::File do
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['product.id'] = 'XYZ'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Webservice::File.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
 
     @base_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file'
     @fileupload_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload'
@@ -104,6 +107,8 @@ RSpec.describe MrMurano::Webservice::File do
           }
         )
         .to_return(status: 200, body: 'nope')
+      # The progress bar clears itself, e.g., spaces to cover old message, than \r.
+      $cfg['tool.no-progress'] = true
       saved = $stdout
       $stdout = StringIO.new
       ret = @srv.fetch('/bob')
@@ -172,13 +177,17 @@ RSpec.describe MrMurano::Webservice::File do
             'Content-Type' => %r{multipart/form-data; boundary=.*},
           },
         )
+      $cfg['tool.no-progress'] = true
       $cfg['tool.curldebug'] = true
+      $cfg['tool.curlfancy'] = false
       $cfg.curlfile_f = nil
       saved = $stdout
       $stdout = StringIO.new
       @srv.upload(@lp, { path: '/one.text' }, false)
-      expect($stdout.string).to match(
-        %r{^curl -s -H 'Authorization: token TTTTTTTTTT'.*-X PUT '#{@fileupload_uri}/one.text' -F file=@.*$}
+      expect($stdout.string.lines).to match_array(
+        [
+          %r{^curl -s -H 'Authorization: token TTTTTTTTTT'.*-X PUT '#{@fileupload_uri}/one.text' -F file=@.*$},
+        ]
       )
       $stdout = saved
     end
@@ -255,7 +264,11 @@ RSpec.describe MrMurano::Webservice::File do
       expect(ret).to eq(
         path: '/files/one.text',
         mime_type: 'text/plain',
-        checksum: 'd1af3dadf08479a1d43b282f95d61dda8efda5e7'
+        # 2018-04-16: Did backend change from SHA1 to MD5 hash function?
+        #   You can calculate this with `sha1sum one.text`
+        #checksum: 'd1af3dadf08479a1d43b282f95d61dda8efda5e7'
+        #   You can calculate this with `md5sum one.text`
+        checksum: 'e9ea4a5be73a09f541ad0b611083f0df'
       )
     end
   end

data/spec/Webservice-Setting_spec.rb

@@ -8,10 +8,12 @@
 require 'tempfile'
 require 'yaml'
 require 'MrMurano/version'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/SyncRoot'
 require 'MrMurano/Webservice-Cors'
 require '_workspace'
+require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::Settings do
   include_context 'WORKSPACE'
@@ -21,11 +23,13 @@ RSpec.describe MrMurano::Webservice::Settings do
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
+    stub_request_email_password
 
     @srv = MrMurano::Webservice::Settings.new
-    allow(@srv).to receive(:token).and_return('TTTTTTTTTT')
 
-    @base_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors'
+    MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
+
+    @base_uri = "#{$cfg['net.protocol']}://#{$cfg['net.host']}/api:1/solution/XYZ/cors"
   end
 
   it 'initializes' do

data/spec/_workspace.rb

@@ -12,6 +12,7 @@ require 'tmpdir'
 RSpec.shared_context 'WORKSPACE' do
   around(:example) do |ex|
     @testdir = Pathname.new(Dir.pwd).realpath
+    $exited_abnormally = true
     Dir.mktmpdir do |hdir|
       @tmpdir = hdir
       saved_home = ENV['HOME']
@@ -27,6 +28,7 @@ RSpec.shared_context 'WORKSPACE' do
       end
       ENV['HOME'] = saved_home
     end
+    $exited_abnormally = false
   end
 end