Merge lp:~knitzsche/dotdepends/bug-1023095 into lp:dotdepends

[Kyle Nitzsche]

[lp:~knitzsche/dotdepends/bug-1023095]

70. By Kyle Nitzsche on 2012-07-10

* dotdepends-merge: fixed some blurry logic on setting node borders red
* rest is mostly code cleanup

[Mike Carifio (carifio)]

line 54: exiist -> exist

review: Approve

=== modified file 'Dotdepends/Dot.py'
--- Dotdepends/Dot.py	2012-07-04 00:40:59 +0000
+++ Dotdepends/Dot.py	2012-07-10 22:00:25 +0000
@@ -92,7 +92,7 @@
     def get_content(self):
         """Returns the content of the dot file as a list of lines.
 
-        Content is the dot file with out the header or footer.
+        Content is the dot file without the header or footer.
         """
         content = []
         for line in self.dot:
@@ -106,7 +106,7 @@
     def get_joins(self):
         """Returns the 'join' lines from the dot file as a list of lists [[]].
 
-        Join lines are edgesi between nodes, specifically: lnode -> rnode.
+        Join lines are edges between nodes, specifically: lnode -> rnode.
         There may be a style after the rnode: lnode -> rnode style. Each
         top-level list represents a join line. This contains a list containing
         the items in the line as follows: [lnode, rnode, style(if any)]
@@ -130,8 +130,9 @@
     def get_nodes(self):
         """Returns a dictionary of nodes in the dot file where the key is the
         node name and the value is the style, if any, as a string, without the
-        closing square brackets.
+        enclosing square brackets one finds in a dot file.
         """
+
         nodes = dict()
         node_lines = []
         for line in self.content:
@@ -151,6 +152,7 @@
         where the key is lnode name and the value is the number of times the
         lnode exists as an lnode in the dot file.
         """
+
         lnodes = dict()
         for join in self.joins:
             if len(join) == 0: continue
@@ -166,6 +168,7 @@
         where the key is rnode name and the value is the number of times the
         rnode exists as an rnode in the dot file.
         """
+
         rnodes = dict()
         for join in self.joins:
             if len(join) == 0: continue
@@ -177,7 +180,7 @@
         return rnodes
 
     def get_popular_lnodes(self, popularity):
-        """Returns a dictionary of lnodes where all lnodes exit as lnodes in
+        """Returns a dictionary of lnodes where all lnodes exiist as lnodes in
         the dot at least as many times as specified by the 'popularity' arg.
         """
         popular = dict()
@@ -215,7 +218,8 @@
         family in order to make large graphs smaller and easier to comprehend.
 
         A family of nodes is a set of nodes that have no lnodes outside of the
-        family (except for the root node of the family which does have lnodes).
+        family (except for the root node of the family which does have lnodes
+        outside of the family).
         """
 
         rnodes = self.get_rnodes_for_lnode(node)
@@ -323,8 +327,9 @@
         where the key is node and the value is an approriately amended style.
 
         Nodes internal to families that are not the family top node are
-        dropped as part of family summariation.
+        dropped as part of family summarization.
         """
+
         n_nodes = dict()
         for node in self.nodes.keys():
             if node in f_internal_nodes:
@@ -338,11 +343,13 @@
                     if not _s.startswith("label="):
                         n_styles+= _s + ','
                 if style.find('fillcolor=blue') >-1:#this is the root node
-                    style = n_styles + \
-"fillcolor=blue,style=filled,shape=%s" % self.shape
+                    style = n_styles
+                    style += "fillcolor=blue,style=filled,shape="
+                    style += self.shape
                 else:
-                    style = n_styles + \
-"fillcolor=yellow,style=filled,shape=%s" % self.shape
+                    style = n_styles
+                    style += "fillcolor=yellow,style=filled,shape="
+                    style += self.shape
                 node = "%s_Family_%d" % (node, len(fams[fam]))
             if node != fam and node in fams[fam]:
                 continue

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-09 18:43:48 +0000
+++ debian/changelog	2012-07-10 22:00:25 +0000
@@ -1,3 +1,13 @@
+dotdepends (0.3.15kyle1) UNRELEASED; urgency=low
+
+  * redundant 'color="red"' styles in nodes in generated pkg-DETAIL.dot files
+    caused dotdepends-merge on such dot files to incorrected draw some node
+    borders, colorwise. fixes LP: #1023095
+  * dotdepends-merge: fixed some blurry logic on setting node borders red
+  * rest is mostly code cleanup
+
+ -- Kyle Nitzsche <[e-mail]>  Tue, 10 Jul 2012 17:53:20 -0400
+
 dotdepends (0.3.15) precise; urgency=low
 
   * fix recent failures of -d option on dotdepends (disables auto running of

=== modified file 'debian/rules'
--- debian/rules	2012-06-21 21:33:13 +0000
+++ debian/rules	2012-07-10 22:00:25 +0000
@@ -6,7 +6,6 @@
 override_dh_auto_install:
 	python ./setup.py install --root=$(CURDIR)/debian/tmp --prefix=/usr --install-layout=deb
 
-
  override_dh_auto_clean:
 	-find . -name '*.py[co]' | xargs rm -f
 

=== modified file 'usr/bin/dotdepends'
--- usr/bin/dotdepends	2012-07-09 18:14:03 +0000
+++ usr/bin/dotdepends	2012-07-10 22:00:25 +0000
@@ -239,8 +239,6 @@
               ]
         if opt.dont_run_dot:
             cmd.append('-d')
-        if opt.installed:
-            cmd.append('-i')
 
         # output_dir_created is True iff the subprocess below will create (and populate)
         #   a new directory opt.output_dir.
@@ -268,17 +266,14 @@
         if opt.dont_run_dot:
             cmd.append('-d')
 
-        if opt.installed and opt.mode == 'rdepends':
-            cmd.append('-i')
-
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
         f2 = p.communicate()
         # Did the process error?
         if p.returncode > 0 or (f2[1] is not None and f2[1].startswith('Error')):
             # Yes, pass the error along
             print >> sys.stderr, f2[1]
-            exit(1)
-        
+            sys.exit(1)
+
         f2dot = f2[0].rstrip('.png\n')
         if not f2dot.endswith(".dot"):
             f2dot += ".dot"
@@ -299,7 +294,7 @@
 
         _f3 = []
         for line in f3:
-            if line.find("->") > -1: 
+            if line.find("->") > -1:
                 _f3.append(line)
                 continue
             if line.find("{") > -1:
@@ -312,7 +307,8 @@
             _line = line.lstrip()
             _pkg = _line.split(" ")[0]
             if _pkg in adds:
-                line = line.replace("[", '[color="red",')
+                if line.find('color="red"') == -1:
+                    line = line.replace("[", '[color="red",')
             _f3.append(line)
 
         _f = open(f3dot, 'w')
@@ -321,7 +317,6 @@
         _f.flush()
         _f.close()
 
-
         if opt.dont_run_dot:
             print f3dot
         else:
@@ -349,7 +344,6 @@
 
         sys.exit(0)
 
-
     deps = dict([])
     recommends = dict([])
     onlyRecs = []
@@ -393,7 +387,7 @@
             p1 = replacement(k)
             if p1 == "label": continue
             p2 = replacement(v)
-            # made joins ('edges')
+            # make joins ('edges')
             if opt.mode == "rdepends":
                 edge = '%s -> %s\n' % (p2,p1)
             elif opt.mode == "depends":

=== modified file 'usr/bin/dotdepends-merge'
--- usr/bin/dotdepends-merge	2012-07-09 14:42:21 +0000
+++ usr/bin/dotdepends-merge	2012-07-10 22:00:25 +0000
@@ -79,33 +79,19 @@
 _n1 = addShapes(n1,s1,c1)
 _n2 = addShapes(n2,s2,c2)
 
-_shape='shape="diamond",fillcolor=orange,style=filled'
+_shape='shape="diamond",fillcolor="orange",style="filled"'
 _nFinal = dict()
 
-#print _n1.keys()
-#print _n2.keys()
-
 nBoth = set(_n1.keys()).intersection(set(_n2.keys()))
 n1Only = set(_n1.keys()).difference(set(_n2.keys()))
 n2Only = set(_n2.keys()).difference(set(_n1.keys()))
 
-#print "1"
-#for n in n1Only:
-#    print "%s" % (n)
-#print "2"
-#for n in n2Only:
-#    print "%s" % (n)
-#print "BOTH"
-#for n in nBoth:
-#    print "%s" % (n)
-#sys.exit()
-
 nWorking = dict()
 nFinal = dict()
 
 for node in nBoth:
     n = _n1[node]
-    # if color="red" in both node sets, this pkg is only a Rec
+    # if color:red is in both node sets, this pkg is only a Rec
     # and needs to be red here too.
     aRec = False
     try:
@@ -115,11 +101,14 @@
     except:
         pass
     try:
-        if 'color' in _n[node].keys():
-            if _n1[node][color] == 'red':
+        if 'color' in _n2[node].keys():
+            if _n2[node][color] == 'red':
                 aRec = True
+            else:
+                aRec = False
     except:
-        pass
+        aRec = False
+
     if aRec:
         n['color'] = 'red'
 
@@ -134,17 +123,9 @@
     try:
         if 'color' in _n1[node].keys():
             if _n1[node][color] == 'red':
-                aRec = True
-    except:
-        pass
-    try:
-        if 'color' in _n[node].keys():
-            if _n1[node][color] == 'red':
-                aRec = True
-    except:
-        pass
-    if aRec:
-        n['color'] = 'red'
+                n['color'] = 'red'
+    except:
+        pass
     n['shape'] = s1
     n['fillcolor'] = c1
     n['style'] = 'filled'
@@ -152,21 +133,12 @@
 
 for node in n2Only:
     n = _n2[node]
-    aRec = False
     try:
         if 'color' in _n1[node].keys():
             if _n1[node][color] == 'red':
-                aRec = True
-    except:
-        pass
-    try:
-        if 'color' in _n[node].keys():
-            if _n1[node][color] == 'red':
-                aRec = True
-    except:
-        pass
-    if aRec:
-        n['color'] = 'red'
+                n['color'] = 'red'
+    except:
+        pass
     n['shape'] = s2
     n['fillcolor'] = c2
     n['style'] = 'filled'
@@ -196,7 +168,7 @@
     line = "%s [" % n
     for style in nFinal[n]:
         if style == '': continue
-        line += '%s="%s",' %(style,nFinal[n][style])
+        line += '%s="%s",' % (style, nFinal[n][style])
     line = line[:len(line)-1]
     line += '];'
     print line