gems-status 0.2.1 → 0.2.2

data/lib/gems_composite_command.rb

@@ -92,7 +92,7 @@ class GemsCompositeCommand < GemsCommand
     end
     @results[@target].each do |k,v| 
       if !common_key?(k) then 
-        $stderr.puts "ERROR: #{k} in #{@target} but not found in all the sources!"
+        Utils.log_error "ERROR: #{k} in #{@target} but not found in all the sources!"
         next
       end
       if equal_gems?(k) then

data/lib/gems_status.rb

@@ -21,7 +21,7 @@ class GemStatus
     begin
       @conf = YAML::load(File::open(conf_file))
     rescue
-      $stderr.puts "ERROR: There was a problem opening #{conf_file}"
+      Utils.log_error "ERROR: There was a problem opening #{conf_file}"
     end
   end
 

data/lib/gems_status_metadata.rb

@@ -1,3 +1,3 @@
 module GemsStatusMetadata
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/lockfile_gems.rb

@@ -24,13 +24,13 @@ class LockfileGems < GemsCommand
     begin
       data = File.open(@filename).read
     rescue
-      $stderr.puts "ERROR: There was a problem opening file #{filename} "
+      Utils.log_error "ERROR: There was a problem opening file #{filename} "
     end
     return data
   end
 
   def execute
-    $stderr.puts "DEBUG: reading #{@filename}"
+    Utils.log_error "DEBUG: reading #{@filename}"
     file_data = get_data
     if file_data.empty?
       return

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
-      $stderr.puts "ERROR: There was a problem opening #{gem_uri} #{e.class} #{e.message}" 
+      Utils.log_error "ERROR: There was a problem opening #{gem_uri} #{e.class} #{e.message}" 
     end
     return false unless result 
     return result.spec.extensions.empty?

data/lib/not_rails_checker.rb

@@ -17,7 +17,7 @@ class NotRailsChecker < GemChecker
       #io.close if io && !io.closed? 
       #or is a bug on rubygems???
     rescue => e
-      $stderr.puts "ERROR: There was a problem opening #{gem_uri} #{e.class} #{e.message}" 
+      Utils.log_error "ERROR: There was a problem opening #{gem_uri} #{e.class} #{e.message}" 
     end
     return false unless result 
     result.spec.dependencies.each do |gem|

data/lib/obs_gems.rb

@@ -20,25 +20,25 @@ class OBSGems < GemsCommand
 
   def parse_link(linkinfo)
     if linkinfo.length > 1 then
-      $stderr.puts "ERROR: There is more than one linkinfo element"
+      Utils.log_error "ERROR: There is more than one linkinfo element"
       return
     end
     if !linkinfo[0]["project"] then
-      $stderr.puts "ERROR: Project element does not exists in linkinfo"
+      Utils.log_error "ERROR: Project element does not exists in linkinfo"
       return
     end
     if !linkinfo[0]["package"] then
-      $stderr.puts "ERROR: Package element does not exists in linkinfo"
+      Utils.log_error "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"]
-      $stderr.puts "DEBUG: Revision in link: #{rev}."
+      Utils.log_error "DEBUG: Revision in link: #{rev}."
       package = package + "?rev=" + rev
     end
-    $stderr.puts "DEBUG: follow link to project: #{repo} package: #{package}"
+    Utils.log_error "DEBUG: follow link to project: #{repo} package: #{package}"
     parse_rpm_data(repo, package)
   end
 
@@ -47,7 +47,7 @@ class OBSGems < GemsCommand
     begin
       data = open(url, :http_basic_authentication => [@username, @password]).read
     rescue
-      $stderr.puts "ERROR: There was a problem opening #{url} " 
+      Utils.log_error "ERROR: There was a problem opening #{url} " 
     end
     return data 
   end
@@ -61,15 +61,21 @@ class OBSGems < GemsCommand
     end
     data = XmlSimple.xml_in(response)
     if data["linkinfo"] then
-      $stderr.puts "DEBUG: #{data["name"]} is a link."
+      Utils.log_error "DEBUG: #{data["name"]} is a link."
+      if data["entry"].length != 1
+        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"
+      end
       parse_link(data["linkinfo"])
       return
     end
     if !data["entry"] then
-      $stderr.puts "ERROR: something went wrong retrieving info from #{project} : #{package}"
+      Utils.log_error "ERROR: something went wrong retrieving info from #{project} : #{package}"
       return
     end
     data["entry"].each do |entry|
+      if !(entry["name"] =~ /\w\.(gem|spec|changes|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"]}"
+      end
       if entry["name"].end_with?(".gem") then
         name = gem_name(entry['name'])
         version = Gem::Version.new(gem_version(entry['name']))

data/lib/ruby_gems_gems.rb

@@ -26,7 +26,7 @@ class RubyGemsGems < GemsCommand
       gz = Zlib::GzipReader.new(source)
       return gz.read
     rescue
-      $stderr.puts "ERROR: There was a problem opening #{specs_url} "
+      Utils.log_error "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" 
-    $stderr.puts "DEBUG: download and md5 for #{@name} from #{gem_uri}"
+    Utils.log_error "DEBUG: download and md5 for #{@name} from #{gem_uri}"
     begin
       source = open(gem_uri)
       @md5 = Digest::MD5.hexdigest(source.read)
       return @md5
     rescue
-      $stderr.puts "ERROR: There was a problem opening #{gem_uri}" 
+      Utils.log_error "ERROR: There was a problem opening #{gem_uri}" 
     end 
     return nil
   end

data/lib/utils.rb

@@ -1,4 +1,11 @@
 class Utils
+  attr_accessor :errors
+  @@errors = []
+
+  def Utils.errors
+    return @@errors
+  end
+  
   def Utils.check_parameters(classname, conf, parameters)
     if !conf['classname'] then
       raise "ERROR: trying to initialize #{classname} when parameter classname does not exists"
@@ -12,4 +19,10 @@ class Utils
       end
     end
   end
+
+  def Utils.log_error(msg)
+    @@errors << msg
+    $stderr.puts msg
+  end
+
 end

data/lib/view_results.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'gems_status_metadata'
+require 'utils'
 
 class ViewResults
 
@@ -32,16 +33,18 @@ class ViewResults
     <ol>
     <li> Maintain those gems that have been patched but are not outdated
     </li>
-    <li> Update does gems that have been patched and are outdated
+    <li> Update those gems that have been patched and are outdated
     </li>
-    <li> Update does gems that are outdated
+    <li> Update those gems that are outdated
     </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
     </p>
+    <p> At the end there are the errors. Look them carefully.
+    </p>
     <p>
-    You should run gems-status periodically until the lists of patched, outdated and checks are gone.
+    You should run gems-status periodically until the lists of errors, patched, outdated and checks are gone.
     </p>
     "
   end
@@ -88,7 +91,7 @@ class ViewResults
       version = result[k].version
       md5 = result[k].md5
     end
-    puts "<tr><td><span class='#{name_color}'>#{k}</span></td></tr>"
+    puts "<tr><td width='50%'><span class='#{name_color}'>#{k}</span></td><td width='10%'>version</td><td width='40%'>md5</td></tr>"
     puts html_string
     puts "</table>"
     puts "</p>"
@@ -111,6 +114,11 @@ class ViewResults
     font-size: 110%;
     font-weight: bold;
     }
+    h2
+    {
+    font-size: 100%;
+    font-weight: bold;
+    }
     .gem_name
     {
     color: #000000;
@@ -153,6 +161,8 @@ class ViewResults
   end
 
   def ViewResults.print_tail
+    puts "<h2>errors:</h2>"
+    Utils.errors.each {|e| puts "<br/><span class='alert'>#{e}</span>"}
     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/Gemfile

@@ -1,9 +1,10 @@
 source 'http://rubygems.org'
 
 gem 'system_timer'
-gem 'abingo'
+#gem 'abingo'
 gem 'factory_girl_rails'
 gem 'curb'
 gem 'xml-simple'
 gem 'fakefs'
+gem 'gem2rpm'
 

data/test/Gemfile.lock

@@ -1,15 +1,70 @@
 GEM
   remote: http://rubygems.org/
   specs:
-gem 'fakefs'  
-    system_timer (1.2.4)
-    abingo (1.0.3)
-    factory_girl_rails (1.2.0)
-    curb (0.7.15)
-    xml-simple (1.0.12)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    curb (0.8.0)
+    erubis (2.7.0)
+    factory_girl (2.5.1)
+      activesupport
+    factory_girl_rails (1.6.0)
+      factory_girl (~> 2.5.0)
+      railties (>= 3.0.0)
     fakefs (0.4.0)
+    gem2rpm (0.7.1)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.1)
+    json (1.6.5)
+    multi_json (1.0.4)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    system_timer (1.2.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  curb
+  factory_girl_rails
+  fakefs
+  gem2rpm
+  system_timer
+  xml-simple

data/test/Gemfile.lock.test

@@ -2,8 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     test (0.8.6)
+      test2 (1.2.3)
+    test2 (1.2.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+test
+

data/test/test-lockfile_gems.rb

@@ -16,10 +16,15 @@ class TestLockfileGems < Test::Unit::TestCase
  def test_get_rubygems_data
    lockfilegems = LockfileGemsTest.new
    lockfilegems.execute
+   assert(lockfilegems.result.length == 2)
    result = lockfilegems.result["test"].name
    assert_equal("test",result)
    result = lockfilegems.result["test"].version
    assert_equal(Gem::Version.new("0.8.6"), result)
+   result = lockfilegems.result["test2"].name
+   assert_equal("test2",result)
+   result = lockfilegems.result["test2"].version
+   assert_equal(Gem::Version.new("1.2.3"), result)
  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple