MuranoCLI 2.2.4 → 3.0.0

data/spec/Verbosing_spec.rb

@@ -1,6 +1,13 @@
+# Last Modified: 2017.07.03 /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 'highline/import'
-require 'MrMurano/version'
 require 'MrMurano/hash'
+require 'MrMurano/version'
 require 'MrMurano/verbosing'
 require 'MrMurano/Config'
 require '_workspace'
@@ -128,7 +135,9 @@ RSpec.describe MrMurano::Verbose do
 
       it "errors if it can't" do
         $stdout = StringIO.new
-        expect(@tst).to receive(:error).with("Don't know how to tabularize data.").once
+        # 2017-07-03: [lb] converted to class func.
+        #expect(@tst).to receive(:error).with(MrMurano::Verbose::TABULARIZE_DATA_FORMAT_ERROR).once
+        expect(MrMurano::Verbose).to receive(:error).with(MrMurano::Verbose::TABULARIZE_DATA_FORMAT_ERROR).once
         @tst.tabularize(12)
       end
 
@@ -274,6 +283,5 @@ RSpec.describe MrMurano::Verbose do
       expect($stdout.string).to eq("pop\n")
     end
   end
-
 end
-#  vim: set ai et sw=2 ts=2 :
+

data/spec/{Solution-Cors_spec.rb → Webservice-Cors_spec.rb}

@@ -1,26 +1,29 @@
-require 'MrMurano/version'
-require 'MrMurano/Solution-Cors'
-require 'MrMurano/ProjectFile'
 require 'tempfile'
 require 'yaml'
+require 'MrMurano/version'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/SyncRoot'
+require 'MrMurano/Webservice-Cors'
 require '_workspace'
 
-RSpec.describe MrMurano::Cors do
+RSpec.describe MrMurano::Webservice::Cors do
   include_context "WORKSPACE"
   before(:example) do
-    MrMurano::SyncRoot.reset
+    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
-    $cfg['solution.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
 
-    @srv = MrMurano::Cors.new
+    @srv = MrMurano::Webservice::Cors.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("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors/")
+    uri = @srv.endpoint('/')
+    expect(uri.to_s).to eq("#{@baseURI}/")
   end
 
   context "when server gives string" do
@@ -31,7 +34,7 @@ RSpec.describe MrMurano::Cors do
                 :headers=>["Content-Type","Cookie","Authorization"],
                 :credentials=>true}
         body = {:cors=>cors.to_json}
-        stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+        stub_request(:get, "#{@baseURI}").
           with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                           'Content-Type'=>'application/json'}).
                           to_return(body: body.to_json)
@@ -45,7 +48,7 @@ RSpec.describe MrMurano::Cors do
                 :headers=>["Content-Type","Cookie","Authorization"],
                 :credentials=>true}
         body = {:cors=>cors.to_json}
-        stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+        stub_request(:get, "#{@baseURI}").
           with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                           'Content-Type'=>'application/json'}).
                           to_return(body: body.to_json)
@@ -70,7 +73,7 @@ RSpec.describe MrMurano::Cors do
                 :headers=>["Content-Type","Cookie","Authorization"],
                 :credentials=>true}
         body = cors
-        stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+        stub_request(:get, "#{@baseURI}").
           with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                           'Content-Type'=>'application/json'}).
                           to_return(body: body.to_json)
@@ -84,7 +87,7 @@ RSpec.describe MrMurano::Cors do
                 :headers=>["Content-Type","Cookie","Authorization"],
                 :credentials=>true}
         body = cors
-        stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+        stub_request(:get, "#{@baseURI}").
           with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                           'Content-Type'=>'application/json'}).
                           to_return(body: body.to_json)
@@ -111,8 +114,8 @@ RSpec.describe MrMurano::Cors do
                :credentials=>true}
     end
     it "specified file" do
-      File.open(File.join(@projectDir, 'bob.yaml'), 'w'){|io| io << @cors.to_yaml}
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+      File.open(File.join(@project_dir, 'bob.yaml'), 'w'){|io| io << @cors.to_yaml}
+      stub_request(:put, "#{@baseURI}").
         with(:body=>@cors.to_json,
              :headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
@@ -123,9 +126,9 @@ RSpec.describe MrMurano::Cors do
     end
 
     it "file in $project" do
-      File.open(File.join(@projectDir, 'bob.yaml'), 'w'){|io| io << @cors.to_yaml}
+      File.open(File.join(@project_dir, 'bob.yaml'), 'w'){|io| io << @cors.to_yaml}
       $project['routes.cors'] = 'bob.yaml'
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+      stub_request(:put, "#{@baseURI}").
         with(:body=>@cors.to_json,
              :headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
@@ -136,8 +139,8 @@ RSpec.describe MrMurano::Cors do
     end
 
     it "file defaults thru $project" do
-      File.open(File.join(@projectDir, 'cors.yaml'), 'w'){|io| io << @cors.to_yaml}
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+      File.open(File.join(@project_dir, 'cors.yaml'), 'w'){|io| io << @cors.to_yaml}
+      stub_request(:put, "#{@baseURI}").
         with(:body=>@cors.to_json,
              :headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
@@ -149,7 +152,7 @@ RSpec.describe MrMurano::Cors do
 
     it "cors in $project" do
       $project['routes.cors'] = @cors
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors").
+      stub_request(:put, "#{@baseURI}").
         with(:body=>@cors.to_json,
              :headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).

data/spec/{Solution-Endpoint_spec.rb → Webservice-Endpoint_spec.rb}

@@ -1,9 +1,10 @@
-require 'MrMurano/version'
-require 'MrMurano/Solution-Endpoint'
 require 'tempfile'
 require '_workspace'
+require 'MrMurano/version'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/Webservice-Endpoint'
 
-RSpec.describe MrMurano::Endpoint do
+RSpec.describe MrMurano::Webservice::Endpoint do
   include_context "WORKSPACE"
   before(:example) do
     $cfg = MrMurano::Config.new
@@ -11,15 +12,17 @@ RSpec.describe MrMurano::Endpoint do
     $project = MrMurano::ProjectFile.new
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
-    $cfg['solution.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
 
-    @srv = MrMurano::Endpoint.new
+    @srv = MrMurano::Webservice::Endpoint.new
     allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
+
+    @baseURI = "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint"
   end
 
   it "initializes" do
-    uri = @srv.endPoint('/')
-    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/")
+    uri = @srv.endpoint('/')
+    expect(uri.to_s).to eq("#{@baseURI}/")
   end
 
   context "lists" do
@@ -36,12 +39,12 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
 
-      ret = @srv.list()
+      ret = @srv.list
       expect(ret).to eq(body)
     end
 
@@ -58,12 +61,12 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
 
-      ret = @srv.list()
+      ret = @srv.list
       expect(ret).to eq(body)
     end
 
@@ -80,12 +83,12 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
 
-      ret = @srv.list()
+      ret = @srv.list
       expect(ret).to eq(body)
     end
 
@@ -102,12 +105,12 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
 
-      ret = @srv.list()
+      ret = @srv.list
       expect(ret).to eq(body)
     end
 
@@ -124,12 +127,11 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
-
-      ret = @srv.list()
+      ret = @srv.list
       body.first.merge!({:content_type=>'application/json'})
       expect(ret).to eq(body)
     end
@@ -146,12 +148,12 @@ RSpec.describe MrMurano::Endpoint do
        :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").
+      stub_request(:get, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
 
-      ret = @srv.list()
+      ret = @srv.list
       body.first.merge!({:content_type=>'application/json'})
       expect(ret).to eq(body)
     end
@@ -167,7 +169,7 @@ RSpec.describe MrMurano::Endpoint do
               :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").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -183,7 +185,7 @@ RSpec.describe MrMurano::Endpoint do
               :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").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -202,7 +204,7 @@ RSpec.describe MrMurano::Endpoint do
               :content_type=>"application/json",
               :script=>"response.message = \"HI\"\n",
       }
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -218,7 +220,7 @@ RSpec.describe MrMurano::Endpoint do
               :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").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -234,7 +236,7 @@ RSpec.describe MrMurano::Endpoint do
               :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").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -250,7 +252,7 @@ RSpec.describe MrMurano::Endpoint do
               :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").
+      stub_request(:get, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: body.to_json)
@@ -261,7 +263,7 @@ RSpec.describe MrMurano::Endpoint do
   end
 
   it "removes" do
-    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+    stub_request(:delete, "#{@baseURI}/9K0").
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
       to_return(body: "")
@@ -285,13 +287,13 @@ RSpec.describe MrMurano::Endpoint do
     end
 
     it "over old version" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      stub_request(:put, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
       ret = @srv.upload(@tio_.path,
-        MrMurano::Endpoint::RouteItem.new(
+        MrMurano::Webservice::Endpoint::RouteItem.new(
           :id=>"9K0",
           :method=>"websocket",
           :path=>"/api/v1/bar",
@@ -301,17 +303,17 @@ RSpec.describe MrMurano::Endpoint do
     end
 
     it "when nothing is there" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      stub_request(:put, "#{@baseURI}/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/").
+      stub_request(:post, "#{@baseURI}/").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
       ret = @srv.upload(@tio_.path,
-        MrMurano::Endpoint::RouteItem.new(
+        MrMurano::Webservice::Endpoint::RouteItem.new(
           :id=>"9K0",
           :method=>"websocket",
           :path=>"/api/v1/bar",
@@ -321,13 +323,13 @@ RSpec.describe MrMurano::Endpoint do
     end
 
     it "without an itemkey" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/").
+      stub_request(:post, @baseURI).
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
       ret = @srv.upload(@tio_.path,
-        MrMurano::Endpoint::RouteItem.new(
+        MrMurano::Webservice::Endpoint::RouteItem.new(
           :method=>"websocket",
           :path=>"/api/v1/bar",
           :content_type=>"application/json",
@@ -336,14 +338,14 @@ RSpec.describe MrMurano::Endpoint do
     end
 
     it "Handles others errors" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/endpoint/9K0").
+      stub_request(:put, "#{@baseURI}/9K0").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(status: 502, body: "{}")
 
       expect(@srv).to receive(:error).and_return(nil)
       ret = @srv.upload(@tio_.path,
-        MrMurano::Endpoint::RouteItem.new(
+        MrMurano::Webservice::Endpoint::RouteItem.new(
           :id=>"9K0",
           :method=>"websocket",
           :path=>"/api/v1/bar",
@@ -432,7 +434,7 @@ RSpec.describe MrMurano::Endpoint do
     end
   end
 
-  context "toRemoteItem" do
+  context "to_remote_item" do
     it "reads one" do
       Tempfile.open("foo") do |tio|
         tio << %{--#ENDPOINT GET /one/two
@@ -441,7 +443,7 @@ RSpec.describe MrMurano::Endpoint do
         }.gsub(/^\s+/,'')
         tio.close
 
-        ret = @srv.toRemoteItem(nil, tio.path)
+        ret = @srv.to_remote_item(nil, tio.path)
         e = {:method=>"GET",
              :path=>"/one/two",
              :content_type=>"application/json",
@@ -466,7 +468,7 @@ RSpec.describe MrMurano::Endpoint do
         }.gsub(/^\s+/,'')
         tio.close
 
-        ret = @srv.toRemoteItem(nil, tio.path)
+        ret = @srv.to_remote_item(nil, tio.path)
 
         expect(ret).to eq([
           {
@@ -508,7 +510,7 @@ RSpec.describe MrMurano::Endpoint do
         }.gsub(/^\s+/,'')
         tio.close
 
-        ret = @srv.toRemoteItem(nil, tio.path)
+        ret = @srv.to_remote_item(nil, tio.path)
         expect(ret).to eq([])
       end
     end
@@ -523,7 +525,7 @@ RSpec.describe MrMurano::Endpoint do
         }.gsub(/^\s+/,'')
         tio.close
 
-        ret = @srv.toRemoteItem(nil, tio.path)
+        ret = @srv.to_remote_item(nil, tio.path)
         e = {:method=>"GET",
              :path=>"/one/two",
              :content_type=>"application/json",

data/spec/{Solution-File_spec.rb → Webservice-File_spec.rb}

@@ -1,8 +1,9 @@
 require 'MrMurano/version'
-require 'MrMurano/Solution-File'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/Webservice-File'
 require '_workspace'
 
-RSpec.describe MrMurano::File do
+RSpec.describe MrMurano::Webservice::File do
   include_context "WORKSPACE"
   before(:example) do
     $cfg = MrMurano::Config.new
@@ -10,40 +11,49 @@ RSpec.describe MrMurano::File do
     $project = MrMurano::ProjectFile.new
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
-    $cfg['solution.id'] = 'XYZ'
+    $cfg['product.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
 
-    @srv = MrMurano::File.new
+    @srv = MrMurano::Webservice::File.new
     allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
+
+    @baseURI = "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file"
+    @fileuploadURI = "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload"
   end
 
   it "initializes" do
-    uri = @srv.endPoint('/')
-    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file/")
+    uri = @srv.endpoint('/')
+    expect(uri.to_s).to eq("#{@baseURI}/")
   end
 
   it "lists" do
     body = [
-      {:path=>"/",
-       :mime_type=>"text/html",
-       :checksum=>"f535dad52b2877a49717a034b4eee5ff1cdb8a18"},
-      {:path=>"/batteryMeter.svg",
-       :mime_type=>"image/svg+xml",
-       :checksum=>"06a1aab86ba8cb9b3f2913c673d4aa243c553494"},
-      {:path=>"/meter.html",
-       :mime_type=>"text/html",
-       :checksum=>"82e12125c2f1324bbf7bd64bf187f3334416117e"}
+      {
+        :path=>"/",
+        :mime_type=>"text/html",
+        :checksum=>"f535dad52b2877a49717a034b4eee5ff1cdb8a18",
+      },
+      {
+        :path=>"/batteryMeter.svg",
+        :mime_type=>"image/svg+xml",
+        :checksum=>"06a1aab86ba8cb9b3f2913c673d4aa243c553494",
+      },
+      {
+        :path=>"/meter.html",
+        :mime_type=>"text/html",
+        :checksum=>"82e12125c2f1324bbf7bd64bf187f3334416117e",
+      }
     ]
-    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file").
+    stub_request(:get, @baseURI).
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
                       to_return(body: body.to_json)
-
-    ret = @srv.list()
+    ret = @srv.list
     expect(ret).to eq(body)
   end
 
   it "removes" do
-    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file/index.html").
+    stub_request(:delete, "#{@baseURI}/index.html").
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
                       to_return(status: 200)
@@ -53,7 +63,7 @@ RSpec.describe MrMurano::File do
 
   context "fetches" do
     it "gets an error" do
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file/bob").
+      stub_request(:get, "#{@baseURI}/bob").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(status: 404, body: "nope")
@@ -66,7 +76,7 @@ RSpec.describe MrMurano::File do
     end
 
     it "gets $stdout" do
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file/bob").
+      stub_request(:get, "#{@baseURI}/bob").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(status: 200, body: "nope")
@@ -79,7 +89,7 @@ RSpec.describe MrMurano::File do
     end
 
     it "gets to block" do
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/file/bob").
+      stub_request(:get, "#{@baseURI}/bob").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>'application/json'}).
                         to_return(status: 200, body: "nope")
@@ -92,14 +102,14 @@ RSpec.describe MrMurano::File do
 
   context "uploads" do
     before(:example) do
-      FileUtils.mkpath(@projectDir + '/files')
-      @lp = Pathname.new(@projectDir + '/files/one.text')
+      FileUtils.mkpath(@project_dir + '/files')
+      @lp = Pathname.new(@project_dir + '/files/one.text')
       @lp.open('w') {|io| io << %{Just some text}}
       @lp = @lp.realpath
     end
 
     it "an item" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload/one.text").
+      stub_request(:put, "#{@baseURI}upload/one.text").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>%r{multipart/form-data; boundary=.*}},
             )
@@ -108,7 +118,7 @@ RSpec.describe MrMurano::File do
     end
 
     it "gets an error" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload/one.text").
+      stub_request(:put, "#{@baseURI}upload/one.text").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>%r{multipart/form-data; boundary=.*}},
             ).
@@ -122,15 +132,16 @@ RSpec.describe MrMurano::File do
     end
 
     it "an item with curl debug" do
-      stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload/one.text").
+      stub_request(:put, "#{@baseURI}upload/one.text").
         with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                         'Content-Type'=>%r{multipart/form-data; boundary=.*}},
             )
       $cfg['tool.curldebug'] = true
+      $cfg.curlfile_f = nil
       saved = $stdout
       $stdout = StringIO.new
       @srv.upload(@lp, {:path=>'/one.text'}, false)
-      expect($stdout.string).to match(%r{^curl -s -H 'Authorization: token TTTTTTTTTT'.*-X PUT 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/fileupload/one.text' -F file=@.*$})
+      expect($stdout.string).to match(%r{^curl -s -H 'Authorization: token TTTTTTTTTT'.*-X PUT '#{@fileuploadURI}/one.text' -F file=@.*$})
       $stdout = saved
     end
   end
@@ -191,16 +202,16 @@ RSpec.describe MrMurano::File do
     end
   end
 
-  context "toRemoteItem" do
+  context "to_remote_item" do
     before(:example) do
-      FileUtils.mkpath(@projectDir + '/files')
-      @lp = Pathname.new(@projectDir + '/files/one.text')
+      FileUtils.mkpath(@project_dir + '/files')
+      @lp = Pathname.new(@project_dir + '/files/one.text')
       @lp.open('w') {|io| io << %{Just some text}}
       @lp = @lp.realpath
     end
     it "gets item" do
-      prj = Pathname.new(@projectDir).realpath
-      ret = @srv.toRemoteItem(prj, @lp)
+      prj = Pathname.new(@project_dir).realpath
+      ret = @srv.to_remote_item(prj, @lp)
       expect(ret).to eq({
         :path=>"/files/one.text",
         :mime_type=>"text/plain",