gems-status 0.4.0 → 0.5.0

data/lib/gems_status_metadata.rb

@@ -1,3 +1,3 @@
 module GemsStatusMetadata
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/lockfile_gems.rb

@@ -10,11 +10,12 @@ require "utils"
 
 class LockfileGems < GemsCommand
   def initialize(conf)
-    Utils::check_parameters('LockfileGems', conf, ["id", "filenames", "gems_url"])
+    Utils::check_parameters('LockfileGems', conf, ["id", "filenames", "gems_url", "upstream_url"])
     @filenames = conf['filenames']
     @gems_url = conf['gems_url']
     @result = {}
     @ident = conf['id']
+    @upstream_url = conf['upstream_url']
   end
 
   def get_data(dirname, filename)
@@ -75,6 +76,8 @@ class LockfileGems < GemsCommand
         @result[name] = [] if !@result[name]
         @result[name] << RubyGemsGems_GemSimple.new(name, version , '', filename,
                                                    gems_url, dependencies)
+        @result[name] << RubyGemsGems_GemSimple.new(name, version , '', @upstream_url,
+                                                   @upstream_url, dependencies)
       end
       update_dependencies
     end

data/lib/ruby_gems_gems_gem_simple.rb

@@ -17,19 +17,13 @@ class RubyGemsGems_GemSimple < GemSimple
     uri_debug = gem_uri.clone
     uri_debug.password = "********" if uri_debug.password
     Utils::log_debug "download and md5 for #{@name} from #{uri_debug}"
+    @md5 = nil
     begin
-      if gem_uri.user && gem_uri.password
-        source = open(gem_uri.scheme + "://" + gem_uri.host + "/" + gem_uri.path, 
-                      :http_basic_authentication=>[gem_uri.user, gem_uri.password])
-      else
-        source = open(gem_uri)
-      end
-      @md5 = Digest::MD5.hexdigest(source.read)
-      return @md5
+      @md5 = Utils::download_md5(gem_uri)
     rescue
       Utils::log_error(@name, "There was a problem opening #{gem_uri}")
     end 
-    return nil
+    return @md5
   end
 
   def from_git?

data/lib/utils.rb

@@ -1,6 +1,7 @@
 class Utils
   attr_accessor :errors
   @@errors = {}
+  @@md5_sums = {}
 
   def Utils.errors
     return @@errors
@@ -30,4 +31,17 @@ class Utils
     $stderr.puts "DEBUG: #{msg}"
   end
 
+  def Utils.download_md5(gem_uri)
+    return @@md5_sums[gem_uri] if @@md5_sums[gem_uri]
+    if gem_uri.user && gem_uri.password
+      source = open(gem_uri.scheme + "://" + gem_uri.host + "/" + gem_uri.path, 
+                    :http_basic_authentication=>[gem_uri.user, gem_uri.password])
+    else
+      source = open(gem_uri)
+    end
+    md5 = Digest::MD5.hexdigest(source.read)
+    @@md5_sums[gem_uri] = md5
+    return md5
+  end
+
 end

data/lib/view_results.rb

@@ -3,6 +3,9 @@ require 'gems_status_metadata'
 require 'utils'
 
 class ViewResults
+  @@patched = 0
+  @@outdated = 0
+  @@up_to_date = 0
 
   def ViewResults.print_description(ids)
     puts "
@@ -49,6 +52,16 @@ class ViewResults
     "
   end
 
+  def ViewResults.update_summary(name_color)
+    if name_color == "alert"
+      @@patched += 1
+    elsif name_color == "warning"
+      @@outdated += 1
+    else
+      @@up_to_date += 1
+    end
+  end
+
   def ViewResults.print_results(k, results, target, checker_results, comments)
     puts "<p>"
     puts "<table width='100%' class='table_results'>"
@@ -105,16 +118,25 @@ class ViewResults
     end
     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
+    update_summary(name_color)
     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>"
+    if checker_results
+      puts "<p> <span class='check'>checks:"
+      puts "<br/>#{checker_results}</span>" 
+      puts "</p>"
+    end
+    if Utils::errors[k]
+      puts "<p><span class='errors'>errors: "
+      puts "<br/>#{Utils::errors[k]}</span>" 
+      Utils.errors.delete(k)
+      puts "</p>"
+    end
+    if comments
+      puts "<p><span class='comment'>comments: "
+      puts "<br/>#{comments}</span>" 
+      puts "</p>"
+    end
   end
 
   def ViewResults.print_head
@@ -189,16 +211,23 @@ class ViewResults
   end
 
   def ViewResults.print_hash(desc, data, style)
+    return if !data or data.length == 0
     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_summary
+    puts "<h2>summary</h2>"
+    puts "patched/errored: #{@@patched} outdated: #{@@outdated} up-to-date: #{@@up_to_date}"
+  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")
+    self.print_summary
     date = Time.now.strftime('%a %b %d %H:%M:%S %Z %Y')
     puts "<p class='footer'>run by <a href=\"https://github.com/jordimassaguerpla/gems-status\">gems-status</a> - #{date} - version: #{GemsStatusMetadata::VERSION}</p>
     </body>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 Z
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: compares rubygems from different sources