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

data/spec/Webservice-Setting_spec.rb

@@ -6,7 +6,9 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'tempfile'
+require 'webmock'
 require 'yaml'
+
 require 'MrMurano/version'
 require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
@@ -17,8 +19,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::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'
@@ -32,6 +34,10 @@ RSpec.describe MrMurano::Webservice::Settings do
     @base_uri = "#{$cfg['net.protocol']}://#{$cfg['net.host']}/api:1/solution/XYZ/cors"
   end
 
+  after(:example) do
+    WebMock.reset!
+  end
+
   it 'initializes' do
     uri = @srv.endpoint('/')
     expect(uri.to_s).to eq("#{@base_uri}/")

data/spec/_workspace.rb

@@ -10,6 +10,15 @@ require 'pathname'
 require 'tmpdir'
 
 RSpec.shared_context 'WORKSPACE' do
+  before(:context) do
+    @timeit_time0 = Time.now
+  end
+
+  after(:context) do
+    elapsed_secs = Time.now - @timeit_time0
+    puts "\n  .. elapsed: #{elapsed_secs.round(2)} secs."
+  end
+
   around(:example) do |ex|
     @testdir = Pathname.new(Dir.pwd).realpath
     $exited_abnormally = true

data/spec/cmd_business_spec.rb

@@ -20,49 +20,44 @@ RSpec.describe 'murano business', :cmd, :needs_password do
 
   context 'list' do
     it 'as table' do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list'))
+      out, err = murano_command_run('business list')
       expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+){3}\+$/)
       expect(olines[1]).to match(/^\| bizid\s+\| role\s+\| name\s+\|$/)
       expect(olines[2]).to match(/^(\+-+){3}\+$/)
       expect(olines[-1]).to match(/^(\+-+){3}\+$/)
-      expect(status.exitstatus).to eq(0)
     end
 
     it 'as json' do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '-c', 'outformat=json'))
+      out, err = murano_command_run('business list', '-c', 'outformat=json')
       expect(err).to eq('')
       expect { JSON.parse(out) }.to_not raise_error
-      expect(status.exitstatus).to eq(0)
     end
 
     it 'only ids' do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--idonly'))
+      out, err = murano_command_run('business list', '--idonly')
       expect(err).to eq('')
       expect(out).to match(/^(\S+\s)*\S+$/)
-      expect(status.exitstatus).to eq(0)
     end
 
     it 'output to file' do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--idonly', '-o', 'bob'))
+      out, err = murano_command_run('business list', '--idonly', '-o', 'bob')
       expect(err).to eq('')
       expect(out).to eq('')
-      expect(status.exitstatus).to eq(0)
       expect(File.exist?('bob')).to be true
       data = IO.read('bob')
       expect(data).to match(/^(\S+\s)*\S+$/)
     end
 
     it 'fewer fields' do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--brief'))
+      out, err = murano_command_run('business list', '--brief')
       expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+)+\+$/)
       expect(olines[1]).to match(/^(\| \S+\s+)+\|$/)
       expect(olines[2]).to match(/^(\+-+)+\+$/)
       expect(olines[-1]).to match(/^(\+-+)+\+$/)
-      expect(status.exitstatus).to eq(0)
     end
   end
 end

data/spec/cmd_common.rb

@@ -10,7 +10,9 @@ require 'highline'
 require 'highline/import'
 require 'os'
 require 'pathname'
+require 'rainbow'
 require 'shellwords'
+require 'time'
 require 'timeout'
 require 'tmpdir'
 require 'webmock/rspec'
@@ -23,30 +25,39 @@ require 'MrMurano/HttpAuthed'
 # - Note that this comes before importing Commander.
 $exited_abnormally = false
 
+$catpured_io = false
+
 def capture_stdio
+  return if $catpured_io
   $murcli_wasout = $stdout
   $murcli_waserr = $stderr
   $murcli_wasterm = $terminal
+  $catpured_io = true
 end
 capture_stdio
 
 def restore_stdio
+  return unless $catpured_io
   $stdout = $murcli_wasout
   $stderr = $murcli_waserr
   $terminal = $murcli_wasterm
+  $murcli_wasout = nil
+  $murcli_waserr = nil
+  $murcli_wasterm = nil
+  $catpured_io = false
 end
 
 at_exit do
   if $exited_abnormally
     restore_stdio
     warn('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-    warn(%(         ____                      ))
-    warn(%{       ,%(   Y`.                   })
-    warn(%(      /        \                   ))
-    warn(%(      \ ()  () /                   ))
-    warn(%{       `. /\ ,%(                   })
-    warn(%(   8====| "" |====8                ))
-    warn(%(        `LLLU'                     ))
+    warn(%(              ____                 ))
+    warn(%{            ,%(   Y`.              })
+    warn(%(           /        \              ))
+    warn(%(           \ ()  () /              ))
+    warn(%{            `. /\ ,%(              })
+    warn(%(        8====| "" |====8           ))
+    warn(%(             `LLLU'                ))
     warn(%(                                   ))
     warn('¡Unexpected spec exit killed rspec!')
     warn('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
@@ -159,9 +170,9 @@ RSpec.shared_context 'CI_CMD' do
   # *** Utility fcns: Murano Solutions management: create/delete/expunge.
 
   def murano_solutions_expunge_yes
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solutions', 'expunge', '-y')
-    )
+    # (lb): Cannot really use murano_command_run or murano_command_exits
+    # because we don't know if it'll exit or not.
+    out, err, status = Open3.capture3(capcmd('murano', 'solutions', 'expunge', '-y'))
     expect(out).to \
       eq('').or \
         eq("No solutions found\n").or \
@@ -175,53 +186,45 @@ RSpec.shared_context 'CI_CMD' do
     murano_solutions_expunge_yes if defined?(PRE_EXPUNGE) && PRE_EXPUNGE
 
     @proj_name_prod = rname('MurCLITestProd')
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'product', 'create', @proj_name_prod, '--save')
+    # NOTE: Do not use alias, which resolves to base command, but without options.
+    #   E.g., use 'solution create', ...; and not 'product create'.
+    out, err = murano_command_run(
+      'solution create', '--type', 'product', @proj_name_prod, '--save',
     )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
 
     @proj_name_appy = rname('MurCLITestAppy')
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'application', 'create', @proj_name_appy, '--save')
+    out, err = murano_command_run(
+      'solution create', '--type', 'application', @proj_name_appy, '--save',
     )
     expect(err).to eq('')
     soln_id = out
     expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
 
     project_up_link unless skip_link
   end
 
   def project_up_link
-    out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
-    #expect(out).to a_string_starting_with("Linked product #{@proj_name_prod}")
+    out, err = murano_command_run('assign set')
     olines = out.lines
     expect(strip_fancy(olines[0])).to eq(
       "Linked '#{@proj_name_prod}' to '#{@proj_name_appy}'\n"
     )
     expect(olines[1]).to eq("Created default event handler\n")
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   def project_down
     return if defined?(PRE_EXPUNGE) && PRE_EXPUNGE
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solution', 'delete', @proj_name_appy, '-y')
-    )
+    out, err = murano_command_run('solution delete', @proj_name_appy, '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solution', 'delete', @proj_name_prod, '-y')
-    )
+    out, err = murano_command_run('solution delete', @proj_name_prod, '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   # Utility fcns: Strings.
@@ -239,7 +242,7 @@ RSpec.shared_context 'CI_CMD' do
   end
 
   def strip_color(str)
-    str.gsub(/\e\[(\d+)m/, '')
+    str.gsub(/\e\[[;0-9]+m/, '')
   end
 
   def strip_fancy(str)
@@ -268,6 +271,10 @@ RSpec.shared_context 'CI_CMD' do
     murano_command_runner(cmd, *args)
   end
 
+  def murano_command_run_gentle(cmd, *args)
+    murano_command_runner(cmd, *args, skip_cfg: true)
+  end
+
   def murano_command_exits(cmd, *args)
     murano_command_runner(cmd, *args, wont_run: true)
   end
@@ -276,7 +283,9 @@ RSpec.shared_context 'CI_CMD' do
     murano_command_runner(cmd, *args, wont_parse: true)
   end
 
-  def murano_command_runner(cmd, *args, wont_run: false, wont_parse: false)
+  def murano_command_runner(
+    cmd, *args, wont_run: false, wont_parse: false, skip_cfg: false
+  )
     # This is a functional test, so tell WebMock to back off.
     allow_net_conn = WebMock::Config.instance.allow_net_connect != false
     WebMock.allow_net_connect!
@@ -303,10 +312,17 @@ RSpec.shared_context 'CI_CMD' do
     # at_exit, it uses runner.command_exit to tell ReCommander's at_exit
     # monkey patch not to call Commander.run!. Via rspec, we don't use the
     # at_exit hook, or ReCommander.
-    $cfg = MrMurano::Config.new(::Commander::Runner.instance)
-    $cfg.load
-    $cfg['tool.no-progress'] = true
+    unless skip_cfg
+      $cfg = MrMurano::Config.new(::Commander::Runner.instance)
+      $cfg.load
+      $cfg['tool.no-progress'] = true
+
+      # In case the test runner installed a project file.
+      $project = MrMurano::ProjectFile.new
+      $project.load
+    end
     $cfg.validate_cmd
+
     runner = ::Commander::Runner.instance
     unless defined?(runner.command_exit) && runner.command_exit
       # (lb): Commander's at_exit hook calls runner.run! which runs the
@@ -314,6 +330,7 @@ RSpec.shared_context 'CI_CMD' do
       # few different ways to reset Runner.instance, but nothing worked;
       # our best bet is to just call the command directly.
       the_cmd = command(cmd.to_sym)
+      raise "Specified command not recognized! “#{cmd}”" if the_cmd.nil?
       when_called = the_cmd.peek_when_called.dup
 
       runner.force_args(args.dup)
@@ -332,6 +349,12 @@ RSpec.shared_context 'CI_CMD' do
             # This is unexpected. Leave $exited_abnormally so we warn the user.
             restore_stdio
             raise
+          rescue SystemExit => _err
+            # This happens if the CLI calls exit, but the test runner was not
+            # expecting it to exit (because otherwise the test runner would
+            # have called this method with wont_run: true). So long as our
+            # $exited_abnormally works as intended, we have nothing to do.
+            raise
           end
         end
       end
@@ -350,6 +373,9 @@ RSpec.shared_context 'CI_CMD' do
 
     WebMock.disable_net_connect! unless allow_net_conn
 
+    HighLine.use_color = true
+    Rainbow.enabled = true
+
     [strip_color(tmpout.string), strip_color(tmperr.string)]
   end
 
@@ -363,6 +389,15 @@ RSpec.shared_context 'CI_CMD' do
 
   # *** before() and around()
 
+  before(:context) do
+    @timeit_time0 = Time.now
+  end
+
+  after(:context) do
+    elapsed_secs = Time.now - @timeit_time0
+    puts "\n  .. elapsed: #{elapsed_secs.round(2)} secs."
+  end
+
   # Before: Load Config.
   before(:example) do
     $cfg = MrMurano::Config.new

data/spec/cmd_config_spec.rb

@@ -13,17 +13,15 @@ RSpec.describe 'murano config', :cmd do
   include_context 'CI_CMD'
 
   it 'Needs a key' do
-    out, err, status = Open3.capture3(capcmd('murano', 'config'))
-    expect(status).to eq(0)
-    expect(out).to eq("\e[31mNeed a config key\e[0m\n")
+    out, err = murano_command_run('config')
+    expect(out).to eq("Need a config key\n")
     expect(err).to eq('')
   end
 
   it 'Sets a key' do
-    out, err, status = Open3.capture3(capcmd(%w[murano config bob build]))
+    out, err = murano_command_run('config', 'bob', 'build')
     expect(out).to eq('')
-    expect(err).to eq('')
-    expect(status).to eq(0)
+    expect(err).to eq("WARNING: Unknown key ‘tool.bob’ set to ‘build’\n")
 
     afile = IO.read(File.join(@tmpdir, '.murano/config'))
     bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_tool_bob').read
@@ -33,10 +31,9 @@ RSpec.describe 'murano config', :cmd do
   it 'Sets a user key' do
     user_cfg = File.join(ENV['HOME'], '.murano', 'config')
     File.unlink(user_cfg) if File.exist? user_cfg
-    out, err, status = Open3.capture3(capcmd(%w[murano config bob build --user]))
-    expect(status).to eq(0)
+    out, err = murano_command_run('config', 'bob', 'build', '--user')
     expect(out).to eq('')
-    expect(err).to eq('')
+    expect(err).to eq("WARNING: Unknown key ‘tool.bob’ set to ‘build’\n")
 
     afile = IO.read(user_cfg)
     bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_tool_bob').read
@@ -50,10 +47,9 @@ RSpec.describe 'murano config', :cmd do
       File.join(@tmpdir, '.murano', 'config'),
       verbose: true
     )
-    out, err, status = Open3.capture3(capcmd(%w[murano config --project doThisTest.bob]))
-    expect(status).to eq(0)
+    out, err = murano_command_run('config', '--project', 'doThisTest.bob')
     expect(out).to eq("build\n")
-    expect(err).to eq('')
+    expect(err).to eq("WARNING: Unknown key ‘doThisTest.bob’ set to ‘build’\n")
   end
 
   it 'Removes a key' do
@@ -64,8 +60,7 @@ RSpec.describe 'murano config', :cmd do
       rcf,
       verbose: true
     )
-    out, err, status = Open3.capture3(capcmd(%w[murano config --project --unset doThisTest.bob]))
-    expect(status).to eq(0)
+    out, err = murano_command_run('config', '--project', '--unset', 'doThisTest.bob')
     expect(out).to eq('')
     expect(err).to eq('')
 

data/spec/cmd_content_spec.rb

@@ -15,25 +15,23 @@ RSpec.describe 'murano content', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('contestTest')
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'product', 'create', @product_name, '--save')
+    out, err = murano_command_run(
+      'solution create', '--type', 'product', @product_name, '--save',
     )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
   end
 
   after(:example) do
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solution', 'delete', '--yes', @product_name)
+    out, err = murano_command_run(
+      'solution delete', '--yes', @product_name,
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'life cycle', :club_10s do
-    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    out, err = murano_command_run('content list')
     #expect(out.lines).to match(
     #  [
     #    a_string_matching(/^(\+-+){2}\+$/),
@@ -44,18 +42,16 @@ RSpec.describe 'murano content', :cmd, :needs_password do
     #)
     #expect(err).to eq('')
     expect(out.lines).to match([])
-    expect(err).to eq("\e[33mDid not find any content\e[0m\n")
-    expect(status.exitstatus).to eq(0)
+    expect(err).to eq("Did not find any content\n")
 
     FileUtils.copy(File.join(@testdir, 'spec/fixtures/dumped_config'), 'myFile')
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'content', 'upload', 'myFile', '--tags', 'random=junk')
+    out, err = murano_command_run(
+      'content upload', 'myFile', '--tags', 'random=junk',
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    out, err = murano_command_run('content list')
     expect(err).to eq('')
     expect(out.lines).to match(
       [
@@ -66,9 +62,8 @@ RSpec.describe 'murano content', :cmd, :needs_password do
         a_string_matching(/^(\+-+){2}\+$/),
       ]
     )
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'content', 'info', 'myFile'))
+    out, err = murano_command_run('content info', 'myFile')
     expect(err).to eq('')
     expect { out = YAML.load(out) }.to_not raise_error
     expect(out).to match(
@@ -80,27 +75,22 @@ RSpec.describe 'murano content', :cmd, :needs_password do
         'random' => 'junk',
       }
     )
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'content', 'download', 'myFile', '-o', 'testDown')
+    out, err = murano_command_run(
+      'content download', 'myFile', '-o', 'testDown',
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
     expect(File.exist?('testDown')).to be true
     dcf = IO.read('myFile')
     tdf = IO.read('testDown')
     expect(tdf).to eq(dcf)
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'content', 'delete', 'myFile', '-y')
-    )
+    murano_command_run('content delete', 'myFile', '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    out, err = murano_command_run('content list')
     #expect(out.lines).to match(
     #  [
     #    a_string_matching(/^(\+-+){2}\+$/),
@@ -111,8 +101,7 @@ RSpec.describe 'murano content', :cmd, :needs_password do
     #)
     #expect(err).to eq('')
     expect(out.lines).to match([])
-    expect(err).to eq("\e[33mDid not find any content\e[0m\n")
-    expect(status.exitstatus).to eq(0)
+    expect(err).to eq("Did not find any content\n")
   end
 end