gems-status 0.16.0 → 0.17.0

data/lib/gems-status/gems_status_metadata.rb

@@ -1,3 +1,3 @@
 module GemsStatusMetadata
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/lib/gems-status/not_a_security_alert_checker.rb

@@ -72,20 +72,24 @@ class NotASecurityAlertChecker < GemChecker
       return 
     end
     Utils::log_debug "Source URL for #{gem.name} #{source_repo}"
-    look_for_security_messages(gem.name, source_repo)
+    look_for_security_messages(gem.name, source_repo, gem.origin)
     filter_security_messages_already_fixed(gem.version)
   end
 
+  def key_for_emails(listname, gem, email)
+    "email_#{listname}_#{gem.name}_#{gem.origin}_#{email.uid}"
+  end
+
   def look_in_emails(gem)
     @emails.each do |listname, emails|
       emails.each do |email|
         if listname.include?(gem.name)
-          @security_messages["email_#{listname}_#{gem.name}_#{email.uid}"] = email.subject
+          @security_messages[key_for_emails] = email.subject
           Utils::log_debug "looking for security emails: listname matches gem #{gem.name}: #{listname}"
           next
         end
         if email.subject.include?(gem.name)
-          @security_messages["email_#{listname}_#{gem.name}_#{email.uid}"] = email.subject
+          @security_messages[key_for_emails] = email.subject
           Utils::log_debug "looking for security emails: subject matches gem #{gem.name}: #{email.subject}"
           next
         end
@@ -146,7 +150,7 @@ class NotASecurityAlertChecker < GemChecker
    return uri
  end
 
- def look_for_security_messages(name, source_repo, counter = 0)
+ def look_for_security_messages(name, source_repo, origin, counter = 0)
     Utils::log_debug "looking for security messages on #{source_repo}"
     if ! File.exists?("build_security_messages_check")
       Dir.mkdir("build_security_messages_check")
@@ -170,7 +174,7 @@ class NotASecurityAlertChecker < GemChecker
           return {}
         end
         @security_messages = scmCheckMessages.check_messages(name, source_repo, 
-                                        ScmSecurityMessages.new)
+                                        ScmSecurityMessages.new, origin)
       end
     end
  end

data/lib/gems-status/scm_check_messages.rb

@@ -1,29 +1,29 @@
 class ScmCheckMessages
   MAX_RETRIES = 3
 
-  def check_messages(name, source_repo, message_checker, counter = 0)
+  def check_messages(name, source_repo, message_checker, origin, counter = 0)
     begin
       messages = messages(name, source_repo)
-      return security_alerts(name, messages, message_checker)
+      return security_alerts(name, messages, message_checker, origin)
     rescue => e
       if counter == MAX_RETRIES
         Utils::log_error name, "There was a problem checking out #{source_repo} #{e}"
         return {}
       else
         Utils::log_debug "There was a problem checking out  #{source_repo} #{e}: Trying it again..."
-        return check_messages(name, source_repo, message_checker, counter + 1)
+        return check_messages(name, source_repo, message_checker, origin, counter + 1)
       end
     end
   end
 
 private
 
-  def security_alerts(name, commits, message_checker)
+  def security_alerts(name, commits, message_checker, origin)
     results = {}
     commits.each do |commit|
       if message_checker.check_message?(message(commit))
         Utils::log_debug "#{message(commit)}"
-        key = "#{name}_#{commit_key(commit)}"
+        key = "#{name}_#{origin}_#{commit_key(commit)}"
         if !key
           Utils::log_error "no key for #{name}"
           next

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gems-status
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: 
   segments: 
   - 0
-  - 16
+  - 17
   - 0
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors: 
 - Jordi Massaguer Pla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2012-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple