apt-pkg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84dc3e1846ba85b0b390fab4f2bc79df60be2f8
-  data.tar.gz: 8a01ee86fb7e14569a3ddca653f65c6a57fa38de
+  metadata.gz: dca5749e8aeefa1455545b78ee74c606a0980c3a
+  data.tar.gz: c55db57c265cc70b03951e4fe1d2512a1df11d8c
 SHA512:
-  metadata.gz: 0351a2ebd626836792954809677e899c6b2bb4689088583421ba63efb6d723e7395967f614a37f0fa25c441bf22b28f2210540842e3c6d0585aee7aea2284c56
-  data.tar.gz: 6791a8180fa9a6abe2da1f071a0c7ce76aa320bf641893e2a3d86dc07a14bd681b05db6d1364fb94ddab6af5ddade6a8ace3388e4c102283f598baaed2cf502f
+  metadata.gz: 309b619137c40692dda14b015640a608570d47f3bf80ff1b578718f757c8cde0c07f81efbb8f3e3d383457dd462972a1dfbe2a0b76a6f9b9a3771a19c18f6c02
+  data.tar.gz: c8a6b47d0fb7f87d74e830632c21a782070a600aa6daead1c00b8769b70529f6628f61a6c00e7f31e1714429b6ed75fc2170dbcd3ee8ebf680db08ce6a943961

data/History.md

@@ -1,4 +1,11 @@
 
+0.2.0 / 2016-01-04
+==================
+
+  * Fix cache count methods when not init
+  * Add init, init_{config,system}
+  * Add PkgCache.is_multi_arch method
+
 0.1.0 / 2015-12-20
 ==================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014-2015 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2014-2016 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

@@ -7,44 +7,45 @@ Currently install, remove packages commands are **not** implemented.
 
 ## INSTALL
 
-~~~ console
-aptitude install build-essential ruby-dev libapt-pkg-dev (~> 1.0)
+``` console
+apt install build-essential ruby-dev libapt-pkg-dev (>= 1.0)
 gem install apt-pkg
-~~~
+```
 
 ## USING
 
 Simple search is implemented with:
 
-~~~ ruby
+``` ruby
 require 'debian/apt_pkg'
+Debian::AptPkg.init
 Debian::AptPkg::PkgCache.pkg_names("vim")
-~~~
+```
 
 [Documentation](https://spk.github.io/ruby-apt-pkg/)
 
 ## BUILD
 
-~~~ console
+``` console
 gem install bundler
 bundle install
 bundle exec rake compile
-~~~
+```
 
 ## TEST
 
-~~~ console
+``` console
 bundle exec rake test
-~~~
+```
 
 ## LICENSE
 
 The MIT License
 
-Copyright (c) 2014-2015 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2014-2016 Laurent Arnoud <laurent@spkdev.net>
 
 ---
-[![Gem Version](https://badge.fury.io/rb/apt-pkg.svg)](https://rubygems.org/gems/apt-pkg)
-[![Build Status](https://secure.travis-ci.org/spk/ruby-apt-pkg.svg?branch=master)](https://travis-ci.org/spk/ruby-apt-pkg)
-[![License](https://img.shields.io/github/license/spk/ruby-apt-pkg.svg)](http://opensource.org/licenses/MIT "MIT")
+[![Build](https://img.shields.io/travis-ci/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)
+[![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")

data/ext/apt_pkg/apt-pkg.cpp

@@ -2,6 +2,52 @@
 #include "configuration.h"
 #include "pkgcache.h"
 
+/*
+ * call-seq: init() -> nil
+ *
+ * Shorthand for doing init_config() and init_system().
+ *
+ *   Debian::AptPkg.init # => nil
+ *
+ **/
+static VALUE
+init(VALUE self)
+{
+  pkgInitConfig(*_config);
+  pkgInitSystem(*_config, _system);
+  return Qnil;
+}
+
+/*
+ * call-seq: init_config() -> bool
+ *
+ * Load the default configuration and the config file.
+ *
+ *   Debian::AptPkg.init_config # => false
+ *
+ **/
+static VALUE
+init_config(VALUE self)
+{
+  int res = pkgInitConfig(*_config);
+  return INT2BOOL(res);
+}
+
+/*
+ * call-seq: init_system() -> bool
+ *
+ * Construct the apt_pkg system.
+ *
+ *   Debian::AptPkg.init_system # => false
+ *
+ **/
+static VALUE
+init_system(VALUE self)
+{
+  int res = pkgInitSystem(*_config, _system);
+  return INT2BOOL(res);
+}
+
 /*
  * call-seq: cmp_version(pkg_version_a, pkg_version_b) -> int
  *
@@ -15,11 +61,12 @@
  *   Debian::AptPkg.cmp_version('1.0', '1.1') # => -1
  *
  **/
-static
-VALUE cmp_version(VALUE self, VALUE pkg_version_a, VALUE pkg_version_b) {
-    int res = debVS.CmpVersion(StringValuePtr(pkg_version_a),
-            StringValuePtr(pkg_version_b));
-    return INT2FIX(res);
+static VALUE
+cmp_version(VALUE self, VALUE pkg_version_a, VALUE pkg_version_b)
+{
+  int res = debVS.CmpVersion(StringValuePtr(pkg_version_a),
+                             StringValuePtr(pkg_version_b));
+  return INT2FIX(res);
 }
 
 /*
@@ -37,24 +84,26 @@ VALUE cmp_version(VALUE self, VALUE pkg_version_a, VALUE pkg_version_b) {
  *   Debian::AptPkg.check_dep('1', Debian::AptPkg::NOT_EQUALS, '2') # => true
  *
  **/
-static
-VALUE check_dep(VALUE self, VALUE pkg_version_a, VALUE cmp_type, VALUE pkg_version_b) {
-    unsigned int op = 0;
-    if (TYPE(cmp_type) == T_FIXNUM) {
-        op = NUM2INT(cmp_type);
-    } else {
-        const char *op_str = StringValuePtr(cmp_type);
-        if (strcmp(op_str, ">") == 0) op_str = ">>";
-        if (strcmp(op_str, "<") == 0) op_str = "<<";
-        if (*debListParser::ConvertRelation(op_str, op) != 0)
-        {
-            rb_raise(rb_eArgError, "Bad comparison operation");
-            return 0;
-        }
+static VALUE
+check_dep(VALUE self, VALUE pkg_version_a, VALUE cmp_type, VALUE pkg_version_b)
+{
+  unsigned int op = 0;
+  if (TYPE(cmp_type) == T_FIXNUM) {
+    op = NUM2INT(cmp_type);
+  } else {
+    const char *op_str = StringValuePtr(cmp_type);
+    if (strcmp(op_str, ">") == 0)
+      op_str = ">>";
+    if (strcmp(op_str, "<") == 0)
+      op_str = "<<";
+    if (*debListParser::ConvertRelation(op_str, op) != 0) {
+      rb_raise(rb_eArgError, "Bad comparison operation");
+      return 0;
     }
-    int res = debVS.CheckDep(StringValuePtr(pkg_version_a), op,
-            StringValuePtr(pkg_version_b));
-    return INT2BOOL(res);
+  }
+  int res = debVS.CheckDep(StringValuePtr(pkg_version_a), op,
+                           StringValuePtr(pkg_version_b));
+  return INT2BOOL(res);
 }
 
 /*
@@ -65,9 +114,10 @@ VALUE check_dep(VALUE self, VALUE pkg_version_a, VALUE cmp_type, VALUE pkg_versi
  *   Debian::AptPkg.uri_to_filename('http://debian.org/index.html') # => 'debian.org_index.html'
  *
  **/
-static
-VALUE uri_to_filename(VALUE self, VALUE uri) {
-    return rb_str_new2(URItoFileName(StringValuePtr(uri)).c_str());
+static VALUE
+uri_to_filename(VALUE self, VALUE uri)
+{
+  return rb_str_new2(URItoFileName(StringValuePtr(uri)).c_str());
 }
 
 /*
@@ -78,9 +128,10 @@ VALUE uri_to_filename(VALUE self, VALUE uri) {
  *   Debian::AptPkg.upstream_version('3.4.15-1+b1') # => '3.4.15'
  *
  **/
-static
-VALUE upstream_version(VALUE self, VALUE ver) {
-    return rb_str_new2(debVS.UpstreamVersion(StringValuePtr(ver)).c_str());
+static VALUE
+upstream_version(VALUE self, VALUE ver)
+{
+  return rb_str_new2(debVS.UpstreamVersion(StringValuePtr(ver)).c_str());
 }
 
 /*
@@ -91,9 +142,10 @@ VALUE upstream_version(VALUE self, VALUE ver) {
  *   Debian::AptPkg.time_to_str(3601) # => '1h 0min 1s'
  *
  **/
-static
-VALUE time_to_str(VALUE self, VALUE secondes) {
-    return rb_str_new2(TimeToStr(NUM2INT(secondes)).c_str());
+static VALUE
+time_to_str(VALUE self, VALUE secondes)
+{
+  return rb_str_new2(TimeToStr(NUM2INT(secondes)).c_str());
 }
 
 /*
@@ -104,9 +156,10 @@ VALUE time_to_str(VALUE self, VALUE secondes) {
  *   Debian::AptPkg.size_to_str(10000) # => '10.0 k'
  *
  **/
-static
-VALUE size_to_str(VALUE self, VALUE size) {
-    return rb_str_new2(SizeToStr(NUM2INT(size)).c_str());
+static VALUE
+size_to_str(VALUE self, VALUE size)
+{
+  return rb_str_new2(SizeToStr(NUM2INT(size)).c_str());
 }
 
 /*
@@ -119,9 +172,10 @@ VALUE size_to_str(VALUE self, VALUE size) {
  *   Debian::AptPkg.string_to_bool('no-recognized') # => false
  *
  **/
-static
-VALUE string_to_bool(VALUE self, VALUE text) {
-    return INT2BOOL(StringToBool(StringValuePtr(text)) == 1);
+static VALUE
+string_to_bool(VALUE self, VALUE text)
+{
+  return INT2BOOL(StringToBool(StringValuePtr(text)) == 1);
 }
 
 /*
@@ -132,59 +186,66 @@ VALUE string_to_bool(VALUE self, VALUE text) {
  *   Debian::AptPkg.check_domain_list("alioth.debian.org", "debian.net,debian.org") # => true
  *
  **/
-static
-VALUE check_domain_list(VALUE self, VALUE host, VALUE list) {
-    int res = CheckDomainList(StringValuePtr(host), StringValuePtr(list));
-    return INT2BOOL(res);
+static VALUE
+check_domain_list(VALUE self, VALUE host, VALUE list)
+{
+  int res = CheckDomainList(StringValuePtr(host), StringValuePtr(list));
+  return INT2BOOL(res);
 }
 
 void
-Init_apt_pkg() {
-    pkgInitConfig(*_config);
-    pkgInitSystem(*_config, _system);
-
-    /* Base module */
-    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, "uri_to_filename",
-            RUBY_METHOD_FUNC(uri_to_filename), 1);
-    rb_define_singleton_method(rb_mDebianAptPkg, "time_to_str",
-            RUBY_METHOD_FUNC(time_to_str), 1);
-    rb_define_singleton_method(rb_mDebianAptPkg, "size_to_str",
-            RUBY_METHOD_FUNC(size_to_str), 1);
-    rb_define_singleton_method(rb_mDebianAptPkg, "string_to_bool",
-            RUBY_METHOD_FUNC(string_to_bool), 1);
-    rb_define_singleton_method(rb_mDebianAptPkg, "check_domain_list",
-            RUBY_METHOD_FUNC(check_domain_list), 2);
-    rb_define_singleton_method(rb_mDebianAptPkg, "cmp_version",
-            RUBY_METHOD_FUNC(cmp_version), 2);
-    rb_define_singleton_method(rb_mDebianAptPkg, "check_dep",
-            RUBY_METHOD_FUNC(check_dep), 3);
-    rb_define_singleton_method(rb_mDebianAptPkg, "upstream_version",
-            RUBY_METHOD_FUNC(upstream_version), 1);
-
-    /* Represents less equal operator. */
-    rb_define_const(rb_mDebianAptPkg, "LESS_EQ", INT2FIX(pkgCache::Dep::LessEq));
-    /* Represents greater equal operator. */
-    rb_define_const(rb_mDebianAptPkg, "GREATER_EQ", INT2FIX(pkgCache::Dep::GreaterEq));
-    /* Represents less operator. */
-    rb_define_const(rb_mDebianAptPkg, "LESS", INT2FIX(pkgCache::Dep::Less));
-    /* Represents greater operator. */
-    rb_define_const(rb_mDebianAptPkg, "GREATER", INT2FIX(pkgCache::Dep::Greater));
-    /* Represents equals operator. */
-    rb_define_const(rb_mDebianAptPkg, "EQUALS", INT2FIX(pkgCache::Dep::Equals));
-    /* Represents not equals operator. */
-    rb_define_const(rb_mDebianAptPkg, "NOT_EQUALS", INT2FIX(pkgCache::Dep::NotEquals));
-
-    /* Represents the version of apt. */
-    rb_define_const(rb_mDebianAptPkg, "APT_VERSION", rb_str_new2(pkgVersion));
-    /* Represents the version of apt_pkg library. */
-    rb_define_const(rb_mDebianAptPkg, "LIBAPT_PKG_VERSION",
-        rb_str_new2(pkgLibVersion));
-
-    init_apt_pkg_configuration();
-    init_apt_pkg_pkgcache();
+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);
+  rb_define_singleton_method(rb_mDebianAptPkg, "init_config",
+                             RUBY_METHOD_FUNC(init_config), 0);
+  rb_define_singleton_method(rb_mDebianAptPkg, "init_system",
+                             RUBY_METHOD_FUNC(init_system), 0);
+
+  rb_define_singleton_method(rb_mDebianAptPkg, "uri_to_filename",
+                             RUBY_METHOD_FUNC(uri_to_filename), 1);
+  rb_define_singleton_method(rb_mDebianAptPkg, "time_to_str",
+                             RUBY_METHOD_FUNC(time_to_str), 1);
+  rb_define_singleton_method(rb_mDebianAptPkg, "size_to_str",
+                             RUBY_METHOD_FUNC(size_to_str), 1);
+  rb_define_singleton_method(rb_mDebianAptPkg, "string_to_bool",
+                             RUBY_METHOD_FUNC(string_to_bool), 1);
+  rb_define_singleton_method(rb_mDebianAptPkg, "check_domain_list",
+                             RUBY_METHOD_FUNC(check_domain_list), 2);
+  rb_define_singleton_method(rb_mDebianAptPkg, "cmp_version",
+                             RUBY_METHOD_FUNC(cmp_version), 2);
+  rb_define_singleton_method(rb_mDebianAptPkg, "check_dep",
+                             RUBY_METHOD_FUNC(check_dep), 3);
+  rb_define_singleton_method(rb_mDebianAptPkg, "upstream_version",
+                             RUBY_METHOD_FUNC(upstream_version), 1);
+
+  /* Represents less equal operator. */
+  rb_define_const(rb_mDebianAptPkg, "LESS_EQ", INT2FIX(pkgCache::Dep::LessEq));
+  /* Represents greater equal operator. */
+  rb_define_const(rb_mDebianAptPkg, "GREATER_EQ",
+                  INT2FIX(pkgCache::Dep::GreaterEq));
+  /* Represents less operator. */
+  rb_define_const(rb_mDebianAptPkg, "LESS", INT2FIX(pkgCache::Dep::Less));
+  /* Represents greater operator. */
+  rb_define_const(rb_mDebianAptPkg, "GREATER", INT2FIX(pkgCache::Dep::Greater));
+  /* Represents equals operator. */
+  rb_define_const(rb_mDebianAptPkg, "EQUALS", INT2FIX(pkgCache::Dep::Equals));
+  /* Represents not equals operator. */
+  rb_define_const(rb_mDebianAptPkg, "NOT_EQUALS",
+                  INT2FIX(pkgCache::Dep::NotEquals));
+
+  /* Represents the version of apt. */
+  rb_define_const(rb_mDebianAptPkg, "APT_VERSION", rb_str_new2(pkgVersion));
+  /* Represents the version of apt_pkg library. */
+  rb_define_const(rb_mDebianAptPkg, "LIBAPT_PKG_VERSION",
+                  rb_str_new2(pkgLibVersion));
+
+  init_apt_pkg_configuration();
+  init_apt_pkg_pkgcache();
 }

data/ext/apt_pkg/apt-pkg.h

@@ -20,5 +20,6 @@ static VALUE string_to_bool(VALUE self, VALUE text);
 static VALUE check_domain_list(VALUE self, VALUE host, VALUE list);
 /* Versioning */
 static VALUE cmp_version(VALUE self, VALUE pkg_version_a, VALUE pkg_version_b);
-static VALUE check_dep(VALUE self, VALUE pkg_version_a, VALUE cmp_type, VALUE pkg_version_b);
+static VALUE check_dep(VALUE self, VALUE pkg_version_a, VALUE cmp_type,
+                       VALUE pkg_version_b);
 static VALUE upstream_version(VALUE self, VALUE ver);

data/ext/apt_pkg/configuration.cpp

@@ -8,16 +8,16 @@
  *   Debian::AptPkg::Configuration.architectures # => ["amd64"]
  *
  **/
-static
-VALUE architectures(VALUE self) {
-    VALUE result = rb_ary_new();
-    std::vector<std::string> arches = APT::Configuration::getArchitectures();
-    std::vector<std::string>::const_iterator I;
-    for (I = arches.begin(); I != arches.end(); I++)
-    {
-        rb_ary_push(result, rb_str_new2((*I).c_str()));
-    }
-    return result;
+static VALUE
+architectures(VALUE self)
+{
+  VALUE result = rb_ary_new();
+  std::vector < std::string > arches = APT::Configuration::getArchitectures();
+  std::vector < std::string >::const_iterator I;
+  for (I = arches.begin(); I != arches.end(); I++) {
+    rb_ary_push(result, rb_str_new2((*I).c_str()));
+  }
+  return result;
 }
 
 /*
@@ -28,10 +28,11 @@ VALUE architectures(VALUE self) {
  *   Debian::AptPkg::Configuration.check_architecture("all") # => true
  *
  **/
-static
-VALUE check_architecture(VALUE self, VALUE arch) {
-    int res = APT::Configuration::checkArchitecture(StringValuePtr(arch));
-    return INT2BOOL(res);
+static VALUE
+check_architecture(VALUE self, VALUE arch)
+{
+  int res = APT::Configuration::checkArchitecture(StringValuePtr(arch));
+  return INT2BOOL(res);
 }
 
 /*
@@ -47,18 +48,19 @@ VALUE check_architecture(VALUE self, VALUE arch) {
  *   Debian::AptPkg::Configuration.languages(false) # => ["en"]
  *
  **/
-static
-VALUE languages(int argc, VALUE* argv, VALUE self) {
-    VALUE all;
-    rb_scan_args(argc, argv, "01", &all);
-    VALUE result = rb_ary_new();
-    std::vector<std::string> const langs = APT::Configuration::getLanguages(all);
-    std::vector<std::string>::const_iterator I;
-    for (I = langs.begin(); I != langs.end(); I++)
-    {
-        rb_ary_push(result, rb_str_new2((*I).c_str()));
-    }
-    return result;
+static VALUE
+languages(int argc, VALUE *argv, VALUE self)
+{
+  VALUE all;
+  rb_scan_args(argc, argv, "01", &all);
+  VALUE result = rb_ary_new();
+  std::vector < std::string > const langs =
+    APT::Configuration::getLanguages(all);
+  std::vector < std::string >::const_iterator I;
+  for (I = langs.begin(); I != langs.end(); I++) {
+    rb_ary_push(result, rb_str_new2((*I).c_str()));
+  }
+  return result;
 }
 
 /*
@@ -69,15 +71,16 @@ VALUE languages(int argc, VALUE* argv, VALUE self) {
  *   Debian::AptPkg::Configuration.check_language("fr") # => true
  *
  **/
-static
-VALUE check_language(int argc, VALUE* argv, VALUE self) {
-    if (argc > 2 || argc == 0) {
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
-    VALUE lang, all;
-    rb_scan_args(argc, argv, "11", &lang,  &all);
-    int res = APT::Configuration::checkLanguage(StringValuePtr(lang), all);
-    return INT2BOOL(res);
+static VALUE
+check_language(int argc, VALUE *argv, VALUE self)
+{
+  if (argc > 2 || argc == 0) {
+    rb_raise(rb_eArgError, "wrong number of arguments");
+  }
+  VALUE lang, all;
+  rb_scan_args(argc, argv, "11", &lang, &all);
+  int res = APT::Configuration::checkLanguage(StringValuePtr(lang), all);
+  return INT2BOOL(res);
 }
 
 /*
@@ -88,16 +91,16 @@ VALUE check_language(int argc, VALUE* argv, VALUE self) {
  *   Debian::AptPkg::Configuration.compressors # => ["gz"]
  *
  **/
-static
-VALUE compressors(VALUE self) {
-    VALUE result = rb_ary_new();
-    std::vector<std::string> cmps = APT::Configuration::getCompressionTypes();
-    std::vector<std::string>::const_iterator I;
-    for (I = cmps.begin(); I != cmps.end(); I++)
-    {
-        rb_ary_push(result, rb_str_new2((*I).c_str()));
-    }
-    return result;
+static VALUE
+compressors(VALUE self)
+{
+  VALUE result = rb_ary_new();
+  std::vector < std::string > cmps = APT::Configuration::getCompressionTypes();
+  std::vector < std::string >::const_iterator I;
+  for (I = cmps.begin(); I != cmps.end(); I++) {
+    rb_ary_push(result, rb_str_new2((*I).c_str()));
+  }
+  return result;
 }
 
 /*
@@ -114,17 +117,18 @@ VALUE compressors(VALUE self) {
  *   Debian::AptPkg::Configuration.config_find('Dir::Etc::main') # => "apt.conf"
  *
  **/
-static
-VALUE config_find(int argc, VALUE* argv, VALUE self) {
-    if (argc > 2 || argc == 0) {
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
-    VALUE name, default_key;
-    rb_scan_args(argc, argv, "11", &name,  &default_key);
-    if (NIL_P(default_key))
-        default_key = rb_str_new2("");
-    return rb_str_new2(_config->Find(StringValuePtr(name),
-                StringValuePtr(default_key)).c_str());
+static VALUE
+config_find(int argc, VALUE *argv, VALUE self)
+{
+  if (argc > 2 || argc == 0) {
+    rb_raise(rb_eArgError, "wrong number of arguments");
+  }
+  VALUE name, default_key;
+  rb_scan_args(argc, argv, "11", &name, &default_key);
+  if (NIL_P(default_key))
+    default_key = rb_str_new2("");
+  return rb_str_new2(_config->Find(StringValuePtr(name),
+                                   StringValuePtr(default_key)).c_str());
 }
 
 /*
@@ -144,39 +148,43 @@ VALUE config_find(int argc, VALUE* argv, VALUE self) {
  *   Debian::AptPkg::Configuration.config_find_file('Dir::Etc::main') # => "/etc/apt/apt.conf"
  *
  **/
-static
-VALUE config_find_file(int argc, VALUE* argv, VALUE self) {
-    if (argc > 2 || argc == 0) {
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
-    VALUE name, default_key;
-    rb_scan_args(argc, argv, "11", &name,  &default_key);
-    if (NIL_P(default_key))
-        default_key = rb_str_new2("");
-    return rb_str_new2(_config->FindFile(StringValuePtr(name),
-                StringValuePtr(default_key)).c_str());
+static VALUE
+config_find_file(int argc, VALUE *argv, VALUE self)
+{
+  if (argc > 2 || argc == 0) {
+    rb_raise(rb_eArgError, "wrong number of arguments");
+  }
+  VALUE name, default_key;
+  rb_scan_args(argc, argv, "11", &name, &default_key);
+  if (NIL_P(default_key))
+    default_key = rb_str_new2("");
+  return rb_str_new2(_config->FindFile(StringValuePtr(name),
+                                       StringValuePtr(default_key)).c_str());
 }
 
 void
-init_apt_pkg_configuration() {
-    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");
+init_apt_pkg_configuration()
+{
+  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_mDebianAptPkgConfiguration, "architectures",
-            RUBY_METHOD_FUNC(architectures), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "check_architecture",
-            RUBY_METHOD_FUNC(check_architecture), 1);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "languages",
-            RUBY_METHOD_FUNC(languages), -1);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "check_language",
-            RUBY_METHOD_FUNC(check_language), -1);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "compressors",
-            RUBY_METHOD_FUNC(compressors), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "architectures",
+                             RUBY_METHOD_FUNC(architectures), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration,
+                             "check_architecture",
+                             RUBY_METHOD_FUNC(check_architecture), 1);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "languages",
+                             RUBY_METHOD_FUNC(languages), -1);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "check_language",
+                             RUBY_METHOD_FUNC(check_language), -1);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "compressors",
+                             RUBY_METHOD_FUNC(compressors), 0);
 
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "config_find",
-            RUBY_METHOD_FUNC(config_find), -1);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "config_find_file",
-            RUBY_METHOD_FUNC(config_find_file), -1);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "config_find",
+                             RUBY_METHOD_FUNC(config_find), -1);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration,
+                             "config_find_file",
+                             RUBY_METHOD_FUNC(config_find_file), -1);
 }

data/ext/apt_pkg/extconf.rb

@@ -1,8 +1,5 @@
 require 'mkmf'
-
 have_library('stdc++')
 have_library('apt-pkg')
-
 dir_config('apt_pkg')
-
 create_makefile('apt_pkg')

data/ext/apt_pkg/pkgcache.cpp

@@ -1,213 +1,291 @@
 #include "pkgcache.h"
 
+/*
+ * private
+ */
+bool
+config_system_initialized()
+{
+  string const arch = _config->Find("APT::Architecture");
+  if (arch.empty()) {
+    return false;
+  }
+  return true;
+}
+
 /*
  * call-seq: gen_caches() -> bool
  *
  * Call the main cache generator.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.gen_caches # => false
  *
  **/
-static
-VALUE gen_caches(VALUE self) {
-    pkgCacheFile CacheFile;
-    int res = CacheFile.BuildCaches(NULL, true);
-    return INT2BOOL(res);
+static VALUE
+gen_caches(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  int res = CacheFile.BuildCaches(NULL, true);
+  return INT2BOOL(res);
+}
+
+/*
+ * call-seq: is_multi_arch() -> bool
+ *
+ * An attribute determining whether the cache supports multi-arch.
+ * Return `nil` when config, system, cache is not configured.
+ *
+ *   Debian::AptPkg::PkgCache.is_multi_arch # => false
+ *
+ **/
+static VALUE
+is_multi_arch(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  int res = Cache->MultiArchCache();
+  return INT2BOOL(res);
 }
 
 /*
  * call-seq: pkg_names() -> array, nil
  *
  * List the names of all packages in the system.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.pkg_names('gcolor2') # => ["gcolor2"]
  *
  **/
-static
-VALUE pkg_names(int argc, VALUE* argv, VALUE self) {
-    if (argc > 1 || argc == 0) {
-        rb_raise(rb_eArgError, "You must give at least one search argument");
-    }
-    VALUE name;
-    rb_scan_args(argc, argv, "01", &name);
-    if (NIL_P(name) || RSTRING_LEN(name) < 1) {
-        rb_raise(rb_eArgError, "You must give at least one search pattern");
-    }
-    VALUE result = rb_ary_new();
+static VALUE
+pkg_names(int argc, VALUE *argv, VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  if (argc > 1 || argc == 0) {
+    rb_raise(rb_eArgError, "You must give at least one search argument");
+  }
+  VALUE name;
+  rb_scan_args(argc, argv, "01", &name);
+  if (NIL_P(name) || RSTRING_LEN(name) < 1) {
+    rb_raise(rb_eArgError, "You must give at least one search pattern");
+  }
+  VALUE result = rb_ary_new();
 
-    pkgCacheFile CacheFile;
-    if (CacheFile.GetPkgCache() == 0) {
-        return Qnil;
-    }
-    pkgCache::GrpIterator I = CacheFile.GetPkgCache()->GrpBegin();
+  pkgCacheFile CacheFile;
+  if (CacheFile.GetPkgCache() == 0) {
+    return Qnil;
+  }
+  pkgCache::GrpIterator I = CacheFile.GetPkgCache()->GrpBegin();
 
-    const char *pkgname = StringValuePtr(name);
-    for (;I.end() != true; ++I) {
-        if (strncmp(I.Name(), pkgname, strlen(pkgname)) == 0) {
-            rb_ary_push(result, rb_str_new2(I.Name()));
-        }
+  const char *pkgname = StringValuePtr(name);
+  for (; I.end() != true; ++I) {
+    if (strncmp(I.Name(), pkgname, strlen(pkgname)) == 0) {
+      rb_ary_push(result, rb_str_new2(I.Name()));
     }
-    return result;
+  }
+  return result;
 }
 
 /*
  * call-seq: package_count() -> int, nil
  *
  * The total number of packages available in the cache.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.package_count # => 69511
  *
  **/
-static
-VALUE package_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->PackageCount);
+static VALUE
+package_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->PackageCount);
 }
 
 /*
  * call-seq: version_count() -> int, nil
  *
  * The total number of package versions available in the cache.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.version_count # => 84630
  *
  **/
-static
-VALUE version_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->VersionCount);
+static VALUE
+version_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->VersionCount);
 }
 
 /*
  * call-seq: depends_count() -> int, nil
  *
  * The total number of dependencies stored in the cache.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.depends_count # => 551983
  *
  **/
-static
-VALUE depends_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->DependsCount);
+static VALUE
+depends_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->DependsCount);
 }
 
 /*
  * call-seq: package_file_count() -> int, nil
  *
  * The total number of packages files available.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.package_file_count # => 17
  *
  **/
-static
-VALUE package_file_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->PackageFileCount);
+static VALUE
+package_file_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->PackageFileCount);
 }
 
 /*
  * call-seq: ver_file_count() -> int, nil
  *
  * The total number of version and package file relations stored in the cache.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.ver_file_count # => 11274
  *
  **/
-static
-VALUE ver_file_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->VerFileCount);
+static VALUE
+ver_file_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->VerFileCount);
 }
 
 /*
  * call-seq: provides_count() -> int, nil
  *
  * The number of provided packages.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.provides_count # => 69511
  *
  **/
-static
-VALUE provides_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->ProvidesCount);
+static VALUE
+provides_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->ProvidesCount);
 }
 
 /*
  * call-seq: group_count() -> int, nil
  *
  * The number of groups in the cache.
- * Return `nil` when cache is not generated.
+ * Return `nil` when config, system, cache is not configured.
  *
  *   Debian::AptPkg::PkgCache.group_count # => 16730
  *
  **/
-static
-VALUE group_count(VALUE self) {
-    pkgCacheFile CacheFile;
-    pkgCache *Cache = CacheFile.GetPkgCache();
-    if (Cache == NULL) {
-        return Qnil;
-    }
-    return INT2FIX(Cache->HeaderP->GroupCount);
+static VALUE
+group_count(VALUE self)
+{
+  if (!config_system_initialized()) {
+    return Qnil;
+  }
+  pkgCacheFile CacheFile;
+  pkgCache *Cache = CacheFile.GetPkgCache();
+  if (Cache == NULL) {
+    return Qnil;
+  }
+  return INT2FIX(Cache->HeaderP->GroupCount);
 }
 
 void
-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,
-            "PkgCache");
-
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "gen_caches",
-            RUBY_METHOD_FUNC(gen_caches), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "pkg_names",
-            RUBY_METHOD_FUNC(pkg_names), -1);
-
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "package_count",
-            RUBY_METHOD_FUNC(package_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "version_count",
-            RUBY_METHOD_FUNC(version_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "depends_count",
-            RUBY_METHOD_FUNC(depends_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "package_file_count",
-            RUBY_METHOD_FUNC(package_file_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "ver_file_count",
-            RUBY_METHOD_FUNC(ver_file_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "provides_count",
-            RUBY_METHOD_FUNC(provides_count), 0);
-    rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "group_count",
-            RUBY_METHOD_FUNC(group_count), 0);
+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,
+                                                               "PkgCache");
+
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "gen_caches",
+                             RUBY_METHOD_FUNC(gen_caches), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "is_multi_arch",
+                             RUBY_METHOD_FUNC(is_multi_arch), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "pkg_names",
+                             RUBY_METHOD_FUNC(pkg_names), -1);
+
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "package_count",
+                             RUBY_METHOD_FUNC(package_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "version_count",
+                             RUBY_METHOD_FUNC(version_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "depends_count",
+                             RUBY_METHOD_FUNC(depends_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration,
+                             "package_file_count",
+                             RUBY_METHOD_FUNC(package_file_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "ver_file_count",
+                             RUBY_METHOD_FUNC(ver_file_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "provides_count",
+                             RUBY_METHOD_FUNC(provides_count), 0);
+  rb_define_singleton_method(rb_mDebianAptPkgConfiguration, "group_count",
+                             RUBY_METHOD_FUNC(group_count), 0);
 }

data/lib/debian/apt_pkg/version.rb

@@ -3,6 +3,6 @@ module Debian
   # AptPkg base module
   module AptPkg
     # Gem version
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/test/apt_pkg_cache_not_init_test.rb

@@ -0,0 +1,13 @@
+require_relative 'test_helper'
+
+describe Debian::AptPkg::PkgCache do
+  describe 'not init' do
+    %i(package version depends package_file ver_file provides group).each do |m|
+      describe ".#{m}_count" do
+        it 'can be called' do
+          Debian::AptPkg::PkgCache.public_send("#{m}_count")
+        end
+      end
+    end
+  end
+end

data/test/apt_pkg_cache_test.rb

@@ -1,6 +1,10 @@
 require_relative 'test_helper'
 
 describe Debian::AptPkg::PkgCache do
+  before :all do
+    Debian::AptPkg.init
+  end
+
   describe '.gen_caches' do
     it 'return boolean' do
       if Process.uid == 0
@@ -11,6 +15,12 @@ describe Debian::AptPkg::PkgCache do
     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

data/test/apt_pkg_configuration_test.rb

@@ -1,6 +1,10 @@
 require_relative 'test_helper'
 
 describe Debian::AptPkg::Configuration do
+  before :all do
+    Debian::AptPkg.init
+  end
+
   it 'architectures return an array' do
     arches = Debian::AptPkg::Configuration.architectures
     arches.must_be_instance_of Array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt-pkg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ files:
 - ext/apt_pkg/pkgcache.h
 - lib/debian/apt_pkg.rb
 - lib/debian/apt_pkg/version.rb
+- test/apt_pkg_cache_not_init_test.rb
 - test/apt_pkg_cache_test.rb
 - test/apt_pkg_configuration_test.rb
 - test/apt_pkg_test.rb
@@ -107,3 +108,4 @@ signing_key:
 specification_version: 4
 summary: Ruby interface to libapt-pkg
 test_files: []
+has_rdoc: