MuranoCLI 2.2.4 → 3.0.0

data/spec/Webservice-Setting_spec.rb

@@ -0,0 +1,89 @@
+require 'tempfile'
+require 'yaml'
+require 'MrMurano/version'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/SyncRoot'
+require 'MrMurano/Webservice-Cors'
+require '_workspace'
+
+RSpec.describe MrMurano::Webservice::Settings do
+  include_context "WORKSPACE"
+  before(:example) do
+    MrMurano::SyncRoot.instance.reset
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['application.id'] = 'XYZ'
+
+    @srv = MrMurano::Webservice::Settings.new
+    allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
+
+    @baseURI = "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors"
+  end
+
+  it "initializes" do
+    uri = @srv.endpoint('/')
+    expect(uri.to_s).to eq("#{@baseURI}/")
+  end
+
+  context "when server gives string" do
+    context "fetches" do
+      it "as a hash" do
+        cors = {:origin=>true,
+                :methods=>["HEAD","GET","POST","PUT","DELETE","OPTIONS","PATCH"],
+                :headers=>["Content-Type","Cookie","Authorization"],
+                :credentials=>true}
+        body = cors
+        stub_request(:get, "#{@baseURI}").
+          with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                          'Content-Type'=>'application/json'}).
+                          to_return(body: body.to_json)
+
+        ret = @srv.cors
+        expect(ret).to eq(cors)
+      end
+    end
+  end
+
+  context "when server gives object" do
+    context "fetches" do
+      it "as a hash" do
+        cors = {:origin=>true,
+                :methods=>["HEAD","GET","POST","PUT","DELETE","OPTIONS","PATCH"],
+                :headers=>["Content-Type","Cookie","Authorization"],
+                :credentials=>true}
+        body = cors
+        stub_request(:get, "#{@baseURI}").
+          with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                          'Content-Type'=>'application/json'}).
+                          to_return(body: body.to_json)
+
+        ret = @srv.cors
+        expect(ret).to eq(cors)
+      end
+    end
+  end
+
+  context "uploads" do
+    before(:example) do
+      $project = MrMurano::ProjectFile.new
+      $project.load
+      @cors = {:origin=>true,
+               :methods=>["HEAD","GET","POST","PUT","DELETE","OPTIONS","PATCH"],
+               :headers=>["Content-Type","Cookie","Authorization"],
+               :credentials=>true}
+    end
+    it "sets" do
+      stub_request(:put, "#{@baseURI}").
+        with(:body=>@cors.to_json,
+             :headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: "")
+
+      ret = @srv.cors=(@cors)
+      expect(ret).to eq(@cors)
+    end
+  end
+
+end
+#  vim: set ai et sw=2 ts=2 :

data/spec/_workspace.rb

@@ -1,5 +1,5 @@
-require 'pathname'
 require 'fileutils'
+require 'pathname'
 require 'tmpdir'
 
 RSpec.shared_context "WORKSPACE" do
@@ -13,9 +13,9 @@ RSpec.shared_context "WORKSPACE" do
       ENV['HOME'] = File.join(hdir, 'home')
       FileUtils.mkpath(ENV['HOME'])
       Dir.chdir(hdir) do
-        @projectDir = File.join(ENV['HOME'], 'work', 'project')
-        FileUtils.mkpath(@projectDir)
-        Dir.chdir(@projectDir) do
+        @project_dir = File.join(ENV['HOME'], 'work', 'project')
+        FileUtils.mkpath(@project_dir)
+        Dir.chdir(@project_dir) do
             ex.run
         end
       end

data/spec/cmd_business_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.17 /coding: utf-8
+# frozen_string_literal: probably not yet
+
+# 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'
@@ -42,8 +49,8 @@ RSpec.describe 'murano business', :cmd, :needs_password do
       expect(data).to match(/^(\S+\s)*\S+$/)
     end
 
-    it "all fields" do
-      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--all'))
+    it "fewer fields" do
+      out, err, status = Open3.capture3(capcmd('murano', 'business', 'list', '--brief'))
       expect(err).to eq("")
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+)+\+$/)
@@ -52,8 +59,6 @@ RSpec.describe 'murano business', :cmd, :needs_password do
       expect(olines[-1]).to match(/^(\+-+)+\+$/)
       expect(status.exitstatus).to eq(0)
     end
-
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_common.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'shellwords'
 require 'timeout'
 require 'tmpdir'
+require 'MrMurano/Config'
 
 RSpec.shared_context "CI_CMD" do
   def capcmd(*args)
@@ -16,6 +17,8 @@ RSpec.shared_context "CI_CMD" do
     end
     args.push '--trace'
     args.push '-c', 'fullerror'
+    # The spinner output would make it hard to write expects().
+    args.push '--no-progress'
 
     if Gem.win_platform? then
       cmd = args.map do |i|
@@ -36,7 +39,45 @@ RSpec.shared_context "CI_CMD" do
   end
 
   def rname(name)
-    "#{name}-#{Random.new.rand.hash.abs.to_s(16)}"
+    #"#{name}-#{Random.new.rand.hash.abs.to_s(16)}"
+    # MUR-2454: Product name may only contain letters and numbers.
+    #"#{name}#{Random.new.rand.hash.abs.to_s(16)}"
+    # MUR-XXXX: Product name must be lowercase.
+    # 2017-06-01: From [cr]: "I'll be having bizapi convert to lower case
+    #  in the short term, and pegasus is updating to allow upper case."
+    #  LATER: Remove .downcase once PAAS fixed.
+    "#{name.downcase}#{Random.new.rand.hash.abs.to_s(16)}"
+  end
+
+  def mk_symlink
+    # Make it easy to debug tests, e.g., add breakpoint before capcmd('murano', ...)
+    # run test, then open another terminal window and `cd /tmp/murcli-test`.
+    # NOTE: When run on Jenkins, Dir.tmpdir() returns the path to the project directory!
+    #   Since this is for DEVs only, we can hack around this.
+    tmpdir = Dir.tmpdir()
+    return unless tmpdir == '/tmp'
+    @dev_symlink = File.join(tmpdir, "murcli-test")
+    FileUtils.rm(@dev_symlink, :force => true)
+    begin
+      FileUtils.ln_s(Dir.pwd, @dev_symlink)
+    rescue NotImplementedError => err
+      # This happens on Windows...
+      require 'rbconfig'
+      # Check the platform, e.g., "linux-gnu", or other.
+      is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+      $stderr.puts(
+        "Unexpected: ln_s failed on non-Windows machine / host_os: #{RbConfig::CONFIG['host_os']} / err: #{err}"
+      ) unless is_windows
+    end
+  end
+
+  def rm_symlink
+    FileUtils.rm(@dev_symlink, :force => true) if defined?(@dev_symlink)
+  end
+
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
   end
 
   around(:example) do |ex|
@@ -48,9 +89,11 @@ RSpec.shared_context "CI_CMD" do
         @tmpdir = File.join(hdir, 'project')
         Dir.mkdir(@tmpdir)
         Dir.chdir(@tmpdir) do
+          mk_symlink
           Timeout::timeout(300) do
             ex.run
           end
+          rm_symlink
         end
       end
     end

data/spec/cmd_content_spec.rb

@@ -1,49 +1,68 @@
 require 'fileutils'
 require 'open3'
 require 'pathname'
+require 'yaml'
 require 'cmd_common'
 
 RSpec.describe 'murano content', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('contestTest')
-      out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @project_name, '--save'))
+    @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)
   end
   after(:example) do
-      out, err, status = Open3.capture3(capcmd('murano', 'product', 'delete', @project_name))
+      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).to eq('')
-      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(/^(\+-+){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'), 'dumped_config')
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'upload', 'myFile', 'dumped_config', '--meta', 'random junk'))
+      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(out).to eq("myFile\n")
       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)
 
       out, err, status = Open3.capture3(capcmd('murano', 'content', 'info', 'myFile'))
       expect(err).to eq('')
-      olines = out.lines
-      expect(olines[0]).to match(/^(\+-+){5}\+$/)
-      expect(olines[1]).to match(/^\| \S+\s+\| \d+\s+\| \d+\s+\| random junk\s+\| (false|true)\s+\|$/)
-      expect(olines[2]).to match(/^(\+-+){5}\+$/)
+      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'))
@@ -51,18 +70,25 @@ RSpec.describe 'murano content', :cmd, :needs_password do
       expect(err).to eq('')
       expect(status.exitstatus).to eq(0)
       expect(File.exist?('testDown')).to be true
-      dcf = IO.read('dumped_config')
+      dcf = IO.read('myFile')
       tdf = IO.read('testDown')
       expect(tdf).to eq(dcf)
 
-      out, err, status = Open3.capture3(capcmd('murano', 'content', 'delete', 'myFile'))
+      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).to eq('')
-      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(/^(\+-+){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
 

data/spec/cmd_cors_spec.rb

@@ -8,14 +8,14 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('corstest')
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'create', @project_name, '--save'))
+    @product_name = rname('corstest')
+    out, err, status = Open3.capture3(capcmd('murano', 'application', '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', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -28,7 +28,7 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
     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
     end

data/spec/cmd_device_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: probably not yet
+
+# 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'
@@ -7,14 +14,14 @@ RSpec.describe 'murano device', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('deviceTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @project_name, '--save'))
+    @product_name = rname('deviceTest')
+    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', 'product', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '-y', @product_name))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -30,13 +37,39 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(err).to eq('')
     olines = out.lines
     expect(olines[0]).to match(/^(\+-+){3}\+$/)
-    expect(olines[1]).to match(/^\| SN\s+\| Status\s+\| RID\s+\|$/)
+    expect(olines[1]).to match(/^\| Identifier\s+\| Status\s+\| Online\s+\|$/)
     expect(olines[2]).to match(/^(\+-+){3}\+$/)
-    expect(olines[3]).to match(/^\| 12345\s+\| notactivated\s+\| \h{40}\s+\|$/)
+    expect(olines[3]).to match(/^\| 12345\s+\| whitelisted\s+\| false\s+\|$/)
     expect(olines[4]).to match(/^(\+-+){3}\+$/)
     expect(status.exitstatus).to eq(0)
   end
 
+  it "enables a batch" do
+    File.open('ids.csv', 'w') do |io|
+      io << "ID\n"
+      io << "1234\n"
+      io << "1235\n"
+      io << "1236\n"
+    end
+
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '--file', 'ids.csv'))
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
+
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'list'))
+    expect(err).to eq('')
+    olines = out.lines
+    expect(olines[0]).to match(/^(\+-+){3}\+$/)
+    expect(olines[1]).to match(/^\| Identifier\s+\| Status\s+\| Online\s+\|$/)
+    expect(olines[2]).to match(/^(\+-+){3}\+$/)
+    expect(olines[3]).to match(/^\| 1234\s+\| whitelisted\s+\| false\s+\|$/)
+    expect(olines[4]).to match(/^\| 1235\s+\| whitelisted\s+\| false\s+\|$/)
+    expect(olines[5]).to match(/^\| 1236\s+\| whitelisted\s+\| false\s+\|$/)
+    expect(olines[6]).to match(/^(\+-+){3}\+$/)
+    expect(status.exitstatus).to eq(0)
+  end
+
   it "activates" do
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
     expect(out).to eq('')
@@ -44,17 +77,23 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
 
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'activate', '12345'))
-    expect(out.chomp).to match(/^\h{40}$/)
+    # 2017-06-01: This used to return hex, e.g., /^\h{40}$/, but now returns
+    #   a-zA-Z0-9 (but not \w, which also includes underscore).
+    #expect(out.chomp).to match(/^\h{40}$/)
+    expect(out.chomp).to match(/^[a-zA-Z0-9]{40}$/)
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
 
   it "writes and reads" do
     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',
+    )
 
-    out, err, status = Open3.capture3(capcmd('murano', 'syncup', '--specs'))
-    expect(out).to eq('')
+    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(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
@@ -64,7 +103,9 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(status.exitstatus).to eq(0)
 
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'activate', '12345'))
-    expect(out.chomp).to match(/^\h{40}$/)
+    # 2017-06-01: This used to return hex, e.g., /^\h{40}$/, but now returns
+    #   a-zA-Z0-9 (but not \w, which also includes underscore).
+    expect(out.chomp).to match(/^[a-zA-Z0-9]{40}$/)
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
@@ -79,18 +120,22 @@ RSpec.describe 'murano device', :cmd, :needs_password do
 #    expect(olines[-1]).to match(/^(\+-+){4}\+$/)
 #    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'write', '12345', 'state', '42'))
-    expect(out).to eq("state: ok\n")
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'write', '12345', 'state=42'))
+    expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
     out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'read', '12345', 'state'))
-    expect(out.strip).to eq('42')
+    #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(status.exitstatus).to eq(0)
-
   end
-
 end
 
-#  vim: set ai et sw=2 ts=2 :