MuranoCLI 2.2.4 → 3.0.0

data/spec/Solution-UsersRoles_spec.rb

@@ -1,23 +1,25 @@
+require 'tempfile'
+require 'MrMurano/hash'
 require 'MrMurano/version'
 require 'MrMurano/Solution-Users'
-require 'MrMurano/hash'
-require 'tempfile'
+require 'MrMurano/SyncRoot'
 require '_workspace'
 
 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'
-    $cfg['solution.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
 
     @srv = MrMurano::Role.new
     allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
   end
 
   it "initializes" do
-    uri = @srv.endPoint('/')
+    uri = @srv.endpoint('/')
     expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/role/")
   end
 
@@ -110,7 +112,7 @@ RSpec.describe MrMurano::Role do
 
   context "downloads" do
     before(:example) do
-      @lry = Pathname.new(@projectDir) + 'roles.yaml'
+      @lry = Pathname.new(@project_dir) + 'roles.yaml'
       @grl = {:role_id=>"guest", :parameter=>[{:name=>"could"}]}
     end
 
@@ -133,7 +135,7 @@ RSpec.describe MrMurano::Role do
 
   context "removing local roles" do
     before(:example) do
-      @lry = Pathname.new(@projectDir) + 'roles.yaml'
+      @lry = Pathname.new(@project_dir) + 'roles.yaml'
       @grl = {:role_id=>"guest", :parameter=>[{:name=>"could"}]}
     end
 
@@ -166,14 +168,14 @@ RSpec.describe MrMurano::Role do
   end
 
   it "tolocalpath is into" do
-    lry = Pathname.new(@projectDir) + 'roles.yaml'
+    lry = Pathname.new(@project_dir) + 'roles.yaml'
     ret = @srv.tolocalpath(lry, {:role_id=>"guest", :parameter=>[{:name=>"could"}]})
     expect(ret).to eq(lry)
   end
 
   context "list local items" do
     before(:example) do
-      @lry = Pathname.new(@projectDir) + 'roles.yaml'
+      @lry = Pathname.new(@project_dir) + 'roles.yaml'
     end
 
     it "when missing" do

data/spec/Solution_spec.rb

@@ -1,25 +1,33 @@
-require 'MrMurano/version'
-require 'MrMurano/Solution-Cors'
 require 'tempfile'
 require 'yaml'
+require 'MrMurano/version'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/Solution'
+require 'MrMurano/SyncRoot'
 require '_workspace'
 
 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['solution.id'] = 'XYZ'
+    $cfg['product.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
+
+    # NOTE: This test works on either Product or Application.
+    # MAYBE: Add Application to this test.
+    @srv = MrMurano::Product.new
+    #@srv = MrMurano::Application.new
 
-    @srv = MrMurano::Solution.new
     allow(@srv).to receive(:token).and_return("TTTTTTTTTT")
   end
 
   it "initializes" do
-    uri = @srv.endPoint('/')
+    uri = @srv.endpoint('/')
     expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/solution/XYZ/")
   end
 
@@ -31,7 +39,7 @@ RSpec.describe MrMurano::Solution do
       :biz_id=>"ABCDEFG",
       :cors=> "{\"origin\":true,\"methods\":[\"HEAD\",\"GET\",\"POST\",\"PUT\",\"DELETE\",\"OPTIONS\",\"PATCH\"],\"headers\":[\"Content-Type\",\"Cookie\",\"Authorization\"],\"credentials\":true}"
     }
-    
+
     stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ").
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
@@ -49,13 +57,13 @@ RSpec.describe MrMurano::Solution do
       :biz_id=>"ABCDEFG",
       :cors=> "{\"origin\":true,\"methods\":[\"HEAD\",\"GET\",\"POST\",\"PUT\",\"DELETE\",\"OPTIONS\",\"PATCH\"],\"headers\":[\"Content-Type\",\"Cookie\",\"Authorization\"],\"credentials\":true}"
     }
-    
+
     stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/").
       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
 
@@ -90,3 +98,4 @@ RSpec.describe MrMurano::Solution do
 end
 
 #  vim: set ai et sw=2 ts=2 :
+

data/spec/SyncRoot_spec.rb

@@ -1,6 +1,14 @@
+# Last Modified: 2017.08.17 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'MrMurano/version'
 require 'MrMurano/Config'
 require 'MrMurano/ProjectFile'
+require 'MrMurano/SyncRoot'
 require 'MrMurano/SyncUpDown'
 require '_workspace'
 
@@ -8,17 +16,33 @@ RSpec.describe MrMurano::SyncRoot do
   include_context "WORKSPACE"
 
   after(:example) do
-    MrMurano::SyncRoot.reset
+    MrMurano::SyncRoot.instance.reset
   end
 
   before(:example) do
-    MrMurano::SyncRoot.reset # also creates @@syncset
-    class User
+    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:
+    #       warning: method redefined; discarding old description
+    #   /exo/clients/exosite/MuranoCLIs/MuranoCLI+landonb/spec/SyncRoot_spec.rb:30:
+    #       warning: previous definition of description was here
+    if !defined?(User)
+      class User
+        def self.description
+          %(describe user)
+        end
+      end
     end
-    class Role
+    MrMurano::SyncRoot.instance.add('user', User, 'U', true)
+    if !defined?(Role)
+      class Role
+        def self.description
+          %(describe role)
+        end
+      end
     end
-    MrMurano::SyncRoot.add('user', User, 'U', "describe user", true)
-    MrMurano::SyncRoot.add('role', Role, 'R', "describe role")
+    MrMurano::SyncRoot.instance.add('role', Role, 'G', false)
 
     # This must happen after all syncables have been added.
     $cfg = MrMurano::Config.new
@@ -27,7 +51,7 @@ RSpec.describe MrMurano::SyncRoot do
     $project.load
 
     @options = {}
-    @options.define_singleton_method(:method_missing) do |mid,*args|
+    @options.define_singleton_method(:method_missing) do |mid, *args|
       if mid.to_s.match(/^(.+)=$/) then
         self[$1.to_sym] = args.first
       else
@@ -37,47 +61,49 @@ RSpec.describe MrMurano::SyncRoot do
   end
 
   it "has defaults" do
-    ret = MrMurano::SyncRoot.bydefault
+    ret = MrMurano::SyncRoot.instance.bydefault
     expect(ret).to eq(['user'])
   end
 
   it "iterates on each" do
     ret=[]
-    MrMurano::SyncRoot.each{|a,b,c| ret << a}
+    MrMurano::SyncRoot.instance.each { |a, _b, _c, _d| ret << a }
     expect(ret).to eq(["user", "role"])
   end
 
   it "iterates only on selected" do
     @options.role = true
     ret=[]
-    MrMurano::SyncRoot.each_filtered(@options) {|a,b,c| ret << a}
+    MrMurano::SyncRoot.instance.each_filtered(@options) { |a, _b, _c, _d| ret << a }
     expect(ret).to eq(["role"])
   end
 
   it "selects all" do
     @options.all = true
-    MrMurano::SyncRoot.checkSAME(@options)
+    MrMurano::SyncRoot.instance.check_same(@options)
     expect(@options).to eq({:all=>true, :user=>true, :role=>true})
   end
 
   it "selects defaults when none" do
-    MrMurano::SyncRoot.checkSAME(@options)
+    MrMurano::SyncRoot.instance.check_same(@options)
     expect(@options).to eq({:user=>true})
   end
 
   it "selects custom defaults when none" do
     $cfg['sync.bydefault'] = 'role'
-    MrMurano::SyncRoot.checkSAME(@options)
-    expect(@options).to eq({:role=>true})
+    MrMurano::SyncRoot.instance.check_same(@options)
+    expect(@options).to eq({role: true})
   end
 
   it "builds option params" do
-    ret=[]
-    MrMurano::SyncRoot.each_option do |s,l,d|
-      ret << [s,l,d]
+    ret = []
+    MrMurano::SyncRoot.instance.each_option do |s, l, d|
+      ret << [s, l, d]
     end
-    expect(ret).to eq([["-u", "--[no-]user", "describe user"], ["-r", "--[no-]role", "describe role"]])
+    expect(ret).to eq([
+      ["-U", "--[no-]user", "describe user"],
+      ["-G", "--[no-]role", "describe role"],
+    ])
   end
-
 end
-#  vim: set ai et sw=2 ts=2 :
+

data/spec/SyncUpDown_spec.rb

@@ -1,18 +1,39 @@
-require 'MrMurano/version'
 require 'MrMurano/verbosing'
+require 'MrMurano/version'
 require 'MrMurano/Config'
+require 'MrMurano/ProjectFile'
+require 'MrMurano/SyncRoot'
 require 'MrMurano/SyncUpDown'
 require '_workspace'
 
 class TSUD
   include MrMurano::Verbose
   include MrMurano::SyncUpDown
+
   def initialize
+    # 2017-07-03: See MrMurano::SolutionBase.state for the list of attrs.
+    @sid = 'XYZ'
+    @valid_sid = true
+    @uriparts = []
+    @solntype = 'application.id'
     @itemkey = :name
     @project_section = :routes
   end
+
+  def sid
+    @sid
+  end
+
+  def sid?
+    @valid_sid
+  end
+
   def fetch(id)
   end
+
+  def self.description
+    %(Time Series Database)
+  end
 end
 
 RSpec::Matchers.define :pathname_globs do |glob|
@@ -21,10 +42,12 @@ RSpec::Matchers.define :pathname_globs do |glob|
   end
 end
 
+ITEM_UPDATED_AT="2017-06-24T00:45:15.564Z"
+
 RSpec.describe MrMurano::SyncUpDown do
   include_context "WORKSPACE"
   before(:example) do
-    MrMurano::SyncRoot.reset
+    MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
     $cfg.load
     $project = MrMurano::ProjectFile.new
@@ -32,7 +55,8 @@ RSpec.describe MrMurano::SyncUpDown do
     $project['routes.location'] = 'tsud'
     $project['routes.include'] = ['*.lua', '*/*.lua']
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
-    $cfg['solution.id'] = 'XYZ'
+    $cfg['product.id'] = 'XYZ'
+    $cfg['application.id'] = 'XYZ'
   end
 
   context "status" do
@@ -40,173 +64,241 @@ RSpec.describe MrMurano::SyncUpDown do
       t = TSUD.new
       expect(t).to receive(:warning).once.with(/Skipping missing location.*/)
       ret = t.status
-      expect(ret).to eq({:toadd=>[], :todel=>[], :tomod=>[], :unchg=>[]})
+      expect(ret).to eq({toadd: [], todel: [], tomod: [], unchg: [], skipd: []})
     end
 
     it "finds nothing in empty directory" do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       t = TSUD.new
       ret = t.status
-      expect(ret).to eq({:toadd=>[], :todel=>[], :tomod=>[], :unchg=>[]})
+      expect(ret).to eq({toadd: [], todel: [], tomod: [], unchg: [], skipd: []})
     end
 
     it "finds things there but not here" do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       t = TSUD.new
       expect(t).to receive(:list).once.and_return([
-        {:name=>1},{:name=>2},{:name=>3}
+        {:name=>1},
+        {:name=>2},
+        {:name=>3},
       ])
       ret = t.status
       expect(ret).to eq({
         :toadd=>[],
-        :todel=>[{:name=>1, :synckey=>1}, {:name=>2, :synckey=>2}, {:name=>3, :synckey=>3}],
+        :todel=>[
+          {
+            :name=>1,
+            :synckey=>1,
+            :synctype=>TSUD.description,
+          },
+          {
+            :name=>2,
+            :synckey=>2,
+            :synctype=>TSUD.description,
+          },
+          {
+            :name=>3,
+            :synckey=>3,
+            :synctype=>TSUD.description,
+          }],
         :tomod=>[],
-        :unchg=>[]})
+        :unchg=>[],
+        :skipd=>[],
+      })
     end
 
     it "finds things there but not here; asdown" do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       t = TSUD.new
       expect(t).to receive(:list).once.and_return([
-        {:name=>1},{:name=>2},{:name=>3}
+        {:name=>1},
+        {:name=>2},
+        {:name=>3},
       ])
       ret = t.status({:asdown=>true})
       expect(ret).to eq({
-        :todel=>[],
-        :toadd=>[{:name=>1, :synckey=>1}, {:name=>2, :synckey=>2}, {:name=>3, :synckey=>3}],
-        :tomod=>[],
-        :unchg=>[]})
+        todel: [],
+        toadd: [
+          { name: 1, synckey: 1, synctype: TSUD.description },
+          { name: 2, synckey: 2, synctype: TSUD.description },
+          { name: 3, synckey: 3, synctype: TSUD.description },
+        ],
+        tomod: [],
+        unchg: [],
+        skipd: [],
+      })
     end
 
     it "finds things here but not there" do
-      FileUtils.mkpath(@projectDir + '/tsud')
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      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(:toRemoteItem).and_return(
-        {:name=>'one.lua'},{:name=>'two.lua'}
+      expect(t).to receive(:to_remote_item).and_return(
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       )
       ret = t.status
       expect(ret).to match({
-        :toadd=>[
-          {:name=>'one.lua', :synckey=>'one.lua',
-           :local_path=>an_instance_of(Pathname)},
-          {:name=>'two.lua', :synckey=>'two.lua',
-           :local_path=>an_instance_of(Pathname)},
+        toadd: [
+          {
+            name: 'one.lua',
+            synckey: 'one.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
+          {
+            name: 'two.lua',
+            synckey: 'two.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
         ],
-        :todel=>[],
-        :tomod=>[],
-        :unchg=>[]})
+        todel: [],
+        tomod: [],
+        unchg: [],
+        skipd: [],
+      })
     end
 
     it "finds things here and there" do
-      FileUtils.mkpath(@projectDir + '/tsud')
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      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([
-        {:name=>'one.lua'},{:name=>'two.lua'}
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       ])
-      expect(t).to receive(:toRemoteItem).and_return(
-        {:name=>'one.lua'},{:name=>'two.lua'}
+      expect(t).to receive(:to_remote_item).and_return(
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       )
       ret = t.status
       expect(ret).to match({
-        :tomod=>[
-          {:name=>'one.lua', :synckey=>'one.lua',
-           :local_path=>an_instance_of(Pathname)},
-          {:name=>'two.lua', :synckey=>'two.lua',
-           :local_path=>an_instance_of(Pathname)},
+        tomod: [
+          {
+            name: 'one.lua',
+            synckey: 'one.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
+          {
+            name: 'two.lua',
+            synckey: 'two.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
         ],
-        :todel=>[],
-        :toadd=>[],
-        :unchg=>[]})
+        todel: [],
+        toadd: [],
+        unchg: [],
+        skipd: [],
+      })
     end
     it "finds things here and there; but they're the same" do
-      FileUtils.mkpath(@projectDir + '/tsud')
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      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([
-        {:name=>'one.lua'},{:name=>'two.lua'}
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       ])
-      expect(t).to receive(:toRemoteItem).and_return(
-        {:name=>'one.lua'},{:name=>'two.lua'}
+      expect(t).to receive(:to_remote_item).and_return(
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       )
       expect(t).to receive(:docmp).twice.and_return(false)
       ret = t.status
       expect(ret).to match({
-        :unchg=>[
-          {:name=>'one.lua', :synckey=>'one.lua',
-           :local_path=>an_instance_of(Pathname)},
-          {:name=>'two.lua', :synckey=>'two.lua',
-           :local_path=>an_instance_of(Pathname)},
+        unchg: [
+          {
+            name: 'one.lua',
+            synckey: 'one.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
+          {
+            name: 'two.lua',
+            synckey: 'two.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+          },
         ],
-        :todel=>[],
-        :toadd=>[],
-        :tomod=>[]})
+        todel: [],
+        toadd: [],
+        tomod: [],
+        skipd: [],
+      })
     end
 
     it "calls diff" do
-      FileUtils.mkpath(@projectDir + '/tsud')
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
+      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(:toRemoteItem).and_return(
+      expect(t).to receive(:to_remote_item).and_return(
         {:name=>'one.lua'}
       )
       expect(t).to receive(:dodiff).once.and_return("diffed output")
       ret = t.status({:diff=>true})
       expect(ret).to match({
-        :tomod=>[
-          {:name=>'one.lua', :synckey=>'one.lua',
-           :local_path=>an_instance_of(Pathname),
-           :diff=>"diffed output"},
+        tomod: [
+          {
+            name: 'one.lua',
+            synckey: 'one.lua',
+            synctype: TSUD.description,
+            local_path: an_instance_of(Pathname),
+            diff: "diffed output",
+          },
         ],
-        :todel=>[],
-        :toadd=>[],
-        :unchg=>[]})
+        todel: [],
+        toadd: [],
+        unchg: [],
+        skipd: [],
+      })
     end
 
     context "Filtering" do
       before(:example) do
-        FileUtils.mkpath(@projectDir + '/tsud/ga')
-        FileUtils.mkpath(@projectDir + '/tsud/gb')
-        FileUtils.touch(@projectDir + '/tsud/one.lua')     # tomod
-        FileUtils.touch(@projectDir + '/tsud/ga/two.lua')  # tomod
-        FileUtils.touch(@projectDir + '/tsud/three.lua')   # unchg
-        FileUtils.touch(@projectDir + '/tsud/gb/four.lua') # unchg
-        FileUtils.touch(@projectDir + '/tsud/five.lua')    # toadd
-        FileUtils.touch(@projectDir + '/tsud/ga/six.lua')  # toadd
+        FileUtils.mkpath(@project_dir + '/tsud/ga')
+        FileUtils.mkpath(@project_dir + '/tsud/gb')
+        FileUtils.touch(@project_dir + '/tsud/one.lua')     # tomod
+        FileUtils.touch(@project_dir + '/tsud/ga/two.lua')  # tomod
+        FileUtils.touch(@project_dir + '/tsud/three.lua')   # unchg
+        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([
-          MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}),   # tomod
-          MrMurano::SyncUpDown::Item.new({:name=>'two.lua'}),   # tomod
-          MrMurano::SyncUpDown::Item.new({:name=>'three.lua'}), # unchg
-          MrMurano::SyncUpDown::Item.new({:name=>'four.lua'}),  # unchg
-          MrMurano::SyncUpDown::Item.new({:name=>'seven.lua'}), # todel
-          MrMurano::SyncUpDown::Item.new({:name=>'eight.lua'}), # todel
+          MrMurano::SyncUpDown::Item.new({:name=>'eight.lua', :updated_at=>ITEM_UPDATED_AT}), # todel
+          MrMurano::SyncUpDown::Item.new({:name=>'four.lua', :updated_at=>ITEM_UPDATED_AT}),  # unchg
+          MrMurano::SyncUpDown::Item.new({:name=>'one.lua', :updated_at=>ITEM_UPDATED_AT}),   # tomod
+          MrMurano::SyncUpDown::Item.new({:name=>'seven.lua', :updated_at=>ITEM_UPDATED_AT}), # todel
+          MrMurano::SyncUpDown::Item.new({:name=>'three.lua', :updated_at=>ITEM_UPDATED_AT}), # unchg
+          MrMurano::SyncUpDown::Item.new({:name=>'two.lua', :updated_at=>ITEM_UPDATED_AT}),   # tomod
         ])
-        expect(@t).to receive(:toRemoteItem).
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/one.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}))
-        expect(@t).to receive(:toRemoteItem).
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'one.lua', :updated_at=>ITEM_UPDATED_AT}))
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/two.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'two.lua'}))
-        expect(@t).to receive(:toRemoteItem).
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'two.lua', :updated_at=>ITEM_UPDATED_AT}))
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/three.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'three.lua'}))
-        expect(@t).to receive(:toRemoteItem).
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'three.lua', :updated_at=>ITEM_UPDATED_AT}))
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/four.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'four.lua'}))
-        expect(@t).to receive(:toRemoteItem).
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'four.lua', :updated_at=>ITEM_UPDATED_AT}))
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/five.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'five.lua'}))
-        expect(@t).to receive(:toRemoteItem).
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'five.lua', :updated_at=>ITEM_UPDATED_AT}))
+        expect(@t).to receive(:to_remote_item).
           with(anything(), pathname_globs('**/six.lua')).
-          and_return(MrMurano::SyncUpDown::Item.new({:name=>'six.lua'}))
+          and_return(MrMurano::SyncUpDown::Item.new({:name=>'six.lua', :updated_at=>ITEM_UPDATED_AT}))
 
         expect(@t).to receive(:docmp).with(have_attributes({:name=>'one.lua'}),anything()).and_return(true)
         expect(@t).to receive(:docmp).with(have_attributes({:name=>'two.lua'}),anything()).and_return(true)
@@ -218,27 +310,69 @@ RSpec.describe MrMurano::SyncUpDown do
         ret = @t.status
         expect(ret).to match({
           :unchg=>[
-            have_attributes({:name=>'three.lua', :synckey=>'three.lua',
-             :local_path=> pathname_globs('**/three.lua')}),
-            have_attributes({:name=>'four.lua', :synckey=>'four.lua',
-             :local_path=>pathname_globs('**/four.lua')}),
+            have_attributes(
+              {
+                :name=>'four.lua',
+                :synckey=>'four.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/four.lua'),
+              }),
+            have_attributes(
+              {
+                :name=>'three.lua',
+                :synckey=>'three.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/three.lua'),
+              }),
           ],
           :toadd=>[
-            have_attributes({:name=>'five.lua', :synckey=>'five.lua',
-             :local_path=>pathname_globs('**/five.lua')}),
-            have_attributes({:name=>'six.lua', :synckey=>'six.lua',
-             :local_path=>pathname_globs('**/six.lua')}),
+            have_attributes(
+              {
+                :name=>'five.lua',
+                :synckey=>'five.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/five.lua'),
+              }),
+            have_attributes(
+              {
+                :name=>'six.lua',
+                :synckey=>'six.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/six.lua'),
+              }),
           ],
           :todel=>[
-            have_attributes({:name=>'seven.lua', :synckey=>'seven.lua'}),
-            have_attributes({:name=>'eight.lua', :synckey=>'eight.lua'}),
+            have_attributes(
+              {
+                :name=>'eight.lua',
+                :synckey=>'eight.lua',
+                :synctype=>TSUD.description,
+              }),
+            have_attributes(
+              {
+                :name=>'seven.lua',
+                :synckey=>'seven.lua',
+                :synctype=>TSUD.description,
+              }),
           ],
           :tomod=>[
-            have_attributes({:name=>'one.lua', :synckey=>'one.lua',
-             :local_path=>pathname_globs('**/one.lua')}),
-            have_attributes({:name=>'two.lua', :synckey=>'two.lua',
-             :local_path=>pathname_globs('**/two.lua')}),
-          ]})
+            have_attributes(
+              {
+                :name=>'one.lua',
+                :synckey=>'one.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/one.lua'),
+              }),
+            have_attributes(
+              {
+                :name=>'two.lua',
+                :synckey=>'two.lua',
+                :synctype=>TSUD.description,
+                :local_path=>pathname_globs('**/two.lua'),
+              }),
+          ],
+          :skipd=>[],
+        })
       end
 
       it "Finds local path globs" do
@@ -246,50 +380,104 @@ RSpec.describe MrMurano::SyncUpDown do
         expect(ret).to match({
           :unchg=>[ ],
           :toadd=>[
-            have_attributes(:name=>'six.lua', :synckey=>'six.lua',
-             :local_path=>an_instance_of(Pathname)),
+            have_attributes(
+              :name=>'six.lua',
+              :synckey=>'six.lua',
+              :synctype=>TSUD.description,
+              :local_path=>an_instance_of(Pathname)
+            ),
           ],
           :todel=>[ ],
           :tomod=>[
-            have_attributes(:name=>'two.lua', :synckey=>'two.lua',
-             :local_path=>an_instance_of(Pathname)),
-          ]})
+            have_attributes(
+              :name=>'two.lua',
+              :synckey=>'two.lua',
+              :synctype=>TSUD.description,
+              :local_path=>an_instance_of(Pathname)
+            ),
+          ],
+          :skipd=>[],
+        })
       end
 
       it "Finds nothing with specific matcher" do
         ret = @t.status({}, ['#foo'])
         expect(ret).to match({
-          :unchg=>[ ],
-          :toadd=>[ ],
-          :todel=>[ ],
-          :tomod=>[ ]})
+          :unchg=>[],
+          :toadd=>[],
+          :todel=>[],
+          :tomod=>[],
+          :skipd=>[],
+        })
       end
 
       it "gets all the details" do
         ret = @t.status({:unselected=>true})
         expect(ret).to match({
           :unchg=>[
-            have_attributes(:name=>'three.lua', :synckey=>'three.lua', :selected=>true,
-                            :local_path=> pathname_globs('**/three.lua')),
-          have_attributes(:name=>'four.lua', :synckey=>'four.lua', :selected=>true,
-                          :local_path=>pathname_globs('**/four.lua')),
+            have_attributes(
+              :name=>'four.lua',
+              :synckey=>'four.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/four.lua')
+              ),
+            have_attributes(
+              :name=>'three.lua',
+              :synckey=>'three.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/three.lua')
+            ),
           ],
           :toadd=>[
-            have_attributes(:name=>'five.lua', :synckey=>'five.lua', :selected=>true,
-                            :local_path=>pathname_globs('**/five.lua')),
-          have_attributes(:name=>'six.lua', :synckey=>'six.lua', :selected=>true,
-                          :local_path=>pathname_globs('**/six.lua')),
+            have_attributes(
+              :name=>'five.lua',
+              :synckey=>'five.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/five.lua')
+            ),
+            have_attributes(
+              :name=>'six.lua',
+              :synckey=>'six.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/six.lua')
+            ),
           ],
           :todel=>[
-            have_attributes(:name=>'seven.lua', :selected=>true, :synckey=>'seven.lua'),
-            have_attributes(:name=>'eight.lua', :selected=>true, :synckey=>'eight.lua'),
+            have_attributes(
+              :name=>'eight.lua',
+              :selected=>true,
+              :synckey=>'eight.lua',
+              :synctype=>TSUD.description,
+            ),
+            have_attributes(
+              :name=>'seven.lua',
+              :selected=>true,
+              :synckey=>'seven.lua',
+              :synctype=>TSUD.description,
+            ),
           ],
           :tomod=>[
-            have_attributes(:name=>'one.lua', :synckey=>'one.lua', :selected=>true,
-                            :local_path=>pathname_globs('**/one.lua')),
-          have_attributes(:name=>'two.lua', :synckey=>'two.lua', :selected=>true,
-                          :local_path=>pathname_globs('**/two.lua')),
-          ]})
+            have_attributes(
+              :name=>'one.lua',
+              :synckey=>'one.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/one.lua')
+            ),
+            have_attributes(
+              :name=>'two.lua',
+              :synckey=>'two.lua',
+              :synctype=>TSUD.description,
+              :selected=>true,
+              :local_path=>pathname_globs('**/two.lua')
+            ),
+          ],
+          :skipd=>[],
+        })
       end
     end
   end
@@ -302,60 +490,86 @@ RSpec.describe MrMurano::SyncUpDown do
       @t = TSUD.new
     end
     it "finds local items" do
-      expect(@t).to receive(:toRemoteItem).and_return(
-        {:name=>'one.lua'},{:name=>'two.lua'}
+      expect(@t).to receive(:to_remote_item).and_return(
+        {:name=>'one.lua'},
+        {:name=>'two.lua'},
       )
-      ret = @t.localitems(Pathname.new(@projectDir + '/tsud').realpath)
+      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)},
+        {
+          :name=>'one.lua',
+          :local_path=>an_instance_of(Pathname)
+        },
+        {
+          :name=>'two.lua',
+          :local_path=>an_instance_of(Pathname)
+        },
       ])
     end
 
-    it "takes an array from toRemoteItem" do
-      expect(@t).to receive(:toRemoteItem).and_return(
-        [{:name=>'one:1'},{:name=>'one:2'}],
-        [{:name=>'two:1'},{:name=>'two:2'}]
-        )
-      ret = @t.localitems(Pathname.new(@projectDir + '/tsud').realpath)
+    it "takes an array from to_remote_item" do
+      expect(@t).to receive(:to_remote_item).and_return(
+        [
+          {:name=>'one:1'},
+          {:name=>'one:2'},
+        ],
+        [
+          {:name=>'two:1'},
+          {: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)},
+        {
+          :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),
+        },
       ])
     end
   end
 
   context "download" do
     it "defaults to :id if @itemkey missing" do
-      FileUtils.mkpath(@projectDir + '/tsud')
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      lp = Pathname.new(@projectDir + '/tsud/one.lua').realpath
+      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})
+      t.download(lp, {:id=>1, :updated_at=>ITEM_UPDATED_AT})
     end
   end
 
   context "doing diffs" do
     before(:example) do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       @t = TSUD.new
-      @scpt = Pathname.new(@projectDir + '/tsud/one.lua')
+      @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({:name=>'one.lua', :local_path=>@scpt})
+      ret = @t.dodiff(
+        {
+          name: 'one.lua',
+          local_path: @scpt,
+          updated_at: ITEM_UPDATED_AT,
+        },
+        nil
+      )
       if Gem.win_platform? then
         expect(ret).to match(/FC: no differences encountered/)
       else
@@ -365,14 +579,29 @@ RSpec.describe MrMurano::SyncUpDown do
 
     it "something when different." do
       expect(@t).to receive(:fetch).and_yield(%{-- fake lua\nreturn 2\n})
-      ret = @t.dodiff({:name=>'one.lua', :local_path=>@scpt})
+      ret = @t.dodiff(
+        {
+          name: 'one.lua',
+          local_path: @scpt,
+          updated_at: ITEM_UPDATED_AT,
+        },
+        nil
+      )
       expect(ret).not_to eq('')
     end
 
     it "uses script in item" do
       script = %{-- fake lua\nreturn 2\n}
       expect(@t).to receive(:fetch).and_yield(script)
-      ret = @t.dodiff({:name=>'one.lua', :local_path=>@scpt, :script=>script})
+      ret = @t.dodiff(
+        {
+          name: 'one.lua',
+          local_path: @scpt,
+          script: script,
+          updated_at: ITEM_UPDATED_AT,
+        },
+        nil
+      )
       if Gem.win_platform? then
         expect(ret).to match(/FC: no differences encountered/)
       else
@@ -383,37 +612,42 @@ RSpec.describe MrMurano::SyncUpDown do
 
   context "syncup" do
     before(:example) do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       @t = TSUD.new
     end
 
     it "removes" do
       expect(@t).to receive(:list).once.and_return([
-        {:name=>1},{:name=>2},{:name=>3}
+        {:name=>1},
+        {:name=>2},
+        {:name=>3},
       ])
       expect(@t).to receive(:remove).exactly(3).times
       @t.syncup({:delete=>true})
     end
 
     it "creates" do
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      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})
     end
 
     it "updates" do
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      FileUtils.touch(@project_dir + '/tsud/one.lua')
+      FileUtils.touch(@project_dir + '/tsud/two.lua')
       expect(@t).to receive(:list).once.and_return([
-        MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}),
-        MrMurano::SyncUpDown::Item.new({:name=>'two.lua'})
+        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(kind_of(Pathname), kind_of(MrMurano::SyncUpDown::Item), true)
-      expect(@t).to receive(:toRemoteItem).and_return(
-        {:name=>'one.lua'},{:name=>'two.lua'}
+      expect(@t).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'},
       )
       @t.syncup({:update=>true})
     end
@@ -421,62 +655,62 @@ RSpec.describe MrMurano::SyncUpDown do
 
   context "syncdown" do
     before(:example) do
-      FileUtils.mkpath(@projectDir + '/tsud')
+      FileUtils.mkpath(@project_dir + '/tsud')
       @t = TSUD.new
     end
 
     it "removes" do
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      FileUtils.touch(@project_dir + '/tsud/one.lua')
+      FileUtils.touch(@project_dir + '/tsud/two.lua')
 
-      @t.syncdown({:delete=>true})
-      expect(FileTest.exist?(@projectDir + '/tsud/one.lua')).to be false
-      expect(FileTest.exist?(@projectDir + '/tsud/two.lua')).to be false
+      @t.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([
-        MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}),
-        MrMurano::SyncUpDown::Item.new({:name=>'two.lua'})
+        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(FileTest.exist?(@projectDir + '/tsud/one.lua')).to be true
-      expect(FileTest.exist?(@projectDir + '/tsud/two.lua')).to be true
+      @t.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
 
     it "updates" do
-      FileUtils.touch(@projectDir + '/tsud/one.lua')
-      FileUtils.touch(@projectDir + '/tsud/two.lua')
+      FileUtils.touch(@project_dir + '/tsud/one.lua')
+      FileUtils.touch(@project_dir + '/tsud/two.lua')
       expect(@t).to receive(:list).once.and_return([
-        MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}),
-        MrMurano::SyncUpDown::Item.new({:name=>'two.lua'})
+        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(:toRemoteItem).and_return(
-        MrMurano::SyncUpDown::Item.new({:name=>'one.lua'}),
-        MrMurano::SyncUpDown::Item.new({:name=>'two.lua'})
+      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})
       )
-      @t.syncdown({:update=>true})
-      expect(FileTest.exist?(@projectDir + '/tsud/one.lua')).to be true
-      expect(FileTest.exist?(@projectDir + '/tsud/two.lua')).to be true
+      @t.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
   end
 
 #  context "bundles" do
 #    before(:example) do
-#      FileUtils.mkpath(@projectDir + '/tsud')
-#      FileUtils.mkpath(@projectDir + '/bundles/mybun/tsud')
+#      FileUtils.mkpath(@project_dir + '/tsud')
+#      FileUtils.mkpath(@project_dir + '/bundles/mybun/tsud')
 #      @t = TSUD.new
 #    end
 #
 #    it "finds items in bundles." do
-#      FileUtils.touch(@projectDir + '/tsud/one.lua')
-#      FileUtils.touch(@projectDir + '/bundles/mybun/tsud/two.lua')
+#      FileUtils.touch(@project_dir + '/tsud/one.lua')
+#      FileUtils.touch(@project_dir + '/bundles/mybun/tsud/two.lua')
 #
-#      expect(@t).to receive(:toRemoteItem).and_return(
+#      expect(@t).to receive(:to_remote_item).and_return(
 #        {:name=>'two.lua'},{:name=>'one.lua'}
 #      )
 #      ret = @t.locallist
@@ -490,8 +724,8 @@ RSpec.describe MrMurano::SyncUpDown do
 #    end
 #
 #    it "Doesn't download a bundled item" do
-#      FileUtils.touch(@projectDir + '/tsud/one.lua')
-#      lp = Pathname.new(@projectDir + '/tsud/one.lua').realpath
+#      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.*/)
 #
@@ -499,4 +733,6 @@ RSpec.describe MrMurano::SyncUpDown do
 #    end
 #  end
 end
+
 #  vim: set ai et sw=2 ts=2 :
+