gems-status 0.2.6 → 0.2.7

data/lib/exists_in_upstream.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
 require 'open-uri'
 require 'gem_checker'
+require 'utils'
 
 class ExistsInUpstream < GemChecker
   def ExistsInUpstream.check?(gem)
-    $stderr.puts "DEBUG: Looking for #{gem.name}"
+    Utils::log_debug("Looking for #{gem.name}")
     result = nil
     gem_uri = "#{gem.gems_url}/#{gem.name}-#{gem.version}.gem" 
     begin

data/lib/gem_simple.rb

@@ -12,7 +12,7 @@ class GemSimple
   #TODO: write a test for this
   def depends?(gem)
     if !@dependencies
-      Utils::log_error("ERROR: trying to get depends on a gem that has no info on dependencies #{@name} depends #{gem.name}")
+      Utils::log_error(@name, "trying to get depends on a gem that has no info on dependencies #{@name} depends #{gem.name}")
       return false
     end
     @dependencies.each do |dep|
@@ -24,7 +24,7 @@ class GemSimple
   #TODO: write a test for this
   def merge_deps(gem)
     if !@dependencies || !gem.dependencies
-      Utils::log_error("ERROR: trying to merge depends on a gem that has no info on dependencies #{@name} merge #{gem.name}")
+      Utils::log_error(@name, "trying to merge depends on a gem that has no info on dependencies #{@name} merge #{gem.name}")
       return false
     end
     changes = false
@@ -32,7 +32,7 @@ class GemSimple
       if !@dependencies.include?(dep)
         changes = true
         @dependencies << dep
-        Utils::log_debug("DEBUG: adding #{dep} to dependencies")
+        Utils::log_debug("adding #{dep} to dependencies")
       end
     end
     return changes

data/lib/gems_composite_command.rb

@@ -9,6 +9,8 @@ class GemsCompositeCommand < GemsCommand
   def initialize(target)
     @commands = []
     @checkers = []
+    @checker_results = {}
+    @comments = {}
     @results = {}
     @target = target
   end
@@ -33,6 +35,11 @@ class GemsCompositeCommand < GemsCommand
     @commands.each do |command|
       @results[command.ident] = command.result
     end
+    @checkers.each do |check_class|
+      @results[@target].sort.each do |k, gem|
+        @checker_results[gem.name] = check_class::description + gem.name unless check_class::check?(gem)
+      end
+    end
   end
 
   def common_key?(k)
@@ -69,6 +76,10 @@ class GemsCompositeCommand < GemsCommand
     return true
   end
 
+  def add_comments(comments)
+    @comments = comments
+  end
+
   def are_there_results?
     if !@results or @results.empty?
       return false
@@ -92,19 +103,26 @@ class GemsCompositeCommand < GemsCommand
     end
     @results[@target].sort.each do |k,v| 
       if !common_key?(k) then 
-        Utils::log_error "ERROR: #{k} in #{@target} but not found in all the sources!"
+        Utils::log_error(k, "#{k} in #{@target} but not found in all the sources!")
         next
       end
       if equal_gems?(k) then
         next
       end
-      ViewResults::print_diff(k, @results, @target)
-    end
-    @checkers.each do |check_class|
-      @results[@target].sort.each do |k, gem|
-        ViewResults::print_check(check_class::description, gem.name) unless check_class::check?(gem)
+      if @checker_results[k]
+        checker_results = @checker_results[k]
+      else
+        checker_results = nil
+      end
+      if @comments[k]
+        comments = @comments[k]
+      else
+        comments = nil
       end
+      ViewResults::print_results(k, @results, @target, checker_results, comments)
+      @checker_results.delete(k) 
+      @comments.delete(k)
     end
-    ViewResults::print_tail
+    ViewResults::print_tail(@checker_results, @comments)
   end
 end

data/lib/gems_status.rb

@@ -21,7 +21,7 @@ class GemStatus
     begin
       @conf = YAML::load(File::open(conf_file))
     rescue
-      Utils::log_error "ERROR: There was a problem opening #{conf_file}"
+      Utils::log_error("?", "There was a problem opening #{conf_file}")
     end
   end
 
@@ -36,6 +36,9 @@ class GemStatus
        gems_composite_command.add_checker(eval(c["classname"]))
       end
     end
+    if @conf["comments"]
+      gems_composite_command.add_comments(@conf["comments"])
+    end
     gems_composite_command.execute
     gems_composite_command.print
   end

data/lib/gems_status_metadata.rb

@@ -1,3 +1,3 @@
 module GemsStatusMetadata
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/lockfile_gems.rb

@@ -23,13 +23,13 @@ class LockfileGems < GemsCommand
     begin
       data = File.open(filename).read
     rescue
-      Utils::log_error "ERROR: There was a problem opening file #{filename} "
+      Utils::log_error("?", "There was a problem opening file #{filename} ")
     end
     return data
   end
 
   def update_gem_dependencies(gem)
-    Utils::log_debug("DEBUG: updating dependencies for #{gem.name}")
+    Utils::log_debug("updating dependencies for #{gem.name}")
     changes = false
     @result.each do |k, gem2|
       if gem.depends?(gem2)
@@ -49,10 +49,10 @@ class LockfileGems < GemsCommand
 
   def execute
     @filenames.each do |filename|
-      Utils::log_debug "DEBUG: reading #{filename}"
+      Utils::log_debug "reading #{filename}"
       file_data = get_data(File::dirname(filename), File::basename(filename))
       if file_data.empty?
-        Utils::log_error "ERROR: file empty #{filename}"
+        Utils::log_error("?", "file empty #{filename}")
         next
       end
       lockfile = Bundler::LockfileParser.new(file_data)
@@ -60,13 +60,13 @@ class LockfileGems < GemsCommand
         name = spec.name
         version = Gem::Version.create(spec.version)
         if @result[name] && @result[name].version != version
-          Utils::log_error " 
-            ERROR: Same gem with different versions: 
+          Utils::log_error(name, " 
+            Same gem with different versions: 
             #{name} - #{version} - #{filename}\n
-            #{name} - #{@result[name].version} - #{@result[name].origin} "
+            #{name} - #{@result[name].version} - #{@result[name].origin} ")
         end
         dependencies = spec.dependencies
-        Utils::log_debug "DEBUG: dependencies for #{name} #{dependencies}"
+        Utils::log_debug "dependencies for #{name} #{dependencies}"
         @result[name] = RubyGemsGems_GemSimple.new(name, version , '', filename,
                                                    @gems_url, dependencies)
       end

data/lib/not_native_gem_checker.rb

@@ -17,7 +17,7 @@ class NotNativeGemChecker < GemChecker
       #io.close if io && !io.closed? 
       #or is a bug on rubygems???
     rescue => e
-      Utils::log_error "ERROR: There was a problem opening #{gem_uri} #{e.class} #{e.message}" 
+      Utils::log_error(gem.name, "There was a problem opening #{gem_uri} #{e.class} #{e.message}")
     end
     return false unless result 
     return result.spec.extensions.empty?

data/lib/obs_gems.rb

@@ -7,6 +7,7 @@ require "gems_command"
 require "utils"
 
 class OBSGems < GemsCommand
+  FILES_TO_IGNORE = /(\w(\.gem|\.spec|\.changes|\.rpmlintrc|-rpm-lintrc|-rpmlintrc))|README.SuSE/
   def initialize(conf)
     Utils::check_parameters('OBSGems', conf, ["id", "username", "password", "url", "obs_repo"])
     @result = {}
@@ -20,34 +21,34 @@ class OBSGems < GemsCommand
 
   def parse_link(linkinfo)
     if linkinfo.length > 1 then
-      Utils::log_error "ERROR: There is more than one linkinfo element"
+      Utils::log_error("?", "There is more than one linkinfo element")
       return
     end
     if !linkinfo[0]["project"] then
-      Utils::log_error "ERROR: Project element does not exists in linkinfo"
+      Utils::log_error("?", "Project element does not exists in linkinfo")
       return
     end
     if !linkinfo[0]["package"] then
-      Utils::log_error "ERROR: Package element does not exists in linkinfo"
+      Utils::log_error("?", "Package element does not exists in linkinfo")
       return
     end
     repo = linkinfo[0]["project"]
     package = linkinfo[0]["package"]
     if linkinfo[0]["rev"] then
       rev = linkinfo[0]["rev"]
-      Utils::log_debug "DEBUG: Revision in link: #{rev}."
+      Utils::log_debug "Revision in link: #{rev}."
       package = package + "?rev=" + rev
     end
-    Utils::log_debug "DEBUG: follow link to project: #{repo} package: #{package}"
+    Utils::log_debug "follow link to project: #{repo} package: #{package}"
     parse_rpm_data(repo, package)
   end
 
-  def get_data(url)
+  def get_data(package, url)
     data = ""
     begin
       data = open(url, :http_basic_authentication => [@username, @password]).read
     rescue
-      Utils::log_error "ERROR: There was a problem opening #{url} " 
+      Utils::log_error(package.sub("rubygem-",""), "There was a problem opening #{url} ")
     end
     return data 
   end
@@ -55,28 +56,28 @@ class OBSGems < GemsCommand
   def parse_rpm_data(project, package)
     url = @obs_url + "/" + project
     rpm_url = url + "/" + package
-    response = get_data(rpm_url) 
+    response = get_data(package, rpm_url) 
     if response.empty? then
       return
     end
     data = XmlSimple.xml_in(response)
     if data["linkinfo"] then
-      Utils::log_debug "DEBUG: #{data["name"]} is a link."
+      Utils::log_debug "#{data["name"]} is a link."
       if data["entry"].length != 1
-        msg = ""
-        data["entry"].each {|e| msg << e["name"]}
-        Utils::log_error "ERROR: when parsing the link for #{project} : #{package}. There are more entries than expected. That may be a patched link and the result may not be correct" + msg
+        msg = " "
+        data["entry"].each {|e| msg << " " << e["name"]}
+        Utils::log_error(package.sub("rubygem-",""), "when parsing the link for #{project} : #{package}. There are more entries than expected. That may be a patched link and the result may not be correct:" + msg)
       end
       parse_link(data["linkinfo"])
       return
     end
     if !data["entry"] then
-      Utils::log_error "ERROR: something went wrong retrieving info from #{project} : #{package}"
+      Utils::log_error(package.sub("rubygem-",""), "something went wrong retrieving info from #{project} : #{package}")
       return
     end
     data["entry"].each do |entry|
-      if !(entry["name"] =~ /\w(\.gem|\.spec|\.changes|\.rpmlintrc|-rpm-lintrc|-rpmlintrc)/)
-        Utils::log_error "ERROR: when parsing data for #{project} : #{package}. Entry not expected. That may be a patched rpm and the result may not be correct. #{entry["name"]}"
+      if !(entry["name"] =~ OBSGems::FILES_TO_IGNORE)
+        Utils::log_error(package.sub("rubygem-",""), "when parsing data for #{project} : #{package}. Entry not expected. That may be a patched rpm and the result may not be correct. #{entry["name"]} ")
       end
       if entry["name"].end_with?(".gem") then
         name = gem_name(entry['name'])
@@ -91,7 +92,7 @@ class OBSGems < GemsCommand
 
   def execute
     url = @obs_url + "/" + @repo
-    response = get_data(url)
+    response = get_data("?", url)
     if response.empty? then
       return
     end

data/lib/ruby_gems_gems.rb

@@ -26,7 +26,7 @@ class RubyGemsGems < GemsCommand
       gz = Zlib::GzipReader.new(source)
       return gz.read
     rescue
-      Utils::log_error "ERROR: There was a problem opening #{specs_url} "
+      Utils::log_error "?", "There was a problem opening #{specs_url} "
     end
     return ""
   end

data/lib/ruby_gems_gems_gem_simple.rb

@@ -11,13 +11,13 @@ class RubyGemsGems_GemSimple < GemSimple
       return @md5
     end
     gem_uri = "#{@gems_url}/#{@name}-#{@version}.gem" 
-    Utils::log_debug "DEBUG: download and md5 for #{@name} from #{gem_uri}"
+    Utils::log_debug "download and md5 for #{@name} from #{gem_uri}"
     begin
       source = open(gem_uri)
       @md5 = Digest::MD5.hexdigest(source.read)
       return @md5
     rescue
-      Utils::log_error "ERROR: There was a problem opening #{gem_uri}" 
+      Utils::log_error(@name, "There was a problem opening #{gem_uri}")
     end 
     return nil
   end

data/lib/utils.rb

@@ -1,6 +1,6 @@
 class Utils
   attr_accessor :errors
-  @@errors = []
+  @@errors = {}
 
   def Utils.errors
     return @@errors
@@ -8,25 +8,26 @@ class Utils
   
   def Utils.check_parameters(classname, conf, parameters)
     if !conf['classname'] then
-      raise "ERROR: trying to initialize #{classname} when parameter classname does not exists"
+      raise "trying to initialize #{classname} when parameter classname does not exists"
     end
     if conf['classname'] != classname then
-      raise "ERROR: trying to initialize #{classname} when parameter classname is #{conf['classname']}"
+      raise "trying to initialize #{classname} when parameter classname is #{conf['classname']}"
     end
     parameters.each do |p|
       if !conf[p] then
-        raise "ERROR: parameter #{p} not found for #{classname}"
+        raise "parameter #{p} not found for #{classname}"
       end
     end
   end
 
-  def Utils.log_error(msg)
-    @@errors << msg
-    $stderr.puts msg
+  def Utils.log_error(name, msg)
+    @@errors[name] = "\n" unless @@errors[name]
+    @@errors[name]  << msg << "\n"
+    $stderr.puts "ERROR: #{msg}"
   end
 
   def Utils.log_debug(msg)
-    $stderr.puts msg
+    $stderr.puts "DEBUG: #{msg}"
   end
 
 end

data/lib/view_results.rb

@@ -39,9 +39,9 @@ class ViewResults
     </li>
     </ol>
     <p>
-    After the comparison there are some checks that have been performed. Those checks imply also there is some kind of work to do
+    After the comparison there are some checks that have been performed, errors related and comments. Look those results as they imply there is some kind of work to do
     </p>
-    <p> At the end there are the errors. Look them carefully.
+    <p> At the end there are the errors, checks and comments that do not apply to any of the gems. Look them carefully.
     </p>
     <p>
     You should run gems-status periodically until the lists of errors, patched, outdated and checks are gone.
@@ -49,7 +49,7 @@ class ViewResults
     "
   end
 
-  def ViewResults.print_diff(k, results, target)
+  def ViewResults.print_results(k, results, target, checker_results, comments)
     puts "<p>"
     puts "<table width='100%' class='table_results'>"
     version = results[target][k].version
@@ -91,16 +91,20 @@ class ViewResults
       version = result[k].version
       md5 = result[k].md5
     end
-    puts "<tr><td width='50%'><span class='#{name_color}'>#{k}</span></td><td width='10%'>version</td><td width='40%'>md5</td></tr>"
+    puts "<tr><td width='50%'><span class='#{name_color}'>#{k.upcase}</span></td><td width='10%'>version</td><td width='40%'>md5</td></tr>"
     puts html_string
     puts "</table>"
     puts "</p>"
+    puts "<p> <span class='check'>checks:"
+    puts "<br/>#{checker_results}</span>" if checker_results
+    puts "</p><p><span class='errors'>errors: "
+    puts "<br/>#{Utils::errors[k]}</span>" if Utils::errors[k]
+    Utils.errors.delete(k)
+    puts "</p><p><span class='comment'>comments: "
+    puts "<br/>#{comments}</span>" if comments
+    puts "</p>"
   end
 
-  def ViewResults.print_check(description, name_gem)
-      puts "<span class='check'> #{description}  #{name_gem}</span><br/>" 
-  end
-  
   def ViewResults.print_head
     puts "<html>
     <head>
@@ -145,11 +149,23 @@ class ViewResults
     color: #aaaaaa;
     font-size: 60%;
     }
+    .errors
+    {
+    color: #ff0000;
+    font-size: 80%;
+    font-style: italic;
+    }
     .check
     {
+    color: #a0a0a0;
+    font-size: 80%;
     font-style: italic;
-    color: #ff0000;
+    }
+    .comment
+    {
+    color: #a0a0a0;
     font-size: 80%;
+    font-style: italic;
     }
     .table_results
     {
@@ -160,9 +176,17 @@ class ViewResults
     <body>"
   end
 
-  def ViewResults.print_tail
-    puts "<h2>errors:#{Utils::errors.length}</h2>"
-    Utils::errors.each {|e| puts "<br/><span class='footer'><span class='alert'>#{e}</span></span>"}
+  def ViewResults.print_hash(desc, data, style)
+    puts "<p>"
+    puts "<h2>#{desc}: #{data.length}</h2>"
+    data.each {|k,v| puts "<span class='#{style}'>#{k.upcase} : #{v}</span><br/>"}
+    puts "</p>"
+  end
+
+  def ViewResults.print_tail(checker_results, comments)
+    self.print_hash("checks", checker_results, "check")
+    self.print_hash("comments", comments, "comment")
+    self.print_hash("errors", Utils::errors, "errors")
     date = Time.now.strftime('%F0')
     puts "<p class='footer'>run by <a href=\"https://github.com/jordimassaguerpla/gems-status\">gems-status</a> - #{date} - version: #{GemsStatusMetadata::VERSION}</p>
     </body>

data/test/test-obs_gems.rb

@@ -4,7 +4,7 @@ require 'obs_gems'
 
 class OBSGemsTest < OBSGems
   attr_accessor :result
-  def get_data(url)
+  def get_data(package, url)
     return '<directory name="rubygem-test" rev="3" vrev="3" srcmd5="85dff037c5d450f68e3724af3624c6b4">
              <entry name="rubygem-test.changes" md5="410f50267b43b7dba33b54cb3f588ecb" size="284" mtime="1276279120" />
              <entry name="rubygem-test.spec" md5="6a519f6a782a6f3cb151feef1ab69aaa" size="1827" mtime="1276279120" />

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple