gems-status 0.2.4 → 0.2.5

data/lib/gems_composite_command.rb

@@ -90,9 +90,9 @@ class GemsCompositeCommand < GemsCommand
     if !are_there_results?
       return
     end
-    @results[@target].each do |k,v| 
+    @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 "ERROR: #{k} in #{@target} but not found in all the sources!"
         next
       end
       if equal_gems?(k) then
@@ -101,7 +101,7 @@ class GemsCompositeCommand < GemsCommand
       ViewResults::print_diff(k, @results, @target)
     end
     @checkers.each do |check_class|
-      @results[@target].each do |k, gem|
+      @results[@target].sort.each do |k, gem|
         ViewResults::print_check(check_class::description, gem.name) unless check_class::check?(gem)
       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 "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.4"
+  VERSION = "0.2.5"
 end

data/lib/lockfile_gems.rb

@@ -10,36 +10,41 @@ require "utils"
 
 class LockfileGems < GemsCommand
   def initialize(conf)
-    Utils::check_parameters('LockfileGems', conf, ["id", "dirname", "filename", "gems_url"])
-    @dirname = conf['dirname']
-    @filename = conf['filename']
+    Utils::check_parameters('LockfileGems', conf, ["id", "filenames", "gems_url"])
+    @filenames = conf['filenames']
     @gems_url = conf['gems_url']
     @result = {}
     @ident = conf['id']
   end
 
-  def get_data
-    Dir.chdir(@dirname)
+  def get_data(dirname, filename)
+    Dir.chdir(dirname)
     data = ""
     begin
-      data = File.open(@filename).read
+      data = File.open(filename).read
     rescue
-      Utils.log_error "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
-    Utils.log_debug "DEBUG: reading #{@filename}"
-    file_data = get_data
-    if file_data.empty?
-      return
-    end
-    lockfile = Bundler::LockfileParser.new(file_data)
-    lockfile.specs.each do |spec|
-      name = spec.name
-      version = spec.version
-      @result[name] = RubyGemsGems_GemSimple.new(name, Gem::Version.create(version) , '', @filename, @gems_url)
+    @filenames.each do |filename|
+      Utils::log_debug "DEBUG: reading #{filename}"
+      file_data = get_data(File::dirname(filename), File::basename(filename))
+      if file_data.empty?
+        Utils::log_error "ERROR: file empty #{filename}"
+        next
+      end
+      lockfile = Bundler::LockfileParser.new(file_data)
+      lockfile.specs.each do |spec|
+        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: #{name} - #{version} - #{filename}\n       #{name} - #{@result[name].version} - #{@result[name].origin} "
+        end
+        @result[name] = RubyGemsGems_GemSimple.new(name, version , '', filename, @gems_url)
+      end
     end
   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 "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
-      Utils.log_error "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
-      Utils.log_error "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
-      Utils.log_error "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
-      Utils.log_error "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"]
-      Utils.log_debug "DEBUG: Revision in link: #{rev}."
+      Utils::log_debug "DEBUG: Revision in link: #{rev}."
       package = package + "?rev=" + rev
     end
-    Utils.log_debug "DEBUG: follow link to project: #{repo} package: #{package}"
+    Utils::log_debug "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
-      Utils.log_error "ERROR: There was a problem opening #{url} " 
+      Utils::log_error "ERROR: There was a problem opening #{url} " 
     end
     return data 
   end
@@ -61,20 +61,22 @@ class OBSGems < GemsCommand
     end
     data = XmlSimple.xml_in(response)
     if data["linkinfo"] then
-      Utils.log_debug "DEBUG: #{data["name"]} is a link."
+      Utils::log_debug "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"
+        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
       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 "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"]}"
+      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"]}"
       end
       if entry["name"].end_with?(".gem") then
         name = gem_name(entry['name'])

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 "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 "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 "ERROR: There was a problem opening #{gem_uri}" 
     end 
     return nil
   end

data/lib/view_results.rb

@@ -161,8 +161,8 @@ class ViewResults
   end
 
   def ViewResults.print_tail
-    puts "<h2>errors:</h2>"
-    Utils.errors.each {|e| puts "<br/><span class='footer'><span class='alert'>#{e}</span></span>"}
+    puts "<h2>errors:#{Utils::errors.length}</h2>"
+    Utils::errors.each {|e| puts "<br/><span class='footer'><span class='alert'>#{e}</span></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>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple