gems-status 0.38.0 → 0.39.0

data/lib/gems-status/sources/lockfile_gems.rb

@@ -8,81 +8,84 @@ require "gems-status/sources/ruby_gems_gems_gem_simple"
 require "gems-status/gems_command"
 require "gems-status/utils"
 
-class LockfileGems < GemsCommand
-  def initialize(conf)
-    Utils::check_parameters('LockfileGems', conf, ["id", "filenames", "gems_url", "upstream_url"])
-    @filenames = conf['filenames']
-    @gems_url = conf['gems_url']
-    @result = {}
-    @ident = conf['id']
-    @upstream_url = conf['upstream_url']
-  end
+module GemsStatus
 
-  def get_data(dirname, filename)
-    data = ""
-    Dir.chdir(dirname) do
-      begin
-        data = File.open(filename).read
-      rescue
-        Utils::log_error("?", "There was a problem opening file #{filename} ")
-      end
+  class LockfileGems < GemsCommand
+    def initialize(conf)
+      Utils::check_parameters('LockfileGems', conf, ["id", "filenames", "gems_url", "upstream_url"])
+      @filenames = conf['filenames']
+      @gems_url = conf['gems_url']
+      @result = {}
+      @ident = conf['id']
+      @upstream_url = conf['upstream_url']
     end
-    return data
-  end
 
-  def update_gem_dependencies(gem)
-    Utils::log_debug("updating dependencies for #{gem.name}")
-    changes = false
-    @result.each do |k, gems|
-      gems.each do |gem2|
-        if gem.depends?(gem2)
-          changes = gem.merge_deps(gem2) || changes
+    def get_data(dirname, filename)
+      data = ""
+      Dir.chdir(dirname) do
+        begin
+          data = File.open(filename).read
+        rescue
+          Utils::log_error("?", "There was a problem opening file #{filename} ")
         end
       end
+      return data
     end
-    return changes
-  end
 
-  def update_dependencies
-    changes = false
-    @result.each do |k, gems|
-      gems.each do |gem|
-        changes = update_gem_dependencies(gem) || changes
+    def update_gem_dependencies(gem)
+      Utils::log_debug("updating dependencies for #{gem.name}")
+      changes = false
+      @result.each do |k, gems|
+        gems.each do |gem2|
+          if gem.depends?(gem2)
+            changes = gem.merge_deps(gem2) || changes
+          end
+        end
       end
+      return changes
     end
-    update_dependencies if changes
-  end
 
-  def execute
-    @filenames.each do |filename|
-      Utils::log_debug "reading #{filename}"
-      Dir.chdir(File.dirname(filename)) do
-        file_data = get_data(File::dirname(filename), File::basename(filename))
-        if file_data.empty?
-          Utils::log_error("?", "file empty #{filename}")
-          next
+    def update_dependencies
+      changes = false
+      @result.each do |k, gems|
+        gems.each do |gem|
+          changes = update_gem_dependencies(gem) || changes
         end
-        lockfile = Bundler::LockfileParser.new(file_data)
-        lockfile.specs.each do |spec|
-          name = spec.name
-          version = Gem::Version.create(spec.version)
-          dependencies = spec.dependencies
-          Utils::log_debug "dependencies for #{name} #{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
+      update_dependencies if changes
+    end
+
+    def execute
+      @filenames.each do |filename|
+        Utils::log_debug "reading #{filename}"
+        Dir.chdir(File.dirname(filename)) do
+          file_data = get_data(File::dirname(filename), File::basename(filename))
+          if file_data.empty?
+            Utils::log_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)
+            dependencies = spec.dependencies
+            Utils::log_debug "dependencies for #{name} #{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)
+            @result[name] << RubyGemsGems_GemSimple.new(name, version , '', @upstream_url,
+                                                     @upstream_url, dependencies)
           end
-          @result[name] = [] if !@result[name]
-          @result[name] << RubyGemsGems_GemSimple.new(name, version , '', filename,
-                                                     gems_url, dependencies)
-          @result[name] << RubyGemsGems_GemSimple.new(name, version , '', @upstream_url,
-                                                   @upstream_url, dependencies)
         end
+        update_dependencies
       end
-      update_dependencies
     end
-  end
 
+  end
 end

data/lib/gems-status/sources/obs_gems.rb

@@ -6,104 +6,107 @@ require "gems-status/gem_simple"
 require "gems-status/gems_command"
 require "gems-status/utils"
 
-class OBSGems < GemsCommand
-  FILES_TO_IGNORE = /(\w(\.gem|\.spec|\.changes|\.rpmlintrc|-rpm-lintrc|-rpmlintrc))|README.SuSE/
-  def initialize(conf)
-    Utils::check_parameters('OBSGems', conf, ["id", "username", "password", "url", "obs_repo"])
-    @result = {}
-    @username = conf['username']
-    @password = conf['password']
-    @obs_url = conf['url']
-    @repo = conf['obs_repo']
-    @ident = conf['id']
+module GemsStatus
 
-  end
+  class OBSGems < GemsCommand
+    FILES_TO_IGNORE = /(\w(\.gem|\.spec|\.changes|\.rpmlintrc|-rpm-lintrc|-rpmlintrc))|README.SuSE/
+    def initialize(conf)
+      Utils::check_parameters('OBSGems', conf, ["id", "username", "password", "url", "obs_repo"])
+      @result = {}
+      @username = conf['username']
+      @password = conf['password']
+      @obs_url = conf['url']
+      @repo = conf['obs_repo']
+      @ident = conf['id']
 
-  def parse_link(linkinfo)
-    if linkinfo.length > 1 then
-      Utils::log_error("?", "There is more than one linkinfo element")
-      return
-    end
-    if !linkinfo[0]["project"] then
-      Utils::log_error("?", "Project element does not exists in linkinfo")
-      return
-    end
-    if !linkinfo[0]["package"] then
-      Utils::log_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 "Revision in link: #{rev}."
-      package = package + "?rev=" + rev
-    end
-    Utils::log_debug "follow link to project: #{repo} package: #{package}"
-    parse_rpm_data(repo, package)
-  end
 
-  def get_data(package, url)
-    data = ""
-    begin
-      data = open(url, :http_basic_authentication => [@username, @password]).read
-    rescue
-      Utils::log_error(package.sub("rubygem-",""), "There was a problem opening #{url} ")
+    def parse_link(linkinfo)
+      if linkinfo.length > 1 then
+        Utils::log_error("?", "There is more than one linkinfo element")
+        return
+      end
+      if !linkinfo[0]["project"] then
+        Utils::log_error("?", "Project element does not exists in linkinfo")
+        return
+      end
+      if !linkinfo[0]["package"] then
+        Utils::log_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 "Revision in link: #{rev}."
+        package = package + "?rev=" + rev
+      end
+      Utils::log_debug "follow link to project: #{repo} package: #{package}"
+      parse_rpm_data(repo, package)
     end
-    return data 
-  end
 
-  def parse_rpm_data(project, package)
-    url = @obs_url + "/" + project
-    rpm_url = url + "/" + package
-    response = get_data(package, rpm_url) 
-    if response.empty? then
-      return
-    end
-    data = XmlSimple.xml_in(response)
-    if data["linkinfo"] then
-      Utils::log_debug "#{data["name"]} is a link."
-      if data["entry"].length != 1
-        msg = " "
-        data["entry"].each {|e| msg << " " << e["name"]}
-        Utils::log_error(package.sub("rubygem-",""), "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)
+    def get_data(package, url)
+      data = ""
+      begin
+        data = open(url, :http_basic_authentication => [@username, @password]).read
+      rescue
+        Utils::log_error(package.sub("rubygem-",""), "There was a problem opening #{url} ")
       end
-      parse_link(data["linkinfo"])
-      return
+      return data 
     end
-    if !data["entry"] then
-      Utils::log_error(package.sub("rubygem-",""), "something went wrong retrieving info from #{project} : #{package}")
-      return
-    end
-    data["entry"].each do |entry|
-      if !(entry["name"] =~ OBSGems::FILES_TO_IGNORE)
-        Utils::log_error(package.sub("rubygem-",""), "when parsing data for #{project} : #{package}. Entry not expected. That may be a patched rpm and the result may not be correct. #{entry["name"]} ")
+
+    def parse_rpm_data(project, package)
+      url = @obs_url + "/" + project
+      rpm_url = url + "/" + package
+      response = get_data(package, rpm_url) 
+      if response.empty? then
+        return
+      end
+      data = XmlSimple.xml_in(response)
+      if data["linkinfo"] then
+        Utils::log_debug "#{data["name"]} is a link."
+        if data["entry"].length != 1
+          msg = " "
+          data["entry"].each {|e| msg << " " << e["name"]}
+          Utils::log_error(package.sub("rubygem-",""), "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(package.sub("rubygem-",""), "something went wrong retrieving info from #{project} : #{package}")
+        return
       end
-      if entry["name"].end_with?(".gem") then
-        name = gem_name(entry['name'])
-        version = Gem::Version.new(gem_version(entry['name']))
-        md5 = entry['md5']
-        if !@result[name] || @result[name][0].version < version    
-          @result[name] = [GemSimple.new(name, version, md5, url)]
+      data["entry"].each do |entry|
+        if !(entry["name"] =~ OBSGems::FILES_TO_IGNORE)
+          Utils::log_error(package.sub("rubygem-",""), "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']))
+          md5 = entry['md5']
+          if !@result[name] || @result[name][0].version < version    
+            @result[name] = [GemSimple.new(name, version, md5, url)]
+          end
         end
       end
     end
-  end
 
-  def execute
-    url = @obs_url + "/" + @repo
-    response = get_data("?", url)
-    if response.empty? then
-      return
-    end
-    data = XmlSimple.xml_in(response)
-    data["entry"].each do |entry|
-      entry.each do |k,v|
-        if k == "name" and v.start_with?("rubygem-") then
-          parse_rpm_data(@repo, v)
+    def execute
+      url = @obs_url + "/" + @repo
+      response = get_data("?", url)
+      if response.empty? then
+        return
+      end
+      data = XmlSimple.xml_in(response)
+      data["entry"].each do |entry|
+        entry.each do |k,v|
+          if k == "name" and v.start_with?("rubygem-") then
+            parse_rpm_data(@repo, v)
+          end
         end
       end
     end
-  end
 
+  end
 end

data/lib/gems-status/sources/ruby_gems_gems.rb

@@ -7,43 +7,45 @@ require "gems-status/sources/ruby_gems_gems_gem_simple"
 require "gems-status/gems_command"
 require "gems-status/utils"
 
+module GemsStatus
 
-class RubyGemsGems < GemsCommand
+  class RubyGemsGems < GemsCommand
 
-  def initialize(conf)
-    Utils::check_parameters('RubyGemsGems', conf, ["id", "url", "specs"])
-    @url = conf['url']
-    @specs = conf['specs']
-    @result = {}
-    @ident = conf['id']
+    def initialize(conf)
+      Utils::check_parameters('RubyGemsGems', conf, ["id", "url", "specs"])
+      @url = conf['url']
+      @specs = conf['specs']
+      @result = {}
+      @ident = conf['id']
 
-  end
+    end
 
-  def get_data
-    specs_url = @url + "/" + @specs 
-    begin
-      source = open(specs_url)
-      gz = Zlib::GzipReader.new(source)
-      return gz.read
-    rescue
-      Utils::log_error "?", "There was a problem opening #{specs_url} "
+    def get_data
+      specs_url = @url + "/" + @specs 
+      begin
+        source = open(specs_url)
+        gz = Zlib::GzipReader.new(source)
+        return gz.read
+      rescue
+        Utils::log_error "?", "There was a problem opening #{specs_url} "
+      end
+      return ""
     end
-    return ""
-  end
 
 
-  def execute
-    response = get_data
-    if response.empty? then
-      return
+    def execute
+      response = get_data
+      if response.empty? then
+        return
+      end
+      data = Marshal.load(response)
+      data.each do |line|
+        name = line[0]
+        version = Gem::Version.new(line[1])
+        gems_url = "#{@url}/gems"
+        @result[name] = [RubyGemsGems_GemSimple.new(name, version,'' , @url, gems_url)]
+      end
     end
-    data = Marshal.load(response)
-    data.each do |line|
-      name = line[0]
-      version = Gem::Version.new(line[1])
-      gems_url = "#{@url}/gems"
-      @result[name] = [RubyGemsGems_GemSimple.new(name, version,'' , @url, gems_url)]
-    end
-  end
 
+  end
 end

data/lib/gems-status/sources/ruby_gems_gems_gem_simple.rb

@@ -2,42 +2,45 @@ require "rubygems/format"
 require "gems-status/gem_simple"
 require "time"
 
-class RubyGemsGems_GemSimple < GemSimple
+module GemsStatus
 
-  def initialize(name, version, md5, origin, gems_url, dependencies=nil)
-    super(name, version, nil, origin, gems_url, dependencies)
-  end
+  class RubyGemsGems_GemSimple < GemSimple
 
-  def license
-    if from_git?
-      return nil
+    def initialize(name, version, md5, origin, gems_url, dependencies=nil)
+      super(name, version, nil, origin, gems_url, dependencies)
+    end
+
+    def license
+      if from_git?
+        return nil
+      end
+      Utils::download_license(@name, @version, @gems_url)
     end
-    Utils::download_license(@name, @version, @gems_url)
-  end
 
 
-  def md5
-    if from_git?
-      return nil
+    def md5
+      if from_git?
+        return nil
+      end
+      Utils::download_md5(@name, @version, @gems_url)
     end
-    Utils::download_md5(@name, @version, @gems_url)
-  end
 
-  def date
-    Utils::log_debug "looking for date for #{@name} - #{@version}"
-    begin
-      versions = JSON.parse(open("https://rubygems.org/api/v1/versions/#{@name}.json").read)
-      versions.each do |version|
-        if Gem::Version.new(version["number"]) == @version
-          Utils::log_debug  "Date for #{@name} - #{@version} : #{version["built_at"]}"
-          return Time.parse version["built_at"]
+    def date
+      Utils::log_debug "looking for date for #{@name} - #{@version}"
+      begin
+        versions = JSON.parse(open("https://rubygems.org/api/v1/versions/#{@name}.json").read)
+        versions.each do |version|
+          if Gem::Version.new(version["number"]) == @version
+            Utils::log_debug  "Date for #{@name} - #{@version} : #{version["built_at"]}"
+            return Time.parse version["built_at"]
+          end
         end
+      rescue
+        Utils::log_error(@name, "There was a problem opening https://rubygems.org/api/v1/versions/#{@name}.json")
       end
-    rescue
-      Utils::log_error(@name, "There was a problem opening https://rubygems.org/api/v1/versions/#{@name}.json")
+      nil
     end
-    nil
+
   end
 
 end
-