MrMurano 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d8ab1106bc7c79174b671075339b574dd017de
-  data.tar.gz: 53c2be7de4579527f6174ffbc0957109d3a29d51
+  metadata.gz: 9d80701051b1837ecfe462e1487ec2cc238e54b9
+  data.tar.gz: 40e4cca578b534b259092f496d161697969e5bf6
 SHA512:
-  metadata.gz: 36c4e019e27f568af176f0544ac3137c720aab8f4a7e49f83d00faefdea09b23d9e3bc8855cf008ed4b6c3620dda5bf58b28296303166bd3567f1a86505d2611
-  data.tar.gz: cc2e8f89109bd70c3fb6aaaa8bdf28c12caeeb6aedb47e0294445124a628d5b4d3e034259df287d92241be45a1eabaa3326ee7f4b37aecd089126711346d0ca9
+  metadata.gz: e24973636dfb33ec1343886be2196d03338ea377a49f7b7a6598fe456c9b426c0064a89f9dc99e8199a18c226287a63ab1fe2deb958a44434f2103b925e18a1f
+  data.tar.gz: 53bed541a095ba1ecf0ba52003e3f13c0a5f2c563737a9e6bcd51634c3aebee02dbc1107f9a4bbb96e0ac2f5babb619a40c2fa4c6f347d9aac4371c5e62f675f

data/lib/MrMurano/Solution.rb

@@ -1,6 +1,8 @@
 require 'uri'
 require 'net/http'
 require 'json'
+require 'tempfile'
+require 'shellwords'
 require 'pp'
 
 module MrMurano
@@ -59,6 +61,7 @@ module MrMurano
         else
           say_error "got #{response} from #{request} #{request.uri.to_s}"
           say_error ":: #{response.body}"
+          say_error '==='
           raise response
         end
       end
@@ -90,13 +93,35 @@ module MrMurano
 
     # …
 
+    ##
+    # Compute a remote resource name from the local path
+    # @param root Pathname: Root path for this resource type from config files
+    # @param path Pathname: Path to local item 
+    # @return String: remote resource name
     def toremotename(root, path)
       path = Pathname.new(path) unless path.kind_of? Pathname
       root = Pathname.new(root) unless root.kind_of? Pathname
       path.relative_path_from(root).to_s
     end
+
+    ##
+    # Compute the local name from remote item details
+    # @param item Hash: listing details for the item.
+    # @param itemkey Symbol: Key for look up.
+    def tolocalname(item, itemkey)
+      item[itemkey]
+    end
+
+    ##
+    # Compute the local path from the listing details
+    # 
+    # If there is already a matching local item, some of its details are also in
+    # the item hash.
+    #
+    # @param into Pathname: Root path for this resource type from config files
+    # @param item Hash: listing details for the item.
+    # @return Pathname: path to save (or merge) remote item into
     def tolocalpath(into, item)
-      into.mkpath unless $cfg['tool.dry']
       return item[:local_path] if item.has_key? :local_path
       itemkey = @itemkey.to_sym
       name = tolocalname(item, itemkey)
@@ -111,7 +136,20 @@ module MrMurano
       end
       raise "Not a directory: #{from.to_s}" unless from.directory?
 
-      Pathname.glob(from.to_s + '/**/*').map do |path|
+      from.children.map do |path|
+        if path.directory? then
+          # TODO: look for definition. ( ?.rockspec? ?mr.modules? ?mr.manifest? )
+          # Lacking definition, find all *.lua but not *_test.lua
+          # This specifically and intentionally only goes one level deep.
+          path.children
+        else
+          path
+        end
+      end.flatten.compact.reject do |path|
+        path.fnmatch('*_test.lua') or path.basename.fnmatch('.*')
+      end.select do |path|
+        path.extname == '.lua'
+      end.map do |path|
         name = toremotename(from, path)
         case name
         when Hash
@@ -128,133 +166,115 @@ module MrMurano
       item[key]
     end
 
-    def syncup(from, options={})
-      there = list()
-      here = locallist(from)
-      itemkey = @itemkey.to_sym
- 
-      # split into three lists.
-      # - Items here and not there. (toadd)
-      # - Items there and not here. (todel)
-      # - Items here and there. (tomod)
-      therebox = {}
-      there.each do |item|
-        item = Hash.transform_keys_to_symbols(item)
-        therebox[ synckey(item) ] = item
-      end
-      herebox = {}
-      here.each do |item|
-        item = Hash.transform_keys_to_symbols(item)
-        herebox[ synckey(item) ] = item
+    def download(local, item)
+      local.dirname.mkpath
+      id = item[@itemkey.to_sym]
+      local.open('wb') do |io|
+        fetch(id) do |chunk|
+          io.write chunk
+        end
       end
-      toadd = herebox.keys - therebox.keys
-      todel = therebox.keys - herebox.keys
-      tomod = herebox.keys & therebox.keys
+    end
+
+    def removelocal(dest, item)
+      dest.unlink
+    end
+
+    def syncup(from, options=Commander::Command::Options.new)
+      itemkey = @itemkey.to_sym
+      options.asdown=false
+      dt = status(from, options)
+      toadd = dt[:toadd]
+      todel = dt[:todel]
+      tomod = dt[:tomod]
 
       if options.delete then
-        todel.each do |key|
-          verbose "Removing item #{key}"
+        todel.each do |item|
+          verbose "Removing item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            item = therebox[key]
             remove(item[itemkey])
           end
         end
       end
       if options.create then
-        toadd.each do |key|
-          verbose "Adding item #{key}"
+        toadd.each do |item|
+          verbose "Adding item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            item = herebox[key]
             upload(item[:local_path], item.reject{|k,v| k==:local_path})
           end
         end
       end
       if options.update then
-        tomod.each do |key|
-          verbose "Updating item #{key}"
+        tomod.each do |item|
+          verbose "Updating item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            #item = therebox[key].merge herebox[key] # need to be consistent with key types for this to work
-            id = therebox[key][itemkey]
-            item = herebox[key].dup
-            item[itemkey] = id
             upload(item[:local_path], item.reject{|k,v| k==:local_path})
           end
         end
       end
     end
 
-    def syncdown(into, options={})
-      there = list()
-      into = Pathname.new(into) unless into.kind_of? Pathname
-      here = locallist(into)
-      itemkey = @itemkey.to_sym
- 
-      # split into three lists.
-      # - Items here and not there. (todel)
-      # - Items there and not here. (toadd)
-      # - Items here and there. (tomod)
-      therebox = {}
-      there.each do |item|
-        item = Hash.transform_keys_to_symbols(item)
-        therebox[ synckey(item) ] = item
-      end
-      herebox = {}
-      here.each do |item|
-        item = Hash.transform_keys_to_symbols(item)
-        herebox[ synckey(item) ] = item
-      end
-      todel = herebox.keys - therebox.keys
-      toadd = therebox.keys - herebox.keys
-      tomod = herebox.keys & therebox.keys
+    def syncdown(into, options=Commander::Command::Options.new)
+      options.asdown = true
+      dt = status(into, options)
+      toadd = dt[:toadd]
+      todel = dt[:todel]
+      tomod = dt[:tomod]
 
       if options.delete then
-        todel.each do |key|
-          verbose "Removing item #{key}"
+        todel.each do |item|
+          verbose "Removing item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            item = herebox[key]
             dest = tolocalpath(into, item)
             removelocal(dest, item)
           end
         end
       end
       if options.create then
-        toadd.each do |key|
-          verbose "Adding item #{key}"
+        toadd.each do |item|
+          verbose "Adding item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            item = therebox[key]
             dest = tolocalpath(into, item)
-
             download(dest, item)
           end
         end
       end
       if options.update then
-        tomod.each do |key|
-          verbose "Updating item #{key}"
+        tomod.each do |item|
+          verbose "Updating item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
-            item = therebox[key]
-            dest = tolocalpath(into, herebox[key].merge(item) )
-
+            dest = tolocalpath(into, item)
             download(dest, item)
           end
         end
       end
     end
 
-    def download(local, item)
-      id = item[@itemkey.to_sym]
-      local.open('wb') do |io|
-        fetch(id) do |chunk|
-          io.write chunk
-        end
-      end
+    ##
+    # True if itemA and itemB are different
+    def docmp(itemA, itemB)
+      true
     end
 
-    def removelocal(dest, item)
-      dest.unlink
+    def dodiff(item)
+      tfp = Tempfile.new([tolocalname(item, @itemkey), '.lua'])
+      df = ""
+      begin
+        download(Pathname.new(tfp.path), item)
+
+        cmd = $cfg['diff.cmd'].shellsplit
+        cmd << tfp.path
+        cmd << item[:local_path].to_s
+
+        IO.popen(cmd) {|io| df = io.read }
+      ensure
+        tfp.close
+        tfp.unlink
+      end
+      df
     end
 
-    def status(from, options={})
+    def status(from, options=Commander::Command::Options.new)
       there = list()
       here = locallist(from)
       itemkey = @itemkey.to_sym
@@ -271,26 +291,29 @@ module MrMurano
         item[:synckey] = synckey(item)
         herebox[ item[:synckey] ] = item
       end
+      toadd = []
+      todel = []
+      tomod = []
+      unchg = []
       if options.asdown then
-        todel = herebox.keys - therebox.keys
-        toadd = therebox.keys - herebox.keys
-        tomod = herebox.keys & therebox.keys
-        {
-          :toadd=> toadd.map{|key| therebox[key] },
-          :todel=> todel.map{|key| herebox[key] },
-          # FIXME what if therebox[key] is nil?
-          :tomod=> tomod.map{|key| therebox[key].merge(herebox[key]) }
-        }
+        todel = (herebox.keys - therebox.keys).map{|key| therebox[key] }
+        toadd = (therebox.keys - herebox.keys).map{|key| herebox[key] }
       else
-        toadd = herebox.keys - therebox.keys
-        todel = therebox.keys - herebox.keys
-        tomod = herebox.keys & therebox.keys
-        {
-          :toadd=> toadd.map{|key| herebox[key] },
-          :todel=> todel.map{|key| therebox[key] },
-          :tomod=> tomod.map{|key| therebox[key].merge(herebox[key]) }
-        }
+        toadd = (herebox.keys - therebox.keys).map{|key| herebox[key] }
+        todel = (therebox.keys - herebox.keys).map{|key| therebox[key] }
+      end
+      (herebox.keys & therebox.keys).each do |key|
+        # Want here to override there except for itemkey.
+        mrg = herebox[key].reject{|k,v| k==itemkey}
+        mrg = therebox[key].merge(mrg)
+        if docmp(herebox[key], therebox[key]) then
+          mrg[:diff] = dodiff(mrg) if options.diff
+          tomod << mrg
+        else
+          unchg << mrg
+        end
       end
+      { :toadd=>toadd, :todel=>todel, :tomod=>tomod, :unchg=>unchg }
     end
   end
 
@@ -313,6 +336,21 @@ module MrMurano
 
   end
 
+  # …/serviceconfig
+  class ServiceConfig < SolutionBase
+    def initialize
+      super
+      @uriparts << 'serviceconfig'
+    end
+
+    def list
+      get()['items']
+    end
+    def fetch(id)
+      get('/' + id.to_s)
+    end
+  end
+
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.0.1'.freeze
+	VERSION = '1.0.2'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander