MrMurano 1.10.4 → 1.11.0

data/lib/MrMurano/commands/productDeviceIdCmds.rb

@@ -7,15 +7,22 @@ command 'product device list' do |c|
 
   c.option '--offset NUMBER', Integer, %{Offset to start listing at}
   c.option '--limit NUMBER', Integer, %{How many devices to return}
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
   c.action do |args,options|
     options.default :offset=>0, :limit=>50
 
     prd = MrMurano::Product.new
+    io=nil
+    io = File.open(options.output, 'w') if options.output
     data = prd.list(options.offset, options.limit)
-    busy = data.map{|row| [row[:sn], row[:status], row[:rid]]}
-    table = Terminal::Table.new :rows => busy, :headings => ['SN', 'Status', 'RID']
-    say table
+    prd.outf(data, nil) do |dd,ios|
+      dt={}
+      dt[:headers] = [:SN, :Status, :RID]
+      dt[:rows] = data.map{|row| [row[:sn], row[:status], row[:rid]]}
+      prd.tabularize(dt, ios)
+    end
+    io.close unless io.nil?
   end
 end
 

data/lib/MrMurano/commands.rb

@@ -9,6 +9,7 @@ require 'MrMurano/commands/exportImport'
 require 'MrMurano/commands/init'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
+require 'MrMurano/commands/mock'
 require 'MrMurano/commands/postgresql'
 require 'MrMurano/commands/product'
 require 'MrMurano/commands/productCreate'

data/lib/MrMurano/template/mock.erb

@@ -0,0 +1,9 @@
+--#ENDPOINT POST /testpoint/{service}/{call}
+-- this function allows remote calls to your services
+if request.headers["authorization"] == "<%= uuid %>" then
+  local fn = _G[request.parameters.service][request.parameters.call]
+  response.message = fn(request.body)
+else
+  response.code = 401
+  response.message = "invalid authorization header"
+end

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.10.4'.freeze
+  VERSION = '1.11.0'.freeze
 end
 

data/lib/MrMurano.rb

@@ -15,4 +15,3 @@ require 'MrMurano/Product-1P-Device'
 require 'MrMurano/Product-Resources'
 
 require 'MrMurano/commands'
-

data/spec/Config_spec.rb

@@ -246,6 +246,10 @@ bob = test
   end
 
   context "Can find the project directory by .mrmuranorc but not sub .git/" do
+    #
+    # /home/work/project/
+    # /home/work/project/.mrmuranorc
+    # /home/work/project/some/.git
     before(:example) do
       @tmpdir = Dir.tmpdir
       path = '/home/work/project/some/where'
@@ -285,14 +289,17 @@ bob = test
     end
   end
 
-  context "Can find the project directory by .mrmurano/ but not sub .git/" do
+  context "Can find the project directory by .mrmuranorc but not parent .git/" do
+    # /home/work/project/
+    # /home/work/project/.git
+    # /home/work/project/some/.mrmuranorc
     before(:example) do
       @tmpdir = Dir.tmpdir
       path = '/home/work/project/some/where'
       @projectDir = @tmpdir + '/home/work/project'
       FileUtils.mkpath(@tmpdir + path)
-      FileUtils.mkpath(@projectDir + '/.mrmurano')
-      FileUtils.mkpath(@projectDir + '/some/.git')
+      FileUtils.touch(@projectDir + '/some/.mrmuranorc')
+      FileUtils.mkpath(@projectDir + '/.git')
 
       # Set ENV to override output of Dir.home
       ENV['HOME'] = @tmpdir + '/home'
@@ -309,6 +316,8 @@ bob = test
         # Follow symlinks to get the paths comparable.
         locbase = cfg.get('location.base', :defaults).realdirpath
         wkd = Pathname.new(@projectDir).realdirpath
+        # This will correctly assume that this project dir with .git is the
+        # location.base
         expect(locbase).to eq(wkd)
       end
     end
@@ -319,11 +328,12 @@ bob = test
         cfg.load
         # Follow symlinks to get the paths comparable.
         locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
+        wkd = Pathname.new(@projectDir+'/some').realdirpath
         expect(locbase).to eq(wkd)
       end
     end
   end
+
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/spec/Mock_spec.rb

@@ -0,0 +1,60 @@
+require 'MrMurano/Mock'
+require 'tempfile'
+
+RSpec.describe MrMurano::Mock, "#mock" do
+  before(:example) do
+    @tmpdir = Dir.tmpdir
+    @projectDir = @tmpdir + '/home/work/project'
+
+    FileUtils.mkpath(@projectDir)
+    FileUtils.mkpath(@projectDir + '/endpoints')
+    Dir.chdir(@projectDir) do
+      $cfg = MrMurano::Config.new
+      $cfg.load
+    end
+
+    @mock = MrMurano::Mock.new
+  end
+
+  after(:example) do
+    FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
+  end
+
+  it "can create the testpoint file" do
+    Dir.chdir(@projectDir) do
+      uuid = @mock.create_testpoint()
+      expect(uuid.length).to be("XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX".length)
+      path = @mock.get_testpoint_path()
+      testpoint = File.read(path)
+      expect(testpoint.include? uuid).to be(true)
+    end
+  end
+
+  it "can show the UUID from the testpoint file" do
+    Dir.chdir(@projectDir) do
+      uuid = @mock.create_testpoint()
+      retrieved_uuid = @mock.show()
+      expect(uuid).to eq(retrieved_uuid)
+    end
+  end
+
+  it "can remove the testpoint file" do
+    Dir.chdir(@projectDir) do
+      @mock.create_testpoint()
+      path = @mock.get_testpoint_path()
+      removed = @mock.remove_testpoint()
+      expect(removed).to be(true)
+      expect(File.exist?(path)).to be(false)
+    end
+  end
+
+  it "cannot show the UUID if there's no testpoint file" do
+    Dir.chdir(@projectDir) do
+      @mock.create_testpoint()
+      @mock.show()
+      @mock.remove_testpoint()
+      retrieved_uuid = @mock.show()
+      expect(retrieved_uuid).to be(false)
+    end
+  end
+end

data/spec/ProductResources_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe MrMurano::ProductResources do
     it "raises when no spec name" do
       $cfg['product.spec'] = nil
       $cfg['product.id'] = nil
-      expect { @prd.location }.to raise_error("No spec file named; run `mr config prodcut.spec <specfile>`")
+      expect { @prd.location }.to raise_error("No spec file named; run `mr config product.spec <specfile>`")
     end
   end
 

data/spec/Solution-Endpoint_spec.rb

@@ -0,0 +1,314 @@
+require 'MrMurano/version'
+require 'MrMurano/Solution-Endpoint'
+require 'tempfile'
+
+RSpec.describe MrMurano::Endpoint do
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['solution.id'] = 'XYZ'
+
+    @srv = MrMurano::Endpoint.new
+    allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
+  end
+
+  it "initializes" do
+    uri = @srv.endPoint('/')
+    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/")
+  end
+
+  context "lists" do
+    it "same content_type" do
+      body = [{:id=>"9K0",
+               :method=>"websocket",
+               :path=>"/api/v1/bar",
+               :content_type=>"application/json",
+               :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n\n",
+      },
+      {:id=>"B76",
+       :method=>"websocket",
+       :path=>"/api/v1/foo/{id}",
+       :content_type=>"application/json",
+       :script=> "--#ENDPOINT WEBSOCKET /api/v1/foo/{id}\nresponse.message = \"HI\"\n\n-- BOB WAS HERE\n",
+      }]
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.list()
+      expect(ret).to eq(body)
+    end
+
+    it "missing headers" do
+      body = [{:id=>"9K0",
+               :method=>"websocket",
+               :path=>"/api/v1/bar",
+               :content_type=>"application/json",
+               :script=>"response.message = \"HI\"\n\n",
+      },
+      {:id=>"B76",
+       :method=>"websocket",
+       :path=>"/api/v1/foo/{id}",
+       :content_type=>"application/json",
+       :script=> "response.message = \"HI\"\n\n-- BOB WAS HERE\n",
+      }]
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.list()
+      expect(ret).to eq(body)
+    end
+
+    it "not default content_type" do
+      body = [{:id=>"9K0",
+               :method=>"websocket",
+               :path=>"/api/v1/bar",
+               :content_type=>"text/csv",
+               :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar text/csv\nresponse.message = \"HI\"\n\n",
+      },
+      {:id=>"B76",
+       :method=>"websocket",
+       :path=>"/api/v1/foo/{id}",
+       :content_type=>"image/png",
+       :script=> "--#ENDPOINT WEBSOCKET /api/v1/foo/{id} image/png\nresponse.message = \"HI\"\n\n-- BOB WAS HERE\n",
+      }]
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.list()
+      expect(ret).to eq(body)
+    end
+
+    it "mismatched content_type header" do
+      body = [{:id=>"9K0",
+               :method=>"websocket",
+               :path=>"/api/v1/bar",
+               :content_type=>"text/csv",
+               :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n\n",
+      },
+      {:id=>"B76",
+       :method=>"websocket",
+       :path=>"/api/v1/foo/{id}",
+       :content_type=>"image/png",
+       :script=> "--#ENDPOINT WEBSOCKET /api/v1/foo/{id}\nresponse.message = \"HI\"\n\n-- BOB WAS HERE\n",
+      }]
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.list()
+      expect(ret).to eq(body)
+    end
+
+  end
+
+
+  context "fetches" do
+    it "fetches" do
+      body = {:id=>"9K0",
+              :method=>"websocket",
+              :path=>"/api/v1/bar",
+              :content_type=>"application/json",
+              :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n",
+      }
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.fetch('9K0')
+      expect(ret).to eq(body[:script])
+    end
+
+    it "missing headers" do
+      body = {:id=>"9K0",
+              :method=>"websocket",
+              :path=>"/api/v1/bar",
+              :content_type=>"application/json",
+              :script=>"response.message = \"HI\"\n",
+      }
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.fetch('9K0')
+      expect(ret).to eq("--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n")
+    end
+
+    it "not default content_type" do
+      body = {:id=>"9K0",
+              :method=>"websocket",
+              :path=>"/api/v1/bar",
+              :content_type=>"text/csv",
+              :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar text/csv\nresponse.message = \"HI\"\n",
+      }
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.fetch('9K0')
+      expect(ret).to eq(body[:script])
+    end
+
+    it "missing content_type header" do
+      body = {:id=>"9K0",
+              :method=>"websocket",
+              :path=>"/api/v1/bar",
+              :content_type=>"text/csv",
+              :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n",
+      }
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.fetch('9K0')
+      expect(ret).to eq("--#ENDPOINT WEBSOCKET /api/v1/bar text/csv\nresponse.message = \"HI\"\n")
+    end
+
+    it "mismatched content_type header" do
+      body = {:id=>"9K0",
+              :method=>"websocket",
+              :path=>"/api/v1/bar",
+              :content_type=>"text/csv",
+              :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar image/png\nresponse.message = \"HI\"\n",
+      }
+      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+        with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                        'Content-Type'=>'application/json'}).
+                        to_return(body: body.to_json)
+
+      ret = @srv.fetch('9K0')
+      expect(ret).to eq("--#ENDPOINT WEBSOCKET /api/v1/bar text/csv\nresponse.message = \"HI\"\n")
+    end
+  end
+
+  it "removes" do
+    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+
+    ret = @srv.remove('9K0')
+    expect(ret).to eq({})
+  end
+
+  it "uploads over old version" do
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+
+    Tempfile.open('foo') do |tio|
+      tio << %{-- lua code is here
+    function foo(bar)
+      return bar + 1
+    end
+      }
+      tio.close
+
+      ret = @srv.upload(tio.path, {:id=>"9K0",
+                                   :method=>"websocket",
+                                   :path=>"/api/v1/bar",
+                                   :content_type=>"application/json",
+      }, true)
+      expect(ret)
+    end
+  end
+
+  it "uploads when nothing is there" do
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(status: 404)
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+
+    Tempfile.open('foo') do |tio|
+      tio << %{-- lua code is here
+    function foo(bar)
+      return bar + 1
+    end
+      }
+      tio.close
+
+      ret = @srv.upload(tio.path, {:id=>"9K0",
+                                   :method=>"websocket",
+                                   :path=>"/api/v1/bar",
+                                   :content_type=>"application/json",
+      }, false)
+      expect(ret)
+    end
+
+  end
+
+  context "compares" do
+    before(:example) do
+      @iA = {:id=>"9K0",
+             :method=>"websocket",
+             :path=>"/api/v1/bar",
+             :content_type=>"application/json",
+             :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n",
+             }
+      @iB = {:id=>"9K0",
+             :method=>"websocket",
+             :path=>"/api/v1/bar",
+             :content_type=>"application/json",
+             :script=>"--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n",
+             }
+    end
+    it "both have script" do
+      ret = @srv.docmp(@iA, @iB)
+      expect(ret).to eq(false)
+    end
+
+    it "iA is a local file" do
+      Tempfile.open('foo') do |tio|
+        tio << @iA[:script]
+        tio.close
+        iA = @iA.reject{|k,v| k == :script}.merge({
+          :local_path => Pathname.new(tio.path)
+        })
+        ret = @srv.docmp(iA, @iB)
+        expect(ret).to eq(false)
+
+        iB = @iB.dup
+        iB[:script] = "BOB"
+        ret = @srv.docmp(iA, iB)
+        expect(ret).to eq(true)
+      end
+    end
+
+    it "iB is a local file" do
+      Tempfile.open('foo') do |tio|
+        tio << @iB[:script]
+        tio.close
+        iB = @iB.reject{|k,v| k == :script}.merge({
+          :local_path => Pathname.new(tio.path)
+        })
+        ret = @srv.docmp(@iA, iB)
+        expect(ret).to eq(false)
+
+        iA = @iB.dup
+        iA[:script] = "BOB"
+        ret = @srv.docmp(iA, iB)
+        expect(ret).to eq(true)
+      end
+    end
+  end
+
+  # TODO: status tests
+
+end
+#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_common.rb

@@ -0,0 +1,44 @@
+require 'pathname'
+require 'shellwords'
+require 'timeout'
+require 'tmpdir'
+
+RSpec.shared_context "CI_CMD" do
+  def capcmd(*args)
+    args = [args] unless args.kind_of? Array
+    args.flatten!
+    testdir = File.realpath(@testdir.to_s)
+    if ENV['CI_MR_EXE'].nil? then
+      args[0] = File.join(testdir, 'bin', args[0])
+      args.unshift("ruby", "-I#{File.join(testdir, 'lib')}")
+    else
+      args[0] = File.join(testdir, (args[0] + '.exe'))
+    end
+
+    if Gem.win_platform? then
+      cmd = args.map{|i| if i =~ / / then %{"#{i}"} else i end}.join(' ')
+    else
+      cmd = Shellwords.join(args)
+    end
+    #pp cmd
+    cmd
+  end
+
+  around(:example) do |ex|
+    @testdir = Pathname.new(Dir.pwd).realpath
+    Dir.mktmpdir do |hdir|
+      ENV['HOME'] = hdir
+      Dir.chdir(hdir) do
+        @tmpdir = File.join(hdir, 'project')
+        Dir.mkdir(@tmpdir)
+        Dir.chdir(@tmpdir) do
+          Timeout::timeout(20) do
+            ex.run
+          end
+        end
+      end
+    end
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_config_spec.rb

@@ -1,34 +1,10 @@
 require 'fileutils'
 require 'open3'
 require 'pathname'
-require 'shellwords'
-require 'tmpdir'
+require 'cmd_common'
 
 RSpec.describe 'mr config' do
-
-  def capcmd(*args)
-    args = [args] unless args.kind_of? Array
-    args.flatten!
-    args[0] = @testdir + 'bin' + args[0]
-    args.unshift("ruby", "-I#{(@testdir+'lib').to_s}")
-    cmd = Shellwords.join(args)
-    #pp cmd
-    cmd
-  end
-
-  around(:example) do |ex|
-    @testdir = Pathname.new(Dir.pwd).realpath
-    Dir.mktmpdir do |hdir|
-      ENV['HOME'] = hdir
-      Dir.chdir(hdir) do
-        @tmpdir = File.join(hdir, 'project')
-        Dir.mkdir(@tmpdir)
-        Dir.chdir(@tmpdir) do
-          ex.run
-        end
-      end
-    end
-  end
+  include_context "CI_CMD"
 
   it "Needs a key" do
     out, err, status = Open3.capture3(capcmd('mr', "config"))

data/spec/cmd_init_spec.rb

@@ -1,34 +1,10 @@
 require 'fileutils'
 require 'open3'
 require 'pathname'
-require 'shellwords'
-require 'tmpdir'
+require 'cmd_common'
 
 RSpec.describe 'mr init' do
-
-  def capcmd(*args)
-    args = [args] unless args.kind_of? Array
-    args.flatten!
-    args[0] = @testdir + 'bin' + args[0]
-    args.unshift("ruby", "-I#{(@testdir+'lib').to_s}")
-    cmd = Shellwords.join(args)
-    #pp cmd
-    cmd
-  end
-
-  around(:example) do |ex|
-    @testdir = Pathname.new(Dir.pwd).realpath
-    Dir.mktmpdir do |hdir|
-      ENV['HOME'] = hdir
-      Dir.chdir(hdir) do
-        @tmpdir = File.join(hdir, 'project')
-        Dir.mkdir(@tmpdir)
-        Dir.chdir(@tmpdir) do
-          ex.run
-        end
-      end
-    end
-  end
+  include_context "CI_CMD"
 
   it "Won't init in HOME (gracefully)" do
     # this is in the project dir. Want to be in HOME