gems-status 0.38.0 → 0.39.0

data/lib/gems-status/utils.rb

@@ -1,93 +1,96 @@
 require "openssl"
 OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
-class Utils
-  attr_accessor :errors
-  @@errors = {}
-  @@md5_sums = {}
-  @@licenses = {}
-  @@keys = {}
-  @@gems = {}
+module GemsStatus
 
-  def Utils.errors
-    return @@errors
-  end
+  class Utils
+    attr_accessor :errors
+    @@errors = {}
+    @@md5_sums = {}
+    @@licenses = {}
+    @@keys = {}
+    @@gems = {}
 
-  def Utils.check_parameters(classname, conf, parameters)
-    if !conf['classname'] then
-      raise "trying to initialize #{classname} when parameter classname does not exists"
-    end
-    if conf['classname'] != classname then
-      raise "trying to initialize #{classname} when parameter classname is #{conf['classname']}"
+    def Utils.errors
+      return @@errors
     end
-    parameters.each do |p|
-      if !conf[p] then
-        raise "parameter #{p} not found for #{classname}"
+
+    def Utils.check_parameters(classname, conf, parameters)
+      if !conf['classname'] then
+        raise "trying to initialize #{classname} when parameter classname does not exists"
+      end
+      if conf['classname'] != classname then
+        raise "trying to initialize #{classname} when parameter classname is #{conf['classname']}"
+      end
+      parameters.each do |p|
+        if !conf[p] then
+          raise "parameter #{p} not found for #{classname}"
+        end
       end
     end
-  end
 
-  def Utils.log_error(name, msg)
-    @@errors[name] = "\n" unless @@errors[name]
-    @@errors[name]  << msg << "\n"
-    $stderr.puts "ERROR: #{msg}"
-  end
+    def Utils.log_error(name, msg)
+      @@errors[name] = "\n" unless @@errors[name]
+      @@errors[name]  << msg << "\n"
+      $stderr.puts "ERROR: #{msg}"
+    end
 
-  def Utils.log_debug(msg)
-    $stderr.puts "DEBUG: #{msg}"
-  end
+    def Utils.log_debug(msg)
+      $stderr.puts "DEBUG: #{msg}"
+    end
 
-  def Utils.download_md5(name, version, gems_url)
-    key = "#{name}-#{version}-#{gems_url.gsub("/", "_").gsub(":", "_")}"
-    return @@md5_sums[key] if @@md5_sums[key]
-    begin
-      gem_file_path = self.download_gem(name, version, gems_url)
-    rescue Exception => e
-      self.log_error(name, e.message)
-      return nil
+    def Utils.download_md5(name, version, gems_url)
+      key = "#{name}-#{version}-#{gems_url.gsub("/", "_").gsub(":", "_")}"
+      return @@md5_sums[key] if @@md5_sums[key]
+      begin
+        gem_file_path = self.download_gem(name, version, gems_url)
+      rescue Exception => e
+        self.log_error(name, e.message)
+        return nil
+      end
+      md5 = Digest::MD5.hexdigest(open(gem_file_path).read)
+      @@md5_sums["#{name}-#{version}"] = md5
+      return md5
     end
-    md5 = Digest::MD5.hexdigest(open(gem_file_path).read)
-    @@md5_sums["#{name}-#{version}"] = md5
-    return md5
-  end
 
-  def Utils.download_license(name, version, gems_url)
-    key = "#{name}-#{version}-#{gems_url.gsub("/", "_").gsub(":", "_")}"
-    return @@licenses[key] if @@licenses[key]
-    begin
-      gem_file_path = self.download_gem(name, version, gems_url)
-    rescue Exception => e
-      self.log_error(name, e.message)
-      return nil
+    def Utils.download_license(name, version, gems_url)
+      key = "#{name}-#{version}-#{gems_url.gsub("/", "_").gsub(":", "_")}"
+      return @@licenses[key] if @@licenses[key]
+      begin
+        gem_file_path = self.download_gem(name, version, gems_url)
+      rescue Exception => e
+        self.log_error(name, e.message)
+        return nil
+      end
+      license = Gem::Format.from_file_by_path(gem_file_path).spec.license
+      @@licenses[key] = license
+      return license
     end
-    license = Gem::Format.from_file_by_path(gem_file_path).spec.license
-    @@licenses[key] = license
-    return license
-  end
 
-  private
+    private
 
-  def Utils.download_gem(name, version, gems_url)
-    gem_uri = URI.parse("#{gems_url}/#{name}-#{version}.gem")
-    tmp_path = "tmp/utils/gems/#{gems_url.gsub("/", "_").gsub(":", "_")}/"
-    gem_name = "#{name}-#{version}.gem"
-    full_path = "#{tmp_path}/#{gem_name}"
-    return full_path if File.exists? full_path
-    uri_debug = gem_uri.clone
-    uri_debug.password = "********" if uri_debug.password
-    Utils::log_debug "download #{@name} from #{uri_debug}"
-    FileUtils::mkdir_p(tmp_path) if ! File.exists?(tmp_path)
-    if gem_uri.user && gem_uri.password
-      source = open(gem_uri.scheme + "://" + gem_uri.host + "/" + gem_uri.path,
-                   "rb",
-                    :http_basic_authentication=>[gem_uri.user, gem_uri.password])
-    else
-      source = open(gem_uri)
-    end
-    open(full_path, "wb") do |file|
-      file.write(source.read)
+    def Utils.download_gem(name, version, gems_url)
+      gem_uri = URI.parse("#{gems_url}/#{name}-#{version}.gem")
+      tmp_path = "tmp/utils/gems/#{gems_url.gsub("/", "_").gsub(":", "_")}/"
+      gem_name = "#{name}-#{version}.gem"
+      full_path = "#{tmp_path}/#{gem_name}"
+      return full_path if File.exists? full_path
+      uri_debug = gem_uri.clone
+      uri_debug.password = "********" if uri_debug.password
+      Utils::log_debug "download #{@name} from #{uri_debug}"
+      FileUtils::mkdir_p(tmp_path) if ! File.exists?(tmp_path)
+      if gem_uri.user && gem_uri.password
+        source = open(gem_uri.scheme + "://" + gem_uri.host + "/" + gem_uri.path,
+                     "rb",
+                      :http_basic_authentication=>[gem_uri.user, gem_uri.password])
+      else
+        source = open(gem_uri)
+      end
+      open(full_path, "wb") do |file|
+        file.write(source.read)
+      end
+      source.close
+      return full_path
     end
-    source.close
-    return full_path
   end
 end

data/test/test-gems_command.rb

@@ -3,62 +3,65 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
 require 'gems-status'
 
-class TestGemsCommand < Test::Unit::TestCase
-  def test_gem_name_wrong_name
-    gem_name = 'wrong_name'
-    result = GemsCommand.new.gem_name(gem_name)
-    expected = gem_name
-    assert_equal(result, expected)
-  end
+module GemsStatus
 
-  def test_gem_name_without_version
-    gem_name = 'name.gem'
-    result = GemsCommand.new.gem_name(gem_name)
-    expected = 'name'
-    assert_equal(result, expected)
-  end
+  class TestGemsCommand < Test::Unit::TestCase
+    def test_gem_name_wrong_name
+      gem_name = 'wrong_name'
+      result = GemsCommand.new.gem_name(gem_name)
+      expected = gem_name
+      assert_equal(result, expected)
+    end
 
-  def test_gem_name_simple
-    gem_name = 'name-1.0.0.gem'
-    result = GemsCommand.new.gem_name(gem_name)
-    expected = 'name'
-    assert_equal(result, expected)
-  end
+    def test_gem_name_without_version
+      gem_name = 'name.gem'
+      result = GemsCommand.new.gem_name(gem_name)
+      expected = 'name'
+      assert_equal(result, expected)
+    end
 
-  def test_gem_name_with_dashes
-    gem_name = 'name-1-1.0.0.gem'
-    result = GemsCommand.new.gem_name(gem_name)
-    expected = 'name-1'
-    assert_equal(result, expected)
-  end
+    def test_gem_name_simple
+      gem_name = 'name-1.0.0.gem'
+      result = GemsCommand.new.gem_name(gem_name)
+      expected = 'name'
+      assert_equal(result, expected)
+    end
 
-  def test_gem_version_no_version
-    gem_name = 'name.gem'
-    result = GemsCommand.new.gem_version(gem_name)
-    expected = '-1'
-    assert_equal(result, expected)
-  end
+    def test_gem_name_with_dashes
+      gem_name = 'name-1-1.0.0.gem'
+      result = GemsCommand.new.gem_name(gem_name)
+      expected = 'name-1'
+      assert_equal(result, expected)
+    end
 
-  def test_gem_version_wrong_name
-    gem_name = 'name-1.0'
-    result = GemsCommand.new.gem_version(gem_name)
-    expected = '-1'
-    assert_equal(result, expected)
-  end
+    def test_gem_version_no_version
+      gem_name = 'name.gem'
+      result = GemsCommand.new.gem_version(gem_name)
+      expected = '-1'
+      assert_equal(result, expected)
+    end
 
-  def test_gem_version_simple_version
-    gem_name = 'name-1.0.0.gem'
-    result = GemsCommand.new.gem_version(gem_name)
-    expected = '1.0.0'
-    assert_equal(result, expected)
-  end
+    def test_gem_version_wrong_name
+      gem_name = 'name-1.0'
+      result = GemsCommand.new.gem_version(gem_name)
+      expected = '-1'
+      assert_equal(result, expected)
+    end
+
+    def test_gem_version_simple_version
+      gem_name = 'name-1.0.0.gem'
+      result = GemsCommand.new.gem_version(gem_name)
+      expected = '1.0.0'
+      assert_equal(result, expected)
+    end
+
+    def test_gem_version_with_dashes
+      gem_name = 'name-a-1.0.0.gem'
+      result = GemsCommand.new.gem_version(gem_name)
+      expected = '1.0.0'
+      assert_equal(result, expected)
+    end
 
-  def test_gem_version_with_dashes
-    gem_name = 'name-a-1.0.0.gem'
-    result = GemsCommand.new.gem_version(gem_name)
-    expected = '1.0.0'
-    assert_equal(result, expected)
   end
 
 end
-

data/test/test-gems_composite_command.rb

@@ -3,47 +3,50 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
 require 'gems-status'
 
-class GemsCompositeCommandTest < GemsCompositeCommand
-  attr_accessor :results
-end
+module GemsStatus
 
-class TestGemsCompositeCommand < Test::Unit::TestCase
-  def test_common_key_in_empty_results
-    gemscompositecommand = GemsCompositeCommand.new('id')
-    result = gemscompositecommand.common_key?("this key does not exists")
-    assert(!result)
-  end
-  def test_common_key_in_zero_coincidences_one_result
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gemscompositecommand.results['id'] = {"a key"=>"a value"}
-    result = gemscompositecommand.common_key?("this key does not exists")
-    assert(!result)
-  end
-  def test_common_key_in_zero_coincidences_two_results
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gemscompositecommand.results['id'] = {"a key"=>"a value"}
-    gemscompositecommand.results['id2'] = {"another key"=>"another value"}
-    result = gemscompositecommand.common_key?("this key does not exists")
-    assert(!result)
+  class GemsCompositeCommandTest < GemsCompositeCommand
+    attr_accessor :results
   end
-  def test_common_key_in_one_coincidence_one_results
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gemscompositecommand.results['id']= {"a key"=>"a value"}
-    result = gemscompositecommand.common_key?("a key")
-    assert(!result)
-  end
-  def test_common_key_in_one_coincidence_two_results
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gemscompositecommand.results['id']= {"a key"=>"a value"}
-    gemscompositecommand.results['id2']= {"another key"=>"another value"}
-    result = gemscompositecommand.common_key?("a key")
-    assert(!result)
-  end
-  def test_common_key_in_two_coincidence_two_results
-    gemscompositecommand = GemsCompositeCommandTest.new('id')
-    gemscompositecommand.results['id']= {"a key"=>"a value"}
-    gemscompositecommand.results['id2']= {"a key"=>"another value"}
-    result = gemscompositecommand.common_key?("a key")
-    assert(result)
+
+  class TestGemsCompositeCommand < Test::Unit::TestCase
+    def test_common_key_in_empty_results
+      gemscompositecommand = GemsCompositeCommand.new('id')
+      result = gemscompositecommand.common_key?("this key does not exists")
+      assert(!result)
+    end
+    def test_common_key_in_zero_coincidences_one_result
+      gemscompositecommand = GemsCompositeCommandTest.new('id')
+      gemscompositecommand.results['id'] = {"a key"=>"a value"}
+      result = gemscompositecommand.common_key?("this key does not exists")
+      assert(!result)
+    end
+    def test_common_key_in_zero_coincidences_two_results
+      gemscompositecommand = GemsCompositeCommandTest.new('id')
+      gemscompositecommand.results['id'] = {"a key"=>"a value"}
+      gemscompositecommand.results['id2'] = {"another key"=>"another value"}
+      result = gemscompositecommand.common_key?("this key does not exists")
+      assert(!result)
+    end
+    def test_common_key_in_one_coincidence_one_results
+      gemscompositecommand = GemsCompositeCommandTest.new('id')
+      gemscompositecommand.results['id']= {"a key"=>"a value"}
+      result = gemscompositecommand.common_key?("a key")
+      assert(!result)
+    end
+    def test_common_key_in_one_coincidence_two_results
+      gemscompositecommand = GemsCompositeCommandTest.new('id')
+      gemscompositecommand.results['id']= {"a key"=>"a value"}
+      gemscompositecommand.results['id2']= {"another key"=>"another value"}
+      result = gemscompositecommand.common_key?("a key")
+      assert(!result)
+    end
+    def test_common_key_in_two_coincidence_two_results
+      gemscompositecommand = GemsCompositeCommandTest.new('id')
+      gemscompositecommand.results['id']= {"a key"=>"a value"}
+      gemscompositecommand.results['id2']= {"a key"=>"another value"}
+      result = gemscompositecommand.common_key?("a key")
+      assert(result)
+    end
   end
 end

data/test/test-helper.rb

@@ -1,3 +1,5 @@
 require 'simplecov'
 SimpleCov.start
+require 'coveralls'
+Coveralls.wear!
 

data/test/test-lockfile_gems.rb

@@ -4,69 +4,72 @@ require 'test/unit'
 require 'gems-status'
 require 'rubygems/dependency'
 
-class LockfileGemsTest < LockfileGems
-  attr_accessor :result
-  def initialize
-    dir=File.expand_path(File.dirname(__FILE__))
-    puts "DEBUG: dir : #{dir} #{dir.class.name}"
-    @filenames = ["#{dir}/Gemfile.lock.test"]
-    @gems_url = ""
-    @result = {}
+module GemsStatus
+
+  class LockfileGemsTest < LockfileGems
+    attr_accessor :result
+    def initialize
+      dir=File.expand_path(File.dirname(__FILE__))
+      puts "DEBUG: dir : #{dir} #{dir.class.name}"
+      @filenames = ["#{dir}/Gemfile.lock.test"]
+      @gems_url = ""
+      @result = {}
+    end
   end
-end
 
-class TestLockfileGems < Test::Unit::TestCase
- def test_get_rubygems_names
-   lockfilegems = LockfileGemsTest.new
-   lockfilegems.execute
-   assert(lockfilegems.result.length == 6)
-   result = lockfilegems.result["test"][0].name
-   assert_equal("test",result)
-   result = lockfilegems.result["test"][0].version
-   assert_equal(Gem::Version.new("0.8.6"), result)
-   result = lockfilegems.result["test2"][0].name
-   assert_equal("test2",result)
-   result = lockfilegems.result["test2"][0].version
-   assert_equal(Gem::Version.new("1.2.3"), result)
-   result = lockfilegems.result["test3"][0].name
-   assert_equal("test3",result)
-   result = lockfilegems.result["test3"][0].version
-   assert_equal(Gem::Version.new("1.2.3"), result)
-   result = lockfilegems.result["test4"][0].name
-   assert_equal("test4",result)
-   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
+  class TestLockfileGems < Test::Unit::TestCase
+   def test_get_rubygems_names
+     lockfilegems = LockfileGemsTest.new
+     lockfilegems.execute
+     assert(lockfilegems.result.length == 6)
+     result = lockfilegems.result["test"][0].name
+     assert_equal("test",result)
+     result = lockfilegems.result["test"][0].version
+     assert_equal(Gem::Version.new("0.8.6"), result)
+     result = lockfilegems.result["test2"][0].name
+     assert_equal("test2",result)
+     result = lockfilegems.result["test2"][0].version
+     assert_equal(Gem::Version.new("1.2.3"), result)
+     result = lockfilegems.result["test3"][0].name
+     assert_equal("test3",result)
+     result = lockfilegems.result["test3"][0].version
+     assert_equal(Gem::Version.new("1.2.3"), result)
+     result = lockfilegems.result["test4"][0].name
+     assert_equal("test4",result)
+     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"][0].dependencies
-   assert(result)
-   result = lockfilegems.result["test"][0].dependencies.length
-   assert_equal(3, result)
-   result = lockfilegems.result["test"][0].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
+   def test_get_rubygems_dependencies
+     lockfilegems = LockfileGemsTest.new
+     lockfilegems.execute
+     result = lockfilegems.result["test"][0].dependencies
+     assert(result)
+     result = lockfilegems.result["test"][0].dependencies.length
+     assert_equal(3, result)
+     result = lockfilegems.result["test"][0].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
 
- 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
+   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
 
+end