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

data/spec/cmd_setting_product_spec.rb

@@ -16,68 +16,78 @@ RSpec.describe 'murano product setting', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('settingtest')
-    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', @product_name, '-y'))
+    out, err = murano_command_run('solution delete', @product_name, '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   context 'Writes (using Device2.identity_format)' do
     before(:example) do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+      )
       expect { @json_before = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
     end
     # {'prefix'=>'', 'type'=>'opaque', 'options'=>{'casing'=>'mixed', 'length'=>0}}
 
     it 'a string value', :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', 'fidget'))
+      out, err = murano_command_run(
+        'setting write', 'Device2.identity_format', 'prefix', 'fidget',
+      )
       expect(err).to eq('')
       expect(out).to eq('')
-      expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+      )
       json_after = nil
       expect { json_after = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
       @json_before['prefix'] = 'fidget'
       expect(json_after).to match(@json_before)
     end
 
     it 'a forced string value', :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string', 'fidget'))
+      out, err = murano_command_run(
+        'setting write', 'Device2.identity_format', 'prefix', '--string', 'fidget',
+      )
       expect(err).to eq('')
       expect(out).to eq('')
-      expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+      )
       json_after = nil
       expect { json_after = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
       @json_before['prefix'] = 'fidget'
       expect(json_after).to match(@json_before)
     end
 
     it 'a forced string value on STDIN', :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string'), stdin_data: 'fidget')
+      # FIXME: (lb): Replace capcmd with murano_command_run (need to handle stdin_data).
+      out, err, status = Open3.capture3(capcmd(
+        'murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string',
+      ), stdin_data: 'fidget')
       expect(err).to eq('')
       expect(out).to eq('')
       expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+      )
       json_after = nil
       expect { json_after = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
       @json_before['prefix'] = 'fidget'
       expect(json_after).to match(@json_before)
     end
@@ -100,53 +110,62 @@ RSpec.describe 'murano product setting', :cmd, :needs_password do
 
     context 'a number value' do
       it 'integer 12', :club_10s do
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12'))
+        out, err = murano_command_run(
+          'setting write', 'Device2.identity_format', 'options.length', '--num', '12',
+        )
         expect(err).to eq('')
         expect(out).to eq('')
-        expect(status.exitstatus).to eq(0)
 
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+        out, err = murano_command_run(
+          'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+        )
         json_after = nil
         expect { json_after = JSON.parse(out) }.to_not raise_error
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
         @json_before.set('options.length', 12)
         expect(json_after).to match(@json_before)
       end
 
       it 'float 12.67', :club_10s do
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12.67'))
+        out, err = murano_command_run(
+          'setting write', 'Device2.identity_format', 'options.length', '--num', '12.67',
+        )
         expect(err).to eq('')
         expect(out).to eq('')
-        expect(status.exitstatus).to eq(0)
 
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+        out, err = murano_command_run(
+          'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+        )
         json_after = nil
         expect { json_after = JSON.parse(out) }.to_not raise_error
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
         @json_before.set('options.length', 12.67)
         expect(json_after).to match(@json_before)
       end
 
       it 'fiftyHalf' do
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', 'fiftyHalf'))
-        expect(err).to eq("\e[31mValue \"fiftyHalf\" is not a number\e[0m\n")
+        out, err = murano_command_exits(
+          'setting write', 'Device2.identity_format', 'options.length', '--num', 'fiftyHalf',
+        )
+        expect(err).to eq("Value \"fiftyHalf\" is not a number\n")
         expect(out).to eq('')
-        expect(status.exitstatus).to eq(2)
       end
 
       it 'on STDIN' do
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num'), stdin_data: '12')
+        # FIXME: (lb): Replace capcmd with murano_command_run (need to handle stdin_data).
+        out, err, status = Open3.capture3(capcmd(
+          'murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num'
+        ), stdin_data: '12')
         expect(err).to eq('')
         expect(out).to eq('')
         expect(status.exitstatus).to eq(0)
 
-        out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+        out, err = murano_command_run(
+          'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+        )
         json_after = nil
         expect { json_after = JSON.parse(out) }.to_not raise_error
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
         @json_before.set('options.length', 12)
         expect(json_after).to match(@json_before)
       end
@@ -192,16 +211,18 @@ RSpec.describe 'murano product setting', :cmd, :needs_password do
 #    end
 
     it 'merges into a dictionary', :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', '.', '--dict', '--merge', 'prefix', 'tix', 'type', 'base10'))
+      out, err = murano_command_run(
+        'setting write', 'Device2.identity_format', '.', '--dict', '--merge', 'prefix', 'tix', 'type', 'base10',
+      )
       expect(err).to eq('')
       expect(out).to eq('')
-      expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Device2.identity_format', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Device2.identity_format', '-c', 'outformat=json',
+      )
       json_after = nil
       expect { json_after = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
       @json_before['prefix'] = 'tix'
       @json_before['type'] = 'base10'
       expect(json_after).to match(@json_before)
@@ -210,10 +231,11 @@ RSpec.describe 'murano product setting', :cmd, :needs_password do
 
   context 'Writes (using Webservice.cors)' do
     before(:example) do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'read', 'Webservice.cors', '-c', 'outformat=json'))
+      out, err = murano_command_run(
+        'setting read', 'Webservice.cors', '-c', 'outformat=json',
+      )
       expect { @json_before = JSON.parse(out) }.to_not raise_error
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
     end
     # {'origin'=>true,
     # 'methods'=>['HEAD', 'GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH'],

data/spec/cmd_status_spec.rb

@@ -10,31 +10,40 @@ require 'json'
 require 'open3'
 require 'os'
 require 'rbconfig'
+require 'time'
 
 require 'cmd_common'
 
 RSpec.describe 'murano status', :cmd, :needs_password do
   include_context 'CI_CMD'
 
+  before(:all) do
+    @timeit_time0 = Time.now
+  end
+
+  after(:all) do
+    # FIXME/DRY: Report elapsed time.
+    elapsed_secs = Time.now - @timeit_time0
+    puts "CI_CMD: elapsed_secs: #{elapsed_secs}"
+  end
+
   before(:example) do
     @product_name = rname('statusTest')
-    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)
 
     @applctn_name = rname('statusTest')
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'application', 'create', @applctn_name, '--save')
+    out, err = murano_command_run(
+      'solution create', '--type', 'application', @applctn_name, '--save',
     )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'syncdown', '--services', '--no-delete', '--no-update')
+    out, err = murano_command_run(
+      'syncdown', '--services', '--no-delete', '--no-update',
     )
     # NOTE: 2017-12-14: (landonb): The new behavior is that MurCLI will treat
     #   platform scripts that are simply empty strings as not being in conflict
@@ -49,32 +58,29 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   after(:example) do
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+    out, err = murano_command_run(
+      'solution delete', @applctn_name, '-y',
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(
-      capcmd('murano', 'solution', 'delete', @product_name, '-y')
+    out, err = murano_command_run(
+      'solution delete', @product_name, '-y',
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   def match_syncable_contents(slice)
     expect(slice).to include(
       a_string_matching(%r{ \+ \w  .*modules/table_util\.lua}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:7}),
-      a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:1-4}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:5-7}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:8-11}),
+      a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua:1-5}),
       a_string_matching(%r{ \+ \w  .*files/js/script\.js}),
       a_string_matching(%r{ \+ \w  .*files/icon\.png}),
       a_string_matching(%r{ \+ \w  .*files/index\.html}),
@@ -93,9 +99,9 @@ RSpec.describe 'murano status', :cmd, :needs_password do
   def match_syncable_contents_except_single_route(slice)
     expect(slice).to include(
       a_string_matching(%r{ \+ \w  .*modules/table_util\.lua}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
-      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:7}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:1-4}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:5-7}),
+      a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:8-11}),
       a_string_matching(%r{ \+ \w  .*files/icon\.png}),
       a_string_matching(%r{ \+ \w  .*files/index\.html}),
       a_string_matching(%r{ \+ \w  .*files/js/script\.js}),
@@ -104,11 +110,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
 
   def match_remote_boilerplate_v1_0_0_service(slice)
     expect(slice).to include(
-      a_string_matching(/ - \w  config_service/),
-      a_string_matching(/ - \w  config_status/),
-      a_string_matching(/ - \w  user_account\.lua/),
-      a_string_matching(/ - \w  config_service/),
-      a_string_matching(/ - \w  config_status/),
+      a_string_matching(/ - \w  user_account\.lua \[phantom\]/),
     )
   end
 
@@ -124,50 +126,20 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     it 'status', :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      out, err = murano_command_run('status')
       expect(err).to eq('')
-      # Two problems with this output.
-      # 1: Order of files is not set
-      # 2: Path prefixes could be different.
       olines = out.lines
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents(olines[5..12])
-      #expect(olines[13]).to eq("Nothing new remotely\n")
-      expect(olines[13]).to eq("Only on remote server:\n")
-      expect(olines[14]).to eq(" - I  config_service\n")
-      expect(olines[15]).to eq(" - I  config_status\n")
-      # FIMXE/2017-06-23: We should DRY this long list which is same in each test.
-      # FIXME/2017-06-23: The interfaces the server creates for a new project
-      #   will problem vary depending on what modules are loaded, and are likely
-      #   to change over time...
-      #match_remote_boilerplate_v1_0_0_service(olines[14..35])
-
-      # NOTE: On Windows, touch doesn't work, so items differ.
-      # Check the platform, e.g., 'linux-gnu', or other.
-      # 2017-07-14 08:51: Is there a race condition here? [lb] saw
-      # differences earlier, but then not after adding this...
-      #is_windows = (
-      #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      #)
-      #if OS.windows?
-      #  expect(olines[14]).to eq("Items that differ:\n")
-      #  expect(olines[15..16]).to contain_exactly(
-      #    a_string_matching(%r{ M \w  .*services/timer_timer\.lua}),
-      #    a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
-      #  )
-      #else
-      expect(olines[16]).to eq("Nothing that differs\n")
-      #end
-
-      expect(status.exitstatus).to eq(0)
+      expect(olines[13]).to eq("Nothing new remotely\n")
+      expect(olines[14]).to eq("Nothing that differs\n")
     end
 
     it 'matches file path', :broken_on_windows, :club_20s, :club_10s do
       # capcmd calls shellwords, which escapes strings so that Open3 doesn't
       # expand them. E.g., **/ would expand to the local directory name.
-      status_cmd = capcmd('murano', 'status', '**/icon.png')
-      out, err, status = Open3.capture3(status_cmd)
+      out, err = murano_command_run('status', '**/icon.png')
       expect(err).to eq('')
       expect(out.lines).to match(
         [
@@ -177,21 +149,19 @@ RSpec.describe 'murano status', :cmd, :needs_password do
           "Nothing that differs\n",
         ]
       )
-      expect(status.exitstatus).to eq(0)
     end
 
     it 'matches route', :broken_on_windows, :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'status', '#put#'))
+      out, err = murano_command_run('status', '#put#')
       expect(err).to eq('')
       expect(out.lines).to match(
         [
           "Only on local machine:\n",
-          a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
+          a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:5-7}),
           "Nothing new remotely\n",
           "Nothing that differs\n",
         ]
       )
-      expect(status.exitstatus).to eq(0)
     end
   end
 
@@ -214,17 +184,14 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     it 'status', :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      out, err = murano_command_run('status')
       expect(err).to eq('')
       olines = out.lines
 
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents(olines[5..12])
-      #expect(olines[13]).to eq("Nothing new remotely\n")
-      expect(olines[13]).to eq("Only on remote server:\n")
-      expect(olines[14]).to eq(" - I  config_service\n")
-      expect(olines[15]).to eq(" - I  config_status\n")
+      expect(olines[13]).to eq("Nothing new remotely\n")
 
       # NOTE: On Windows, touch doesn't work, so items differ.
       # Check the platform, e.g., 'linux-gnu', or other.
@@ -232,20 +199,17 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       #)
       if OS.windows?
-        expect(olines[16]).to eq("Items that differ:\n")
-        expect(olines[17..18]).to include(
+        expect(olines[14]).to eq("Items that differ:\n")
+        expect(olines[15..16]).to include(
           a_string_matching(%r{ M \w  .*services/timer_timer\.lua}),
           a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
         )
       else
-        expect(olines[16]).to eq("Nothing that differs\n")
+        expect(olines[14]).to eq("Nothing that differs\n")
       end
-
-      expect(status.exitstatus).to eq(0)
     end
   end
 
-  # XXX wait, should a Solutionfile even work with Okami?
   context 'with Solutionfile 0.2.0' do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
@@ -273,7 +237,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     it 'status', :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      out, err = murano_command_run('status')
       expect(err).to eq('')
       # Not a single match, because the order of items within groups can shift
       olines = out.lines
@@ -281,9 +245,8 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents_except_single_route(olines[5..11])
       expect(olines[12]).to eq("Only on remote server:\n")
-      match_remote_boilerplate_v1_0_0_service(olines[13..17])
-      expect(olines[18]).to eq("Nothing that differs\n")
-      expect(status.exitstatus).to eq(0)
+      match_remote_boilerplate_v1_0_0_service(olines[13..13])
+      expect(olines[14]).to eq("Nothing that differs\n")
     end
   end
 
@@ -318,16 +281,15 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     end
 
     it 'status', :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      out, err = murano_command_run('status')
       expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
       match_syncable_contents_except_single_route(olines[5..11])
       expect(olines[12]).to eq("Only on remote server:\n")
-      match_remote_boilerplate_v1_0_0_service(olines[13..17])
-      expect(olines[18]).to eq("Nothing that differs\n")
-      expect(status.exitstatus).to eq(0)
+      match_remote_boilerplate_v1_0_0_service(olines[13..13])
+      expect(olines[14]).to eq("Nothing that differs\n")
     end
   end
 end