syncevolution 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66f23c24c893a5c3f65f05bb4c01b68969e9480
-  data.tar.gz: 72711fca4d295007d661967514962f9628435f56
+  metadata.gz: cb5ee760a7b2cd3658ab16b0054a9c091495a1d0
+  data.tar.gz: 714bcd11a734b172fe66a5506852f09afdb3e420
 SHA512:
-  metadata.gz: 6bc97d40e0e1f7385c91e3c46c5834d7e9e17b661fa8e50af1db63516b70b26c9ff0ec4ac6548f47ecd35ed49f0910d363fee0430fcf7e16dcfdce3494933dac
-  data.tar.gz: 77ecb22582ae6c2669bb5180fdd90848fcd072350b2e979d1ce56de1c3cb208be74c09619ac2a5c7db861566168ba6e374b329cfeab76aadb32a77e92a79d003
+  metadata.gz: 10b386dde8ea85515288ca74d4d2ce75633124c2a6baa1feda8d447578e14e41fe8c26198f05e304b03e602885bd85e95edb7e0d23f0efca5db1d894151f4cb2
+  data.tar.gz: bd0f973461089131ac7010e7e8533ed943a563cbd8600a2d5a4866485443c8889b2eed3f9212f8a155061217f3d847bdb9b5cfcdb66e08a25bb84d2dfe5a54af

data/bin/se-config

@@ -4,6 +4,7 @@ require 'inifile'
 require 'nokogiri'
 require 'pp'
 require 'trollop'
+require 'uri'
 
 module SyncEvolution
   class SyncEvolution
@@ -21,23 +22,20 @@ module SyncEvolution
     def to_gv
       gv = "digraph syncevolution {\n"
 
-      objects = {}
+      gv_id = lambda{|node| id(node).split('/').collect{|n| n.gsub(/[^a-z0-9]/i, '').downcase}.join('_').gsub(/^_/, '') }
+
       syncs = 0
 
       @doc.xpath('//context').each{|context|
-        objects[context['name']] ||= "o#{objects.size}"
-        gv << "  subgraph cluster_#{objects[context['name']]} {\n"
+        gv << "  subgraph cluster_#{gv_id.call(context)} {\n"
         gv << "    label = #{context['name'].inspect};\n"
 
         context.xpath('./store').each{|store|
-          objects[context['name'] + ':' + store['name']] ||= "o#{objects.size}"
-          gv << "    #{objects[context['name'] + ':' + store['name']]} [ shape = folder, label = #{store['name'].inspect}];\n"
+          gv << "    #{gv_id.call(store)} [ shape = folder, label = #{store['name'].inspect}];\n"
         }
 
         context.xpath('./sync').each{|sync|
-          objects[context['name'] + ':' + sync['name']] ||= "o#{objects.size}"
-          gv << "    #{objects[context['name'] + ':' + sync['name']]} [ shape = component, label = #{sync['name'].inspect}];\n"
-
+          gv << "    #{gv_id.call(sync)} [ shape = component, label = #{sync['name'].inspect}];\n"
 
           sync.xpath('./store').each{|store|
           }
@@ -48,7 +46,6 @@ module SyncEvolution
 
       @doc.xpath('//sync/store').each{|store|
         sync = store.parent
-        context = sync.parent
 
         if sync['syncURL'] =~ /^local:\/\/@(.+)/
           targetcontext = $1.downcase
@@ -58,17 +55,17 @@ module SyncEvolution
 
         syncs += 1
 
-        objects["#{targetcontext}:target-config"] ||= "o#{objects.size}"
-        objects["#{targetcontext}:#{store['uri']}"] ||= "o#{objects.size}"
+        targetsync = @doc.at("//context[@name=#{_inspect(targetcontext)}]/sync[@name='target-config']")
+        targetstore = @doc.at("//context[@name=#{_inspect(targetcontext)}]/store[@name=#{_inspect(store['uri'])}]")
 
         dir = case store['sync']
           when 'two-way' then 'both'
           else throw store['sync'].inspect
         end
 
-        gv << "  #{objects[context['name'] + ':' + store['name']]} -> #{objects[context['name'] + ':' + sync['name']]} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
-        gv << "  #{objects[context['name'] + ':' + sync['name']]} -> #{objects["#{targetcontext}:target-config"]} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
-        gv << "  #{objects["#{targetcontext}:target-config"]} -> #{objects["#{targetcontext}:#{store['uri']}"]} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
+        gv << "  #{gv_id.call(store)} -> #{gv_id.call(store.parent)} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
+        gv << "  #{gv_id.call(store.parent)} -> #{gv_id.call(targetsync)} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
+        gv << "  #{gv_id.call(targetsync)} -> #{gv_id.call(targetstore)} [label=\"#{syncs}\", dir=#{dir}, style=dashed];\n"
       }
 
       gv << "}\n"
@@ -101,7 +98,7 @@ module SyncEvolution
         }
 
         ctx_s.xpath('./sync').each{|sn_s|
-          sn_t = @doc.at("//context[@name=#{_inspect(ctx_s['name'])}]/store[@name=#{_inspect(sn_s['name'])}]")
+          sn_t = @doc.at("//context[@name=#{_inspect(ctx_s['name'])}]/sync[@name=#{_inspect(sn_s['name'])}]")
           if sn_s.at('./clear') && sn_t
             sn_t.unlink
             sn_t = add(context: ctx_s['name'], sync: sn_s['name'])
@@ -122,13 +119,36 @@ module SyncEvolution
       }
     end
 
+    def id(node)
+      if node.name == 'context'
+        return "/#{node['name'].downcase}"
+      elsif node.parent.name == 'context' and ['store', 'sync'].include?(node.name)
+        return "/#{node.parent['name'].downcase}/#{node['name'].downcase}"
+      elsif node.name == 'store'
+        return "/#{node.parent.parent['name'].downcase}/#{node.parent['name'].downcase}/#{node['name'].downcase}"
+      end
+
+      throw "Unexpected node #{node.inspect}"
+    end
+
     def to_bash(indent)
       bash = ''
 
-      params = to_params(@doc.root.attributes.reject{|k, v| k == 'name'}, indent, '')
+      doc = @doc.clone
+
+      doc.xpath("//*[@password='-' or @databasePassword='-']").each{|node|
+        ['password', 'databasePassword'].each{|attr|
+          next unless node[attr] == '-'
+          var = (id(node).gsub(/^\//, '').gsub(/\//, '__').gsub(/[^A-Z0-9]/i, '_') + '__' + attr).upcase
+          node[attr]="$#{var}"
+          bash << "#{var}=XXXXXXXXXXXXXXXX\n"
+        }
+      }
+
+      params = to_params(doc.root.attributes.reject{|k, v| k == 'name'}, indent, '')
       bash << "syncevolution --configure --template none #{params}\n" if params != ''
 
-      @doc.xpath('//context').each{|context|
+      doc.xpath('//context').each{|context|
         bash << "syncevolution --remove #{escape('@' + context['name'])}\n" if context.at('./clear')
 
         params = to_params(context.attributes.reject{|k, v| k == 'name'}, indent)
@@ -260,27 +280,27 @@ module SyncEvolution
 
     def verify
       @doc.xpath("//sync[@name='target-config']/store[@sync != 'none' and @sync != 'disabled']").each{|store|
-        puts "target-config@#{store.parent.parent['name']} has set sync of #{store['name']} to #{store['sync']}, but sync is not used in a target-config"
+        warn "target-config@#{store.parent.parent['name']} has set sync of #{store['name']} to #{store['sync']}, but sync is not used in a target-config"
       }
 
       @doc.xpath("//sync[@name='target-config' and @syncURL]").each{|sync|
-        puts "target-config@#{sync.parent['name']} has set an syncURL, but syncURL is not used in a target-config"
+        warn "target-config@#{sync.parent['name']} has set an syncURL, but syncURL is not used in a target-config"
       }
 
       @doc.xpath("//sync").each{|sync|
         if !sync['syncURL']
-          puts "sync-config #{sync['name']}@#{sync.parent['name']} has no syncURL" unless sync['name'] == 'target-config'
+          warn "sync-config #{sync['name']}@#{sync.parent['name']} has no syncURL" unless sync['name'] == 'target-config'
         else
           targetcontext = sync['syncURL'].gsub(/^local:\/\//i, '')
 
           if targetcontext != sync['syncURL'].to_s
-            puts "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with #{targetcontext}, which doesn't start with '@'" if targetcontext !~ /^@/
+            warn "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with #{targetcontext}, which doesn't start with '@'" if targetcontext !~ /^@/
             targetcontext.sub!(/^@/, '')
             targetcontext.downcase!
             if !@doc.at("//context[@name=#{_inspect(targetcontext)}]")
-              puts "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with non-existent context #{targetcontext}"
+              warn "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with non-existent context #{targetcontext}"
             elsif !@doc.at("//context[@name=#{_inspect(targetcontext)}]/sync[@name='target-config']")
-              puts "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with non-existent target-config@#{targetcontext}"
+              warn "sync-config #{sync['name']}@#{sync.parent['name']} set up for local sync with non-existent target-config@#{targetcontext}"
             else
               sync.xpath('./store').each{|store|
                 local = @doc.at("//context[@name=#{_inspect(sync.parent['name'])}]/store[@name=#{_inspect(store['name'])}]")
@@ -289,9 +309,9 @@ module SyncEvolution
                   if remote
                     lbe = backend_type(local)
                     rbe = backend_type(remote)
-                    puts "sync-config #{sync['name']}@#{sync.parent['name']} connects store #{local['name']}@#{sync.parent['name']} of type #{lbe} to incompatible #{remote['name']}@#{targetcontext} of type #{rbe}" if lbe != rbe
+                    warn "sync-config #{sync['name']}@#{sync.parent['name']} connects store #{local['name']}@#{sync.parent['name']} of type #{lbe} to incompatible #{remote['name']}@#{targetcontext} of type #{rbe}" if lbe != rbe
                   else
-                    puts "sync-config #{sync['name']}@#{sync.parent['name']} connects store #{store['name']}@#{sync.parent['name']} to non-existent #{store['uri']}@#{targetcontext}"
+                    warn "sync-config #{sync['name']}@#{sync.parent['name']} connects store #{store['name']}@#{sync.parent['name']} to non-existent #{store['uri']}@#{targetcontext}"
                   end
                 end
               }
@@ -302,7 +322,7 @@ module SyncEvolution
 
       @doc.xpath("//sync/store").each{|store|
         if !store.parent.at(".//store[@name=#{_inspect(store['name'])}]")
-          puts "sync-config #{store.parent['name']}@#{store.parent.parent['name']} references non-existent store #{store['name']}"
+          warn "sync-config #{store.parent['name']}@#{store.parent.parent['name']} references non-existent store #{store['name']}"
         end
       }
     end

data/lib/syncevolution/version.rb

@@ -1,3 +1,3 @@
 module SyncEvolution
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syncevolution
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Emiliano Heyns