apt-pkg 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64ee3a45dbc30e9944967e0da58f8c2297449ff1
-  data.tar.gz: 607e15266821d84ee6a1fd7f7c00b622c084794a
+SHA256:
+  metadata.gz: 16cd206a5d9b3137497d05f937ef5b78fcac7aa6bd62e4177b73ef98ff0d917e
+  data.tar.gz: b0bcc23a93c8112321c890487ee385c7cede6da1b3179da4e5f0ebf11b723161
 SHA512:
-  metadata.gz: bf82282038e9b15979d2e7da047eeacc2c9e81ffa245a5ff9774c527242b331dccfd20da8f453ca4f5453f99a1308fe953dcc7b733015c609ff8cac492deb69a
-  data.tar.gz: bc89b13bafcd051b1e2a0dee36eb0faa8cc3e84a8c761a491537d1c646745c1a5d9f72e1c4f7c3091a36d9da663526781653258c733fb97a7d9213226da3ee34
+  metadata.gz: 3e650327a185fca89e757e30659c8c61371e7d2950e47b72e463a6ed598da4656e7fcc2f831830acea7de9e045242636077746d9f692ab5ca55dc9f62182db56
+  data.tar.gz: 8ab515778e66c88f8b53f10d03d65e95db89db8061f166bd4235b2dd47f18433187162b645d663a8f38bcf937d06d4a7fbdd14391b887eafadc4652b35cad80c

data/History.md

@@ -1,4 +1,27 @@
 
+0.5.0 / 2020-07-22
+==================
+
+  * Debian::AptPkg::PkgCache.pkg_names deprecated
+  * Add all maintained Rubies on gitlab-ci
+  * Init listing packages on cache
+  * Quick fix gitlab ci
+  * Add .gitlab-ci.yml
+  * Rename lib/debian/apt_pkg/{version,gem_version}.rb
+  * Update README
+  * Tidy tests remove should
+  * Debian::AptPkg.init returns a boolean
+  * Fix mimitest warnings
+  * Remove cppcheck on CI version conflict
+  * Fix code lint
+  * Fix CI and update Rubies
+  * Fix libapt-pkg 2.1 compat
+  * Update apt-pkg deps
+  * Update doc Debian::AptPkg::InitError
+  * README: Bundler is not needed
+  * Use Debian::AptPkg::InitError instead of RuntimeError
+  * Fix rb_mDebianAptPkgCache name
+
 0.4.0 / 2016-10-06
 ==================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014-2016 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2014-2020 Laurent Arnoud <laurent@spkdev.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,13 +1,13 @@
 # Ruby interface to apt-pkg
 
 Goal of this project is to have a proper Ruby binding to APT like in
-[Python](https://apt.alioth.debian.org/python-apt-doc/library/apt_pkg.html).
+[Python](https://tracker.debian.org/pkg/python-apt).
 
 Currently install, remove packages commands are **not** implemented.
 
 ## INSTALL
 
-``` console
+```
 apt install build-essential ruby-dev libapt-pkg-dev (>= 1.0)
 gem install apt-pkg
 ```
@@ -27,6 +27,12 @@ Debian::AptPkg::PkgCache.update
 
 # Search package by names
 Debian::AptPkg::PkgCache.pkg_names("vim")
+
+# List packages stored in the cache
+Debian::AptPkg::PkgCache.packages
+
+# List installed packages
+Debian::AptPkg::PkgCache.packages.select {|pkg| pkg.is_installed }
 ```
 
 [Documentation](http://www.rubydoc.info/gems/apt-pkg)
@@ -34,27 +40,24 @@ Debian::AptPkg::PkgCache.pkg_names("vim")
 ## BUILD
 
 ``` console
-gem install bundler
-bundle install
-bundle exec rake compile
+rake compile
 ```
 
 ## TEST
 
 ``` console
-bundle exec rake test
+rake test
 ```
 
 ## LICENSE
 
 The MIT License
 
-Copyright (c) 2014-2016 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2014-2020 Laurent Arnoud <laurent@spkdev.net>
 
 ---
-[![Build](https://img.shields.io/travis-ci/spk/ruby-apt-pkg.svg)](https://travis-ci.org/spk/ruby-apt-pkg)
+[![Build](https://img.shields.io/travis/spk/ruby-apt-pkg.svg)](https://travis-ci.org/spk/ruby-apt-pkg)
 [![Version](https://img.shields.io/gem/v/apt-pkg.svg)](https://rubygems.org/gems/apt-pkg)
 [![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/apt-pkg)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
-[![IRC Network](https://img.shields.io/badge/irc-oftc-blue.svg)](https://webchat.oftc.net/ "#ruby-apt-pkg")
-[![Project status](http://img.shields.io/status/experimental.png?color=red)](https://github.com/spk/ruby-apt-pkg)
+[![Project status](https://img.shields.io/badge/status-experimental-red)](https://github.com/spk/ruby-apt-pkg)

data/ext/apt_pkg/apt-pkg.cpp

@@ -3,19 +3,18 @@
 #include "pkgcache.h"
 
 /*
- * call-seq: init() -> nil
+ * call-seq: init() -> bool
  *
  * Shorthand for doing init_config() and init_system().
  *
- *   Debian::AptPkg.init # => nil
+ *   Debian::AptPkg.init # => true
  *
  **/
 static VALUE
 init(VALUE self)
 {
-  pkgInitConfig(*_config);
-  pkgInitSystem(*_config, _system);
-  return Qnil;
+  int res = pkgInitConfig(*_config) && pkgInitSystem(*_config, _system);
+  return INT2BOOL(res);
 }
 
 /*
@@ -199,8 +198,6 @@ Init_apt_pkg()
 {
   VALUE rb_mDebian = rb_define_module("Debian");
   VALUE rb_mDebianAptPkg = rb_define_module_under(rb_mDebian, "AptPkg");
-  VALUE rb_mDebianAptPkgConfiguration =
-    rb_define_module_under(rb_mDebianAptPkg, "Configuration");
 
   rb_define_singleton_method(rb_mDebianAptPkg, "init",
                              RUBY_METHOD_FUNC(init), 0);

data/ext/apt_pkg/apt-pkg.h

@@ -3,6 +3,7 @@
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/init.h>
 
 /* from '<ruby/dl.h>' */

data/ext/apt_pkg/pkgcache.cpp

@@ -1,5 +1,7 @@
 #include "pkgcache.h"
 
+static VALUE e_mDebianAptPkgInitError, rb_cPackage, rb_cVersion;
+
 /*
  * private
  */
@@ -17,7 +19,8 @@ config_system_initialized()
  * call-seq: gen_caches() -> bool
  *
  * Call the main cache generator.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.gen_caches # => false
  *
@@ -26,7 +29,7 @@ static VALUE
 gen_caches(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   int res = CacheFile.BuildCaches(NULL, true);
@@ -37,7 +40,8 @@ gen_caches(VALUE self)
  * call-seq: update() -> bool
  *
  * Update the index files used by the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.update # => false
  *
@@ -46,7 +50,7 @@ static VALUE
 update(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   // Get the source list
@@ -63,7 +67,8 @@ update(VALUE self)
  * call-seq: is_multi_arch() -> bool
  *
  * An attribute determining whether the cache supports multi-arch.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.is_multi_arch # => false
  *
@@ -72,7 +77,7 @@ static VALUE
 is_multi_arch(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -83,11 +88,67 @@ is_multi_arch(VALUE self)
   return INT2BOOL(res);
 }
 
+/*
+ * call-seq: packages() -> array, nil
+ *
+ * A list of Debian::AptPkg::Package objects stored in the cache
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
+ *
+ *   Debian::AptPkg::PkgCache.packages
+ *
+ **/
+static VALUE
+packages(int argc, VALUE *argv, VALUE self)
+{
+  if (!config_system_initialized()) {
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
+  }
+  VALUE result = rb_ary_new();
+  pkgCacheFile CacheFile;
+  if (CacheFile.GetPkgCache() == 0) {
+    return Qnil;
+  }
+  for (pkgCache::PkgIterator Pkg = CacheFile.GetPkgCache()->PkgBegin(); not Pkg.end(); ++Pkg) {
+    VALUE current_version;
+    if (Pkg->CurrentVer == 0) {
+      current_version = Qnil;
+    } else {
+      current_version = rb_struct_new(rb_cVersion,
+          rb_str_new2(Pkg.CurrentVer().ParentPkg().Name()),
+          rb_str_new2(Pkg.CurrentVer().VerStr()),
+          rb_str_new2(Pkg.CurrentVer().Section()),
+          rb_str_new2(Pkg.CurrentVer().Arch()),
+          INT2FIX(Pkg.CurrentVer()->Size),
+          INT2FIX(Pkg.CurrentVer()->InstalledSize),
+          INT2FIX(Pkg.CurrentVer()->Hash),
+          INT2FIX(Pkg.CurrentVer()->ID),
+          INT2FIX(Pkg.CurrentVer()->Priority)
+          );
+    }
+    VALUE rb_cPackage_args[7];
+    rb_cPackage_args[0] = INT2FIX(Pkg->ID);
+    rb_cPackage_args[1] = rb_str_new2(Pkg.Name());
+    rb_cPackage_args[2] = rb_str_new2(Pkg.FullName().c_str());
+    rb_cPackage_args[3] = rb_str_new2(Pkg.Arch());
+    rb_cPackage_args[4] = INT2BOOL((Pkg->Flags & pkgCache::Flag::Essential) != 0);
+    rb_cPackage_args[5] = INT2BOOL((Pkg->Flags & pkgCache::Flag::Important) != 0);
+    rb_cPackage_args[6] = current_version;
+    rb_ary_push(result, rb_class_new_instance(7,
+          rb_cPackage_args,
+          rb_cPackage
+          ));
+  }
+  return result;
+}
+
 /*
  * call-seq: pkg_names() -> array, nil
  *
+ * Deprecated and will removed in 0.6.0
  * List the names of all packages in the system.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.pkg_names('gcolor2') # => ["gcolor2"]
  *
@@ -95,8 +156,10 @@ is_multi_arch(VALUE self)
 static VALUE
 pkg_names(int argc, VALUE *argv, VALUE self)
 {
+  rb_warn("Debian::AptPkg::PkgCache.pkg_names is deprecated; " \
+          "use Debian::AptPkg::PkgCache.packages instead");
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   if (argc > 1 || argc == 0) {
     rb_raise(rb_eArgError, "You must give at least one search argument");
@@ -127,7 +190,8 @@ pkg_names(int argc, VALUE *argv, VALUE self)
  * call-seq: package_count() -> int, nil
  *
  * The total number of packages available in the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.package_count # => 69511
  *
@@ -136,7 +200,7 @@ static VALUE
 package_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -150,7 +214,8 @@ package_count(VALUE self)
  * call-seq: version_count() -> int, nil
  *
  * The total number of package versions available in the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.version_count # => 84630
  *
@@ -159,7 +224,7 @@ static VALUE
 version_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -173,7 +238,8 @@ version_count(VALUE self)
  * call-seq: depends_count() -> int, nil
  *
  * The total number of dependencies stored in the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.depends_count # => 551983
  *
@@ -182,7 +248,7 @@ static VALUE
 depends_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -196,7 +262,8 @@ depends_count(VALUE self)
  * call-seq: package_file_count() -> int, nil
  *
  * The total number of packages files available.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.package_file_count # => 17
  *
@@ -205,7 +272,7 @@ static VALUE
 package_file_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -219,7 +286,8 @@ package_file_count(VALUE self)
  * call-seq: ver_file_count() -> int, nil
  *
  * The total number of version and package file relations stored in the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.ver_file_count # => 11274
  *
@@ -228,7 +296,7 @@ static VALUE
 ver_file_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -242,7 +310,8 @@ ver_file_count(VALUE self)
  * call-seq: provides_count() -> int, nil
  *
  * The number of provided packages.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.provides_count # => 69511
  *
@@ -251,7 +320,7 @@ static VALUE
 provides_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -265,7 +334,8 @@ provides_count(VALUE self)
  * call-seq: group_count() -> int, nil
  *
  * The number of groups in the cache.
- * Return `nil` when config, system, cache is not configured.
+ * Raise `Debian::AptPkg::InitError` when config, system, cache is not
+ * configured.
  *
  *   Debian::AptPkg::PkgCache.group_count # => 16730
  *
@@ -274,7 +344,7 @@ static VALUE
 group_count(VALUE self)
 {
   if (!config_system_initialized()) {
-    rb_raise(rb_eRuntimeError, "System not initialized");
+    rb_raise(e_mDebianAptPkgInitError, "System not initialized");
   }
   pkgCacheFile CacheFile;
   pkgCache *Cache = CacheFile.GetPkgCache();
@@ -289,31 +359,48 @@ init_apt_pkg_pkgcache()
 {
   VALUE rb_mDebian = rb_define_module("Debian");
   VALUE rb_mDebianAptPkg = rb_define_module_under(rb_mDebian, "AptPkg");
-  VALUE rb_mDebianAptPkgConfiguration = rb_define_module_under(rb_mDebianAptPkg,
+  VALUE rb_mDebianAptPkgCache = rb_define_module_under(rb_mDebianAptPkg,
                                                                "PkgCache");
+  e_mDebianAptPkgInitError = rb_define_class_under(rb_mDebianAptPkg,
+                                                    "InitError",
+                                                    rb_eRuntimeError);
+  rb_cPackage = rb_const_get_at(rb_mDebianAptPkg, rb_intern("Package"));
+  rb_cVersion = rb_struct_define_under(rb_mDebianAptPkg, "Version",
+      "parent_package_name",
+      "version_string",
+      "section",
+      "arch",
+      "size",
+      "installed_size",
+      "hash",
+      "id",
+      "priority",
+      NULL);
 
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "gen_caches",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "gen_caches",
                              RUBY_METHOD_FUNC(gen_caches), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "update",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "update",
                              RUBY_METHOD_FUNC(update), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "is_multi_arch",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "is_multi_arch",
                              RUBY_METHOD_FUNC(is_multi_arch), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "pkg_names",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "packages",
+                             RUBY_METHOD_FUNC(packages), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "pkg_names",
                              RUBY_METHOD_FUNC(pkg_names), -1);
 
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "package_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "package_count",
                              RUBY_METHOD_FUNC(package_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "version_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "version_count",
                              RUBY_METHOD_FUNC(version_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "depends_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "depends_count",
                              RUBY_METHOD_FUNC(depends_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration,
+  rb_define_singleton_method(rb_mDebianAptPkgCache,
                              "package_file_count",
                              RUBY_METHOD_FUNC(package_file_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "ver_file_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "ver_file_count",
                              RUBY_METHOD_FUNC(ver_file_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "provides_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "provides_count",
                              RUBY_METHOD_FUNC(provides_count), 0);
-  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "group_count",
+  rb_define_singleton_method(rb_mDebianAptPkgCache, "group_count",
                              RUBY_METHOD_FUNC(group_count), 0);
 }

data/lib/debian/apt_pkg.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+require 'debian/apt_pkg/package'
 require 'apt_pkg'
-require 'debian/apt_pkg/version'
+require 'debian/apt_pkg/gem_version'

data/lib/debian/apt_pkg/gem_version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+# Debian::AptPkg const VERSION file
+module Debian
+  # AptPkg base module
+  module AptPkg
+    # Gem version
+    VERSION = '0.5.0'.freeze
+  end
+end

data/lib/debian/apt_pkg/package.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+# Debian::AptPkg::Package file
+module Debian
+  # AptPkg base module
+  module AptPkg
+    # Debian::AptPkg::Package class
+    # Representation of a package in a cache
+    class Package
+      attr_accessor :id, :name, :full_name, :arch, :essential, :important,
+        :current_version
+
+      # Initialize the Package class
+      # @example
+      #   new(id, name, full_name, arch, essential, important, current_version)
+      # @param [Integer] The numeric ID of the package
+      # @param [String] The name of the package
+      # @param [String] Get the full name of the package, including the
+      #                 architecture
+      # @param [String] The architecture of the package
+      # @param [Boolean] Boolean value determining whether the package is
+      #                  essential
+      # @param [Boolean] Boolean value determining whether the package has the
+      #                 'important' flag set
+      #                 ('Important: yes' in the Packages file)
+      # @param [Version,NilClass] The version of the package currently installed
+      #                           or `nil`
+      # @return [Package] Package instance
+      def initialize(id, name, full_name, arch, essential, important, current_version)
+        @id = id
+        @name = name
+        @full_name = full_name
+        @arch = arch
+        @essential = essential
+        @important = important
+        @current_version = current_version
+      end
+
+      # Return `true` if the package is installed
+      # @return [Boolean]
+      def is_installed
+        return false unless current_version
+
+        true
+      end
+    end
+  end
+end

data/test/apt_pkg_cache_not_init_integration.rb

@@ -1,21 +1,22 @@
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 describe Debian::AptPkg::PkgCache do
   describe 'not init' do
     describe '.update' do
       it 'can be called' do
-        lambda do
+        _(lambda do
           Debian::AptPkg::PkgCache.update
-        end.must_raise RuntimeError
+        end).must_raise Debian::AptPkg::InitError
       end
     end
 
     %i(package version depends package_file ver_file provides group).each do |m|
       describe ".#{m}_count" do
         it 'can be called' do
-          lambda do
+          _(lambda do
             Debian::AptPkg::PkgCache.public_send("#{m}_count")
-          end.must_raise RuntimeError
+          end).must_raise Debian::AptPkg::InitError
         end
       end
     end

data/test/apt_pkg_configuration_test.rb

@@ -7,78 +7,72 @@ describe Debian::AptPkg::Configuration do
 
   it 'architectures return an array' do
     arches = Debian::AptPkg::Configuration.architectures
-    arches.must_be_instance_of Array
-    arches.wont_be_empty
+    _(arches).must_be_instance_of Array
+    _(arches).wont_be_empty
   end
 
   it 'languages return an array' do
     all_langs = Debian::AptPkg::Configuration.languages
-    all_langs.must_be_instance_of Array
-    all_langs.wont_be_empty
+    _(all_langs).must_be_instance_of Array
+    _(all_langs).wont_be_empty
 
     langs = Debian::AptPkg::Configuration.languages(false)
-    langs.must_be_instance_of Array
+    _(langs).must_be_instance_of Array
   end
 
   it 'check_architecture' do
-    Debian::AptPkg::Configuration.check_architecture('all').must_equal true
+    _(Debian::AptPkg::Configuration.check_architecture('all')).must_equal true
 
     arches = Debian::AptPkg::Configuration.architectures
     c = Debian::AptPkg::Configuration.check_architecture(arches.first)
-    c.must_equal true
+    _(c).must_equal true
 
     # http://buildd.debian-ports.org/status/fetch.php?pkg=ruby2.1&arch=m68k&ver=2.1.2-2&stamp=1400604298
-    Debian::AptPkg::Configuration.check_architecture('m68k').must_equal false
+    _(Debian::AptPkg::Configuration.check_architecture('m68k')).must_equal false
   end
 
   it 'check_language' do
-    lambda do
+    _(lambda do
       Debian::AptPkg::Configuration.check_language
-    end.must_raise ArgumentError
+    end).must_raise ArgumentError
 
     langs = Debian::AptPkg::Configuration.languages
-    Debian::AptPkg::Configuration.check_language(langs.first).must_equal true
+    _(Debian::AptPkg::Configuration.check_language(langs.first)).must_equal true
 
     c = Debian::AptPkg::Configuration.check_language('gallifreyan')
-    c.must_equal false
+    _(c).must_equal false
   end
 
   it 'compressors return an array' do
     cmps = Debian::AptPkg::Configuration.compressors
-    cmps.must_be_instance_of Array
-    cmps.wont_be_empty
-    cmps.must_include 'gz'
+    _(cmps).must_be_instance_of Array
+    _(cmps).wont_be_empty
+    _(cmps).must_include 'gz'
   end
 
   it 'find configuration value' do
-    lambda do
+    _(lambda do
       Debian::AptPkg::Configuration.config_find
-    end.must_raise ArgumentError
+    end).must_raise ArgumentError
 
-    Debian::AptPkg::Configuration
-      .config_find('Dir::Etc::main')
+    _(Debian::AptPkg::Configuration.config_find('Dir::Etc::main'))
       .must_equal 'apt.conf'
-    Debian::AptPkg::Configuration
-      .config_find('Dir::Etc::netrc')
+    _(Debian::AptPkg::Configuration.config_find('Dir::Etc::netrc'))
       .must_equal 'auth.conf'
-    Debian::AptPkg::Configuration
-      .config_find('Dir::Etc::parts')
+    _(Debian::AptPkg::Configuration.config_find('Dir::Etc::parts'))
       .must_equal 'apt.conf.d'
-    Debian::AptPkg::Configuration
-      .config_find('Spk', 'DebianUser')
+    _(Debian::AptPkg::Configuration.config_find('Spk', 'DebianUser'))
       .must_equal 'DebianUser'
   end
 
   it 'find file' do
-    lambda do
+    _(lambda do
       Debian::AptPkg::Configuration.config_find_file
-    end.must_raise ArgumentError
+    end).must_raise ArgumentError
 
-    Debian::AptPkg::Configuration
-      .config_find_file('Dir::Etc::main')
+    _(Debian::AptPkg::Configuration.config_find_file('Dir::Etc::main'))
       .must_equal '/etc/apt/apt.conf'
-    Debian::AptPkg::Configuration
-      .config_find_file('Dir::Etc::netrc')
+    _(Debian::AptPkg::Configuration.config_find_file('Dir::Etc::netrc'))
       .must_equal '/etc/apt/auth.conf'
   end
 end

data/test/apt_pkg_test.rb

@@ -13,118 +13,122 @@ describe Debian::AptPkg do
     refute_nil Debian::AptPkg::LIBAPT_PKG_VERSION
   end
 
+  describe '.init' do
+    it 'returns a bool' do
+      _(Debian::AptPkg.init).must_equal true
+    end
+  end
+
   describe '.cmp_version' do
-    it 'should compare version' do
-      Debian::AptPkg.cmp_version('1.1', '1.0').must_be :>, 0
-      Debian::AptPkg.cmp_version('1.0', '1.0').must_be :==, 0
-      Debian::AptPkg.cmp_version('1.0', '1.1').must_be :<, 0
+    it 'compare version' do
+      _(Debian::AptPkg.cmp_version('1.1', '1.0')).must_be :>, 0
+      _(Debian::AptPkg.cmp_version('1.0', '1.0')).must_be :==, 0
+      _(Debian::AptPkg.cmp_version('1.0', '1.1')).must_be :<, 0
     end
   end
 
   describe '.check_dep' do
     describe 'LessEq' do
-      it 'should compare Debian version' do
-        Debian::AptPkg.check_dep('1', '<=', '2').must_equal true
-        Debian::AptPkg.check_dep('2', '<=', '1').must_equal false
-        Debian::AptPkg.check_dep('1', '<=', '1').must_equal true
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', '<=', '2')).must_equal true
+        _(Debian::AptPkg.check_dep('2', '<=', '1')).must_equal false
+        _(Debian::AptPkg.check_dep('1', '<=', '1')).must_equal true
       end
     end
 
     describe 'GreaterEq' do
-      it 'should compare Debian version' do
-        Debian::AptPkg.check_dep('1', '>=', '2').must_equal false
-        Debian::AptPkg.check_dep('2', '>=', '1').must_equal true
-        Debian::AptPkg.check_dep('1', '>=', '1').must_equal true
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', '>=', '2')).must_equal false
+        _(Debian::AptPkg.check_dep('2', '>=', '1')).must_equal true
+        _(Debian::AptPkg.check_dep('1', '>=', '1')).must_equal true
       end
     end
 
     describe 'Less' do
-      it 'should compare Debian version' do
-        Debian::AptPkg.check_dep('1', '<', '2').must_equal true
-        Debian::AptPkg.check_dep('2', '<', '1').must_equal false
-        Debian::AptPkg.check_dep('1', '<', '1').must_equal false
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', '<', '2')).must_equal true
+        _(Debian::AptPkg.check_dep('2', '<', '1')).must_equal false
+        _(Debian::AptPkg.check_dep('1', '<', '1')).must_equal false
       end
     end
 
     describe 'Greater' do
-      it 'should compare Debian version' do
-        Debian::AptPkg.check_dep('1', '>', '2').must_equal false
-        Debian::AptPkg.check_dep('2', '>', '1').must_equal true
-        Debian::AptPkg.check_dep('1', '>', '1').must_equal false
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', '>', '2')).must_equal false
+        _(Debian::AptPkg.check_dep('2', '>', '1')).must_equal true
+        _(Debian::AptPkg.check_dep('1', '>', '1')).must_equal false
       end
     end
 
     describe 'Equals' do
-      it 'should compare Debian version' do
-        Debian::AptPkg.check_dep('1', '=', '2').must_equal false
-        Debian::AptPkg.check_dep('2', '=', '1').must_equal false
-        Debian::AptPkg.check_dep('1', '=', '1').must_equal true
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', '=', '2')).must_equal false
+        _(Debian::AptPkg.check_dep('2', '=', '1')).must_equal false
+        _(Debian::AptPkg.check_dep('1', '=', '1')).must_equal true
       end
     end
 
     describe 'NotEquals' do
-      it 'should compare Debian version' do
-        Debian::AptPkg
-          .check_dep('1', Debian::AptPkg::NOT_EQUALS, '2')
+      it 'compare Debian version' do
+        _(Debian::AptPkg.check_dep('1', Debian::AptPkg::NOT_EQUALS, '2'))
           .must_equal true
-        Debian::AptPkg
-          .check_dep('2', Debian::AptPkg::NOT_EQUALS, '1')
+        _(Debian::AptPkg.check_dep('2', Debian::AptPkg::NOT_EQUALS, '1'))
           .must_equal true
-        Debian::AptPkg
-          .check_dep('1', Debian::AptPkg::NOT_EQUALS, '1')
+        _(Debian::AptPkg.check_dep('1', Debian::AptPkg::NOT_EQUALS, '1'))
           .must_equal false
       end
     end
 
     describe 'Errors' do
-      it 'should raise argument error with bad comparison' do
-        lambda do
+      it 'raise argument error with bad comparison' do
+        _(lambda do
           Debian::AptPkg.check_dep('1', 'bad', '2')
-        end.must_raise ArgumentError
+        end).must_raise ArgumentError
       end
     end
   end
 
   describe '.uri_to_filename' do
-    it 'should return a filename which can be used to store the file' do
-      Debian::AptPkg
-        .uri_to_filename('http://debian.org/index.html')
+    it 'return a filename which can be used to store the file' do
+      _(Debian::AptPkg.uri_to_filename('http://debian.org/index.html'))
         .must_equal 'debian.org_index.html'
     end
   end
 
   describe '.upstream_version' do
     it 'Return the upstream version for the Debian package version' do
-      Debian::AptPkg.upstream_version('3.4.15-1+b1').must_equal '3.4.15'
+      _(Debian::AptPkg.upstream_version('3.4.15-1+b1')).must_equal '3.4.15'
     end
   end
 
   describe '.time_to_str' do
     it 'Format a given duration in human-readable manner' do
-      Debian::AptPkg.time_to_str(3601).must_equal '1h 0min 1s'
+      _(Debian::AptPkg.time_to_str(3601)).must_equal '1h 0min 1s'
     end
   end
 
   describe '.size_to_str' do
     it 'Return a string describing the size in a human-readable manner' do
-      Debian::AptPkg.size_to_str(10_000).must_equal '10.0 k'
+      _(Debian::AptPkg.size_to_str(10_000)).must_equal '10.0 k'
     end
   end
 
   describe '.string_to_bool' do
     it 'Parse the string input and return a boolean' do
-      Debian::AptPkg.string_to_bool('yes').must_equal true
-      Debian::AptPkg.string_to_bool('no').must_equal false
-      Debian::AptPkg.string_to_bool('no-recognized').must_equal false
+      _(Debian::AptPkg.string_to_bool('yes')).must_equal true
+      _(Debian::AptPkg.string_to_bool('no')).must_equal false
+      _(Debian::AptPkg.string_to_bool('no-recognized')).must_equal false
     end
   end
 
   describe '.check_domain_list' do
     it 'See if the host name given by host is one of the domains given' do
-      Debian::AptPkg.check_domain_list('alioth.debian.org',
-                                       'debian.net,debian.org').must_equal true
-      Debian::AptPkg.check_domain_list('git.debian.org',
-                                       'spkdev.net').must_equal false
+      _(Debian::AptPkg.check_domain_list('alioth.debian.org',
+                                         'debian.net,debian.org'))
+        .must_equal true
+      _(Debian::AptPkg.check_domain_list('git.debian.org',
+                                         'spkdev.net'))
+        .must_equal false
     end
   end
 end

data/test/debian/apt_pkg/package_test.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+require_relative '../../test_helper'
+
+describe Debian::AptPkg::Package do
+  let(:id) { 42 }
+  let(:pkg_name) { "ed" }
+  let(:full_name) { "ed:i386" }
+  let(:arch) { "i386" }
+  let(:essential) { false }
+  let(:important) { false }
+  let(:current_version) { nil }
+
+  describe '.new' do
+    describe 'with correct number of arguments' do
+      it 'can initialize a Package class' do
+        Debian::AptPkg::Package.new(id, pkg_name, full_name, arch,
+                                    essential, important, current_version)
+      end
+    end
+
+    describe 'with wrong number of arguments' do
+      it 'cannot initialize a Package class' do
+        _(lambda do
+          Debian::AptPkg::Package.new(id, pkg_name, full_name, arch,
+                                      essential, important)
+        end).must_raise ArgumentError
+      end
+    end
+  end
+
+  describe '#is_installed' do
+    subject do
+      Debian::AptPkg::Package.new(id, pkg_name, full_name, arch,
+                                  essential, important,
+                                  current_version).is_installed
+    end
+
+    describe 'when current_version is present' do
+      let(:current_version) do
+        Debian::AptPkg::Version.new("ed", "1", "editors", "i386", 0, 0, 0, 0, 4)
+      end
+
+      it 'returns true' do
+        _(subject).must_equal true
+      end
+    end
+
+    describe 'when current_version is not present' do
+      let(:current_version) { nil }
+
+      it 'returns false' do
+        _(subject).must_equal false
+      end
+    end
+  end
+end

data/test/debian/apt_pkg/pkg_cache_test.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+require_relative '../../test_helper'
+
+describe Debian::AptPkg::PkgCache do
+  before :all do
+    Debian::AptPkg.init
+  end
+
+  describe '.update' do
+    it 'can be called' do
+      Debian::AptPkg::PkgCache.update
+    end
+  end
+
+  describe '.gen_caches' do
+    it 'return boolean' do
+      if Process.uid == 0
+        _(Debian::AptPkg::PkgCache.gen_caches).must_equal true
+      else
+        _(Debian::AptPkg::PkgCache.gen_caches).must_equal false
+      end
+    end
+  end
+
+  describe '.is_multi_arch' do
+    it 'can be called' do
+      Debian::AptPkg::PkgCache.is_multi_arch
+    end
+  end
+
+  describe '.packages' do
+    it 'returns an array of Package' do
+      packages = Debian::AptPkg::PkgCache.packages
+      _(packages).must_be_kind_of Array
+      _(packages.first).must_be_kind_of Debian::AptPkg::Package
+      libapt = packages.find { |pkg| pkg.name == 'libapt-pkg-dev'  }
+      _(libapt.id).must_be_kind_of Numeric
+      _(libapt.name).must_equal 'libapt-pkg-dev'
+      _(libapt.full_name).must_match(/libapt-pkg-dev:(\w)/)
+      _(libapt.arch).must_match(/(\w)/)
+      _([true, false]).must_include libapt.essential
+      _([true, false]).must_include libapt.important
+      _(libapt.current_version).must_be_kind_of Debian::AptPkg::Version
+      _(libapt.current_version.parent_package_name).must_equal libapt.name
+      _(libapt.current_version.version_string).must_be_kind_of String
+      _(libapt.current_version.section).must_equal 'libdevel'
+      _(libapt.current_version.arch).must_equal libapt.arch
+      _(libapt.current_version.size).must_be_kind_of Numeric
+      _(libapt.current_version.installed_size).must_be_kind_of Numeric
+      _(libapt.current_version.hash).must_be_kind_of Numeric
+      _(libapt.current_version.id).must_be_kind_of Numeric
+      _(libapt.current_version.priority).must_be_kind_of Numeric
+    end
+  end
+
+  describe '.pkg_names' do
+    it 'is deprecated' do
+      out, err = capture_io do
+        Debian::AptPkg::PkgCache.pkg_names('libapt-pkg-dev')
+      end
+      _(out).must_equal ''
+      regexp = /warning:\sDebian::AptPkg::PkgCache\.pkg_names\sis\sdeprecated;\s
+      use\sDebian::AptPkg::PkgCache\.packages\sinstead/x
+      _(err).must_match(regexp)
+    end
+
+    it 'no argument' do
+      _(lambda do
+        capture_io do
+          Debian::AptPkg::PkgCache.pkg_names
+        end
+      end).must_raise ArgumentError
+    end
+
+    it 'nil argument' do
+      _(lambda do
+        capture_io do
+          Debian::AptPkg::PkgCache.pkg_names(nil)
+        end
+      end).must_raise ArgumentError
+    end
+
+    it 'blank argument' do
+      _(lambda do
+        capture_io do
+          Debian::AptPkg::PkgCache.pkg_names('')
+        end
+      end).must_raise ArgumentError
+    end
+
+    it 'be filtered' do
+      capture_io do
+        search = Debian::AptPkg::PkgCache.pkg_names('vim')
+        # CI specific cache can not be present
+        unless search.nil? || search.empty?
+          _(search).must_include 'vim'
+          _(search).must_include 'vim-nox'
+          _(search).must_include 'vim-gtk'
+          _(search).wont_include 'emacs'
+        end
+      end
+    end
+  end
+
+  %i(package version depends package_file ver_file provides group).each do |m|
+    describe ".#{m}_count" do
+      it 'return an int' do
+        if Process.uid == 0
+          _(Debian::AptPkg::PkgCache.public_send("#{m}_count")).must_be :>=, 0
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt-pkg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.13'
 description: Ruby interface to apt-pkg
 email: laurent@spkdev.net
 executables: []
@@ -76,11 +76,13 @@ files:
 - ext/apt_pkg/pkgcache.cpp
 - ext/apt_pkg/pkgcache.h
 - lib/debian/apt_pkg.rb
-- lib/debian/apt_pkg/version.rb
+- lib/debian/apt_pkg/gem_version.rb
+- lib/debian/apt_pkg/package.rb
 - test/apt_pkg_cache_not_init_integration.rb
-- test/apt_pkg_cache_test.rb
 - test/apt_pkg_configuration_test.rb
 - test/apt_pkg_test.rb
+- test/debian/apt_pkg/package_test.rb
+- test/debian/apt_pkg/pkg_cache_test.rb
 - test/test_helper.rb
 homepage: http://github.com/spk/ruby-apt-pkg
 licenses:
@@ -102,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby interface to libapt-pkg

data/lib/debian/apt_pkg/version.rb

@@ -1,8 +0,0 @@
-# Debian::AptPkg version file
-module Debian
-  # AptPkg base module
-  module AptPkg
-    # Gem version
-    VERSION = '0.4.0'.freeze
-  end
-end

data/test/apt_pkg_cache_test.rb

@@ -1,69 +0,0 @@
-require_relative 'test_helper'
-
-describe Debian::AptPkg::PkgCache do
-  before :all do
-    Debian::AptPkg.init
-  end
-
-  describe '.update' do
-    it 'can be called' do
-      Debian::AptPkg::PkgCache.update
-    end
-  end
-
-  describe '.gen_caches' do
-    it 'return boolean' do
-      if Process.uid == 0
-        Debian::AptPkg::PkgCache.gen_caches.must_equal true
-      else
-        Debian::AptPkg::PkgCache.gen_caches.must_equal false
-      end
-    end
-  end
-
-  describe '.is_multi_arch' do
-    it 'can be called' do
-      Debian::AptPkg::PkgCache.is_multi_arch
-    end
-  end
-
-  describe '.pkg_names' do
-    it 'no argument' do
-      lambda do
-        Debian::AptPkg::PkgCache.pkg_names
-      end.must_raise ArgumentError
-    end
-    it 'nil argument' do
-      lambda do
-        Debian::AptPkg::PkgCache.pkg_names(nil)
-      end.must_raise ArgumentError
-    end
-
-    it 'blank argument' do
-      lambda do
-        Debian::AptPkg::PkgCache.pkg_names('')
-      end.must_raise ArgumentError
-    end
-
-    it 'be filtered' do
-      search = Debian::AptPkg::PkgCache.pkg_names('vim')
-      # CI specific cache can not be present
-      unless search.nil? || search.empty?
-        search.must_include 'vim'
-        search.must_include 'vim-nox'
-        search.must_include 'vim-gtk'
-        search.wont_include 'emacs'
-      end
-    end
-  end
-
-  %i(package version depends package_file ver_file provides group).each do |m|
-    describe ".#{m}_count" do
-      it 'return an int' do
-        if Process.uid == 0
-          Debian::AptPkg::PkgCache.public_send("#{m}_count").must_be :>=, 0
-        end
-      end
-    end
-  end
-end