MuranoCLI 3.0.2 → 3.0.4

data/spec/cmd_syncdown_spec.rb

@@ -1,5 +1,5 @@
-# Last Modified: 2017.08.16 /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.
@@ -11,7 +11,7 @@ require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano syncdown', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('syncdownTestPrd')
@@ -31,7 +31,7 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
     out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
     #expect(out).to a_string_starting_with("Linked product #{@product_name}")
     olines = out.lines
-    expect(olines[0].encode!('UTF-8', 'UTF-8')).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
+    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)
@@ -51,10 +51,10 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   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')
+      FileUtils.move('assets', 'files')
       #FileUtils.mkpath('specs')
       #FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
       #  'specs/resources.yaml')
@@ -64,54 +64,58 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_conflict/.'), '.')
     end
 
-    it "syncdown" do
+    it 'syncdown' do
       out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
       #expect(out).to eq('')
       #out_lines = out.lines
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
-      expect(out_lines).to match_array([
-        "Adding item table_util\n",
-        "Updating item timer_timer\n",
-        # E.g., "Updating item i4kl64nn86xk00000_event\n":
-        a_string_starting_with('Updating item '),
-        "Updating item tsdb_exportJob\n",
-        "Updating item user_account\n",
-        # FIXME/2017-08-09: This test includes a fixture with "device2 data_in",
-        # which is deprecated, AFAIK [lb]. We convert it to "device2.event",
-        # but I think what we really want is to edit "<solution_id>.event".
-        "Adding item device2_event\n",
-        "Adding item POST_/api/fire\n",
-        "Adding item PUT_/api/fire/{code}\n",
-        "Adding item DELETE_/api/fire/{code}\n",
-        "Adding item GET_/api/onfire\n",
-        "Adding item /icon.png\n",
-        "Adding item /\n",
-        "Adding item /js/script.js\n",
-      ])
+      out_lines = out.lines.map { |line| strip_fancy(line) }
+      expect(out_lines).to match_array(
+        [
+          "Adding item table_util\n",
+          "Updating item timer_timer\n",
+          # E.g., "Updating item i4kl64nn86xk00000_event\n":
+          a_string_starting_with('Updating item '),
+          "Updating item tsdb_exportJob\n",
+          "Updating item user_account\n",
+          # FIXME/2017-08-09: This test includes a fixture with "device2 data_in",
+          # which is deprecated, AFAIK [lb]. We convert it to "device2.event",
+          # but I think what we really want is to edit "<solution_id>.event".
+          "Adding item device2_event\n",
+          "Adding item POST_/api/fire\n",
+          "Adding item PUT_/api/fire/{code}\n",
+          "Adding item DELETE_/api/fire/{code}\n",
+          "Adding item GET_/api/onfire\n",
+          "Adding item /icon.png\n",
+          "Adding item /\n",
+          "Adding item /js/script.js\n",
+        ]
+      )
 
       #expect(err).to eq('')
-      expect(err).to start_with("\e[33mSkipping missing location ‘")
+      expect(strip_fancy(err)).to start_with("\e[33mSkipping missing location '")
       expect(status.exitstatus).to eq(0)
 
-      FileUtils.rm_r(['files', 'modules', 'routes', 'services'])
+      FileUtils.rm_r(%w[files modules routes services])
       expect(Dir['**/*']).to eq([])
 
       out, err, status = Open3.capture3(capcmd('murano', 'syncdown'))
       #expect(out).to eq('')
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
-      expect(out_lines).to match_array([
-        "Adding item table_util\n",
-        # 2017-08-08: This says updating now because timer.timer is undeletable.
-        #"Adding item timer_timer\n",
-        "Updating item timer_timer\n",
-        "Adding item POST_/api/fire\n",
-        "Adding item DELETE_/api/fire/{code}\n",
-        "Adding item PUT_/api/fire/{code}\n",
-        "Adding item GET_/api/onfire\n",
-        "Adding item /js/script.js\n",
-        "Adding item /icon.png\n",
-        "Adding item /\n",
-      ])
+      out_lines = out.lines.map { |line| strip_fancy(line) }
+      expect(out_lines).to match_array(
+        [
+          "Adding item table_util\n",
+          # 2017-08-08: This says updating now because timer.timer is undeletable.
+          #"Adding item timer_timer\n",
+          "Updating item timer_timer\n",
+          "Adding item POST_/api/fire\n",
+          "Adding item DELETE_/api/fire/{code}\n",
+          "Adding item PUT_/api/fire/{code}\n",
+          "Adding item GET_/api/onfire\n",
+          "Adding item /js/script.js\n",
+          "Adding item /icon.png\n",
+          "Adding item /\n",
+        ]
+      )
       # Look for skipping missing location lines, e.g.,
       #   "\e[33mSkipping missing location /tmp/d20170623-20035-17496y/project/modules\e[0m\n"
       # 2017-07-03: Did I [lb] change syncdown not to complain about missing locations?
@@ -122,40 +126,41 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       #  a_string_ending_with("services\e[0m\n"),
       #)
       #expect(err).to eq('')
-      expect(err).to start_with("\e[33mSkipping missing location ‘")
+      expect(strip_fancy(err)).to start_with("\e[33mSkipping missing location '")
       expect(status.exitstatus).to eq(0)
 
       after = Dir['**/*'].sort
       expect(after).to include(
-        "files",
-        "files/icon.png",
-        "files/index.html",
-        "files/js",
-        "files/js/script.js",
-        "modules",
-        "modules/table_util.lua",
-        "routes",
-        "routes/api-fire-{code}.delete.lua",
-        "routes/api-fire-{code}.put.lua",
-        "routes/api-fire.post.lua",
-        "routes/api-onfire.get.lua",
+        'files',
+        'files/icon.png',
+        'files/index.html',
+        'files/js',
+        'files/js/script.js',
+        'modules',
+        'modules/table_util.lua',
+        'routes',
+        'routes/api-fire-{code}.delete.lua',
+        'routes/api-fire-{code}.put.lua',
+        'routes/api-fire.post.lua',
+        'routes/api-onfire.get.lua',
         # 2017-07-03: services/ would not exist if we did not include fixtures/syncable_conflict/.
-        "services",
+        'services',
         # 2017-07-13: No longer syncing device2_event; is internal to platform.
-        #"services/device2_event.lua",
-        "services/timer_timer.lua",
+        #'services/device2_event.lua',
+        'services/timer_timer.lua',
       )
 
       # A status should show no differences.
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
-      expect(out.lines).to match([
-        "Nothing new locally\n",
-        "Nothing new remotely\n",
-        "Nothing that differs\n",
-      ])
+      expect(out.lines).to match(
+        [
+          "Nothing new locally\n",
+          "Nothing new remotely\n",
+          "Nothing that differs\n",
+        ]
+      )
       expect(status.exitstatus).to eq(0)
-
     end
   end
 

data/spec/cmd_syncup_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.
@@ -11,7 +11,7 @@ require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano syncup', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('syncupTestPrd')
@@ -30,7 +30,7 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
     out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
     #expect(out).to a_string_starting_with("Linked product #{@product_name}")
     olines = out.lines
-    expect(olines[0].encode!('UTF-8', 'UTF-8')).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
+    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)
@@ -47,7 +47,7 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   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')
@@ -63,13 +63,13 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       # E.g.,
       #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Services)
       #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Interfaces)
-      expect(elines).to satisfy { |v| elines.length == 2 }
+      expect(elines).to(satisfy { |_v| elines.length == 2 })
       elines.each do |line|
-        expect(line.encode!('UTF-8', 'UTF-8')).to start_with("\e[33mSkipping missing location ‘")
+        expect(strip_fancy(line)).to start_with("\e[33mSkipping missing location '")
       end
     end
 
-    it "syncup" do
+    it 'syncup' do
       out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
       outl = out.lines
       # The spec tests set --no-progress, so each sync action gets reported.
@@ -77,15 +77,19 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       #expect(outl[1]).to eq("Adding item temperature\n")
       #expect(outl[2]).to eq("Adding item uptime\n")
       #expect(outl[3]).to eq("Adding item humidity\n")
-      (0..3).each { |ln| expect(outl[ln]).to start_with("Adding item ") }
+      (0..3).each { |ln| expect(outl[ln]).to start_with('Adding item ') }
       expect(outl[4]).to eq("Updating product resources\n")
-      expect(outl[5]).to eq("Adding item table_util\n")
+      # Windows is insane:
+      #   "Adding item ........................Administrator.AppData.Local.Temp.2.d20170913-3860-pgji6g.project.modules.table_util\n"
+      #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")
       #expect(outl[6]).to eq("Updating item c3juj9vnmec000000_event\n")
       # The order isn't always consistent, so just do start_with.
       #expect(outl[7]).to eq("Updating item timer_timer\n")
       #expect(outl[8]).to eq("Updating item user_account\n")
       #expect(outl[9]).to eq("Updating item tsdb_exportJob\n")
-      (6..9).each { |ln| expect(outl[ln]).to start_with("Updating item ") }
+      (6..9).each { |ln| expect(outl[ln]).to start_with('Updating item ') }
       #expect(outl[10]).to eq("Adding item POST_/api/fire\n")
       #expect(outl[11]).to eq("Adding item PUT_/api/fire/{code}\n")
       #expect(outl[12]).to eq("Adding item DELETE_/api/fire/{code}\n")
@@ -93,14 +97,14 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       #expect(outl[14]).to eq("Adding item /icon.png\n")
       #expect(outl[15]).to eq("Adding item /\n")
       #expect(outl[16]).to eq("Adding item /js/script.js\n")
-      (10..16).each { |ln| expect(outl[ln]).to start_with("Adding item ") }
+      (10..16).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'))
-      #expect(out).to start_with(%{Adding:\nDeleting:\nChanging:\n})
-      #expect(out).to start_with(%{Nothing to add\nNothing to delete\nNothing to change\n})
-      expect(out).to start_with(%{Nothing new locally\nNothing new remotely\nNothing that differs\n})
+      #expect(out).to start_with(%(Adding:\nDeleting:\nChanging:\n))
+      #expect(out).to start_with(%(Nothing to add\nNothing to delete\nNothing to change\n))
+      expect(out).to start_with(%(Nothing new locally\nNothing new remotely\nNothing that differs\n))
       # Due to timestamp races, there might be modules or services in Changing.
       #expect(err).to eq('')
       verify_err_missing_location(err)

data/spec/cmd_usage_spec.rb

@@ -1,10 +1,17 @@
+# Last Modified: 2017.09.12 /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 'open3'
 require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano usage', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     # NOTE: The usage command works on one or more solutions of any type.
@@ -28,11 +35,11 @@ RSpec.describe 'murano usage', :cmd, :needs_password do
   end
 
   def confirm_usage_table(olines, ix)
-    expect(olines[ix+0]).to match(/^(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 + 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+\|$/)
     # Beneath the header row is a splitter line.
-    expect(olines[ix+3]).to match(/^(\+-+){5}\+$/)
+    expect(olines[ix + 3]).to match(/^(\+-+){5}\+$/)
     ix += 4
     # Beneath the splitter line are 1 or more rows, one for each service.
     loop do
@@ -47,17 +54,14 @@ RSpec.describe 'murano usage', :cmd, :needs_password do
     ix += 1
   end
 
-  it "show usage" do
+  it 'show usage' do
     out, err, status = Open3.capture3(capcmd('murano', 'usage'))
     expect(err).to eq('')
     olines = out.lines
     ix = 0
     ix = confirm_usage_table(olines, ix)
-    ix = confirm_usage_table(olines, ix)
+    _ix = confirm_usage_table(olines, ix)
     expect(status.exitstatus).to eq(0)
   end
-
 end
 
-#  vim: set ai et sw=2 ts=2 :
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2016.0521
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -249,47 +263,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
-  type: :development
+        version: 12.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 12.1.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.6
+        version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.6
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 9.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 9.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -364,14 +378,14 @@ dependencies:
   name: ocra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.8
 description: |-
@@ -413,6 +427,7 @@ files:
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
 - lib/MrMurano/Business.rb
+- lib/MrMurano/Commander-Entry.rb
 - lib/MrMurano/Config-Migrate.rb
 - lib/MrMurano/Config.rb
 - lib/MrMurano/Content.rb
@@ -478,7 +493,6 @@ files:
 - lib/MrMurano/schema/resource-v1.0.0.yaml
 - lib/MrMurano/schema/sf-v0.2.0.yaml
 - lib/MrMurano/schema/sf-v0.3.0.yaml
-- lib/MrMurano/spec_commander.rb
 - lib/MrMurano/template/mock.erb
 - lib/MrMurano/template/projectFile.murano.erb
 - lib/MrMurano/verbosing.rb