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

data/spec/Solution-ServiceConfig_spec.rb

@@ -16,8 +16,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::ServiceConfig do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $project = MrMurano::ProjectFile.new

data/spec/Solution-ServiceEventHandler_spec.rb

@@ -75,6 +75,7 @@ RSpec.describe MrMurano::EventHandler do
       event: 'datapoint',
       created_at: '2016-07-07T19:16:19.479Z',
       updated_at: '2016-09-12T13:26:55.868Z',
+      header: '--#EVENT device datapoint',
       script: %{--#EVENT device datapoint
 -- lua code is here
 function foo(bar)
@@ -330,7 +331,7 @@ end
     end
   end
 
-  context 'to_remote_item' do
+  context 'to_remote_items' do
     before(:example) do
       allow(@srv).to receive(:warning)
     end
@@ -343,17 +344,21 @@ end
         ).gsub(/^\s+/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        expect(ret).to eq(
-          service: 'device',
-          event: 'datapoint',
-          svc_alias: nil,
-          type: nil,
-          line_beg: 0,
-          line_end: 3,
-          local_path: Pathname.new(tio.path),
-          script: %(--#EVENT device datapoint\n-- do something.\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n)
-        )
+        want = [
+          {
+            service: 'device',
+            event: 'datapoint',
+            svc_alias: nil,
+            type: nil,
+            line_beg: 1,
+            line_end: 3,
+            local_path: Pathname.new(tio.path),
+            header: %(--#EVENT device datapoint),
+            script: %(-- do something.\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n),
+          },
+        ]
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret).to eq(want)
       end
     end
 
@@ -365,8 +370,8 @@ end
         ).gsub(/^\s+/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        expect(ret).to eq(nil)
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret).to eq([])
       end
     end
 
@@ -379,19 +384,21 @@ end
         ).gsub(/^\s+/, '')
         tio.close
 
-        ret = @srv.to_remote_item(nil, tio.path)
-        expect(ret).to eq(
+        want = [
           MrMurano::EventHandler::EventHandlerItem.new(
             service: 'device',
             event: 'datapoint',
             svc_alias: nil,
             type: nil,
-            line_beg: 1,
+            line_beg: 2, # Skips the "-- do something." line, before --#EVENT.
             line_end: 3,
             local_path: Pathname.new(tio.path),
-            script: %(--#EVENT device datapoint\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n),
-          )
-        )
+            header: %(--#EVENT device datapoint),
+            script: %(Tsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n),
+          ),
+        ]
+        ret = @srv.to_remote_items(nil, tio.path)
+        expect(ret).to eq(want)
       end
     end
   end

data/spec/Solution-ServiceModules_spec.rb

@@ -542,18 +542,20 @@ RSpec.describe MrMurano::Module do
     end
   end
 
-  context 'to_remote_item' do
+  context 'to_remote_items' do
     it 'reads one' do
       root = Pathname.new(@project_dir)
       path = Pathname.new(@project_dir) + 'test.lua'
-      ret = @srv.to_remote_item(root, path)
-      expect(ret).to eq(name: 'test')
+      want = [{ name: 'test' }]
+      ret = @srv.to_remote_items(root, path)
+      expect(ret).to eq(want)
     end
     it 'reads sub folder one' do
       root = Pathname.new(@project_dir)
       path = Pathname.new(@project_dir) + 'src/test.lua'
-      ret = @srv.to_remote_item(root, path)
-      expect(ret).to eq(name: 'src.test')
+      ret = @srv.to_remote_items(root, path)
+      want = [{ name: 'src.test' }]
+      expect(ret).to eq(want)
     end
   end
 end

data/spec/Solution-UsersRoles_spec.rb

@@ -7,6 +7,8 @@
 
 require 'pathname'
 require 'tempfile'
+require 'webmock'
+
 require 'MrMurano/hash'
 require 'MrMurano/version'
 require 'MrMurano/HttpAuthed'
@@ -17,8 +19,8 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Role do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -29,6 +31,10 @@ RSpec.describe MrMurano::Role do
     MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
+  after(:example) do
+    WebMock.reset!
+  end
+
   it 'initializes' do
     uri = @srv.endpoint('/')
     expect(uri.to_s).to eq(

data/spec/Solution_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,15 +19,17 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Solution do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
+
     $project = MrMurano::ProjectFile.new
     $project.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
     $cfg['product.id'] = 'XYZ'
     $cfg['application.id'] = 'XYZ'
+
     stub_request_email_password
 
     # NOTE: This test works on either Product or Application.
@@ -36,6 +40,10 @@ RSpec.describe MrMurano::Solution do
     MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
 
+  after(:example) do
+    WebMock.reset!
+  end
+
   it 'initializes' do
     uri = @srv.endpoint('/')
     expect(uri.to_s).to eq(

data/spec/SyncRoot_spec.rb

@@ -15,12 +15,8 @@ require '_workspace'
 RSpec.describe MrMurano::SyncRoot do
   include_context 'WORKSPACE'
 
-  after(:example) do
-    MrMurano::SyncRoot.instance.reset
-  end
-
   before(:example) do
-    MrMurano::SyncRoot.instance.reset # also creates @@syncset
+    @syncsetypes = MrMurano::SyncRoot.instance.reset # also creates @@syncset
     # Weird/2017-07-31: I [lb] must[ve changed something, because this
     # block being called twice, which is generating a warning:
     #   /exo/clients/exosite/MuranoCLIs/MuranoCLI+landonb/spec/SyncRoot_spec.rb:30:
@@ -60,6 +56,10 @@ RSpec.describe MrMurano::SyncRoot do
     end
   end
 
+  after(:example) do
+    MrMurano::SyncRoot.instance.reset(@syncsetypes)
+  end
+
   it 'has defaults' do
     ret = MrMurano::SyncRoot.instance.bydefault
     expect(ret).to eq(['user'])

data/spec/SyncUpDown_spec.rb

@@ -11,7 +11,9 @@ require 'MrMurano/version'
 require 'MrMurano/Config'
 require 'MrMurano/ProjectFile'
 require 'MrMurano/SyncRoot'
+require 'MrMurano/Solution-Services'
 require 'MrMurano/SyncUpDown'
+require 'MrMurano/SyncUpDown-Item'
 require '_workspace'
 
 class TSUD
@@ -35,6 +37,7 @@ class TSUD
   end
 
   def fetch(id, _untainted=false)
+    # pass
   end
 
   def self.description
@@ -50,10 +53,27 @@ end
 
 ITEM_UPDATED_AT = '2017-06-24T00:45:15.564Z'
 
+def expect_status_match_arrs(ret_arr, want_arr)
+  ret_arr.each_with_index do |ret_item, index|
+    want_item = want_arr[index]
+    ret_item.each_pair do |key, val|
+      expect(val).to match(want_item[key])
+    end
+  end
+end
+
+def expect_status_match_lkup(ret, want)
+  # Need to tediously iterate, else Item object ID and local_path are flagged.
+  (ret.keys + want.keys).to_set.each do |category|
+    expect(ret[category].length).to eq(want[category].length)
+    expect_status_match_arrs(ret[category], want[category])
+  end
+end
+
 RSpec.describe MrMurano::SyncUpDown do
   include_context 'WORKSPACE'
+
   before(:example) do
-    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $project = MrMurano::ProjectFile.new
@@ -67,9 +87,9 @@ RSpec.describe MrMurano::SyncUpDown do
 
   context 'status' do
     it 'warns with missing directory' do
-      t = TSUD.new
-      expect(t).to receive(:warning).once.with(/Skipping missing location.*/)
-      ret = t.status
+      tsud = TSUD.new
+      expect(tsud).to receive(:warning).once.with(/Skipping missing location.*/)
+      ret = tsud.status
       expect(ret).to eq(
         toadd: [], todel: [], tomod: [], unchg: [], skipd: [], clash: []
       )
@@ -77,8 +97,8 @@ RSpec.describe MrMurano::SyncUpDown do
 
     it 'finds nothing in empty directory' do
       FileUtils.mkpath(@project_dir + '/tsud')
-      t = TSUD.new
-      ret = t.status
+      tsud = TSUD.new
+      ret = tsud.status
       expect(ret).to eq(
         toadd: [], todel: [], tomod: [], unchg: [], skipd: [], clash: []
       )
@@ -86,205 +106,218 @@ RSpec.describe MrMurano::SyncUpDown do
 
     it 'finds things there but not here' do
       FileUtils.mkpath(@project_dir + '/tsud')
-      t = TSUD.new
-      expect(t).to receive(:list).once.and_return(
+      tsud = TSUD.new
+      expect(tsud).to receive(:list).once.and_return(
         [
-          { name: 1 },
-          { name: 2 },
-          { name: 3 },
+          MrMurano::SyncUpDown::Item.new(name: 1),
+          MrMurano::SyncUpDown::Item.new(name: 2),
+          MrMurano::SyncUpDown::Item.new(name: 3),
         ]
       )
-      ret = t.status
-      expect(ret).to eq(
+      want = {
         toadd: [],
         todel: [
-          {
+          MrMurano::SyncUpDown::Item.new(
             name: 1,
             synckey: 1,
             synctype: TSUD.description,
-          },
-          {
+          ),
+          MrMurano::SyncUpDown::Item.new(
             name: 2,
             synckey: 2,
             synctype: TSUD.description,
-          },
-          {
+          ),
+          MrMurano::SyncUpDown::Item.new(
             name: 3,
             synckey: 3,
             synctype: TSUD.description,
-          },
+          ),
         ],
         tomod: [],
         unchg: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status
+      expect_status_match_lkup(ret, want)
     end
 
     it 'finds things there but not here; asdown' do
       FileUtils.mkpath(@project_dir + '/tsud')
-      t = TSUD.new
-      expect(t).to receive(:list).once.and_return(
+      tsud = TSUD.new
+      expect(tsud).to receive(:list).once.and_return(
         [
-          { name: 1 },
-          { name: 2 },
-          { name: 3 },
+          MrMurano::SyncUpDown::Item.new(name: 1),
+          MrMurano::SyncUpDown::Item.new(name: 2),
+          MrMurano::SyncUpDown::Item.new(name: 3),
         ]
       )
-      ret = t.status(asdown: true)
-      expect(ret).to eq(
+      want = {
         todel: [],
         toadd: [
-          { name: 1, synckey: 1, synctype: TSUD.description },
-          { name: 2, synckey: 2, synctype: TSUD.description },
-          { name: 3, synckey: 3, synctype: TSUD.description },
+          MrMurano::SyncUpDown::Item.new(
+            name: 1, synckey: 1, synctype: TSUD.description,
+          ),
+          MrMurano::SyncUpDown::Item.new(
+            name: 2, synckey: 2, synctype: TSUD.description,
+          ),
+          MrMurano::SyncUpDown::Item.new(
+            name: 3, synckey: 3, synctype: TSUD.description,
+          ),
         ],
         tomod: [],
         unchg: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status(asdown: true)
+      expect_status_match_lkup(ret, want)
     end
 
     it 'finds things here but not there' do
       FileUtils.mkpath(@project_dir + '/tsud')
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
-      t = TSUD.new
-      expect(t).to receive(:to_remote_item).and_return(
-        { name: 'one.lua' },
-        name: 'two.lua',
+      tsud = TSUD.new
+      expect(tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')],
+        [MrMurano::SyncUpDown::Item.new(name: 'two.lua')],
       )
-      ret = t.status
-      expect(ret).to match(
+      want = {
         toadd: [
-          {
+          MrMurano::SyncUpDown::Item.new(
             name: 'one.lua',
             synckey: 'one.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
-          {
+          ),
+          MrMurano::SyncUpDown::Item.new(
             name: 'two.lua',
             synckey: 'two.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
+          ),
         ],
         todel: [],
         tomod: [],
         unchg: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status
+      expect_status_match_lkup(ret, want)
     end
 
-    it 'finds things here and there' do
+    it 'finds things here and there; and they are different' do
       FileUtils.mkpath(@project_dir + '/tsud')
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
-      t = TSUD.new
-      expect(t).to receive(:list).once.and_return(
+      tsud = TSUD.new
+      expect(tsud).to receive(:list).once.and_return(
         [
-          { name: 'one.lua' },
-          { name: 'two.lua' },
+          MrMurano::EventHandler::EventHandlerItem.new(name: 'one.lua'),
+          MrMurano::EventHandler::EventHandlerItem.new(name: 'two.lua'),
         ]
       )
-      expect(t).to receive(:to_remote_item).and_return(
-        { name: 'one.lua' },
-        name: 'two.lua',
+      expect(tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::EventHandler::EventHandlerItem.new(name: 'one.lua')],
+        [MrMurano::EventHandler::EventHandlerItem.new(name: 'two.lua')],
       )
-      ret = t.status
-      expect(ret).to match(
+      want = {
         tomod: [
-          {
+          MrMurano::EventHandler::EventHandlerItem.new(
             name: 'one.lua',
             synckey: 'one.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
-          {
+          ),
+          MrMurano::EventHandler::EventHandlerItem.new(
             name: 'two.lua',
             synckey: 'two.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
+          ),
         ],
         todel: [],
         toadd: [],
         unchg: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status
+      expect_status_match_lkup(ret, want)
     end
+
     it "finds things here and there; but they're the same" do
       FileUtils.mkpath(@project_dir + '/tsud')
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
-      t = TSUD.new
-      expect(t).to receive(:list).once.and_return(
+      tsud = TSUD.new
+      expect(tsud).to receive(:list).once.and_return(
         [
-          { name: 'one.lua' },
-          { name: 'two.lua' },
+          MrMurano::SyncUpDown::Item.new(name: 'one.lua'),
+          MrMurano::SyncUpDown::Item.new(name: 'two.lua'),
         ]
       )
-      expect(t).to receive(:to_remote_item).and_return(
-        { name: 'one.lua' },
-        name: 'two.lua',
+      expect(tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')],
+        [MrMurano::SyncUpDown::Item.new(name: 'two.lua')],
       )
-      expect(t).to receive(:docmp).twice.and_return(false)
-      ret = t.status
-      expect(ret).to match(
+      expect(tsud).to receive(:docmp).twice.and_return(false)
+      want = {
         unchg: [
-          {
+          MrMurano::SyncUpDown::Item.new(
             name: 'one.lua',
             synckey: 'one.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
-          {
+          ),
+          MrMurano::SyncUpDown::Item.new(
             name: 'two.lua',
             synckey: 'two.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
-          },
+          ),
         ],
         todel: [],
         toadd: [],
         tomod: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status
+      expect_status_match_lkup(ret, want)
     end
 
     it 'calls diff' do
       FileUtils.mkpath(@project_dir + '/tsud')
       FileUtils.touch(@project_dir + '/tsud/one.lua')
-      t = TSUD.new
-      expect(t).to receive(:list).once.and_return([
-                                                    { name: 'one.lua' },
-                                                  ])
-      expect(t).to receive(:to_remote_item).and_return(
-        name: 'one.lua'
+      tsud = TSUD.new
+      expect(tsud).to receive(:list).once.and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')],
       )
-      expect(t).to receive(:dodiff).once.and_return('diffed output')
-      ret = t.status(diff: true)
-      expect(ret).to match(
+      expect(tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')]
+      )
+      expect(tsud).to receive(:dodiff).once.and_return('diffed output')
+      want = {
         tomod: [
-          {
+          MrMurano::SyncUpDown::Item.new(
             name: 'one.lua',
             synckey: 'one.lua',
             synctype: TSUD.description,
             local_path: an_instance_of(Pathname),
             diff: 'diffed output',
-          },
+          ),
         ],
         todel: [],
         toadd: [],
         unchg: [],
         skipd: [],
-        clash: []
-      )
+        clash: [],
+      }
+      ret = tsud.status(diff: true)
+      expect_status_match_lkup(ret, want)
     end
 
     context 'Filtering' do
@@ -297,8 +330,8 @@ RSpec.describe MrMurano::SyncUpDown do
         FileUtils.touch(@project_dir + '/tsud/gb/four.lua') # unchg
         FileUtils.touch(@project_dir + '/tsud/five.lua')    # toadd
         FileUtils.touch(@project_dir + '/tsud/ga/six.lua')  # toadd
-        @t = TSUD.new
-        expect(@t).to receive(:list).once.and_return(
+        @tsud = TSUD.new
+        expect(@tsud).to receive(:list).once.and_return(
           [
             MrMurano::SyncUpDown::Item.new(
               name: 'eight.lua', updated_at: ITEM_UPDATED_AT
@@ -321,65 +354,77 @@ RSpec.describe MrMurano::SyncUpDown do
           ]
         )
 
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/one.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'one.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'one.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/two.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'two.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'two.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/three.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'three.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'three.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/four.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'four.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'four.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/five.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'five.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'five.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
-        expect(@t).to receive(:to_remote_item)
+        expect(@tsud).to receive(:to_remote_items)
           .with(anything, pathname_globs('**/six.lua'))
           .and_return(
-            MrMurano::SyncUpDown::Item.new(
-              name: 'six.lua', updated_at: ITEM_UPDATED_AT
-            )
+            [
+              MrMurano::SyncUpDown::Item.new(
+                name: 'six.lua', updated_at: ITEM_UPDATED_AT
+              ),
+            ]
           )
 
-        expect(@t).to receive(:docmp)
+        expect(@tsud).to receive(:docmp)
           .with(have_attributes(name: 'one.lua'), anything)
           .and_return(true)
-        expect(@t).to receive(:docmp)
+        expect(@tsud).to receive(:docmp)
           .with(have_attributes(name: 'two.lua'), anything)
           .and_return(true)
-        expect(@t).to receive(:docmp)
+        expect(@tsud).to receive(:docmp)
           .with(have_attributes(name: 'three.lua'), anything)
           .and_return(false)
-        expect(@t).to receive(:docmp)
+        expect(@tsud).to receive(:docmp)
           .with(have_attributes(name: 'four.lua'), anything)
           .and_return(false)
       end
 
       it 'Returns all with no filter' do
-        ret = @t.status
+        ret = @tsud.status
         expect(ret).to match(
           unchg: [
             have_attributes(
@@ -441,7 +486,7 @@ RSpec.describe MrMurano::SyncUpDown do
       end
 
       it 'Finds local path globs' do
-        ret = @t.status({}, ['**/ga/*.lua'])
+        ret = @tsud.status({}, ['**/ga/*.lua'])
         expect(ret).to match(
           unchg: [],
           toadd: [
@@ -467,7 +512,7 @@ RSpec.describe MrMurano::SyncUpDown do
       end
 
       it 'Finds nothing with specific matcher' do
-        ret = @t.status({}, ['#foo'])
+        ret = @tsud.status({}, ['#foo'])
         expect(ret).to match(
           unchg: [],
           toadd: [],
@@ -479,7 +524,7 @@ RSpec.describe MrMurano::SyncUpDown do
       end
 
       it 'gets all the details' do
-        ret = @t.status(unselected: true)
+        ret = @tsud.status(unselected: true)
         expect(ret).to match(
           unchg: [
             have_attributes(
@@ -555,60 +600,58 @@ RSpec.describe MrMurano::SyncUpDown do
       FileUtils.mkpath('tsud')
       FileUtils.touch('tsud/one.lua')
       FileUtils.touch('tsud/two.lua')
-      @t = TSUD.new
+      @tsud = TSUD.new
     end
     it 'finds local items' do
-      expect(@t).to receive(:to_remote_item).and_return(
-        { name: 'one.lua' },
-        name: 'two.lua',
-      )
-      ret = @t.localitems(Pathname.new(@project_dir + '/tsud').realpath)
-      expect(ret).to match(
-        [
-          {
-            name: 'one.lua',
-            local_path: an_instance_of(Pathname),
-          },
-          {
-            name: 'two.lua',
-            local_path: an_instance_of(Pathname),
-          },
-        ]
+      expect(@tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')],
+        [MrMurano::SyncUpDown::Item.new(name: 'two.lua')],
       )
+      want = [
+        MrMurano::SyncUpDown::Item.new(
+          name: 'one.lua',
+          local_path: an_instance_of(Pathname),
+        ),
+        MrMurano::SyncUpDown::Item.new(
+          name: 'two.lua',
+          local_path: an_instance_of(Pathname),
+        ),
+      ]
+      ret = @tsud.localitems(Pathname.new(@project_dir + '/tsud').realpath)
+      expect_status_match_arrs(ret, want)
     end
 
-    it 'takes an array from to_remote_item' do
-      expect(@t).to receive(:to_remote_item).and_return(
+    it 'takes an array from to_remote_items' do
+      expect(@tsud).to receive(:to_remote_items).and_return(
         [
-          { name: 'one:1' },
-          { name: 'one:2' },
+          MrMurano::SyncUpDown::Item.new(name: 'one:1'),
+          MrMurano::SyncUpDown::Item.new(name: 'one:2'),
         ],
         [
-          { name: 'two:1' },
-          { name: 'two:2' },
+          MrMurano::SyncUpDown::Item.new(name: 'two:1'),
+          MrMurano::SyncUpDown::Item.new(name: 'two:2'),
         ],
       )
-      ret = @t.localitems(Pathname.new(@project_dir + '/tsud').realpath)
-      expect(ret).to match(
-        [
-          {
-            name: 'one:1',
-            local_path: an_instance_of(Pathname),
-          },
-          {
-            name: 'one:2',
-            local_path: an_instance_of(Pathname),
-          },
-          {
-            name: 'two:1',
-            local_path: an_instance_of(Pathname),
-          },
-          {
-            name: 'two:2',
-            local_path: an_instance_of(Pathname),
-          },
-        ]
-      )
+      want = [
+        MrMurano::SyncUpDown::Item.new(
+          name: 'one:1',
+          local_path: an_instance_of(Pathname),
+        ),
+        MrMurano::SyncUpDown::Item.new(
+          name: 'one:2',
+          local_path: an_instance_of(Pathname),
+        ),
+        MrMurano::SyncUpDown::Item.new(
+          name: 'two:1',
+          local_path: an_instance_of(Pathname),
+        ),
+        MrMurano::SyncUpDown::Item.new(
+          name: 'two:2',
+          local_path: an_instance_of(Pathname),
+        ),
+      ]
+      ret = @tsud.localitems(Pathname.new(@project_dir + '/tsud').realpath)
+      expect_status_match_arrs(ret, want)
     end
   end
 
@@ -617,24 +660,24 @@ RSpec.describe MrMurano::SyncUpDown do
       FileUtils.mkpath(@project_dir + '/tsud')
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       lp = Pathname.new(@project_dir + '/tsud/one.lua').realpath
-      t = TSUD.new
-      expect(t).to receive(:fetch).once.with(1).and_yield('foo')
-      t.download(lp, id: 1, updated_at: ITEM_UPDATED_AT)
+      tsud = TSUD.new
+      expect(tsud).to receive(:fetch).once.with(1, false).and_yield('foo')
+      tsud.download(lp, id: 1, updated_at: ITEM_UPDATED_AT)
     end
   end
 
   context 'doing diffs' do
     before(:example) do
       FileUtils.mkpath(@project_dir + '/tsud')
-      @t = TSUD.new
+      @tsud = TSUD.new
       @scpt = Pathname.new(@project_dir + '/tsud/one.lua')
       @scpt.open('w') { |io| io << %(-- fake lua\nreturn 0\n) }
       @scpt = @scpt.realpath
     end
 
     it 'nothing when same.' do
-      expect(@t).to receive(:fetch).and_yield(%(-- fake lua\nreturn 0\n))
-      ret = @t.dodiff(
+      expect(@tsud).to receive(:fetch).and_yield(%(-- fake lua\nreturn 0\n))
+      ret = @tsud.dodiff(
         {
           name: 'one.lua',
           local_path: @scpt,
@@ -650,8 +693,8 @@ RSpec.describe MrMurano::SyncUpDown do
     end
 
     it 'something when different.' do
-      expect(@t).to receive(:fetch).and_yield(%(-- fake lua\nreturn 2\n))
-      ret = @t.dodiff(
+      expect(@tsud).to receive(:fetch).and_yield(%(-- fake lua\nreturn 2\n))
+      ret = @tsud.dodiff(
         {
           name: 'one.lua',
           local_path: @scpt,
@@ -664,8 +707,8 @@ RSpec.describe MrMurano::SyncUpDown do
 
     it 'uses script in item' do
       script = %(-- fake lua\nreturn 2\n)
-      expect(@t).to receive(:fetch).and_yield(script)
-      ret = @t.dodiff(
+      expect(@tsud).to receive(:fetch).and_yield(script)
+      ret = @tsud.dodiff(
         {
           name: 'one.lua',
           local_path: @scpt,
@@ -685,76 +728,79 @@ RSpec.describe MrMurano::SyncUpDown do
   context 'syncup' do
     before(:example) do
       FileUtils.mkpath(@project_dir + '/tsud')
-      @t = TSUD.new
+      @tsud = TSUD.new
     end
 
     it 'removes' do
-      expect(@t).to receive(:list).once.and_return(
+      expect(@tsud).to receive(:list).once.and_return(
         [
-          { name: 1 },
-          { name: 2 },
-          { name: 3 },
+          MrMurano::SyncUpDown::Item.new(name: 1),
+          MrMurano::SyncUpDown::Item.new(name: 2),
+          MrMurano::SyncUpDown::Item.new(name: 3),
         ]
       )
-      expect(@t).to receive(:remove).exactly(3).times
-      @t.syncup(delete: true)
+      expect(@tsud).to receive(:remove).exactly(3).times
+      @tsud.syncup(delete: true)
     end
 
     it 'creates' do
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
 
-      expect(@t).to receive(:upload).twice
-                                    .with(kind_of(Pathname), kind_of(MrMurano::SyncUpDown::Item), false)
-      @t.syncup(create: true)
+      expect(@tsud).to receive(
+        :upload
+      ).twice.with(
+        kind_of(Pathname), kind_of(MrMurano::SyncUpDown::Item), false
+      )
+      @tsud.syncup(create: true)
     end
 
     it 'updates' do
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
-      expect(@t).to receive(:list).once.and_return(
+      expect(@tsud).to receive(:list).once.and_return(
         [
           MrMurano::SyncUpDown::Item.new(name: 'one.lua', updated_at: ITEM_UPDATED_AT),
           MrMurano::SyncUpDown::Item.new(name: 'two.lua', updated_at: ITEM_UPDATED_AT),
         ]
       )
 
-      expect(@t).to receive(:upload).twice.with(
+      expect(@tsud).to receive(:upload).twice.with(
         kind_of(Pathname), kind_of(MrMurano::SyncUpDown::Item), true
       )
-      expect(@t).to receive(:to_remote_item).and_return(
-        { name: 'one.lua' },
-        name: 'two.lua',
+      expect(@tsud).to receive(:to_remote_items).and_return(
+        [MrMurano::SyncUpDown::Item.new(name: 'one.lua')],
+        [MrMurano::SyncUpDown::Item.new(name: 'two.lua')],
       )
-      @t.syncup(update: true)
+      @tsud.syncup(update: true)
     end
   end
 
   context 'syncdown' do
     before(:example) do
       FileUtils.mkpath(@project_dir + '/tsud')
-      @t = TSUD.new
+      @tsud = TSUD.new
     end
 
     it 'removes' do
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
 
-      @t.syncdown(delete: true)
+      @tsud.syncdown(delete: true)
       expect(FileTest.exist?(@project_dir + '/tsud/one.lua')).to be false
       expect(FileTest.exist?(@project_dir + '/tsud/two.lua')).to be false
     end
 
     it 'creates' do
-      expect(@t).to receive(:list).once.and_return(
+      expect(@tsud).to receive(:list).once.and_return(
         [
           MrMurano::SyncUpDown::Item.new(name: 'one.lua', updated_at: ITEM_UPDATED_AT),
           MrMurano::SyncUpDown::Item.new(name: 'two.lua', updated_at: ITEM_UPDATED_AT),
         ]
       )
 
-      expect(@t).to receive(:fetch).twice.and_yield("--foo\n")
-      @t.syncdown(create: true)
+      expect(@tsud).to receive(:fetch).twice.and_yield("--foo\n")
+      @tsud.syncdown(create: true)
       expect(FileTest.exist?(@project_dir + '/tsud/one.lua')).to be true
       expect(FileTest.exist?(@project_dir + '/tsud/two.lua')).to be true
     end
@@ -762,19 +808,23 @@ RSpec.describe MrMurano::SyncUpDown do
     it 'updates' do
       FileUtils.touch(@project_dir + '/tsud/one.lua')
       FileUtils.touch(@project_dir + '/tsud/two.lua')
-      expect(@t).to receive(:list).once.and_return(
+      expect(@tsud).to receive(:list).once.and_return(
         [
           MrMurano::SyncUpDown::Item.new(name: 'one.lua', updated_at: ITEM_UPDATED_AT),
           MrMurano::SyncUpDown::Item.new(name: 'two.lua', updated_at: ITEM_UPDATED_AT),
         ]
       )
 
-      expect(@t).to receive(:fetch).twice.and_yield("--foo\n")
-      expect(@t).to receive(:to_remote_item).and_return(
-        MrMurano::SyncUpDown::Item.new(name: 'one.lua', updated_at: ITEM_UPDATED_AT),
-        MrMurano::SyncUpDown::Item.new(name: 'two.lua', updated_at: ITEM_UPDATED_AT)
+      expect(@tsud).to receive(:fetch).twice.and_yield("--foo\n")
+      expect(@tsud).to receive(:to_remote_items).and_return(
+        [
+          MrMurano::SyncUpDown::Item.new(name: 'one.lua', updated_at: ITEM_UPDATED_AT),
+        ],
+        [
+          MrMurano::SyncUpDown::Item.new(name: 'two.lua', updated_at: ITEM_UPDATED_AT),
+        ],
       )
-      @t.syncdown(update: true)
+      @tsud.syncdown(update: true)
       expect(FileTest.exist?(@project_dir + '/tsud/one.lua')).to be true
       expect(FileTest.exist?(@project_dir + '/tsud/two.lua')).to be true
     end
@@ -784,17 +834,18 @@ RSpec.describe MrMurano::SyncUpDown do
 #    before(:example) do
 #      FileUtils.mkpath(@project_dir + '/tsud')
 #      FileUtils.mkpath(@project_dir + '/bundles/mybun/tsud')
-#      @t = TSUD.new
+#      @tsud = TSUD.new
 #    end
 #
 #    it "finds items in bundles." do
 #      FileUtils.touch(@project_dir + '/tsud/one.lua')
 #      FileUtils.touch(@project_dir + '/bundles/mybun/tsud/two.lua')
 #
-#      expect(@t).to receive(:to_remote_item).and_return(
-#        {name: 'two.lua'},{name: 'one.lua'}
+#      expect(@tsud).to receive(:to_remote_items).and_return(
+#        [{name: 'two.lua'}],
+#        [{name: 'one.lua'}],
 #      )
-#      ret = @t.locallist
+#      ret = @tsud.locallist
 #      expect(ret).to match([
 #        {name: 'two.lua',
 #         bundled: true,
@@ -808,9 +859,9 @@ RSpec.describe MrMurano::SyncUpDown do
 #      FileUtils.touch(@project_dir + '/tsud/one.lua')
 #      lp = Pathname.new(@project_dir + '/tsud/one.lua').realpath
 #
-#      expect(@t).to receive(:warning).once.with(/Not downloading into bundled item.*/)
+#      expect(@tsud).to receive(:warning).once.with(/Not downloading into bundled item.*/)
 #
-#      @t.download(lp, {bundled: true, name: 'one.lua'})
+#      @tsud.download(lp, {bundled: true, name: 'one.lua'})
 #    end
 #  end
 end