gems-status 0.2.5 → 0.2.6

data/lib/gem_simple.rb

@@ -1,11 +1,42 @@
 class GemSimple
-  attr_reader :name, :version, :md5, :origin, :gems_url
-  def initialize(name, version, md5, origin, gems_url=nil )
+  attr_reader :name, :version, :md5, :origin, :gems_url, :dependencies
+  def initialize(name, version, md5, origin, gems_url=nil, dependencies = nil )
     @name = name
     @version = version
     @md5 = md5
     @origin = origin
     @gems_url = gems_url
+    @dependencies = dependencies
   end
+
+  #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}")
+      return false
+    end
+    @dependencies.each do |dep|
+      return true if dep.name == gem.name
+    end
+    return false
+  end
+
+  #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}")
+      return false
+    end
+    changes = false
+    gem.dependencies.each do |dep|
+      if !@dependencies.include?(dep)
+        changes = true
+        @dependencies << dep
+        Utils::log_debug("DEBUG: adding #{dep} to dependencies")
+      end
+    end
+    return changes
+  end
+
 end
 

data/lib/gems_status_metadata.rb

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

data/lib/lockfile_gems.rb

@@ -28,6 +28,25 @@ class LockfileGems < GemsCommand
     return data
   end
 
+  def update_gem_dependencies(gem)
+    Utils::log_debug("DEBUG: updating dependencies for #{gem.name}")
+    changes = false
+    @result.each do |k, gem2|
+      if gem.depends?(gem2)
+        changes = gem.merge_deps(gem2) || changes
+      end
+    end
+    return changes
+  end
+
+  def update_dependencies
+    changes = false
+    @result.each do |k, gem|
+      changes = update_gem_dependencies(gem) || changes
+    end
+    update_dependencies if changes
+  end
+
   def execute
     @filenames.each do |filename|
       Utils::log_debug "DEBUG: reading #{filename}"
@@ -41,10 +60,17 @@ 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: #{name} - #{version} - #{filename}\n       #{name} - #{@result[name].version} - #{@result[name].origin} "
+          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)
+        dependencies = spec.dependencies
+        Utils::log_debug "DEBUG: dependencies for #{name} #{dependencies}"
+        @result[name] = RubyGemsGems_GemSimple.new(name, version , '', filename,
+                                                   @gems_url, dependencies)
       end
+      update_dependencies
     end
   end
 

data/lib/not_rails_checker.rb

@@ -4,27 +4,16 @@ require 'open-uri'
 require 'gem_checker'
 
 class NotRailsChecker < GemChecker
+  RAILS_GEMS = ["rails", "railties","activesupport"]
   def NotRailsChecker.check?(gem)
-    result = nil
-    gem_uri = "#{gem.gems_url}/#{gem.name}-#{gem.version}.gem" 
-    begin
-      source = open(gem_uri, Gem.binary_mode) do |io|
-        result = Gem::Format.from_io io
+    return false if !gem.dependencies 
+    gem.dependencies.each do |dep|
+      if RAILS_GEMS.include?(dep.name)
+        return false
       end
-    rescue IOError
-      #bug on open-uri:137 on closing strings
-      #it should be
-      #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}" 
-    end
-    return false unless result 
-    result.spec.dependencies.each do |gem|
-      return false if gem.name == "rails"
     end
     return true
-  end
+    end
 
   def NotRailsChecker.description
     "This gem depends on rails or could not get spec: "

data/lib/ruby_gems_gems_gem_simple.rb

@@ -2,8 +2,8 @@ require "gem_simple"
 
 class RubyGemsGems_GemSimple < GemSimple
 
-  def initialize(name, version, md5, origin, gems_url)
-    super(name, version, nil, origin, gems_url)
+  def initialize(name, version, md5, origin, gems_url, dependencies=nil)
+    super(name, version, nil, origin, gems_url, dependencies)
   end
 
   def md5

data/test/Gemfile.lock.test

@@ -4,6 +4,11 @@ GEM
     test (0.8.6)
       test2 (1.2.3)
     test2 (1.2.3)
+      test3 (1.2.3)
+    test3 (1.2.3)
+      test4 (1.2.3)
+    test4 (1.2.3)
+      test2 (1.2.3)
 
 PLATFORMS
   ruby

data/test/test-lockfile_gems.rb

@@ -1,22 +1,23 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
 require 'lockfile_gems'
+require 'rubygems/dependency'
 
 class LockfileGemsTest < LockfileGems
   attr_accessor :result
   def initialize
-    @dirname = "."
-    @filename = "Gemfile.lock.test"
+    #TODO: this won't work in other development machines!
+    @filenames = ["/home/jordi/work/suse/gems-status/test/Gemfile.lock.test"]
     @gems_url = ""
     @result = {}
   end
 end
 
 class TestLockfileGems < Test::Unit::TestCase
- def test_get_rubygems_data
+ def test_get_rubygems_names
    lockfilegems = LockfileGemsTest.new
    lockfilegems.execute
-   assert(lockfilegems.result.length == 2)
+   assert(lockfilegems.result.length == 4)
    result = lockfilegems.result["test"].name
    assert_equal("test",result)
    result = lockfilegems.result["test"].version
@@ -25,6 +26,33 @@ class TestLockfileGems < Test::Unit::TestCase
    assert_equal("test2",result)
    result = lockfilegems.result["test2"].version
    assert_equal(Gem::Version.new("1.2.3"), result)
+   result = lockfilegems.result["test3"].name
+   assert_equal("test3",result)
+   result = lockfilegems.result["test3"].version
+   assert_equal(Gem::Version.new("1.2.3"), result)
+   result = lockfilegems.result["test4"].name
+   assert_equal("test4",result)
+   result = lockfilegems.result["test4"].version
+   assert_equal(Gem::Version.new("1.2.3"), result)
+ end
+
+ def test_get_rubygems_dependencies
+   lockfilegems = LockfileGemsTest.new
+   lockfilegems.execute
+   result = lockfilegems.result["test"].dependencies
+   assert(result)
+   result = lockfilegems.result["test"].dependencies.length
+   assert_equal(3, result)
+   result = lockfilegems.result["test"].dependencies
+   assert_equal(
+     Gem::Dependency.new("test2", Gem::Requirement.new(["= 1.2.3"])),
+     result[0]) 
+   assert_equal(
+     Gem::Dependency.new("test3", Gem::Requirement.new(["= 1.2.3"])),
+     result[1]) 
+   assert_equal(
+     Gem::Dependency.new("test4", Gem::Requirement.new(["= 1.2.3"])),
+     result[2]) 
  end
 end
 

data/test/test-not_rails_checker.rb

@@ -0,0 +1,54 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'test/unit'
+require 'gems_command'
+require 'gem_simple'
+require 'not_rails_checker'
+
+class TestNotRailsChecker < Test::Unit::TestCase
+  def test_gem_with_no_deps
+    gem = GemSimple.new("name", Gem::Version.new("1.2.3"), nil, nil, nil, nil)
+    check = NotRailsChecker
+    result = check.check?(gem)
+    assert(!result)
+  end
+  def test_gem_with_no_deps_2
+    gem = GemSimple.new("name", Gem::Version.new("1.2.3"), nil, nil, nil, [])
+    check = NotRailsChecker
+    result = check.check?(gem)
+    assert(result)
+  end
+  def test_gem_with_rail_dep
+    deps = [
+      Gem::Dependency.new("rails", Gem::Requirement.new("> 0.0.0")),
+      Gem::Dependency.new("foo", Gem::Requirement.new("> 0.0.0"))
+    ]
+
+    gem = GemSimple.new("name", Gem::Version.new("1.2.3"), nil, nil, nil, deps)
+    check = NotRailsChecker
+    result = check.check?(gem)
+    assert(!result)
+  end
+  def test_gem_with_no_rail_dep
+    deps = [
+      Gem::Dependency.new("norails", Gem::Requirement.new("> 0.0.0")),
+      Gem::Dependency.new("foo", Gem::Requirement.new("> 0.0.0"))
+    ]
+
+    gem = GemSimple.new("name", Gem::Version.new("1.2.3"), nil, nil, nil, deps)
+    check = NotRailsChecker
+    result = check.check?(gem)
+    assert(result)
+  end
+  def test_gem_with_railties_dep
+    deps = [
+      Gem::Dependency.new("railties", Gem::Requirement.new("> 0.0.0")),
+      Gem::Dependency.new("foo", Gem::Requirement.new("> 0.0.0"))
+    ]
+
+    gem = GemSimple.new("name", Gem::Version.new("1.2.3"), nil, nil, nil, deps)
+    check = NotRailsChecker
+    result = check.check?(gem)
+    assert(!result)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -77,6 +77,7 @@ files:
 - test/test-utils.rb
 - test/test-ruby_gems_gems.rb
 - test/test-lockfile_gems.rb
+- test/test-not_rails_checker.rb
 - test/test-obs_gems.rb
 - test/Gemfile.lock
 - test/Gemfile