gpgme 2.0.0 → 2.0.1

data/ext/gpgme/extconf.rb

@@ -2,7 +2,7 @@ require 'mkmf'
 
 BUILD   = Dir::pwd
 SRC     = File.expand_path(File.dirname(__FILE__))
-PREFIX  = "#{BUILD}/dst/"
+PREFIX  = "#{BUILD}/dst"
 
 def sys(*cmd)
   puts "  -- #{cmd.join(' ')}"
@@ -47,7 +47,7 @@ $CFLAGS << " -fPIC "
 
 # build gpgme extension
 
-unless have_library 'gpg-error_ext' and have_library 'gpgme_ext' and have_library 'assuan_ext' and have_library 'gpg-error_ext' and have_header 'gpgme.h'
+unless have_library 'gpg-error_ext' and have_library 'assuan_ext' and have_library 'gpgme_ext' and have_header 'gpgme.h'
   STDERR.puts "\n\n"
   STDERR.puts "*********************************************************"
   STDERR.puts "********* error compiling and linking libgpgme. *********"

data/ext/gpgme/gpgme_n.c

@@ -1540,7 +1540,13 @@ rb_s_gpgme_op_verify_result (VALUE dummy, VALUE vctx)
 	   notation = notation->next)
 	{
 	  VALUE vnotation = rb_class_new_instance(0, NULL, cSigNotation);
-	  rb_iv_set (vnotation, "@name", rb_str_new2 (notation->name));
+	  /* The docs say:
+	   * The name of the notation field. If this is NULL, then the member
+	   * value will contain a policy URL. */
+	  if (notation->name == NULL)
+	    rb_iv_set (vnotation, "@name", Qnil);
+	  else
+	    rb_iv_set (vnotation, "@name", rb_str_new2 (notation->name));
 	  rb_iv_set (vnotation, "@value", rb_str_new2 (notation->value));
 	  rb_ary_push (vnotations, vnotation);
 	}

data/lib/gpgme/data.rb

@@ -173,5 +173,17 @@ module GPGME
       raise exc if exc
       encoding
     end
+
+    ##
+    # Return the entire content of the data object as string.
+    def to_s
+      pos = seek(0, IO::SEEK_CUR)
+      begin
+        seek(0)
+        read
+      ensure
+        seek(pos)
+      end
+    end
   end
 end

data/lib/gpgme/engine.rb

@@ -25,7 +25,7 @@ module GPGME
       # Return an array of {GPGME::EngineInfo} structures of enabled engines.
       #
       # @example
-      #   GPGME::Engine.engine_info.first
+      #   GPGME::Engine.info.first
       #   # => #<GPGME::EngineInfo:0x00000100d4fbd8
       #          @file_name="/usr/local/bin/gpg",
       #          @protocol=0,

data/test/crypto_test.rb

@@ -3,6 +3,10 @@ require 'test_helper'
 require 'tempfile'
 
 describe GPGME::Crypto do
+  before do
+    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+  end
+
   describe "default options functionality" do
     it "allows operation from instances normally" do
       crypto = GPGME::Crypto.new

data/test/ctx_test.rb

@@ -2,6 +2,10 @@
 require 'test_helper'
 
 describe GPGME::Ctx do
+  before do
+    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+  end
+
   it "can instantiate" do
     assert_instance_of GPGME::Ctx, GPGME::Ctx.new
   end

data/test/data_test.rb

@@ -112,5 +112,16 @@ describe GPGME::Data do
       end
     end
   end
+
+  describe :to_s do
+    it "returns the entire content of data" do
+      data = GPGME::Data.new("wadus")
+      data.read
+      old_pos = data.seek(0, IO::SEEK_CUR)
+      assert_equal "wadus", data.to_s
+      new_pos = data.seek(0, IO::SEEK_CUR)
+      assert_equal old_pos, new_pos
+    end
+  end
 end
 

data/test/key_test.rb

@@ -2,6 +2,9 @@
 require 'test_helper'
 
 describe GPGME::Key do
+  before do
+    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+  end
 
   it "has certain attributes" do
     key = GPGME::Key.find(:secret).first

data/test/signature_test.rb

@@ -2,6 +2,10 @@
 require 'test_helper'
 
 describe GPGME::Signature do
+  before do
+    skip unless GPGME::Engine.check_version GPGME::PROTOCOL_OpenPGP
+  end
+
   it "#valid? is true when the signature is valid" do
     crypto = GPGME::Crypto.new
     signatures = 0

data/test/sub_key_test.rb

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

data/test/test_helper.rb

@@ -74,10 +74,12 @@ def without_key(key, &block)
   end
 end
 
-# 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
+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
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gpgme
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Daiki Ueno
@@ -112,44 +112,44 @@ extra_rdoc_files: []
 
 files: 
 - lib/gpgme.rb
-- lib/gpgme/error.rb
+- lib/gpgme/sub_key.rb
 - lib/gpgme/version.rb
-- lib/gpgme/signature.rb
-- lib/gpgme/engine.rb
 - lib/gpgme/key.rb
+- lib/gpgme/key_sig.rb
+- lib/gpgme/engine.rb
+- lib/gpgme/ctx.rb
+- lib/gpgme/signature.rb
+- lib/gpgme/io_callbacks.rb
 - lib/gpgme/misc.rb
 - lib/gpgme/data.rb
-- lib/gpgme/io_callbacks.rb
-- lib/gpgme/key_sig.rb
 - lib/gpgme/constants.rb
-- lib/gpgme/sub_key.rb
+- lib/gpgme/crypto.rb
 - lib/gpgme/compat.rb
 - lib/gpgme/key_common.rb
-- lib/gpgme/ctx.rb
-- lib/gpgme/crypto.rb
 - lib/gpgme/user_id.rb
-- ext/gpgme/gpgme_n.c
+- lib/gpgme/error.rb
 - ext/gpgme/extconf.rb
-- ext/gpgme/libassuan-2.0.2.tar.bz2
+- ext/gpgme/gpgme_n.c
 - ext/gpgme/libgpg-error-1.10.tar.bz2
+- ext/gpgme/libassuan-2.0.2.tar.bz2
 - ext/gpgme/gpgme-1.3.1.tar.bz2
-- test/key_test.rb
-- test/sub_key_test.rb
-- test/test_helper.rb
-- test/data_test.rb
 - test/crypto_test.rb
+- test/test_helper.rb
 - test/gpgme_test.rb
+- test/key_test.rb
+- test/files/testkey_pub.gpg
+- test/files/testkey_sec.gpg
+- test/data_test.rb
 - test/signature_test.rb
 - test/support/resources.rb
+- test/sub_key_test.rb
 - test/ctx_test.rb
-- test/files/testkey_sec.gpg
-- test/files/testkey_pub.gpg
-- examples/sign.rb
-- examples/roundtrip.rb
 - examples/verify.rb
-- examples/genkey.rb
 - examples/keylist.rb
 - examples/edit.rb
+- examples/roundtrip.rb
+- examples/sign.rb
+- examples/genkey.rb
 homepage: http://github.com/ueno/ruby-gpgme
 licenses: []
 
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-gpgme
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby binding of GPGME.