MuranoCLI 3.0.2 → 3.0.4

data/spec/cmd_setting_product_spec.rb

@@ -1,12 +1,19 @@
+# Last Modified: 2017.09.13 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
+require 'json'
 require 'open3'
 require 'pathname'
-require 'json'
 require 'vine'
 require 'cmd_common'
 
 RSpec.describe 'murano setting', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('settingtest')
@@ -22,16 +29,16 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  context "Writes (using Device2.identity_format)" do
+  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'))
       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}}
+    # {'prefix'=>'', 'type'=>'opaque', 'options'=>{'casing'=>'mixed', 'length'=>0}}
 
-    it "a string value" do
+    it 'a string value' do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', 'fidget'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -46,7 +53,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it "a forced string value" do
+    it 'a forced string value' do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string', 'fidget'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -61,8 +68,8 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       expect(json_after).to match(@json_before)
     end
 
-    it "a forced string value on STDIN" do
-      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'prefix', '--string'), :stdin_data=>'fidget')
+    it 'a forced string value on STDIN' do
+      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)
@@ -77,7 +84,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
     end
 
 # This may not be testable in integration. (since it does things that get filtered out)
-    it "all intermediate keys" #do
+    it 'all intermediate keys' #do
 #      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'one.two.three', 'fidget'))
 #      expect(err).to eq('')
 #      expect(out).to eq('')
@@ -92,8 +99,8 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
 #      expect(json_after).to match(@json_before)
 #    end
 
-    context "a number value" do
-      it "integer 12" do
+    context 'a number value' do
+      it 'integer 12' do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -108,7 +115,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it "float 12.67" do
+      it 'float 12.67' do
         out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options.length', '--num', '12.67'))
         expect(err).to eq('')
         expect(out).to eq('')
@@ -123,15 +130,15 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
         expect(json_after).to match(@json_before)
       end
 
-      it "fiftyHalf" do
+      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")
         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')
+      it 'on STDIN' do
+        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)
@@ -146,13 +153,13 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
       end
     end
 
-    it "a json object blob" #do
+    it 'a json object blob' #do
 #      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'type', 'base16'))
 #      expect(err).to eq('')
 #      expect(out).to eq('')
 #      expect(status.exitstatus).to eq(0)
 #
-#      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options', '--json', '{"casing": "lower", "length": 0}'))
+#      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options', '--json', "{'casing': 'lower', 'length': 0}"))
 #      expect(err).to eq('')
 #      expect(out).to eq('')
 #      expect(status.exitstatus).to eq(0)
@@ -167,10 +174,10 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
 #      expect(json_after).to match(@json_before)
 #    end
 
-    it "a json object blob with stdin"
+    it 'a json object blob with stdin'
 
 # This may not be testable in integration.
-    it "a dictionary" #do
+    it 'a dictionary' #do
 #      out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', 'options', '--dict', 'casing', 'lower'))
 #      expect(err).to eq('')
 #      expect(out).to eq('')
@@ -185,7 +192,7 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
 #      expect(json_after).to match(@json_before)
 #    end
 
-    it "merges into a dictionary" do
+    it 'merges into a dictionary' do
       out, err, status = Open3.capture3(capcmd('murano', 'setting', 'write', 'Device2.identity_format', '.', '--dict', '--merge', 'prefix', 'tix', 'type', 'base10'))
       expect(err).to eq('')
       expect(out).to eq('')
@@ -202,19 +209,17 @@ RSpec.describe 'murano setting', :cmd, :needs_password do
     end
   end
 
-  context "Writes (using Webservice.cors)" do
+  context 'Writes (using Webservice.cors)' do
     before(:example) do
       out, err, status = Open3.capture3(capcmd('murano', '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"],
-    # "headers"=>["Content-Type", "Cookie", "Authorization"],
-    # "credentials"=>true}
+    # {'origin'=>true,
+    # 'methods'=>['HEAD', 'GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH'],
+    # 'headers'=>['Content-Type', 'Cookie', 'Authorization'],
+    # 'credentials'=>true}
   end
-
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_status_spec.rb

@@ -1,5 +1,5 @@
-# Last Modified: 2017.08.17 /coding: utf-8
-# frozen_string_literal: probably not yet
+# Last Modified: 2017.09.12 /coding: utf-8
+# frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
 # License: MIT. See LICENSE.txt.
@@ -8,13 +8,14 @@
 require 'fileutils'
 require 'json'
 require 'open3'
+require 'os'
 require 'pathname'
 require 'rbconfig'
 
 require 'cmd_common'
 
 RSpec.describe 'murano status', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('statusTest')
@@ -47,8 +48,8 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     #   pre-exist, in a sense, and are therefore described as being updated,
     #   not added.
     (0..2).each do |ln|
-      #expect(olines[ln].to_s).to a_string_starting_with("Adding item ")
-      expect(olines[ln].to_s).to a_string_starting_with("Updating item ")
+      #expect(olines[ln].to_s).to a_string_starting_with('Adding item ')
+      expect(olines[ln].to_s).to a_string_starting_with('Updating item ')
     end
 
     expect(err).to eq('')
@@ -68,79 +69,79 @@ RSpec.describe 'murano status', :cmd, :needs_password do
   end
 
   def match_syncable_contents(slice)
-      expect(slice).to include(
-        a_string_matching(/ \+ \w  .*modules\/table_util\.lua/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:7/),
-        # singleRoute only appears in some of the tests.
-        a_string_matching(/ \+ \w  .*routes\/singleRoute\.lua/),
-        a_string_matching(/ \+ \w  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ \w  .*files\/icon\.png/),
-        a_string_matching(/ \+ \w  .*files\/index\.html/),
-      )
+    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}),
+      # singleRoute only appears in some of the tests.
+      a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua}),
+      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}),
+    )
   end
 
   def match_syncable_contents_resources(slice)
-      expect(slice).to include(
-        a_string_matching(/ \+ \w  state/),
-        a_string_matching(/ \+ \w  temperature/),
-        a_string_matching(/ \+ \w  uptime/),
-        a_string_matching(/ \+ \w  humidity/),
-      )
+    expect(slice).to include(
+      a_string_matching(/ \+ \w  state/),
+      a_string_matching(/ \+ \w  temperature/),
+      a_string_matching(/ \+ \w  uptime/),
+      a_string_matching(/ \+ \w  humidity/),
+    )
   end
 
-  def match_syncable_contents_except_singleRoute(slice)
-      expect(slice).to include(
-        a_string_matching(/ \+ \w  .*modules\/table_util\.lua/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:7/),
-        # singleRoute does not appear in old Solutionfile tests
-        # that don't specify it.
-        #a_string_matching(/ \+ \w  .*routes\/singleRoute\.lua/),
-        a_string_matching(/ \+ \w  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ \w  .*files\/icon\.png/),
-        a_string_matching(/ \+ \w  .*files\/index\.html/),
-      )
+  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}),
+      # singleRoute does not appear in old Solutionfile tests
+      # that don't specify it.
+      #a_string_matching(%r{ \+ \w  .*routes/singleRoute\.lua}),
+      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}),
+    )
   end
 
   def match_remote_boilerplate_v1_0_0_service(slice)
     expect(slice).to include(
-      #a_string_matching(/ - \w  device2_event/),
-      #a_string_matching(/ - \w  interface_addGatewayResource/),
-      #a_string_matching(/ - \w  interface_addIdentity/),
-      #a_string_matching(/ - \w  interface_clearContent/),
-      #a_string_matching(/ - \w  interface_deleteContent/),
-      #a_string_matching(/ - \w  interface_downloadContent/),
-      #a_string_matching(/ - \w  interface_getGatewayResource/),
-      #a_string_matching(/ - \w  interface_getGatewaySettings/),
-      #a_string_matching(/ - \w  interface_getIdentity/),
-      #a_string_matching(/ - \w  interface_getIdentityState/),
-      #a_string_matching(/ - \w  interface_infoContent/),
-      #a_string_matching(/ - \w  interface_listContent/),
-      #a_string_matching(/ - \w  interface_listIdentities/),
-      #a_string_matching(/ - \w  interface_makeIdentity/),
-      #a_string_matching(/ - \w  interface_removeGatewayResource/),
-      #a_string_matching(/ - \w  interface_removeIdentity/),
-      #a_string_matching(/ - \w  interface_setIdentityState/),
-      #a_string_matching(/ - \w  interface_updateGatewayResource/),
-      #a_string_matching(/ - \w  interface_updateGatewaySettings/),
-      #a_string_matching(/ - \w  interface_updateIdentity/),
-      #a_string_matching(/ - \w  interface_uploadContent/),
-      #a_string_matching(/ - \w  timer_timer (Application Event Handlers)/),
-      #a_string_matching(/ - \w  tsdb_exportJob (Application Event Handlers)/),
-      #a_string_matching(/ - \w  user_account (Application Event Handlers)/),
-      #a_string_matching(/ - \w  timer_timer/),
-      #a_string_matching(/ - \w  tsdb_exportJob/),
-      #a_string_matching(/ - \w  user_account/),
+      #a_string_matching(%r{ - \w  device2_event}),
+      #a_string_matching(%r{ - \w  interface_addGatewayResource}),
+      #a_string_matching(%r{ - \w  interface_addIdentity}),
+      #a_string_matching(%r{ - \w  interface_clearContent}),
+      #a_string_matching(%r{ - \w  interface_deleteContent}),
+      #a_string_matching(%r{ - \w  interface_downloadContent}),
+      #a_string_matching(%r{ - \w  interface_getGatewayResource}),
+      #a_string_matching(%r{ - \w  interface_getGatewaySettings}),
+      #a_string_matching(%r{ - \w  interface_getIdentity}),
+      #a_string_matching(%r{ - \w  interface_getIdentityState}),
+      #a_string_matching(%r{ - \w  interface_infoContent}),
+      #a_string_matching(%r{ - \w  interface_listContent}),
+      #a_string_matching(%r{ - \w  interface_listIdentities}),
+      #a_string_matching(%r{ - \w  interface_makeIdentity}),
+      #a_string_matching(%r{ - \w  interface_removeGatewayResource}),
+      #a_string_matching(%r{ - \w  interface_removeIdentity}),
+      #a_string_matching(%r{ - \w  interface_setIdentityState}),
+      #a_string_matching(%r{ - \w  interface_updateGatewayResource}),
+      #a_string_matching(%r{ - \w  interface_updateGatewaySettings}),
+      #a_string_matching(%r{ - \w  interface_updateIdentity}),
+      #a_string_matching(%r{ - \w  interface_uploadContent}),
+      #a_string_matching(%r{ - \w  timer_timer (Application Event Handlers)}),
+      #a_string_matching(%r{ - \w  tsdb_exportJob (Application Event Handlers)}),
+      #a_string_matching(%r{ - \w  user_account (Application Event Handlers)}),
+      #a_string_matching(%r{ - \w  timer_timer}),
+      #a_string_matching(%r{ - \w  tsdb_exportJob}),
+      #a_string_matching(%r{ - \w  user_account}),
       a_string_matching(/ M \w  timer_timer\.lua/),
       a_string_matching(/ M \w  tsdb_exportJob\.lua/),
       a_string_matching(/ M \w  user_account\.lua/),
     )
   end
 
-  context "without ProjectFile" do
+  context 'without ProjectFile' do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
       FileUtils.move('assets', 'files')
@@ -151,7 +152,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       )
     end
 
-    it "status" do
+    it 'status' do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       # Two problems with this output.
@@ -170,49 +171,55 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       #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.
+      # 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|mingw|cygwin/)
-      #if is_windows
+      #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(/ M \w  .*services\/timer_timer\.lua/),
-      #    a_string_matching(/ M \w  .*services\/tsdb_exportJob\.lua/),
+      #    a_string_matching(%r{ M \w  .*services/timer_timer\.lua}),
+      #    a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
       #  )
       #else
-        expect(olines[14]).to eq("Nothing that differs\n")
+      expect(olines[14]).to eq("Nothing that differs\n")
       #end
 
       expect(status.exitstatus).to eq(0)
     end
 
-    it "matches file path", :broken_on_windows do
+    it 'matches file path', :broken_on_windows do
       out, err, status = Open3.capture3(capcmd('murano', 'status', '**/icon.png'))
       expect(err).to eq('')
-      expect(out.lines).to match([
-        "Only on local machine:\n",
-        a_string_matching(/ \+ \w  .*files\/icon\.png/),
-        "Nothing new remotely\n",
-        "Nothing that differs\n",
-      ])
+      expect(out.lines).to match(
+        [
+          "Only on local machine:\n",
+          a_string_matching(%r{ \+ \w  .*files/icon\.png}),
+          "Nothing new remotely\n",
+          "Nothing that differs\n",
+        ]
+      )
       expect(status.exitstatus).to eq(0)
     end
 
-    it "matches route", :broken_on_windows do
+    it 'matches route', :broken_on_windows do
       out, err, status = Open3.capture3(capcmd('murano', 'status', '#put#'))
       expect(err).to eq('')
-      expect(out.lines).to match([
-        "Only on local machine:\n",
-        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
-        "Nothing new remotely\n",
-        "Nothing that differs\n",
-      ])
+      expect(out.lines).to match(
+        [
+          "Only on local machine:\n",
+          a_string_matching(%r{ \+ \w  .*routes/manyRoutes\.lua:4}),
+          "Nothing new remotely\n",
+          "Nothing that differs\n",
+        ]
+      )
       expect(status.exitstatus).to eq(0)
     end
   end
 
-  context "with ProjectFile" do
+  context 'with ProjectFile' do
     before(:example) do
       # We previously called syncdown, which created the project/services/
       # directory, but don't fret, this copy command will overlay files and
@@ -227,7 +234,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
     end
 
-    it "status" do
+    it 'status' do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       olines = out.lines
@@ -237,13 +244,15 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       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.
-      is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-      if is_windows
+      # Check the platform, e.g., 'linux-gnu', or other.
+      #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 include(
-          a_string_matching(/ M \w  .*services\/timer_timer\.lua/),
-          a_string_matching(/ M \w  .*services\/tsdb_exportJob\.lua/),
+          a_string_matching(%r{ M \w  .*services/timer_timer\.lua}),
+          a_string_matching(%r{ M \w  .*services/tsdb_exportJob\.lua}),
         )
       else
         expect(olines[14]).to eq("Nothing that differs\n")
@@ -254,45 +263,47 @@ RSpec.describe 'murano status', :cmd, :needs_password do
   end
 
   # XXX wait, should a Solutionfile even work with Okami?
-  context "with Solutionfile 0.2.0" do
+  context 'with Solutionfile 0.2.0' do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
-      FileUtils.move('assets','files')
+      FileUtils.move('assets', 'files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
-        'specs/resources.yaml')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml'
+      )
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
-          :default_page => 'index.html',
-          :file_dir => 'files',
-          :custom_api => 'routes/manyRoutes.lua',
-          :modules => {
-            :table_util => 'modules/table_util.lua'
+          default_page: 'index.html',
+          file_dir: 'files',
+          custom_api: 'routes/manyRoutes.lua',
+          modules: {
+            table_util: 'modules/table_util.lua',
+          },
+          event_handler: {
+            device: {
+              datapoint: 'services/devdata.lua',
+            },
           },
-          :event_handler => {
-            :device => {
-              :datapoint => 'services/devdata.lua'
-            }
-          }
         }.to_json
       end
     end
 
-    it "status" do
+    it 'status' do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       # Not a single match, because the order of items within groups can shift
       olines = out.lines
       expect(olines[0]).to eq("Only on local machine:\n")
       match_syncable_contents_resources(olines[1..4])
-      match_syncable_contents_except_singleRoute(olines[5..11])
+      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..15])
       expect(olines[12]).to eq("Nothing new remotely\n")
       #expect(olines[16]).to eq("Nothing that differs\n")
       ##expect(olines[11]).to eq("Items that differ:\n")
       ##expect(olines[12..12]).to contain_exactly(
-      ##  a_string_matching(/ M \w  .*services\/devdata\.lua/),
+      ##  a_string_matching(%r{ M \w  .*services/devdata\.lua}),
       ##)
       expect(olines[13]).to eq("Items that differ:\n")
       match_remote_boilerplate_v1_0_0_service(olines[14..16])
@@ -301,7 +312,7 @@ RSpec.describe 'murano status', :cmd, :needs_password do
   end
 
   # XXX wait, should a Solutionfile even work with Okami?
-  context "with Solutionfile 0.3.0" do
+  context 'with Solutionfile 0.3.0' do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
       FileUtils.move('assets', 'files')
@@ -317,26 +328,26 @@ RSpec.describe 'murano status', :cmd, :needs_password do
           routes: 'routes/manyRoutes.lua',
           # Note that singleRoute.lua is not included, so it won't be seen by status command.
           modules: {
-            table_util: 'modules/table_util.lua'
+            table_util: 'modules/table_util.lua',
           },
           services: {
             device: {
-              datapoint: 'services/devdata.lua'
-            }
+              datapoint: 'services/devdata.lua',
+            },
           },
           version: '0.3.0',
         }.to_json
       end
     end
 
-    it "status" do
+    it 'status' do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       # pp out.split "\n"
       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_singleRoute(olines[5..11])
+      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..15])
       expect(olines[12]).to eq("Nothing new remotely\n")