MuranoCLI 3.0.2 → 3.0.4

data/spec/cmd_business_spec.rb

@@ -1,5 +1,5 @@
-# Last Modified: 2017.08.31 /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,18 +11,18 @@ require 'pathname'
 require 'cmd_common'
 
 RSpec.describe 'murano business', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
-  context "without project" do
-    it "help" do
+  context 'without project' do
+    it 'help' do
       cmd_verify_help('business')
     end
   end
 
-  context "list" do
-    it "as table" do
+  context 'list' do
+    it 'as table' do
       out, err, status = Open3.capture3(capcmd('murano', 'business', 'list'))
-      expect(err).to eq("")
+      expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+){3}\+$/)
       expect(olines[1]).to match(/^\| bizid\s+\| role\s+\| name\s+\|$/)
@@ -31,23 +31,23 @@ RSpec.describe 'murano business', :cmd, :needs_password do
       expect(status.exitstatus).to eq(0)
     end
 
-    it "as json" do
+    it 'as json' do
       out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '-c', 'outformat=json'))
-      expect(err).to eq("")
-      expect{ JSON.parse(out) }.to_not raise_error
+      expect(err).to eq('')
+      expect { JSON.parse(out) }.to_not raise_error
       expect(status.exitstatus).to eq(0)
     end
 
-    it "only ids" do
+    it 'only ids' do
       out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--idonly'))
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(out).to match(/^(\S+\s)*\S+$/)
       expect(status.exitstatus).to eq(0)
     end
 
-    it "output to file" do
+    it 'output to file' do
       out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--idonly', '-o', 'bob'))
-      expect(err).to eq("")
+      expect(err).to eq('')
       expect(out).to eq('')
       expect(status.exitstatus).to eq(0)
       expect(File.exist?('bob')).to be true
@@ -55,9 +55,9 @@ RSpec.describe 'murano business', :cmd, :needs_password do
       expect(data).to match(/^(\S+\s)*\S+$/)
     end
 
-    it "fewer fields" do
+    it 'fewer fields' do
       out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--brief'))
-      expect(err).to eq("")
+      expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+)+\+$/)
       expect(olines[1]).to match(/^(\| \S+\s+)+\|$/)

data/spec/cmd_common.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.
@@ -8,6 +8,7 @@
 require 'highline'
 # Set HighLine's $terminal global.
 require 'highline/import'
+require 'os'
 require 'pathname'
 require 'shellwords'
 require 'timeout'
@@ -27,13 +28,13 @@ at_exit do
     STDERR.puts('¡!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
   end
 end
-alias original_at_exit at_exit
+alias original_at_exit at_exit unless defined?(original_at_exit)
 def at_exit(*args, &block)
   #original_at_exit *args, &block
   # pass!
 end
 
-require 'MrMurano/spec_commander.rb'
+require 'MrMurano/Commander-Entry'
 
 module Commander
   class Command
@@ -107,8 +108,10 @@ RSpec.shared_context 'CI_CMD' do
       # This happens on Windows...
       require 'rbconfig'
       # Check the platform, e.g., "linux-gnu", or other.
-      is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-      unless is_windows
+      #is_windows = (
+      #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      #)
+      unless OS.windows?
         $stderr.puts(
           'Unexpected: ln_s failed on non-Windows machine / ' \
           "host_os: #{RbConfig::CONFIG['host_os']} / err: #{err}"
@@ -164,8 +167,8 @@ RSpec.shared_context 'CI_CMD' do
     out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
     #expect(out).to a_string_starting_with("Linked product #{@proj_name_prod}")
     olines = out.lines
-    expect(olines[0].encode!('UTF-8', 'UTF-8')).to eq(
-      "Linked ‘#{@proj_name_prod}’ to ‘#{@proj_name_appy}’\n"
+    expect(strip_fancy(olines[0])).to eq(
+      "Linked '#{@proj_name_prod}' to '#{@proj_name_appy}'\n"
     )
     expect(olines[1]).to eq("Created default event handler\n")
     expect(err).to eq('')
@@ -208,6 +211,23 @@ RSpec.shared_context 'CI_CMD' do
     str.gsub(/\e\[(\d+)m/, '')
   end
 
+  def strip_fancy(str)
+    # Windows has a complaint about the fancy quotes if you don't encode!, which is
+    #
+    #   expected: "Linked \u2018syncdowntestprd1e8b4034\u2019
+    #               to \u2018syncdowntestapp23d5135b\u2019\n"
+    #        got: "Linked \xE2\x80\x98syncdowntestprd1e8b4034\xE2\x80\x99
+    #               to \xE2\x80\x98syncdowntestapp23d5135b\xE2\x80\x99\n"
+    #
+    # or, to put it another way,
+    #
+    #     -Linked ?syncdowntestprd1e8b4034? to ?syncdowntestapp23d5135b?
+    #     +Linked ΓÇÿsyncdowntestprd1e8b4034ΓÇÖ to ΓÇÿsyncdowntestapp23d5135bΓÇÖ
+    #
+    # which we can solve with an encode call. (Or but using norm quotes.)
+    str.encode!('UTF-8', 'UTF-8').tr(%(‘), %(')).tr(%(’), %('))
+  end
+
   # *** rb-commander goodies
 
   def murano_command_run(cmd, *args)

data/spec/cmd_config_spec.rb

@@ -1,20 +1,27 @@
+# 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 config', :cmd do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
-  it "Needs a key" do
-    out, err, status = Open3.capture3(capcmd('murano', "config"))
+  it 'Needs a key' do
+    out, err, status = Open3.capture3(capcmd('murano', 'config'))
     expect(status).to eq(0)
     expect(out).to eq("\e[31mNeed a config key\e[0m\n")
     expect(err).to eq('')
   end
 
-  it "Sets a key" do
-    out, err, status = Open3.capture3(capcmd(%w{murano config bob build}))
+  it 'Sets a key' do
+    out, err, status = Open3.capture3(capcmd(%w[murano config bob build]))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status).to eq(0)
@@ -24,36 +31,41 @@ RSpec.describe 'murano config', :cmd do
     expect(afile).to eq(bfile)
   end
 
-  it "Sets a user key" do
-    userCfg = File.join(ENV['HOME'], '.murano', 'config')
-    File.unlink(userCfg) if File.exist? userCfg
-    out, err, status = Open3.capture3(capcmd(%w{murano config bob build --user}))
+  it 'Sets a user key' do
+    user_cfg = File.join(ENV['HOME'], '.murano', 'config')
+    File.unlink(user_cfg) if File.exist? user_cfg
+    out, err, status = Open3.capture3(capcmd(%w[murano config bob build --user]))
     expect(status).to eq(0)
     expect(out).to eq('')
     expect(err).to eq('')
 
-    afile = IO.read(userCfg)
+    afile = IO.read(user_cfg)
     bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_tool_bob').read
     expect(afile).to eq(bfile)
   end
 
-  it "Reads a key" do
+  it 'Reads a key' do
     FileUtils.mkpath(File.join(@tmpdir, '.murano'))
-    FileUtils.copy_file((@testdir+'spec'+'fixtures'+'.mrmuranorc').to_s,
-                        File.join(@tmpdir, '.murano', 'config'),
-                        :verbose => true)
-    out, err, status = Open3.capture3(capcmd(%w{murano config --project doThisTest.bob}))
+    FileUtils.copy_file(
+      (@testdir + 'spec' + 'fixtures' + '.mrmuranorc').to_s,
+      File.join(@tmpdir, '.murano', 'config'),
+      verbose: true
+    )
+    out, err, status = Open3.capture3(capcmd(%w[murano config --project doThisTest.bob]))
     expect(status).to eq(0)
     expect(out).to eq("build\n")
     expect(err).to eq('')
   end
 
-  it "Removes a key" do
+  it 'Removes a key' do
     FileUtils.mkpath(File.join(@tmpdir, '.murano'))
     rcf = File.join(@tmpdir, '.murano', 'config')
-    FileUtils.copy_file((@testdir+'spec'+'fixtures'+'.mrmuranorc').to_s,
-                        rcf, :verbose => true)
-    out, err, status = Open3.capture3(capcmd(%w{murano config --project --unset doThisTest.bob}))
+    FileUtils.copy_file(
+      (@testdir + 'spec' + 'fixtures' + '.mrmuranorc').to_s,
+      rcf,
+      verbose: true
+    )
+    out, err, status = Open3.capture3(capcmd(%w[murano config --project --unset doThisTest.bob]))
     expect(status).to eq(0)
     expect(out).to eq('')
     expect(err).to eq('')
@@ -62,7 +74,6 @@ RSpec.describe 'murano config', :cmd do
     bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_deleted_bob').read
     expect(afile).to eq(bfile)
   end
-
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/spec/cmd_content_spec.rb

@@ -1,3 +1,10 @@
+# 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'
@@ -5,93 +12,98 @@ require 'yaml'
 require 'cmd_common'
 
 RSpec.describe 'murano content', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('contestTest')
-      out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @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', 'product', 'create', @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', 'solution', 'delete', '--yes', @product_name))
-      expect(out).to eq('')
-      expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '--yes', @product_name))
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
   end
 
-  it "life cycle" do
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
-      #expect(out.lines).to match([
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #  a_string_matching(/^\| Name\s+\| Size\s+\|$/),
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #])
-      #expect(err).to eq('')
-      expect(out.lines).to match([])
-      expect(err).to eq("\e[33mDid not find any content\e[0m\n")
-      expect(status.exitstatus).to eq(0)
+  it 'life cycle' do
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    #expect(out.lines).to match(
+    #  [
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #    a_string_matching(/^\| Name\s+\| Size\s+\|$/),
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #  ]
+    #)
+    #expect(err).to eq('')
+    expect(out.lines).to match([])
+    expect(err).to eq("\e[33mDid not find any content\e[0m\n")
+    expect(status.exitstatus).to eq(0)
 
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/dumped_config'), 'myFile')
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'upload', 'myFile', '--tags', 'random=junk'))
-      expect(out).to eq('')
-      expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
+    FileUtils.copy(File.join(@testdir, 'spec/fixtures/dumped_config'), 'myFile')
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'upload', 'myFile', '--tags', 'random=junk'))
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
-      expect(err).to eq('')
-      expect(out.lines).to match([
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    expect(err).to eq('')
+    expect(out.lines).to match(
+      [
         a_string_matching(/^(\+-+){2}\+$/),
         a_string_matching(/^\| Name\s+\| Size\s+\|$/),
         a_string_matching(/^(\+-+){2}\+$/),
         a_string_matching(/^\| myFile\s+\| \d+\s+\|$/),
         a_string_matching(/^(\+-+){2}\+$/),
-      ])
-      expect(status.exitstatus).to eq(0)
+      ]
+    )
+    expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'info', 'myFile'))
-      expect(err).to eq('')
-      expect{out = YAML.load(out)}.to_not raise_error
-      expect(out).to match(
-        'type' => a_kind_of(String),
-        'length' => a_kind_of(Integer),
-        'last_modified' => a_kind_of(String),
-        'id' => 'myFile',
-        'tags' => {
-          'random' => 'junk',
-        }
-      )
-      expect(status.exitstatus).to eq(0)
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'info', 'myFile'))
+    expect(err).to eq('')
+    expect { out = YAML.load(out) }.to_not raise_error
+    expect(out).to match(
+      'type' => a_kind_of(String),
+      'length' => a_kind_of(Integer),
+      'last_modified' => a_kind_of(String),
+      'id' => 'myFile',
+      'tags' => {
+        'random' => 'junk',
+      }
+    )
+    expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'download', 'myFile', '-o', 'testDown'))
-      expect(out).to eq('')
-      expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
-      expect(File.exist?('testDown')).to be true
-      dcf = IO.read('myFile')
-      tdf = IO.read('testDown')
-      expect(tdf).to eq(dcf)
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'download', 'myFile', '-o', 'testDown'))
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
+    expect(File.exist?('testDown')).to be true
+    dcf = IO.read('myFile')
+    tdf = IO.read('testDown')
+    expect(tdf).to eq(dcf)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'delete', 'myFile', '-y'))
-      expect(out).to eq('')
-      expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'delete', 'myFile', '-y'))
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
-      #expect(out.lines).to match([
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #  a_string_matching(/^\| Name\s+\| Size\s+\|$/),
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #  a_string_matching(/^(\+-+){2}\+$/),
-      #])
-      #expect(err).to eq('')
-      expect(out.lines).to match([])
-      expect(err).to eq("\e[33mDid not find any content\e[0m\n")
-      expect(status.exitstatus).to eq(0)
+    out, err, status = Open3.capture3(capcmd('murano', 'content', 'list'))
+    #expect(out.lines).to match(
+    #  [
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #    a_string_matching(/^\| Name\s+\| Size\s+\|$/),
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #    a_string_matching(/^(\+-+){2}\+$/),
+    #  ]
+    #)
+    #expect(err).to eq('')
+    expect(out.lines).to match([])
+    expect(err).to eq("\e[33mDid not find any content\e[0m\n")
+    expect(status.exitstatus).to eq(0)
   end
-
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/spec/cmd_cors_spec.rb

@@ -1,3 +1,10 @@
+# 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'
@@ -5,7 +12,7 @@ require 'json'
 require 'cmd_common'
 
 RSpec.describe 'murano cors', :cmd, :needs_password do
-  include_context "CI_CMD"
+  include_context 'CI_CMD'
 
   before(:example) do
     @product_name = rname('corstest')
@@ -21,16 +28,16 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
   end
 
-  it "show CORS" do
+  it 'show CORS' do
     out, err, status = Open3.capture3(capcmd('murano', 'cors', '-c', 'outformat=json'))
     expect { JSON.parse(out) }.to_not raise_error
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
 
-  it "sets CORS" do
+  it 'sets CORS' do
     File.open('cors.yaml', 'wb') do |io|
-      io << {:origin=>['http://localhost:*']}.to_json
+      io << { origin: ['http://localhost:*'] }.to_json
     end
 
     out, err, status = Open3.capture3(capcmd('murano', 'cors', 'set', 'cors.yaml'))
@@ -44,7 +51,6 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
-
 end
 
 #  vim: set ai et sw=2 ts=2 :