apt-pkg 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 746f8355732d3706f08ed9a0448074b5cc809650
-  data.tar.gz: 4e790f19af21ca58fb505e253b0063a9f37a403c
+  metadata.gz: f84dc3e1846ba85b0b390fab4f2bc79df60be2f8
+  data.tar.gz: 8a01ee86fb7e14569a3ddca653f65c6a57fa38de
 SHA512:
-  metadata.gz: 0847ba542a425cf905fc8b1f9878e61d95567ad5edc8701d787b7aeb6890a8907f31a535b7159b43443b79a22c29f0d69ce7df77baec6801318ce42550acfa0e
-  data.tar.gz: c78871b2f29b15180af494de3d6b822c257da1dca3fb3a43af0e6890219ce10e6e44a8ab33658bd4932688241897d6f36e8992da3b672e8365d70470601ca35c
+  metadata.gz: 0351a2ebd626836792954809677e899c6b2bb4689088583421ba63efb6d723e7395967f614a37f0fa25c441bf22b28f2210540842e3c6d0585aee7aea2284c56
+  data.tar.gz: 6791a8180fa9a6abe2da1f071a0c7ce76aa320bf641893e2a3d86dc07a14bd681b05db6d1364fb94ddab6af5ddade6a8ace3388e4c102283f598baaed2cf502f

data/History.md

@@ -1,6 +1,14 @@
 
+0.1.0 / 2015-12-20
+==================
+
+  * Change VERSION, APT_VERSION and LIBAPT_PKG_VERSION
+  * Add cache count methods
+  * Fix rake lint task exit status
+  * Fix syntax offences
+
 0.0.4 / 2015-12-19
 ==================
 
-* Simple search with `Debian::AptPkg::PkgCache.pkg_names("vim")`
-* Documentation update
+  * Simple search with `Debian::AptPkg::PkgCache.pkg_names("vim")`
+  * Documentation update

data/README.md

@@ -17,7 +17,7 @@ gem install apt-pkg
 Simple search is implemented with:
 
 ~~~ ruby
-require 'apt_pkg'
+require 'debian/apt_pkg'
 Debian::AptPkg::PkgCache.pkg_names("vim")
 ~~~
 

data/ext/apt_pkg/apt-pkg.cpp

@@ -180,9 +180,10 @@ Init_apt_pkg() {
     rb_define_const(rb_mDebianAptPkg, "NOT_EQUALS", INT2FIX(pkgCache::Dep::NotEquals));
 
     /* Represents the version of apt. */
-    rb_define_const(rb_mDebianAptPkg, "VERSION", rb_str_new2(pkgVersion));
+    rb_define_const(rb_mDebianAptPkg, "APT_VERSION", rb_str_new2(pkgVersion));
     /* Represents the version of apt_pkg library. */
-    rb_define_const(rb_mDebianAptPkg, "LIB_VERSION", rb_str_new2(pkgLibVersion));
+    rb_define_const(rb_mDebianAptPkg, "LIBAPT_PKG_VERSION",
+        rb_str_new2(pkgLibVersion));
 
     init_apt_pkg_configuration();
     init_apt_pkg_pkgcache();

data/ext/apt_pkg/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 
-have_library("stdc++")
-have_library("apt-pkg")
+have_library('stdc++')
+have_library('apt-pkg')
 
 dir_config('apt_pkg')
 

data/ext/apt_pkg/pkgcache.cpp

@@ -19,7 +19,7 @@ VALUE gen_caches(VALUE self) {
  * 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 cache is not generated.
  *
  *   Debian::AptPkg::PkgCache.pkg_names('gcolor2') # => ["gcolor2"]
  *
@@ -51,6 +51,139 @@ VALUE pkg_names(int argc, VALUE* argv, VALUE self) {
     return result;
 }
 
+/*
+ * call-seq: package_count() -> int, nil
+ *
+ * The total number of packages available in the cache.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
+/*
+ * call-seq: version_count() -> int, nil
+ *
+ * The total number of package versions available in the cache.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
+/*
+ * call-seq: depends_count() -> int, nil
+ *
+ * The total number of dependencies stored in the cache.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
+/*
+ * call-seq: package_file_count() -> int, nil
+ *
+ * The total number of packages files available.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
+/*
+ * 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.
+ *
+ *   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);
+}
+
+/*
+ * call-seq: provides_count() -> int, nil
+ *
+ * The number of provided packages.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
+/*
+ * call-seq: group_count() -> int, nil
+ *
+ * The number of groups in the cache.
+ * Return `nil` when cache is not generated.
+ *
+ *   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);
+}
+
 void
 init_apt_pkg_pkgcache() {
     VALUE rb_mDebian = rb_define_module("Debian");
@@ -62,4 +195,19 @@ init_apt_pkg_pkgcache() {
             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);
 }

data/lib/debian/apt_pkg.rb

@@ -0,0 +1,2 @@
+require 'apt_pkg'
+require 'debian/apt_pkg/version'

data/lib/debian/apt_pkg/version.rb

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

data/test/apt_pkg_cache_test.rb

@@ -12,28 +12,41 @@ describe Debian::AptPkg::PkgCache do
   end
 
   describe '.pkg_names' do
-    it 'argument' do
-      lambda {
+    it 'no argument' do
+      lambda do
         Debian::AptPkg::PkgCache.pkg_names
-      }.must_raise ArgumentError
-
-      lambda {
+      end.must_raise ArgumentError
+    end
+    it 'nil argument' do
+      lambda do
         Debian::AptPkg::PkgCache.pkg_names(nil)
-      }.must_raise ArgumentError
+      end.must_raise ArgumentError
+    end
 
-      lambda {
-        Debian::AptPkg::PkgCache.pkg_names("")
-      }.must_raise ArgumentError
+    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")
+      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"
+        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

data/test/apt_pkg_configuration_test.rb

@@ -28,9 +28,9 @@ describe Debian::AptPkg::Configuration do
   end
 
   it 'check_language' do
-    lambda {
+    lambda do
       Debian::AptPkg::Configuration.check_language
-    }.must_raise ArgumentError
+    end.must_raise ArgumentError
 
     langs = Debian::AptPkg::Configuration.languages
     Debian::AptPkg::Configuration.check_language(langs.first).must_equal true
@@ -47,28 +47,28 @@ describe Debian::AptPkg::Configuration do
   end
 
   it 'find configuration value' do
-    lambda {
+    lambda do
       Debian::AptPkg::Configuration.config_find
-    }.must_raise ArgumentError
+    end.must_raise ArgumentError
 
-    Debian::AptPkg::Configuration.config_find('Dir::Etc::main').
-      must_equal "apt.conf"
-    Debian::AptPkg::Configuration.config_find('Dir::Etc::netrc').
-      must_equal "auth.conf"
-    Debian::AptPkg::Configuration.config_find('Dir::Etc::parts').
-      must_equal "apt.conf.d"
-    Debian::AptPkg::Configuration.config_find('Spk', 'DebianUser').
-      must_equal "DebianUser"
+    Debian::AptPkg::Configuration.config_find('Dir::Etc::main')
+      .must_equal 'apt.conf'
+    Debian::AptPkg::Configuration.config_find('Dir::Etc::netrc')
+      .must_equal 'auth.conf'
+    Debian::AptPkg::Configuration.config_find('Dir::Etc::parts')
+      .must_equal 'apt.conf.d'
+    Debian::AptPkg::Configuration.config_find('Spk', 'DebianUser')
+      .must_equal 'DebianUser'
   end
 
   it 'find file' do
-    lambda {
+    lambda do
       Debian::AptPkg::Configuration.config_find_file
-    }.must_raise ArgumentError
+    end.must_raise ArgumentError
 
-    Debian::AptPkg::Configuration.config_find_file('Dir::Etc::main').
-      must_equal "/etc/apt/apt.conf"
-    Debian::AptPkg::Configuration.config_find_file('Dir::Etc::netrc').
-      must_equal "/etc/apt/auth.conf"
+    Debian::AptPkg::Configuration.config_find_file('Dir::Etc::main')
+      .must_equal '/etc/apt/apt.conf'
+    Debian::AptPkg::Configuration.config_find_file('Dir::Etc::netrc')
+      .must_equal '/etc/apt/auth.conf'
   end
 end

data/test/apt_pkg_test.rb

@@ -1,6 +1,18 @@
 require_relative 'test_helper'
 
 describe Debian::AptPkg do
+  it 'gem has a version number' do
+    refute_nil Debian::AptPkg::VERSION
+  end
+
+  it 'apt has a version number' do
+    refute_nil Debian::AptPkg::APT_VERSION
+  end
+
+  it 'libapt-pkg has a version number' do
+    refute_nil Debian::AptPkg::LIBAPT_PKG_VERSION
+  end
+
   describe '.cmp_version' do
     it 'should compare version' do
       Debian::AptPkg.cmp_version('1.1', '1.0').must_be :>, 0
@@ -52,28 +64,28 @@ describe Debian::AptPkg do
 
     describe 'NotEquals' do
       it 'should 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').
-          must_equal true
-        Debian::AptPkg.check_dep('1', Debian::AptPkg::NOT_EQUALS, '1').
-          must_equal false
+        Debian::AptPkg.check_dep('1', Debian::AptPkg::NOT_EQUALS, '2')
+          .must_equal true
+        Debian::AptPkg.check_dep('2', Debian::AptPkg::NOT_EQUALS, '1')
+          .must_equal true
+        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 {
+        lambda do
           Debian::AptPkg.check_dep('1', 'bad', '2')
-        }.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').
-        must_equal 'debian.org_index.html'
+      Debian::AptPkg.uri_to_filename('http://debian.org/index.html')
+        .must_equal 'debian.org_index.html'
     end
   end
 
@@ -91,7 +103,7 @@ describe Debian::AptPkg do
 
   describe '.size_to_str' do
     it 'Return a string describing the size in a human-readable manner' do
-      Debian::AptPkg.size_to_str(10000).must_equal '10.0 k'
+      Debian::AptPkg.size_to_str(10_000).must_equal '10.0 k'
     end
   end
 
@@ -105,10 +117,10 @@ describe Debian::AptPkg do
 
   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/test_helper.rb

@@ -3,4 +3,4 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'pp'
 
-require_relative '../lib/apt_pkg'
+require_relative '../lib/debian/apt_pkg'

metadata

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