gpgme 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24d559bd1f5f4944e6a57b3ef114d45369a087b
-  data.tar.gz: d5e2c6420f7ad647c35793452cdb04821c7c2960
+  metadata.gz: d1404d6456af3680a442805ede037a138b5d7ed9
+  data.tar.gz: 5a6fc1cadbfaab728a4abed17824736b31bbdf8c
 SHA512:
-  metadata.gz: a810f53185fa5b76531868fa34ac6269dd7aa137a24341225e3c35b51e6b1e689ee7e129416cb4ca04a6f8e4cdc18bbed079077cd7bded49afcca058c5ab3903
-  data.tar.gz: 89af31db1dc5b7c30e4c0e0fadcf112fc4e946a5f667114d4c7511d31faa5632449f75b1a56a8072325098c5793625df1a5874740f0ff1087692f6c4442e9e6b
+  metadata.gz: c58514fedfc607814b68d6b714018ffcd07ae8e189ff5aed7d8a7bd890bfde10f19c8683774b8d2bfe8bc55a7a087a51f58d8dadd304e6a1eac9848406ade80e
+  data.tar.gz: c28c1583beab052240c4fe115a1650343d39ada4511eedce726e9e61c57588a6bd2c7a86d6c930fe594226c0390e78b8b73a921bf29f1cd1f16a36ba72d91627

data/ext/gpgme/extconf.rb

@@ -62,9 +62,12 @@ EOS
   require 'rubygems'
   require 'mini_portile2'
 
-  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.21').tap do |recipe|
+  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.27').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
-    recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
+    recipe.files = [{
+      :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
+      :sha256 => '4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2'
+    }]
     recipe.configure_options = [
       '--disable-shared',
       '--enable-static',
@@ -79,9 +82,12 @@ EOS
     recipe.activate
   end
 
-  libassuan_recipe = MiniPortile.new('libassuan', '2.4.2').tap do |recipe|
+  libassuan_recipe = MiniPortile.new('libassuan', '2.4.3').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
-    recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
+    recipe.files = [{
+      :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
+      :sha256 => '22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71'
+    }]
     recipe.configure_options = [
       '--disable-shared',
       '--enable-static',
@@ -96,9 +102,12 @@ EOS
     recipe.activate
   end
 
-  gpgme_recipe = MiniPortile.new('gpgme', '1.6.0').tap do |recipe|
+  gpgme_recipe = MiniPortile.new('gpgme', '1.9.0').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
-    recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
+    recipe.files = [{
+      :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
+      :sha256 => '1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb'
+    }]
     recipe.configure_options = [
       '--disable-shared',
       '--enable-static',

data/ext/gpgme/gpgme_n.c

@@ -196,6 +196,53 @@ rb_s_gpgme_set_engine_info (VALUE dummy, VALUE vproto, VALUE vfile_name,
   return LONG2NUM(err);
 }
 
+static VALUE
+rb_s_gpgme_ctx_get_engine_info (VALUE dummy, VALUE vctx, VALUE rinfo)
+{
+  long idx;
+
+  gpgme_ctx_t ctx;
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  gpgme_engine_info_t info = gpgme_ctx_get_engine_info (ctx);
+      for (idx = 0; info; info = info->next, idx++)
+	{
+	  VALUE vinfo = rb_class_new_instance (0, NULL, cEngineInfo);
+	  rb_iv_set (vinfo, "@protocol", INT2FIX(info->protocol));
+	  if (info->file_name)
+	    rb_iv_set (vinfo, "@file_name", rb_str_new2 (info->file_name));
+	  if (info->version)
+	    rb_iv_set (vinfo, "@version", rb_str_new2 (info->version));
+	  if (info->req_version)
+	    rb_iv_set (vinfo, "@req_version", rb_str_new2 (info->req_version));
+	  if (info->home_dir)
+	    rb_iv_set (vinfo, "@home_dir", rb_str_new2 (info->home_dir));
+	  rb_ary_store (rinfo, idx, vinfo);
+	}
+  return Qnil;
+}
+
+static VALUE
+rb_s_gpgme_ctx_set_engine_info (VALUE dummy, VALUE vctx, VALUE vproto, VALUE vfile_name,
+			    VALUE vhome_dir)
+{
+  gpgme_ctx_t ctx;
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+  gpgme_error_t err = gpgme_ctx_set_engine_info (ctx,
+               NUM2INT(vproto),
+					     NIL_P(vfile_name) ? NULL :
+					     StringValueCStr(vfile_name),
+					     NIL_P(vhome_dir) ? NULL :
+					     StringValueCStr(vhome_dir));
+  return LONG2NUM(err);
+}
+
 static VALUE
 rb_s_gpgme_pubkey_algo_name (VALUE dummy, VALUE valgo)
 {
@@ -843,7 +890,13 @@ utf8_str_new (const char *data)
 {
     VALUE string = rb_str_new2 (data);
 #ifdef HAVE_RUBY_ENCODING_H
+    /* We assume all the C strings from GPGME are in UTF-8 encoding.
+       If there is any string which cannot be represented in UTF-8,
+       set the string's encoding to ASCII-8BIT and leave the caller to
+       detect the encoding.  */
     rb_enc_associate_index (string, rb_enc_find_index ("UTF-8"));
+    if (rb_enc_str_coderange (string) == ENC_CODERANGE_BROKEN)
+      rb_enc_associate_index (string, rb_enc_find_index ("ASCII-8BIT"));
 #endif
     return string;
 }
@@ -2203,7 +2256,10 @@ Init_gpgme_n (void)
 			     rb_s_gpgme_get_engine_info, 1);
   rb_define_module_function (mGPGME, "gpgme_set_engine_info",
 			     rb_s_gpgme_set_engine_info, 3);
-
+  rb_define_module_function (mGPGME, "gpgme_ctx_get_engine_info",
+           rb_s_gpgme_ctx_get_engine_info, 2);
+  rb_define_module_function (mGPGME, "gpgme_ctx_set_engine_info",
+           rb_s_gpgme_ctx_set_engine_info, 4);
   rb_define_module_function (mGPGME, "gpgme_pubkey_algo_name",
 			     rb_s_gpgme_pubkey_algo_name, 1);
   rb_define_module_function (mGPGME, "gpgme_hash_algo_name",

data/lib/gpgme/key_common.rb

@@ -16,10 +16,10 @@ module GPGME
     # +:encrypt+, +:sign+, +:certify+ or +:authenticate+
     def capability
       caps = []
-      caps << :encrypt if @can_encrypt
-      caps << :sign if @can_sign
-      caps << :certify if @can_certify
-      caps << :authenticate if @can_authenticate
+      caps << :encrypt if @can_encrypt == 1
+      caps << :sign if @can_sign == 1
+      caps << :certify if @can_certify == 1
+      caps << :authenticate if @can_authenticate == 1
       caps
     end
 

data/lib/gpgme/sub_key.rb

@@ -30,7 +30,7 @@ module GPGME
     end
 
     def sha
-      (@fingerprint || @keyid)[-8 .. -1]
+      (@fpr || @keyid)[-8 .. -1]
     end
 
     PUBKEY_ALGO_LETTERS = {
@@ -49,7 +49,7 @@ module GPGME
               secret? ? 'ssc' : 'sub',
               length,
               pubkey_algo_letter,
-              (@fingerprint || @keyid)[-8 .. -1],
+              (@fpr || @keyid)[-8 .. -1],
               timestamp.strftime('%Y-%m-%d'),
               trust.inspect,
               capability.inspect)
@@ -60,7 +60,7 @@ module GPGME
               secret? ? 'ssc' : 'sub',
               length,
               pubkey_algo_letter,
-              (@fingerprint || @keyid)[-8 .. -1],
+              (@fpr || @keyid)[-8 .. -1],
               timestamp.strftime('%Y-%m-%d'))
     end
   end

data/lib/gpgme/version.rb

@@ -1,4 +1,4 @@
 module GPGME
   # The version of GPGME ruby binding you are using
-  VERSION = "2.0.12"
+  VERSION = "2.0.13"
 end

data/test/crypto_test.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 describe GPGME::Crypto do
   before do
-    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+    skip unless ensure_keys GPGME::PROTOCOL_OpenPGP
   end
 
   describe "default options functionality" do
@@ -43,7 +43,7 @@ describe GPGME::Crypto do
 
   describe :encrypt do
     it "should raise an error if the recipients aren't trusted" do
-      assert_raises GPGME::Error::General do
+      assert_raises GPGME::Error::UnusablePublicKey do
         GPGME::Crypto.new.encrypt TEXT[:plain]
       end
     end

data/test/ctx_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 describe GPGME::Ctx do
   before do
-    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+    skip unless ensure_keys GPGME::PROTOCOL_OpenPGP
   end
 
   it "can instantiate" do

data/test/key_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 describe GPGME::Key do
   before do
-    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+    skip unless ensure_keys GPGME::PROTOCOL_OpenPGP
   end
 
   it "has certain attributes" do

data/test/signature_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 describe GPGME::Signature do
   before do
-    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+    skip unless ensure_keys GPGME::PROTOCOL_OpenPGP
   end
 
   it "#valid? is true when the signature is valid" do

data/test/sub_key_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 describe GPGME::SubKey do
   before do
-    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+    skip unless ensure_keys GPGME::PROTOCOL_OpenPGP
   end
 
   # We trust Key for common methods that come from KeyCommon

data/test/test_helper.rb

@@ -82,12 +82,33 @@ def without_key(key, &block)
   end
 end
 
-if GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
-  # We use a different home directory for the keys to not disturb current
-  # installation
-
-  require 'tmpdir'
-  GPGME::Engine.home_dir = Dir.tmpdir
-  remove_all_keys
-  import_keys
+DIRS = []
+
+at_exit do
+  DIRS.each do |dir|
+    FileUtils.remove_entry dir
+  end
+  DIRS.clear
+end
+
+def ensure_keys(proto)
+  return false unless GPGME::Engine.check_version proto
+
+  case proto
+  when GPGME::PROTOCOL_OpenPGP
+    # We use a different home directory for the keys to not disturb current
+    # installation
+    require 'tmpdir'
+
+    if DIRS.empty?
+      dir = Dir.mktmpdir
+      GPGME::Engine.home_dir = dir
+      DIRS.push(dir)
+      remove_all_keys
+      import_keys
+    end
+    true
+  else
+    return false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Daiki Ueno
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -131,9 +131,9 @@ files:
 - lib/gpgme/sub_key.rb
 - lib/gpgme/user_id.rb
 - lib/gpgme/version.rb
-- ports/archives/gpgme-1.6.0.tar.bz2
-- ports/archives/libassuan-2.4.2.tar.bz2
-- ports/archives/libgpg-error-1.21.tar.bz2
+- ports/archives/gpgme-1.9.0.tar.bz2
+- ports/archives/libassuan-2.4.3.tar.bz2
+- ports/archives/libgpg-error-1.27.tar.bz2
 - test/crypto_test.rb
 - test/ctx_test.rb
 - test/data_test.rb
@@ -166,9 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-gpgme
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby binding of GPGME.
 test_files: []
-has_rdoc: true