MuranoCLI 3.0.7 → 3.0.8

data/spec/cmd_config_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano config', :cmd do

data/spec/cmd_content_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'yaml'
 require 'cmd_common'
 

data/spec/cmd_cors_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'json'
 require 'cmd_common'
 

data/spec/cmd_device_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano device', :cmd, :needs_password do
@@ -93,7 +92,7 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     )
 
     out, err, status = Open3.capture3(capcmd('murano', 'syncup', '--resources'))
-    expect(out).to eq("Adding item state\nAdding item temperature\nAdding item uptime\nAdding item humidity\nUpdating product resources\n")
+    expect(out).to eq("Adding item state\nAdding item temperature\nAdding item uptime\nAdding item humidity\nUpdating remote product resources\n")
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 

data/spec/cmd_domain_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano domain', :cmd, :needs_password do

data/spec/cmd_exchange_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 
 require 'cmd_common'
 require 'MrMurano/Config'

data/spec/cmd_help_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 
 require 'highline/import'
 

data/spec/cmd_init_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano init', :cmd do
@@ -52,7 +51,6 @@ RSpec.describe 'murano init', :cmd do
         "\n", # 10
       ]
     elsif has_no_solutions
-      # 2017-07-05: line numbers are for: context "without", :needs_password do / it "existing project" do
       expecting += [
         "This business does not have any applications. Let's create one\n", # 7
         "\n", # 8
@@ -109,20 +107,15 @@ RSpec.describe 'murano init', :cmd do
         "\n",
       ]
     end
-    #expecting += [
-    #  t.a_string_matching(%r{Adding item \w+_event\n}),
-    #  # Order not consistent...
-    #  #"Adding item tsdb_exportJob\n",
-    #  #"Adding item timer_timer\n",
-    #  #"Adding item user_account\n",
-    #  t.a_string_starting_with('Adding item '),
-    #  t.a_string_starting_with('Adding item '),
-    #  t.a_string_starting_with('Adding item '),
-    #  "Synced 4 items\n",
-    #  "\n",
-    #]
     expecting += [
-      "Items already synced\n",
+      # 2017-12-15: Currently:
+      #   services{product.id}_event.lua
+      #   services/user_account.lua
+      #   specs/resources.yaml
+      "Updating local product resources\n",
+      t.a_string_starting_with('Adding item '),
+      t.a_string_starting_with('Adding item '),
+      "Synced 3 items\n",
       "\n",
     ]
     expecting += [
@@ -227,10 +220,10 @@ RSpec.describe 'murano init', :cmd do
         # It will ask to create an application and product.
         # MAGIC_NUMBER: !!!! the 8 is hardcoded indention here !!!!
         #   (removes the leading whitespace from the <<-EOT heredoc)
-        data = <<-EOT.gsub(/^ {8}/, '')
+        data = <<-DATA.gsub(/^ {8}/, '')
         #{@applctn_name}
         #{@product_name}
-        EOT
+        DATA
         # 2017-07-05: [lb] added line numbers to use debugger to help maintain this test.
         out, err, status = Open3.capture3(capcmd('murano', 'init'), stdin_data: data)
         expecting = expected_response_when_ids_found_in_config(
@@ -332,9 +325,6 @@ RSpec.describe 'murano init', :cmd do
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
-        # Because the /tmp/murcli-test/services directory is empty,
-        # murano init *will* download all the event handlers.
-        #local_files_found: true,
       )
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(the_expected)
@@ -360,9 +350,6 @@ RSpec.describe 'murano init', :cmd do
         expect_rebasing: true,
         expect_proj_file_write: false,
         creates_some_default_directories: true,
-        # Because the /tmp/murcli-test/services directory is empty,
-        # murano init *will* download all the event handlers.
-        #local_files_found: true,
       )
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
@@ -396,15 +383,13 @@ RSpec.describe 'murano init', :cmd do
       end
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
+      # NOTE: This tests uses an old Solutionfile.json, config v0.2.0, and it
+      # downloads Lua scripts to the root of the project directory. Just FYI.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
       expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
-        # Because the /tmp/murcli-test/services directory is empty,
-        # murano init *will* download all the event handlers.
-        ##local_files_found_application: true,
-        #local_files_found_product: true,
       )
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
@@ -444,10 +429,6 @@ RSpec.describe 'murano init', :cmd do
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
-        # Because the /tmp/murcli-test/services directory is empty,
-        # murano init *will* download all the event handlers.
-        ##local_files_found_application: true,
-        #local_files_found_product: true,
       )
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)

data/spec/cmd_keystore_spec.rb

@@ -1,13 +1,12 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 require 'json'
 require 'cmd_common'
 

data/spec/cmd_link_spec.rb

@@ -1,16 +1,16 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'open3'
-require 'pathname'
 
 require 'cmd_common'
 require 'MrMurano/Config'
+require 'MrMurano/commands/link'
 
 RSpec.describe 'murano link', :cmd, :needs_password do
   include_context 'CI_CMD'
@@ -36,11 +36,10 @@ RSpec.describe 'murano link', :cmd, :needs_password do
 
       context 'using commander' do
         it 'will not list' do
-          stdout, stderr = murano_command_run('link list')
-          expect(stdout).to eq(MrMurano::Config::INVALID_PROJECT_HINT + "\n")
-          expect(stderr).to eq(
-            %(The "link list" command only works in a Murano project.\n)
-          )
+          # Because we run from the context of the rspec command, the :env
+          # config file will have loaded, so business.id will be set.
+          expect { murano_command_run('link list') }.to raise_error(SystemExit)
+          $exited_abnormally = false
         end
       end
     end
@@ -52,7 +51,6 @@ RSpec.describe 'murano link', :cmd, :needs_password do
 
     it 'links and lists' do
       out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
-      #expect(out).to a_string_starting_with("Linked product #{@solz_name}")
       olines = out.lines
 
       expect(strip_fancy(olines[0])).to eq(
@@ -88,7 +86,8 @@ RSpec.describe 'murano link', :cmd, :needs_password do
       #expect(out).to a_string_starting_with("Unlinked #{@solz_name}")
       # E.g.,
       #   Unlinked ‘linktest3e7def1b86a1d680’ from ‘linktest3e7def1b86a1d680’\n
-      #   Removed ‘h2thqll2z9sqoooc0_w4w3vxla11ngg4cok_event’ from ‘linktest3e7def1b86a1d680\n
+      #   Removed ‘h2thqll2z9sqoooc0_w4w3vxla11ngg4cok_event’
+      #     from ‘linktest3e7def1b86a1d680\n
       olines = out.lines
       expect(strip_fancy(olines[0])).to eq(
         "Unlinked '#{@proj_name_prod}' from '#{@proj_name_appy}'\n"

data/spec/cmd_logs_spec.rb

@@ -0,0 +1,162 @@
+# Copyright © 2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
+# frozen_string_literal: true
+
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
+
+require 'json'
+require 'open3'
+require 'socket'
+require 'timeout'
+require 'uri'
+
+require 'MrMurano/Config'
+require 'cmd_common'
+require 'fixtures/websocket/simple_server'
+require 'fixtures/websocket/logs_faker'
+
+RSpec.describe 'murano logs', :cmd, :needs_password do
+  include_context 'CI_CMD'
+
+  before(:example) do
+    @port = SimpleWebSocket::Server::DEFAULT_WS_PORT
+    @port_s = @port && ":#{@port}" || ''
+
+    # CI_CMD's before() creates a new Config and calls load().
+    #   We just need to add a few things.
+    $cfg.set('net.host', "127.0.0.1#{@port_s}", :project)
+    $cfg.set('net.protocol', 'http', :project)
+    $cfg.set('application.id', 'XYZ', :project)
+
+    @acc = MrMurano::Account.instance
+    allow(@acc).to receive(:login_info).and_return(email: 'bob', password: 'v')
+  end
+
+  # FIXME: (landonb): MUR-3081: Remove old http code for v3.1.0. Search: LOGS_USE_HTTP.
+  def supports_ws?
+    runner = ::Commander::Runner.instance
+    logs_cmd = runner.command(:logs)
+    logs_cmd.options.any? do |opt|
+      opt[:args].include? '--http'
+    end
+  end
+
+  def test_tail_log
+    stub_request_token
+    spawn_websocket_server
+    spawn_logs_stream_test_simple
+    run_logs_tail
+    wait_websocket_server
+    expect_output
+  end
+
+  def stub_request_token
+    stub_request(:post, "http://127.0.0.1#{@port_s}/api:1/token/")
+      .with(
+        body: '{"email":"bob","password":"v"}',
+        headers: {
+          'Accept' => '*/*',
+          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Type' => 'application/json',
+          # 'Host'=>'ABC',
+          'Host' => "127.0.0.1#{@port_s}",
+          'User-Agent' => 'MrMurano/3.0.7',
+        }
+      )
+      .to_return(
+        status: 200, body: { token: 'ABCDEFGHIJKLMNOP' }.to_json, headers: {}
+      )
+  end
+
+  def spawn_websocket_server
+    ws_svr = "#{File.dirname(__FILE__)}/fixtures/websocket/wss-echo.rb"
+    @wss_in, @wss_out, @wss_err, @wss_thr = Open3.popen3(ws_svr.to_s)
+    @wss_out.close
+    @wss_err.close
+    await_websocket_server!
+  end
+
+  def await_websocket_server!
+    # Wait for the server to start, or the logs command will fail to connect.
+    ready = false
+    5.times do
+      begin
+        s = TCPSocket.new('127.0.0.1', @port)
+        s.close
+        ready = true
+        break
+      # rubocop:disable Lint/HandleExceptions: Do not suppress exceptions.
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        # pass
+      end
+      sleep 0.2
+    end
+    raise 'Server never started!' unless ready
+  end
+
+  def spawn_logs_stream_test_simple
+    Thread.abort_on_exception = true
+    @svr_thd = Thread.new { logs_stream_test_simple }
+  end
+
+  def logs_stream_test_simple
+    sleep 0.1 until EM.reactor_running?
+    @blatherer = LogsFaker.new
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_script)
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_call)
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_event)
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_config_device_v1)
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_config_null)
+    sleep 0.1
+    @wss_in.puts JSON.generate(@blatherer.example_type_config_newservice)
+    sleep 0.1
+    @wss_in.puts 'EXIT'
+    @wss_in.close
+  end
+
+  def run_logs_tail
+    # For coverage, we have to call the command directly.
+    #
+    # DEVs: Run this is you want stdout to flow to the terminal
+    #       (to make developing easier):
+    #
+    #   runner = ::Commander::Runner.instance
+    #   logs_cmd = runner.command(:logs)
+    #   mrcmd = logs_cmd.run('-f')
+    #
+    # Normally, we instead capture stdout so we can expect() it.
+    @cmd_out, @cmd_err = murano_command_run('logs', '-f')
+  end
+
+  def wait_websocket_server
+    # Block 'til subprocess exits. Receives a Process::Status.
+    _proc_status = @wss_thr.value
+  end
+
+  def expect_output
+    expect(@cmd_err).to eq(%(WebSocket closed [1006]\n))
+    expect(@cmd_out).to eq(
+      %(
+message: #{JSON.generate(@blatherer.example_type_script)}
+message: #{JSON.generate(@blatherer.example_type_call)}
+message: #{JSON.generate(@blatherer.example_type_event)}
+message: #{JSON.generate(@blatherer.example_type_config_device_v1)}
+message: #{JSON.generate(@blatherer.example_type_config_null)}
+message: #{JSON.generate(@blatherer.example_type_config_newservice)}
+      ).strip + "\n"
+    )
+  end
+
+  context 'when project is setup' do
+    it 'tail log' do
+      test_tail_log if supports_ws?
+    end
+  end
+end
+