MuranoCLI 3.0.2 → 3.0.4

data/spec/cmd_device_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 device', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('deviceTest')
@@ -27,7 +27,7 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "enables and lists" do
+  it 'enables and lists' do
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
     expect(out).to eq('')
     expect(err).to eq('')
@@ -44,7 +44,7 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "enables a batch" do
+  it 'enables a batch' do
     File.open('ids.csv', 'w') do |io|
       io << "ID\n"
       io << "1234\n"
@@ -70,7 +70,7 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "activates" do
+  it 'activates' do
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
     expect(out).to eq('')
     expect(err).to eq('')
@@ -85,7 +85,7 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "writes and reads" do
+  it 'writes and reads' do
     FileUtils.mkpath('specs')
     FileUtils.copy(
       File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
@@ -128,13 +128,15 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'read', '12345', 'state'))
     #expect(out.strip).to eq('42')
     expect(err).to eq('')
-    expect(out.lines).to match_array([
-      /^(\+-+){4}\+$/,
-      /^\| Alias\s+\| Reported\s+\| Set\s+\| Timestamp\s+\|$/,
-      /^(\+-+){4}\+$/,
-      /^\| state\s+\| \s+\| 42\s+\| \d+\s+\|$/,
-      /^(\+-+){4}\+$/,
-    ])
+    expect(out.lines).to match_array(
+      [
+        /^(\+-+){4}\+$/,
+        /^\| Alias\s+\| Reported\s+\| Set\s+\| Timestamp\s+\|$/,
+        /^(\+-+){4}\+$/,
+        /^\| state\s+\| \s+\| 42\s+\| \d+\s+\|$/,
+        /^(\+-+){4}\+$/,
+      ]
+    )
     expect(status.exitstatus).to eq(0)
   end
 end

data/spec/cmd_domain_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 domain', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('domainTest')
@@ -36,17 +36,19 @@ RSpec.describe 'murano domain', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "show domain" do
+  it 'show domain' do
     out, err, status = Open3.capture3(capcmd('murano', 'domain'))
     # 2017-05-31: Previously, the project could be named whatever and
     #   the URI would start with the same.
-    #     expect(out.chomp).to start_with("#{@product_name.downcase}.apps.exosite").and end_with(".io")
-    #   Now, it's: <ID>.m2.exosite.io, where ID is of the form, "j41fj45hhk82so0os"
+    #     expect(out.chomp).to start_with("#{@product_name.downcase}.apps.exosite").and end_with('.io')
+    #   Now, it's: <ID>.m2.exosite.io, where ID is of the form, 'j41fj45hhk82so0os'
     # Is there an expected length? [lb] has seen {16,17}
     #expect(out.split('.', 2)[0]).to match(/^[a-zA-Z0-9]{16,17}$/)
-    #expect(out.chomp).to end_with("m2.exosite.io")
+    #expect(out.chomp).to end_with('m2.exosite.io')
     out.lines.each do |line|
-      expect(line).to match(/^(Product|Application): domain[Tt]est[a-z0-9]+ <[a-z0-9]+> https:\/\/[.a-z0-9]+$/)
+      expect(line).to match(
+        %r{^(Product|Application): domain[Tt]est[a-z0-9]+ <[a-z0-9]+> https://[.a-z0-9]+$}
+      )
     end
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)

data/spec/cmd_exchange_spec.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -107,8 +107,8 @@ RSpec.describe 'murano exchange', :cmd, :needs_password do
           element_id = stdout.strip
           stdout, stderr = murano_command_exits('exchange purchase', element_id)
           expect(stdout).to eq('')
-          expect(stderr).to eq(
-            "The specified element has already been purchased: ‘#{element_name}’ (#{element_id})\n"
+          expect(strip_fancy(stderr)).to eq(
+            "The specified element has already been purchased: '#{element_name}' (#{element_id})\n"
           )
         end
       end

data/spec/cmd_init_spec.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.29 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -11,9 +11,9 @@ require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano init', :cmd do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
-  def expectedResponseWhenIdsFoundInConfig(
+  def expected_response_when_ids_found_in_config(
     t,
     expect_rebasing: false,
     has_one_each_soln: false,
@@ -74,9 +74,9 @@ RSpec.describe 'murano init', :cmd do
       ]
     end
     expecting += [
-      t.a_string_matching(%r{Linked ‘\w+’ to ‘\w+’\n}),
+      t.a_string_matching(/Linked '\w+' to '\w+'\n/),
       "\n",
-      t.a_string_matching(%r{Created default event handler\n}),
+      t.a_string_matching(/Created default event handler\n/),
       "\n",
     ]
     if expect_proj_file_write
@@ -128,26 +128,26 @@ RSpec.describe 'murano init', :cmd do
     expecting += [
       "Success!\n",
       "\n",
-      t.a_string_matching(%r{\s+Business ID: \w+\n}),
-      t.a_string_matching(%r{(\s+Application ID: \w+\n)?}),
-      t.a_string_matching(%r{(\s+Product ID: \w+\n)?}),
+      t.a_string_matching(/\s+Business ID: \w+\n/),
+      t.a_string_matching(/(\s+Application ID: \w+\n)?/),
+      t.a_string_matching(/(\s+Product ID: \w+\n)?/),
       "\n",
     ]
     expecting
   end
 
-  it "Won't init in HOME (gracefully)" do
+  it %(Won't init in HOME (gracefully)) do
     # this is in the project dir. Want to be in HOME
     Dir.chdir(ENV['HOME']) do
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
-      expect(out).to eq("")
+      expect(out).to eq('')
       expect(err).to eq("\e[31mCannot init a project in your HOME directory.\e[0m\n")
       expect(status.exitstatus).to eq(2)
     end
   end
 
-  context "in empty directory", :needs_password do
-    context "with" do
+  context 'in empty directory', :needs_password do
+    context 'with' do
       # Setup a product and application to use.
       # Doing this in a context with before&after so that after runs even when test
       # fails.
@@ -181,30 +181,30 @@ RSpec.describe 'murano init', :cmd do
         expect(status.exitstatus).to eq(0)
       end
 
-      it "existing project" do
+      it 'existing project' do
         # The test account will have one business, one product, and one application.
         # So it won't ask any questions.
         out, err, status = Open3.capture3(capcmd('murano', 'init'))
-        expecting = expectedResponseWhenIdsFoundInConfig(
+        expecting = expected_response_when_ids_found_in_config(
           self,
           has_one_each_soln: true,
         )
-        out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+        out_lines = out.lines.map { |line| strip_fancy(line) }
         expect(out_lines).to match_array(expecting)
         expect(err).to eq('')
         expect(status.exitstatus).to eq(0)
 
-        expect(File.directory?(".murano")).to be true
-        expect(File.exist?(".murano/config")).to be true
-        expect(File.directory?("routes")).to be true
-        expect(File.directory?("services")).to be true
-        expect(File.directory?("files")).to be true
-        expect(File.directory?("modules")).to be true
-        expect(File.directory?("specs")).to be true
+        expect(File.directory?('.murano')).to be true
+        expect(File.exist?('.murano/config')).to be true
+        expect(File.directory?('routes')).to be true
+        expect(File.directory?('services')).to be true
+        expect(File.directory?('files')).to be true
+        expect(File.directory?('modules')).to be true
+        expect(File.directory?('specs')).to be true
       end
     end
 
-    context "without", :needs_password do
+    context 'without', :needs_password do
       before(:example) do
         murano_solutions_expunge_yes
         @applctn_name = rname('initCreatingApp')
@@ -222,7 +222,7 @@ RSpec.describe 'murano init', :cmd do
         expect(status.exitstatus).to eq(0)
       end
 
-      it "existing project" do
+      it 'existing project' do
         # The test account will have one business.
         # It will ask to create an application and product.
         # MAGIC_NUMBER: !!!! the 8 is hardcoded indention here !!!!
@@ -233,12 +233,12 @@ RSpec.describe 'murano init', :cmd do
         EOT
         # 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 = expectedResponseWhenIdsFoundInConfig(
+        expecting = expected_response_when_ids_found_in_config(
           self,
           has_no_solutions: true,
           expect_proj_file_write: true,
         )
-        out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+        out_lines = out.lines.map { |line| strip_fancy(line) }
         expect(out_lines).to match_array(expecting)
         #expect(out.lines).to match_array([
         #  "\n", # 0
@@ -258,7 +258,7 @@ RSpec.describe 'murano init', :cmd do
         #  "Please enter the Product name: \n", # 14
         #  a_string_starting_with('Created new Product: '), # 15
         #  "\n", # 16
-        #  a_string_starting_with('Linked ‘'), # 17
+        #  a_string_starting_with("Linked '"), # 17
         #  "\n", # 18
         #  "Created default event handler\n", # 19
         #  "\n", # 20
@@ -273,21 +273,21 @@ RSpec.describe 'murano init', :cmd do
         #  a_string_starting_with('          Product ID: '), # 29
         #  "\n", # 30
         #])
-        expect(err).to eq("")
+        expect(err).to eq('')
         expect(status.exitstatus).to eq(0)
 
-        expect(File.directory?(".murano")).to be true
-        expect(File.exist?(".murano/config")).to be true
-        expect(File.directory?("routes")).to be true
-        expect(File.directory?("services")).to be true
-        expect(File.directory?("files")).to be true
-        expect(File.directory?("modules")).to be true
-        expect(File.directory?("specs")).to be true
+        expect(File.directory?('.murano')).to be true
+        expect(File.exist?('.murano/config')).to be true
+        expect(File.directory?('routes')).to be true
+        expect(File.directory?('services')).to be true
+        expect(File.directory?('files')).to be true
+        expect(File.directory?('modules')).to be true
+        expect(File.directory?('specs')).to be true
       end
     end
   end
 
-  context "in existing project directory", :needs_password do
+  context 'in existing project directory', :needs_password do
     before(:example) do
       murano_solutions_expunge_yes
 
@@ -324,11 +324,11 @@ RSpec.describe 'murano init', :cmd do
       end
     end
 
-    it "without ProjectFile" do
+    it 'without ProjectFile' do
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
-      the_expected = expectedResponseWhenIdsFoundInConfig(
+      the_expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
@@ -336,26 +336,26 @@ RSpec.describe 'murano init', :cmd do
         # murano init *will* download all the event handlers.
         #local_files_found: true,
       )
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(the_expected)
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(status.exitstatus).to eq(0)
 
-      expect(File.directory?(".murano")).to be true
-      expect(File.exist?(".murano/config")).to be true
-      expect(File.directory?("routes")).to be true
-      expect(File.directory?("services")).to be true
-      expect(File.directory?("files")).to be true
-      expect(File.directory?("modules")).to be true
-      expect(File.directory?("specs")).to be true
+      expect(File.directory?('.murano')).to be true
+      expect(File.exist?('.murano/config')).to be true
+      expect(File.directory?('routes')).to be true
+      expect(File.directory?('services')).to be true
+      expect(File.directory?('files')).to be true
+      expect(File.directory?('modules')).to be true
+      expect(File.directory?('specs')).to be true
     end
 
-    it "with ProjectFile" do
+    it 'with ProjectFile' do
       FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
-      expected = expectedResponseWhenIdsFoundInConfig(
+      expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
         expect_proj_file_write: false,
@@ -364,40 +364,40 @@ RSpec.describe 'murano init', :cmd do
         # murano init *will* download all the event handlers.
         #local_files_found: true,
       )
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(status.exitstatus).to eq(0)
 
-      expect(File.directory?(".murano")).to be true
-      expect(File.exist?(".murano/config")).to be true
-      expect(File.directory?("routes")).to be true
-      expect(File.directory?("services")).to be true
-      expect(File.directory?("files")).to be true
-      expect(File.directory?("modules")).to be true
-      expect(File.directory?("specs")).to be true
+      expect(File.directory?('.murano')).to be true
+      expect(File.exist?('.murano/config')).to be true
+      expect(File.directory?('routes')).to be true
+      expect(File.directory?('services')).to be true
+      expect(File.directory?('files')).to be true
+      expect(File.directory?('modules')).to be true
+      expect(File.directory?('specs')).to be true
     end
 
-    it "with SolutionFile 0.2.0" do
+    it 'with SolutionFile 0.2.0' do
       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
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
-      expected = expectedResponseWhenIdsFoundInConfig(
+      expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
@@ -406,41 +406,41 @@ RSpec.describe 'murano init', :cmd do
         ##local_files_found_application: true,
         #local_files_found_product: true,
       )
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(status.exitstatus).to eq(0)
 
-      expect(File.directory?(".murano")).to be true
-      expect(File.exist?(".murano/config")).to be true
-      expect(File.directory?("routes")).to be true
-      expect(File.directory?("services")).to be true
-      expect(File.directory?("files")).to be true
-      expect(File.directory?("modules")).to be true
-      expect(File.directory?("specs")).to be true
+      expect(File.directory?('.murano')).to be true
+      expect(File.exist?('.murano/config')).to be true
+      expect(File.directory?('routes')).to be true
+      expect(File.directory?('services')).to be true
+      expect(File.directory?('files')).to be true
+      expect(File.directory?('modules')).to be true
+      expect(File.directory?('specs')).to be true
     end
 
-    it "with SolutionFile 0.3.0" do
+    it 'with SolutionFile 0.3.0' do
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
-          :default_page => 'index.html',
-          :assets => 'files',
-          :routes => 'routes/manyRoutes.lua',
-          :modules => {
-            :table_util => 'modules/table_util.lua'
+          default_page: 'index.html',
+          assets: 'files',
+          routes: 'routes/manyRoutes.lua',
+          modules: {
+            table_util: 'modules/table_util.lua',
           },
-          :services => {
-            :device => {
-              :datapoint => 'services/devdata.lua'
-            }
+          services: {
+            device: {
+              datapoint: 'services/devdata.lua',
+            },
           },
-          :version => '0.3.0',
+          version: '0.3.0',
         }.to_json
       end
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
       out, err, status = Open3.capture3(capcmd('murano', 'init'))
-      expected = expectedResponseWhenIdsFoundInConfig(
+      expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
         creates_some_default_directories: true,
@@ -449,20 +449,19 @@ RSpec.describe 'murano init', :cmd do
         ##local_files_found_application: true,
         #local_files_found_product: true,
       )
-      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(status.exitstatus).to eq(0)
 
-      expect(File.directory?(".murano")).to be true
-      expect(File.exist?(".murano/config")).to be true
-      expect(File.directory?("routes")).to be true
-      expect(File.directory?("services")).to be true
-      expect(File.directory?("files")).to be true
-      expect(File.directory?("modules")).to be true
-      expect(File.directory?("specs")).to be true
+      expect(File.directory?('.murano')).to be true
+      expect(File.exist?('.murano/config')).to be true
+      expect(File.directory?('routes')).to be true
+      expect(File.directory?('services')).to be true
+      expect(File.directory?('files')).to be true
+      expect(File.directory?('modules')).to be true
+      expect(File.directory?('specs')).to be true
     end
   end
-
 end