gems-status 0.2.7 → 0.3.0

data/lib/gems_composite_command.rb

@@ -37,7 +37,7 @@ class GemsCompositeCommand < GemsCommand
     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)
+        @checker_results[gem.name].each { |g| check_class::description + gem.name unless check_class::check?(g) }
       end
     end
   end
@@ -54,28 +54,6 @@ class GemsCompositeCommand < GemsCommand
     return true
   end
 
-  def equal_gems?(k)
-    if !are_there_results?
-      return false
-    end
-    if !common_key?(k)
-      return false
-    end
-    version = @results[@target][k].version
-    md5 = @results[@target][k].md5
-    @results.each do |key, result|
-      if result[k].version != version
-        return false
-      end
-      if result[k].md5 != md5
-        return false
-      end
-      version = result[k].version
-      md5 = result[k].md5
-    end
-    return true
-  end
-
   def add_comments(comments)
     @comments = comments
   end
@@ -104,10 +82,6 @@ class GemsCompositeCommand < GemsCommand
     @results[@target].sort.each do |k,v| 
       if !common_key?(k) then 
         Utils::log_error(k, "#{k} in #{@target} but not found in all the sources!")
-        next
-      end
-      if equal_gems?(k) then
-        next
       end
       if @checker_results[k]
         checker_results = @checker_results[k]

data/lib/gems_status_metadata.rb

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

data/lib/lockfile_gems.rb

@@ -31,9 +31,11 @@ class LockfileGems < GemsCommand
   def update_gem_dependencies(gem)
     Utils::log_debug("updating dependencies for #{gem.name}")
     changes = false
-    @result.each do |k, gem2|
-      if gem.depends?(gem2)
-        changes = gem.merge_deps(gem2) || changes
+    @result.each do |k, gems|
+      gems.each do |gem2|
+        if gem.depends?(gem2)
+          changes = gem.merge_deps(gem2) || changes
+        end
       end
     end
     return changes
@@ -41,8 +43,10 @@ class LockfileGems < GemsCommand
 
   def update_dependencies
     changes = false
-    @result.each do |k, gem|
-      changes = update_gem_dependencies(gem) || changes
+    @result.each do |k, gems|
+      gems.each do |gem|
+        changes = update_gem_dependencies(gem) || changes
+      end
     end
     update_dependencies if changes
   end
@@ -59,16 +63,17 @@ class LockfileGems < GemsCommand
       lockfile.specs.each do |spec|
         name = spec.name
         version = Gem::Version.create(spec.version)
-        if @result[name] && @result[name].version != version
-          Utils::log_error(name, " 
-            Same gem with different versions: 
-            #{name} - #{version} - #{filename}\n
-            #{name} - #{@result[name].version} - #{@result[name].origin} ")
-        end
         dependencies = spec.dependencies
         Utils::log_debug "dependencies for #{name} #{dependencies}"
-        @result[name] = RubyGemsGems_GemSimple.new(name, version , '', filename,
-                                                   @gems_url, dependencies)
+        if spec.source.class.name == "Bundler::Source::Git"
+          Utils::log_debug "this comes from git #{name} #{version}"
+          gems_url = spec.source.uri
+        else 
+          gems_url = @gems_url
+        end
+        @result[name] = [] if !@result[name]
+        @result[name] << RubyGemsGems_GemSimple.new(name, version , '', filename,
+                                                   gems_url, dependencies)
       end
       update_dependencies
     end

data/lib/obs_gems.rb

@@ -83,8 +83,8 @@ class OBSGems < GemsCommand
         name = gem_name(entry['name'])
         version = Gem::Version.new(gem_version(entry['name']))
         md5 = entry['md5']
-        if !@result[name] || @result[name].version < version    
-          @result[name] = GemSimple.new(name, version, md5, url)
+        if !@result[name] || @result[name][0].version < version    
+          @result[name] = [GemSimple.new(name, version, md5, url)]
         end
       end
     end

data/lib/ruby_gems_gems.rb

@@ -42,7 +42,7 @@ class RubyGemsGems < GemsCommand
       name = line[0]
       version = Gem::Version.new(line[1])
       gems_url = "#{@url}/gems"
-      @result[name] = RubyGemsGems_GemSimple.new(name, version,'' , @url, gems_url)
+      @result[name] = [RubyGemsGems_GemSimple.new(name, version,'' , @url, gems_url)]
     end
   end
 

data/lib/ruby_gems_gems_gem_simple.rb

@@ -10,10 +10,20 @@ class RubyGemsGems_GemSimple < GemSimple
     if @md5
       return @md5
     end
-    gem_uri = "#{@gems_url}/#{@name}-#{@version}.gem" 
-    Utils::log_debug "download and md5 for #{@name} from #{gem_uri}"
+    if from_git?
+      return nil
+    end
+    gem_uri = URI.parse("#{@gems_url}/#{@name}-#{@version}.gem")
+    uri_debug = gem_uri.clone
+    uri_debug.password = "********" if uri_debug.password
+    Utils::log_debug "download and md5 for #{@name} from #{uri_debug}"
     begin
-      source = open(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)
       return @md5
     rescue
@@ -21,5 +31,9 @@ class RubyGemsGems_GemSimple < GemSimple
     end 
     return nil
   end
+
+  def from_git?
+    return @gems_url.start_with?("git://")
+  end
 end
 

data/lib/view_results.rb

@@ -52,44 +52,56 @@ class ViewResults
   def ViewResults.print_results(k, results, target, checker_results, comments)
     puts "<p>"
     puts "<table width='100%' class='table_results'>"
-    version = results[target][k].version
-    md5 = results[target][k].md5
+    version = results[target][k][0].version
+    md5 = results[target][k][0].md5
     name_color = "info"
     html_string = ""
     results.each do |key, result|
-      html_string << "<tr>"
-      html_string << "<td>"
-      html_string << "#{result[k].origin}"
-      html_string << "</td>"
-      html_string << "<td>"
+      if !result[k]
+        next
+      end
       v_color = "info"
       md5_color = "info"
-      if version != result[k].version then
-        v_color = "warning"
-        name_color = "warning" if name_color != "alert"
-      else
-        if md5 != result[k].md5 then
+      result[k].each do |gem|
+        html_string << "<tr>"
+        html_string << "<td>"
+        html_string << "#{gem.origin}"
+        html_string << "</td>"
+        html_string << "<td>"
+        if gem.from_git? then
           md5_color = name_color = "alert"
         end
+        if version != gem.version then
+          v_color = "warning"
+          name_color = "warning" if name_color != "alert"
+        else
+          if !gem.md5 || md5 != gem.md5 then
+            md5_color = name_color = "alert"
+          end
+        end
+        html_string << "<span class='#{v_color}'>"
+        if !version then
+          html_string << "error: look error log"
+        end
+        html_string << "#{gem.version}"
+        html_string << "</span>"
+        html_string << "</td>"
+        html_string << "<td>"
+        html_string << "<span class='#{md5_color}'>"
+        if !gem.md5 || gem.md5.empty? then
+          if gem.from_git? then
+            html_string << "this comes from #{gem.gems_url}"
+          else
+            html_string << "error: look error log"
+          end
+        end
+        html_string << "#{gem.md5}"
+        html_string << "</span>"
+        html_string << "</td>"
+        html_string << "</tr>"
+        version = gem.version
+        md5 = gem.md5
       end
-      html_string << "<span class='#{v_color}'>"
-      if !version then
-        html_string << "error: look error log"
-      end
-      html_string << "#{result[k].version}"
-      html_string << "</span>"
-      html_string << "</td>"
-      html_string << "<td>"
-      html_string << "<span class='#{md5_color}'>"
-      if !result[k].md5 || result[k].md5.empty? then
-        html_string << "error: look error log"
-      end
-      html_string << "#{result[k].md5}"
-      html_string << "</span>"
-      html_string << "</td>"
-      html_string << "</tr>"
-      version = result[k].version
-      md5 = result[k].md5
     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

data/test/Gemfile.lock.test

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/openSUSE/from_git.git
+  revision: 11111111
+  tag: 1.0.3.p1
+  specs:
+    from_git (1.0.3)
+      dep_from_git (1.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -9,10 +17,12 @@ GEM
       test4 (1.2.3)
     test4 (1.2.3)
       test2 (1.2.3)
+    dep_from_git (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
 test
+from_git (= 1.0.3)!
 

data/test/test-gems_composite_command.rb

@@ -45,53 +45,4 @@ class TestGemsCompositeCommand < Test::Unit::TestCase
     result = gemscompositecommand.common_key?("a key")
     assert(result)
   end
-  def test_equals_when_no_common_keys
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gem1 = GemSimple.new("foo_name","foo_version","md5","origin1")
-    gem2 = GemSimple.new("foo_name","foo_version","md5","origin2")
-    gem3 = GemSimple.new("bar_name","bar_version","md5","origin3")
-    gemscompositecommand.results['id']= {"foo"=>gem1}
-    gemscompositecommand.results['id2']= {"foo"=>gem2}
-    gemscompositecommand.results['id3']= {"bar"=>gem3}
-    result = gemscompositecommand.equal_gems?("foo")
-    assert(!result)
-  end
-  def test_equals_when_version_not_equals
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gem1 = GemSimple.new("foo_name","foo_version","md5","origin1")
-    gem2 = GemSimple.new("foo_name","foo_version","md5","origin2")
-    gem3 = GemSimple.new("foo_name","bar_version","md5","origin3")
-    gemscompositecommand.results['id']= {"foo"=>gem1}
-    gemscompositecommand.results['id2']= {"foo"=>gem2}
-    gemscompositecommand.results['id3']= {"foo"=>gem3}
-    result = gemscompositecommand.equal_gems?("foo")
-    assert(!result)
-  end
-  def test_equals_when_md5_not_equals
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gem1 = GemSimple.new("foo_name","foo_version","md5","origin1")
-    gem2 = GemSimple.new("foo_name","foo_version","md5","origin2")
-    gem3 = GemSimple.new("foo_name","foo_version","md5_2","origin3")
-    gemscompositecommand.results['id']= {"foo"=>gem1}
-    gemscompositecommand.results['id2']= {"foo"=>gem2}
-    gemscompositecommand.results['id3']= {"foo"=>gem3}
-    result = gemscompositecommand.equal_gems?("foo")
-    assert(!result)
-  end
-  def test_equals_when_equals
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gem1 = GemSimple.new("foo_name","foo_version","md5","origin1")
-    gem2 = GemSimple.new("foo_name","foo_version","md5","origin2")
-    gem3 = GemSimple.new("foo_name","foo_version","md5","origin3")
-    gemscompositecommand.results['id']= {"foo"=>gem1}
-    gemscompositecommand.results['id2']= {"foo"=>gem2}
-    gemscompositecommand.results['id3']= {"foo"=>gem3}
-    result = gemscompositecommand.equal_gems?("foo")
-    assert(result)
-  end
-  def test_equals_when_no_results
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    result = gemscompositecommand.equal_gems?("foo")
-    assert(!result)
-  end
 end

data/test/test-lockfile_gems.rb

@@ -17,33 +17,37 @@ class TestLockfileGems < Test::Unit::TestCase
  def test_get_rubygems_names
    lockfilegems = LockfileGemsTest.new
    lockfilegems.execute
-   assert(lockfilegems.result.length == 4)
-   result = lockfilegems.result["test"].name
+   assert(lockfilegems.result.length == 6)
+   result = lockfilegems.result["test"][0].name
    assert_equal("test",result)
-   result = lockfilegems.result["test"].version
+   result = lockfilegems.result["test"][0].version
    assert_equal(Gem::Version.new("0.8.6"), result)
-   result = lockfilegems.result["test2"].name
+   result = lockfilegems.result["test2"][0].name
    assert_equal("test2",result)
-   result = lockfilegems.result["test2"].version
+   result = lockfilegems.result["test2"][0].version
    assert_equal(Gem::Version.new("1.2.3"), result)
-   result = lockfilegems.result["test3"].name
+   result = lockfilegems.result["test3"][0].name
    assert_equal("test3",result)
-   result = lockfilegems.result["test3"].version
+   result = lockfilegems.result["test3"][0].version
    assert_equal(Gem::Version.new("1.2.3"), result)
-   result = lockfilegems.result["test4"].name
+   result = lockfilegems.result["test4"][0].name
    assert_equal("test4",result)
-   result = lockfilegems.result["test4"].version
+   result = lockfilegems.result["test4"][0].version
    assert_equal(Gem::Version.new("1.2.3"), result)
+   result = lockfilegems.result["from_git"][0].version
+   assert_equal(Gem::Version.new("1.0.3"), result)
+   result = lockfilegems.result["dep_from_git"][0].version
+   assert_equal(Gem::Version.new("1.0.0"), result)
  end
 
  def test_get_rubygems_dependencies
    lockfilegems = LockfileGemsTest.new
    lockfilegems.execute
-   result = lockfilegems.result["test"].dependencies
+   result = lockfilegems.result["test"][0].dependencies
    assert(result)
-   result = lockfilegems.result["test"].dependencies.length
+   result = lockfilegems.result["test"][0].dependencies.length
    assert_equal(3, result)
-   result = lockfilegems.result["test"].dependencies
+   result = lockfilegems.result["test"][0].dependencies
    assert_equal(
      Gem::Dependency.new("test2", Gem::Requirement.new(["= 1.2.3"])),
      result[0]) 
@@ -54,5 +58,13 @@ class TestLockfileGems < Test::Unit::TestCase
      Gem::Dependency.new("test4", Gem::Requirement.new(["= 1.2.3"])),
      result[2]) 
  end
+
+ def test_from_git
+   lockfilegems = LockfileGemsTest.new
+   lockfilegems.execute
+   result = lockfilegems.result["from_git"][0].gems_url
+   assert(result.start_with?("git://"))
+   assert(lockfilegems.result["from_git"][0].from_git?)
+ end
 end
 

data/test/test-obs_gems.rb

@@ -25,11 +25,11 @@ class TestObsGems < Test::Unit::TestCase
  def test_get_rubygem_data
    obsgems = OBSGemsTest.new
    obsgems.execute
-   result = obsgems.result["test"].name
+   result = obsgems.result["test"][0].name
    assert_equal("test", result)
-   result = obsgems.result["test"].version
+   result = obsgems.result["test"][0].version
    assert_equal(Gem::Version.new("0.8.6"), result)
-   result = obsgems.result["test"].md5
+   result = obsgems.result["test"][0].md5
    assert_equal("123", result)
  end
 end

data/test/test-ruby_gems_gems.rb

@@ -19,9 +19,9 @@ class TestRubyGemsGems < Test::Unit::TestCase
    rubygemsgems = RubyGemsGemsTest.new 
    rubygemsgems.execute
    rubygemsgems.result.each {|k,v| puts "k: #{k} v: #{v}"}
-   result = rubygemsgems.result["test"].name
+   result = rubygemsgems.result["test"][0].name
    assert_equal("test",result)
-   result = rubygemsgems.result["test"].version
+   result = rubygemsgems.result["test"][0].version
    assert_equal(Gem::Version.new("0.8.6"), result)
  end
 end

metadata

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