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

data/spec/cmd_syncup_spec.rb

@@ -16,46 +16,41 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
     murano_solutions_expunge_yes
 
     @product_name = rname('syncupTestPrd')
-    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('syncupTestApp')
-    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('')
     soln_id = out
     expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
+    out, err = murano_command_run('assign set')
     #expect(out).to a_string_starting_with("Linked product #{@product_name}")
     olines = out.lines
     expect(strip_fancy(olines[0]))
       .to eq("Linked '#{@product_name}' to '#{@applctn_name}'\n")
     expect(olines[1]).to eq("Created default event handler\n")
     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, status = 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, status = murano_command_run(
+      'solution delete', @product_name, '-y',
     )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   context 'without ProjectFile' do
@@ -78,12 +73,12 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       #     ‘/tmp/d20170809-7670-z315jn/project/services’ (Interfaces)
       expect(elines).to(satisfy { |_v| elines.length == 2 })
       elines.each do |line|
-        expect(strip_fancy(line)).to start_with("\e[33mSkipping missing location '")
+        expect(strip_fancy(line)).to start_with("Skipping missing location '")
       end
     end
 
     it 'syncup', :club_40s, :club_30s, :club_20s, :club_10s do
-      out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
+      out, err = murano_command_run('syncup')
       outl = out.lines
       # The spec tests set --no-progress, so each sync action gets reported.
       # You'll see:
@@ -101,13 +96,9 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       #   expect(outl[5]).to eq("Adding item table_util\n")
       expect(outl[5]).to start_with('Adding item ')
       expect(outl[5]).to end_with("table_util\n")
-      # => "Removing item config_service\n",
-      # => "Removing item config_status\n",
-      # => "Removing item user_account\n",
-      # => "Removing item k58sn37r6qz800000_event\n",
-      # => "Removing item config_service\n",
-      # => "Removing item config_status\n",
-      (6..11).each { |ln| expect(outl[ln]).to start_with('Removing item ') }
+      expect(outl[6]).to eq("Clearing item user_account\n")
+      # => "Clearing item k58sn37r6qz800000_event\n",
+      expect(outl[7]).to start_with('Clearing item ')
       # => "Adding item POST_/api/fire\n",
       # => "Adding item PUT_/api/fire/{code}\n",
       # => "Adding item DELETE_/api/fire/{code}\n",
@@ -115,11 +106,10 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       # => "Adding item /icon.png\n",
       # => "Adding item /\n",
       # => "Adding item /js/script.js\n",
-      (12..18).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
+      (8..14).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
       verify_err_missing_location(err)
-      expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      out, err = murano_command_run('status')
       # MUR-6477/MUR-6479: Uploading empty files broken. There's a fix in
       # the pipeline, but until then, disable the original expect.
       # FIXME: Why is files/icon.png showing up as different?
@@ -134,41 +124,16 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
         expect(out.lines).to match(
           [
             "Nothing new locally\n",
-            "Only on remote server:\n",
-            " - S  config_service\n",
-            " - S  config_status\n",
-            " - I  config_service\n",
-            " - I  config_status\n",
-            "Items that differ:\n",
-            # FIXME/MUR-6477/MUR-6479: Remove these two lines after fix released.
-            " M A  files/index.html\n",
-            " M A  files/js/script.js\n",
+            "Nothing new remotely\n",
+            "Nothing that differs\n",
           ]
         )
       end
       verify_err_missing_location(err)
-      expect(status.exitstatus).to eq(0)
-
-      out, err, status = Open3.capture3(capcmd('murano', 'diff'))
-      expect(out.lines).to match(
-        [
-          " - S  config_service\n",
-          " - S  config_status\n",
-          " - I  config_service\n",
-          " - I  config_status\n",
-          # FIXME/MUR-6477/MUR-6479: Uploading empty files is currently broken.
-          #   So these two diffs show the newline kludge. Change this when fixed.
-          # 2018-04-23 16:30: ???: Happening on Jenkins server:
-          #" M A  files/index.html\n",
-          #"@@ -1 +0,0 @@\n",
-          #"-\n",
-          #" M A  files/js/script.js\n",
-          #"@@ -1 +0,0 @@\n",
-          #"-\n",
-        ]
-      )
+
+      out, err = murano_command_run('status', '--diff', '--no-grouped')
+      expect(out).to eq('')
       verify_err_missing_location(err)
-      expect(status.exitstatus).to eq(0)
     end
   end
 

data/spec/cmd_token_spec.rb

@@ -22,9 +22,6 @@ RSpec.describe 'murano token', :cmd, :needs_password, :nondeterministic do
   end
 
   context 'with project' do
-    #before(:example) { project_up }
-    #after(:example) { project_down }
-
     def expect_token_host_user_table(stdout, stderr, num_cols: nil)
       expect(stderr).to eq('')
       lines = stdout.lines

data/spec/cmd_usage_spec.rb

@@ -16,27 +16,33 @@ RSpec.describe 'murano usage', :cmd, :needs_password do
     # NOTE: The usage command works on one or more solutions of any type.
     @product_name = rname('usageTest')
 
-    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)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
+    out, err = murano_command_run(
+      'solution create', '--type', 'application', @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', 'solutions', 'expunge', '--yes'))
+    out, err = murano_command_run('solutions expunge', '--yes')
     expect(out).to eq("Deleted 2 solutions\n")
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   def confirm_usage_table(olines, ix)
-    expect(olines[ix + 0]).to match(%r{^(Product|Application): usage[tT]est[a-z0-9]+ <[a-z0-9]+> https://[.\-a-z0-9]+$})
+    expect(olines[ix + 0]).to match(
+      %r{^(Product|Application): usage[tT]est[a-z0-9]+ <[a-z0-9]+> https://[.\-a-z0-9]+$}
+    )
     expect(olines[ix + 1]).to match(/^(\+-+){5}\+$/)
-    expect(olines[ix + 2]).to match(/^\|\s+\| Quota\s+\| Daily\s+\| Monthly\s+\| Total\s+\|$/)
+    expect(olines[ix + 2]).to match(
+      /^\|\s+\| Quota\s+\| Daily\s+\| Monthly\s+\| Total\s+\|$/
+    )
     # Beneath the header row is a splitter line.
     expect(olines[ix + 3]).to match(/^(\+-+){5}\+$/)
     ix += 4
@@ -54,13 +60,12 @@ RSpec.describe 'murano usage', :cmd, :needs_password do
   end
 
   it 'show usage', :club_10s do
-    out, err, status = Open3.capture3(capcmd('murano', 'usage'))
+    out, err = murano_command_run('usage')
     expect(err).to eq('')
     olines = out.lines
     ix = 0
     ix = confirm_usage_table(olines, ix)
     _ix = confirm_usage_table(olines, ix)
-    expect(status.exitstatus).to eq(0)
   end
 end
 

data/spec/dry_run_formatter.rb

@@ -20,6 +20,7 @@ class DryRunFormatter < RSpec::Core::Formatters::BaseFormatter
   RSpec::Core::Formatters.register self, :example_started
 
   def start(example_count)
+    # 2018-07-26: (lb): "Running 538 specs."
     output << "Running #{example_count.count} specs\n"
     exit(0)
   end

data/spec/fixtures/dumped_config

@@ -20,8 +20,8 @@ protocol = https
 
 [location]
 base = <%= File.realpath(@project_dir) %>
-files = files
-endpoints = routes
+files = assets
+endpoints = endpoints
 modules = modules
 eventhandlers = services
 resources = specs/resources.yaml
@@ -36,14 +36,14 @@ searchFor = **/*
 ignoring = 
 
 [endpoints]
-searchFor = {,../endpoints}/*.lua {,../endpoints}s/*/*.lua
+searchFor = {,../endpoints}/*.lua {,../endpoints}/*/*.lua
 ignoring = *_test.lua *_spec.lua .*
 
 [eventhandler]
 searchFor = *.lua */*.lua {../eventhandlers,../event_handler}/*.lua {../eventhandlers,../event_handler}/*/*.lua
 ignoring = *_test.lua *_spec.lua .*
 skiplist = device.service_call device2.event interface webservice websocket
-undeletable = *.event timer.timer tsdb.exportJob user.account
+undeletable = *.event timer.timer tsdb.exportJob user.account config.service config.status
 
 [modules]
 searchFor = *.lua **/*.lua

data/spec/spec_helper.rb

@@ -36,6 +36,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :needs_password if ENV['MURANO_PASSWORD'].nil?
   config.filter_run_excluding :broken_on_windows if Gem.win_platform?
 
+  # FIXME/2018-07-12: (lb): Make test acct. with element. 'til then: disabled.
+  config.filter_run_excluding :needs_exchange_element
+
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.9
+  version: 3.2.1.pre.beta.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -528,6 +528,7 @@ files:
 - lib/MrMurano/Webservice.rb
 - lib/MrMurano/commands.rb
 - lib/MrMurano/commands/business.rb
+- lib/MrMurano/commands/child.rb
 - lib/MrMurano/commands/completion-bash.erb
 - lib/MrMurano/commands/completion-zsh.erb
 - lib/MrMurano/commands/completion.rb
@@ -626,6 +627,7 @@ files:
 - spec/cmd_status_spec.rb
 - spec/cmd_syncdown_application_spec.rb
 - spec/cmd_syncdown_both_spec.rb
+- spec/cmd_syncdown_unit_spec.rb
 - spec/cmd_syncup_spec.rb
 - spec/cmd_token_spec.rb
 - spec/cmd_usage_spec.rb