MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

data/spec/Verbosing_spec.rb

@@ -65,14 +65,19 @@ RSpec.describe MrMurano::Verbose do
       end
 
       it 'takes Array' do
+        stdout_saved = $stdout
         $stdout = StringIO.new
 
         @tst.tabularize([[1, 2, 3, 4, 5, 6, 7], [10, 20, 30, 40, 50, 60, 70]])
 
-        expect($stdout.string).to eq("1,2,3,4,5,6,7\n10,20,30,40,50,60,70\n")
+        expect($stdout.string).to eq(
+          %("1","2","3","4","5","6","7"\n"10","20","30","40","50","60","70"\n)
+        )
+        $stdout = stdout_saved
       end
 
       it 'ducks to_a' do
+        stdout_saved = $stdout
         $stdout = StringIO.new
 
         class DuckToATest
@@ -82,10 +87,12 @@ RSpec.describe MrMurano::Verbose do
         end
         @tst.tabularize(DuckToATest.new)
 
-        expect($stdout.string).to eq("12\n13\n")
+        expect($stdout.string).to eq(%("12"\n"13"\n))
+        $stdout = stdout_saved
       end
 
       it 'ducks each' do
+        stdout_saved = $stdout
         $stdout = StringIO.new
 
         class DuckEachTest
@@ -96,7 +103,9 @@ RSpec.describe MrMurano::Verbose do
         end
         @tst.tabularize(DuckEachTest.new)
 
-        expect($stdout.string).to eq("22\n44\n")
+        expect($stdout.string).to eq(%("22"\n"44"\n))
+
+        $stdout = stdout_saved
       end
 
       context 'takes Hash' do
@@ -106,11 +115,26 @@ RSpec.describe MrMurano::Verbose do
             title: 'Test output',
             rows: [[1, 2, 3], [10, 20, 30]],
           }
+          @stdout_saved = $stdout
           $stdout = StringIO.new
         end
+
+        after(:example) do
+          $stdout = @stdout_saved
+        end
+
         it 'has all' do
           @tst.tabularize(@hsh)
-          expect($stdout.string).to eq("one,two,three\n1,2,3\n10,20,30\n")
+          expect($stdout.string).to eq(
+            %("one","two","three"\n"1","2","3"\n"10","20","30"\n)
+          )
+        end
+
+        it 'not quoted' do
+          @tst.tabularize(@hsh, no_quotes: true)
+          expect($stdout.string).to eq(
+            %(one,two,three\n1,2,3\n10,20,30\n)
+          )
         end
 
         it 'is empty' do
@@ -121,43 +145,48 @@ RSpec.describe MrMurano::Verbose do
         it 'no headers' do
           @hsh.delete :headers
           @tst.tabularize(@hsh)
-          expect($stdout.string).to eq("1,2,3\n10,20,30\n")
+          expect($stdout.string).to eq(%("1","2","3"\n"10","20","30"\n))
         end
 
         it 'no title' do
           @hsh.delete :title
           @tst.tabularize(@hsh)
-          expect($stdout.string).to eq("one,two,three\n1,2,3\n10,20,30\n")
+          expect($stdout.string).to eq(%("one","two","three"\n"1","2","3"\n"10","20","30"\n))
         end
 
         it 'no rows' do
           @hsh.delete :rows
           @tst.tabularize(@hsh)
-          expect($stdout.string).to eq("one,two,three\n\n")
+          expect($stdout.string).to eq(%("one","two","three"\n\n))
         end
       end
 
       it "errors if it can't" do
+        stdout_saved = $stdout
         $stdout = StringIO.new
         # 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)
+        $stdout = stdout_saved
       end
 
       it 'takes Array, to custom stream' do
+        stdout_saved = $stdout
         $stdout = StringIO.new
         outer = StringIO.new
 
         @tst.tabularize([[1, 2, 3, 4, 5, 6, 7], [10, 20, 30, 40, 50, 60, 70]], outer)
 
-        expect(outer.string).to eq("1,2,3,4,5,6,7\n10,20,30,40,50,60,70\n")
+        expect(outer.string).to eq(%("1","2","3","4","5","6","7"\n"10","20","30","40","50","60","70"\n))
         expect($stdout.string).to eq('')
+        $stdout = stdout_saved
       end
     end
 
     context 'generating a table' do
       it 'takes Array' do
+        stdout_saved = $stdout
         $stdout = StringIO.new
         @tst.tabularize([[1, 2, 3, 4, 5, 6, 7], [10, 20, 30, 40, 50, 60, 70]])
         expect($stdout.string).to eq(
@@ -167,6 +196,7 @@ RSpec.describe MrMurano::Verbose do
             +----+----+----+----+----+----+----+
             ).gsub(/^\s+/, '')
         )
+        $stdout = stdout_saved
       end
 
       context 'takes Hash' do
@@ -176,8 +206,14 @@ RSpec.describe MrMurano::Verbose do
             title: 'Test output',
             rows: [[1, 2, 3], [10, 20, 30]],
           }
+          @stdout_saved = $stdout
           $stdout = StringIO.new
         end
+
+        after(:example) do
+          $stdout = @stdout_saved
+        end
+
         it 'has all' do
           @tst.tabularize(@hsh)
           expect($stdout.string).to eq(
@@ -249,9 +285,14 @@ RSpec.describe MrMurano::Verbose do
         one: 'three',
         two: [{ one: 3 }, { one: 4 }],
       }
+      @stdout_saved = $stdout
       $stdout = StringIO.new
     end
 
+    after(:example) do
+      $stdout = @stdout_saved
+    end
+
     it 'outputs yaml' do
       $cfg['tool.outformat'] = 'yaml'
       @tst.outf(@data)

data/spec/Webservice-Cors_spec.rb

@@ -6,7 +6,9 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'tempfile'
+require 'webmock'
 require 'yaml'
+
 require 'MrMurano/version'
 require 'MrMurano/HttpAuthed'
 require 'MrMurano/ProjectFile'
@@ -17,8 +19,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::Cors do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -31,6 +33,10 @@ RSpec.describe MrMurano::Webservice::Cors do
     @base_uri = 'https://bizapi.hosted.exosite.io/api:1/solution/XYZ/cors'
   end
 
+  after(:example) do
+    WebMock.reset!
+  end
+
   it 'initializes' do
     uri = @srv.endpoint('/')
     expect(uri.to_s).to eq("#{@base_uri}/")
@@ -58,6 +64,7 @@ RSpec.describe MrMurano::Webservice::Cors do
         ret = @srv.fetch
         expect(ret).to eq(cors)
       end
+
       it 'as a block' do
         cors = {
           origin: true,
@@ -109,6 +116,7 @@ RSpec.describe MrMurano::Webservice::Cors do
         ret = @srv.fetch
         expect(ret).to eq(cors)
       end
+
       it 'as a block' do
         cors = {
           origin: true,
@@ -149,6 +157,7 @@ RSpec.describe MrMurano::Webservice::Cors do
         credentials: true,
       }
     end
+
     it 'specified file' do
       File.open(File.join(@project_dir, 'bob.yaml'), 'w') { |io| io << @cors.to_yaml }
       stub_request(

data/spec/Webservice-Endpoint_spec.rb

@@ -16,11 +16,18 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Webservice::Endpoint do
   include_context 'WORKSPACE'
+
   before(:example) do
     $cfg = MrMurano::Config.new
     $cfg.load
     $project = MrMurano::ProjectFile.new
     $project.load
+
+    @pswd = create_instance_double_passwords
+    allow(@pswd).to receive(:get).and_return('built')
+
+    $cfg['user.name'] = 'bob'
+
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['application.id'] = 'XYZ'
     stub_request_email_password
@@ -46,16 +53,21 @@ RSpec.describe MrMurano::Webservice::Endpoint do
           content_type: 'application/json',
           script: "--#ENDPOINT WEBSOCKET /api/v1/bar\nresponse.message = \"HI\"\n\n",
         },
-        { id: 'B76',
+        {
+          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", },
+          script: "--#ENDPOINT WEBSOCKET /api/v1/foo/{id}\nresponse.message = \"HI\"\n\n-- BOB WAS HERE\n",
+        },
       ]
       stub_request(:get, @base_uri)
-        .with(headers: { 'Authorization' => 'token TTTTTTTTTT',
-                         'Content-Type' => 'application/json', })
-        .to_return(body: body.to_json)
+        .with(
+          headers: {
+            'Authorization' => 'token TTTTTTTTTT',
+            'Content-Type' => 'application/json',
+          }
+        ).to_return(body: body.to_json)
 
       ret = @srv.list
       expect(ret).to eq(body)
@@ -471,26 +483,29 @@ RSpec.describe MrMurano::Webservice::Endpoint do
     end
   end
 
-  context 'to_remote_item' do
+  context 'to_remote_items' do
     it 'reads one' do
       Tempfile.open('foo') do |tio|
         tio << %(--#ENDPOINT GET /one/two
         return request
 
-        ).gsub(/^\s+/, '')
+        ).gsub(/^ +/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        e = {
-          method: 'GET',
-          path: '/one/two',
-          content_type: 'application/json',
-          local_path: Pathname.new(tio.path),
-          line_beg: 0,
-          script: "--#ENDPOINT GET /one/two\nreturn request\n",
-          line_end: 2,
-        }
-        expect(ret).to eq([e])
+        want = [
+          {
+            content_type: 'application/json',
+            header: '--#ENDPOINT GET /one/two',
+            line_beg: 1,
+            line_end: 3,
+            local_path: Pathname.new(tio.path),
+            method: 'GET',
+            path: '/one/two',
+            script: "return request\n\n",
+          },
+        ]
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret.collect(&:to_h)).to eq(want)
       end
     end
 
@@ -503,42 +518,43 @@ RSpec.describe MrMurano::Webservice::Endpoint do
 
         --#ENDPOINT DELETE /three/two
         return request
-        ).gsub(/^\s+/, '')
+        ).gsub(/^ +/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-
-        expect(ret).to eq(
-          [
-            {
-              method: 'GET',
-              path: '/one/two',
-              content_type: 'application/json',
-              local_path: Pathname.new(tio.path),
-              line_beg: 0,
-              script: "--#ENDPOINT GET /one/two\nreturn request\n",
-              line_end: 2,
-            },
-            {
-              method: 'PUT',
-              path: '/one/two',
-              content_type: 'application/json',
-              local_path: Pathname.new(tio.path),
-              line_beg: 2,
-              script: "--#ENDPOINT PUT /one/two\nreturn request\n",
-              line_end: 4,
-            },
-            {
-              method: 'DELETE',
-              path: '/three/two',
-              content_type: 'application/json',
-              local_path: Pathname.new(tio.path),
-              line_beg: 4,
-              script: "--#ENDPOINT DELETE /three/two\nreturn request\n",
-              line_end: 6,
-            },
-          ]
-        )
+        want = [
+          {
+            content_type: 'application/json',
+            header: '--#ENDPOINT GET /one/two',
+            line_beg: 1,
+            line_end: 2,
+            local_path: Pathname.new(tio.path),
+            method: 'GET',
+            path: '/one/two',
+            script: "return request\n",
+          },
+          {
+            content_type: 'application/json',
+            header: '--#ENDPOINT PUT /one/two',
+            line_beg: 3,
+            line_end: 5,
+            local_path: Pathname.new(tio.path),
+            method: 'PUT',
+            path: '/one/two',
+            script: "return request\n\n",
+          },
+          {
+            content_type: 'application/json',
+            header: '--#ENDPOINT DELETE /three/two',
+            line_beg: 6,
+            line_end: 7,
+            local_path: Pathname.new(tio.path),
+            method: 'DELETE',
+            path: '/three/two',
+            script: "return request\n",
+          },
+        ]
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret.collect(&:to_h)).to eq(want)
       end
     end
 
@@ -550,8 +566,8 @@ RSpec.describe MrMurano::Webservice::Endpoint do
         ).gsub(/^\s+/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        expect(ret).to eq([])
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret.collect(&:to_h)).to eq([])
       end
     end
 
@@ -565,17 +581,20 @@ RSpec.describe MrMurano::Webservice::Endpoint do
         ).gsub(/^\s+/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        e = {
-          method: 'GET',
-          path: '/one/two',
-          content_type: 'application/json',
-          local_path: Pathname.new(tio.path),
-          line_beg: 1,
-          script: "--#ENDPOINT GET /one/two\nreturn request\n",
-          line_end: 3,
-        }
-        expect(ret).to eq([e])
+        want = [
+          {
+            content_type: 'application/json',
+            header: '--#ENDPOINT GET /one/two',
+            line_beg: 2,
+            line_end: 3,
+            local_path: Pathname.new(tio.path),
+            method: 'GET',
+            path: '/one/two',
+            script: "return request\n",
+          },
+        ]
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret.collect(&:to_h)).to eq(want)
       end
     end
   end

data/spec/Webservice-File_spec.rb

@@ -251,25 +251,30 @@ RSpec.describe MrMurano::Webservice::File do
     end
   end
 
-  context 'to_remote_item' do
+  context 'to_remote_items' do
     before(:example) do
       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(@project_dir).realpath
-      ret = @srv.to_remote_item(prj, @lp)
-      expect(ret).to eq(
-        path: '/files/one.text',
-        mime_type: 'text/plain',
-        # 2018-04-16: Did backend change from SHA1 to MD5 hash function?
-        #   You can calculate this with `sha1sum one.text`
-        #checksum: 'd1af3dadf08479a1d43b282f95d61dda8efda5e7'
-        #   You can calculate this with `md5sum one.text`
-        checksum: 'e9ea4a5be73a09f541ad0b611083f0df'
-      )
+      want = [
+        MrMurano::Webservice::File::FileItem.new(
+          path: '/files/one.text',
+          mime_type: 'text/plain',
+          # 2018-04-16: Did backend change from SHA1 to MD5 hash function?
+          #   You can calculate this with `sha1sum one.text`
+          #checksum: 'd1af3dadf08479a1d43b282f95d61dda8efda5e7'
+          #   You can calculate this with `md5sum one.text`
+          checksum: 'e9ea4a5be73a09f541ad0b611083f0df',
+          size: %(Just some text).length,
+        ),
+      ]
+      ret = @srv.to_remote_items(prj, @lp)
+      expect(ret).to eq(want)
     end
   end
 end