gir_ffi-gnome_keyring 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3048f24273bbc8edba0c65169092ee6584d3f00
-  data.tar.gz: 87c50014c4c13b592112aedeab97f7354fbac557
+  metadata.gz: 1c5d0da487b8bf0fc6253f5f81e21f48d8fff2f7
+  data.tar.gz: 1d1801d16bde2b995b871b140b36b36552f02fd7
 SHA512:
-  metadata.gz: c12fc2555407e363f4318bca376abaa2bcdad645f50fcc4a16692049173ce1e023fe960c0e1b472cd537bed59f16b5ad5a0ec30d7781d378097e12adf4d1ee31
-  data.tar.gz: dc12b9fc5ddc5a40fc84968ac42716f3b19827f8af490dc3fb31aabf017655909e0a478beaa75ac7cc2ded55c3e9b7b337244d2abd0299419477833a34c00472
+  metadata.gz: da1f1c98e310bdbe5a8ec47ec76d2069854b64e1494979f2bda8b474d79305b87a6486995c27654670ebc0378384bab9203c41ce8b96c66068438ced9f74df7e
+  data.tar.gz: e63d5674621ab649b0e9b5df68a701528c3bd89b31bee4bc3e23d39585effc100a4a0560800c9531d00ff76e407c8705548368a0584f41d1c41283d61e4ae10f

data/Changelog.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.0.7 / 2017-09-22
+
+* Depend on GirFFI 0.11.0
+* Require CRuby 2.1 or above
+
 ## 0.0.6 / 2016-03-23
 
 * Depend on GirFFI 0.10.0

data/lib/gir_ffi-gnome_keyring/attribute.rb

@@ -1,17 +1,17 @@
+GnomeKeyring.load_class :Attribute
 module GnomeKeyring
-  load_class :Attribute
-
+  # Overrides for GnomeKeyringAttribute
   class Attribute
     setup_method 'list_new'
     setup_method 'list_append_string'
     setup_method 'list_append_uint32'
 
     private_class_method :list_new,
-      :list_append_string,
-      :list_append_uint32,
-      :list_copy,
-      :list_free,
-      :list_to_glist
+                         :list_append_string,
+                         :list_append_uint32,
+                         :list_copy,
+                         :list_free,
+                         :list_to_glist
 
     def make_finalizer
       # Don't make a finalizer; Use FFI's regular free of the pointer instead.

data/lib/gir_ffi-gnome_keyring/attribute_list.rb

@@ -1,33 +1,34 @@
 require 'gir_ffi-gnome_keyring/attribute'
 
 module GnomeKeyring
+  # GLib::Array alias used when returning lists of GnomeKeyringAttribute.
   class AttributeList < GLib::Array
     def self.new
       ptr = GnomeKeyring::Lib.gnome_keyring_attribute_list_new
       wrap(ptr)
     end
 
-    def self.wrap ptr
+    def self.wrap(ptr)
       super GnomeKeyring::Attribute, ptr
     end
 
-    def self.from it
+    def self.from(it)
       case it
       when self then it
       when FFI::Pointer then wrap it
-      else self.new.tap {|arr| arr.append_vals it }
+      else new.tap { |arr| arr.append_vals it }
       end
     end
 
-    def append_string name, value
-      _v2 = GirFFI::InPointer.from(:utf8, name)
-      _v3 = GirFFI::InPointer.from(:utf8, value)
-      GnomeKeyring::Lib.gnome_keyring_attribute_list_append_string self, _v2, _v3
+    def append_string(name, value)
+      v2 = GirFFI::InPointer.from(:utf8, name)
+      v3 = GirFFI::InPointer.from(:utf8, value)
+      GnomeKeyring::Lib.gnome_keyring_attribute_list_append_string self, v2, v3
     end
 
-    def append_uint32 name, value
-      _v2 = GirFFI::InPointer.from(:utf8, name)
-      GnomeKeyring::Lib.gnome_keyring_attribute_list_append_uint32 self, _v2, value
+    def append_uint32(name, value)
+      v2 = GirFFI::InPointer.from(:utf8, name)
+      GnomeKeyring::Lib.gnome_keyring_attribute_list_append_uint32 self, v2, value
     end
 
     private

data/lib/gir_ffi-gnome_keyring/found.rb

@@ -1,20 +1,19 @@
 require 'gir_ffi-gnome_keyring/attribute_list'
 
-module GnomeKeyring
-  load_class :Found
+GnomeKeyring.load_class :Found
 
+module GnomeKeyring
+  # Overrides for GnomeKeyringFound
   class Found
     remove_method :attributes
     remove_method :attributes=
 
     def attributes
-      struct = GnomeKeyring::Found::Struct.new(@struct.to_ptr)
-      GnomeKeyring::AttributeList.wrap(struct[:attributes])
+      GnomeKeyring::AttributeList.wrap(@struct[:attributes])
     end
 
     def attributes=(value)
-      struct = GnomeKeyring::Found::Struct.new(@struct.to_ptr)
-      struct[:attributes] = GnomeKeyring::AttributeList.from(value)
+      @struct[:attributes] = GnomeKeyring::AttributeList.from(value)
     end
   end
 end

data/lib/gir_ffi-gnome_keyring.rb

@@ -6,6 +6,7 @@ require 'gir_ffi-gnome_keyring/attribute'
 require 'gir_ffi-gnome_keyring/attribute_list'
 require 'gir_ffi-gnome_keyring/found'
 
+# Overrides for GnomeKeyring singleton methods
 module GnomeKeyring
   setup_method :find_items_sync
   setup_method :item_create_sync
@@ -20,39 +21,37 @@ module GnomeKeyring
   end
 
   def self.find_items_sync(type, attributes)
-    _v2 = GnomeKeyring::AttributeList.from(attributes)
-    _v3 = FFI::MemoryPointer.new :pointer
-    _v4 = GnomeKeyring::Lib.gnome_keyring_find_items_sync(type, _v2, _v3)
-    _v5 = GLib::List.wrap(GnomeKeyring::Found, _v3.get_pointer(0))
-    return [_v4, _v5]
+    v2 = GnomeKeyring::AttributeList.from(attributes)
+    v3 = FFI::MemoryPointer.new :pointer
+    v4 = GnomeKeyring::Lib.gnome_keyring_find_items_sync(type, v2, v3)
+    v5 = GLib::List.wrap(GnomeKeyring::Found, v3.get_pointer(0))
+    [v4, v5]
   end
 
   def self.item_create_sync(keyring, type, display_name, attributes, secret,
                             update_if_exists)
-    _v1 = GirFFI::InPointer.from_utf8(keyring)
-    _v3 = GirFFI::InPointer.from_utf8(display_name)
-    _v4 = GnomeKeyring::AttributeList.from(attributes)
-    _v5 = GirFFI::InPointer.from_utf8(secret)
-    _v7 = FFI::MemoryPointer.new :uint32
-    _v8 = GnomeKeyring::Lib.gnome_keyring_item_create_sync(_v1, type, _v3, _v4,
-                                                           _v5,
-                                                           update_if_exists,
-                                                           _v7)
-    _v9 = _v7.get_uint32(0)
-    return [_v8, _v9]
+    v1 = GirFFI::InPointer.from_utf8(keyring)
+    v3 = GirFFI::InPointer.from_utf8(display_name)
+    v4 = GnomeKeyring::AttributeList.from(attributes)
+    v5 = GirFFI::InPointer.from_utf8(secret)
+    v7 = FFI::MemoryPointer.new :uint32
+    v8 = GnomeKeyring::Lib.gnome_keyring_item_create_sync(v1, type, v3, v4, v5,
+                                                          update_if_exists, v7)
+    v9 = v7.get_uint32(0)
+    [v8, v9]
   end
 
   def self.item_get_attributes_sync(keyring, id)
-    _v1 = GirFFI::InPointer.from_utf8(keyring)
-    _v3 = FFI::MemoryPointer.new :pointer
-    _v4 = GnomeKeyring::Lib.gnome_keyring_item_get_attributes_sync(_v1, id, _v3)
-    attributes = GnomeKeyring::AttributeList.wrap(_v3.get_pointer(0))
-    return [_v4, attributes]
+    v1 = GirFFI::InPointer.from_utf8(keyring)
+    v3 = FFI::MemoryPointer.new :pointer
+    v4 = GnomeKeyring::Lib.gnome_keyring_item_get_attributes_sync(v1, id, v3)
+    attributes = GnomeKeyring::AttributeList.wrap(v3.get_pointer(0))
+    [v4, attributes]
   end
 
   def self.item_set_attributes_sync(keyring, id, attributes)
-    _v1 = GirFFI::InPointer.from_utf8(keyring)
-    _v3 = GnomeKeyring::AttributeList.from(attributes)
-    GnomeKeyring::Lib.gnome_keyring_item_set_attributes_sync(_v1, id, _v3)
+    v1 = GirFFI::InPointer.from_utf8(keyring)
+    v3 = GnomeKeyring::AttributeList.from(attributes)
+    GnomeKeyring::Lib.gnome_keyring_item_set_attributes_sync(v1, id, v3)
   end
 end

data/tasks/test.rake

@@ -1,19 +1,18 @@
 require 'rake/testtask'
 
 namespace :test do
-
   Rake::TestTask.new(:unit) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/unit/**/*_test.rb']
-    t.ruby_opts += ["-w -Itest"]
+    t.ruby_opts += ['-w -Itest']
   end
 
   Rake::TestTask.new(:integration) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/integration/*_test.rb']
-    t.ruby_opts += ["-w -Itest"]
+    t.ruby_opts += ['-w -Itest']
   end
 end
 
 desc 'Run unit and integration tests'
-task :test => ['test:unit', 'test:integration']
+task test: ['test:unit', 'test:integration']

data/tasks/yardoc.rake

@@ -3,7 +3,8 @@ begin
 
   YARD::Rake::YardocTask.new do |t|
     t.files   = ['lib/**/*.rb']
-    t.options = ['--private', '--protected', '--readme',  'README.md']
+    t.options = ['--private', '--protected', '--readme', 'README.md']
   end
 rescue LoadError
+  nil # Do nothing
 end

data/test/unit/gir_ffi-gnome_keyring/attribute_list_test.rb

@@ -1,38 +1,38 @@
 require 'test_helper'
 
 describe GnomeKeyring::AttributeList do
-  it "descends from GLib::Array" do
+  it 'descends from GLib::Array' do
     GnomeKeyring::AttributeList.ancestors.must_include GLib::Array
   end
 
-  describe ".new" do
-    it "takes no arguments" do
+  describe '.new' do
+    it 'takes no arguments' do
       GnomeKeyring::AttributeList.new
       pass
     end
   end
 
-  describe ".wrap" do
-    it "wraps its argument in an AttributeList object" do
+  describe '.wrap' do
+    it 'wraps its argument in an AttributeList object' do
       orig = GnomeKeyring::AttributeList.new
       copy = GnomeKeyring::AttributeList.wrap(orig.to_ptr)
       copy.to_ptr.must_equal orig.to_ptr
     end
   end
 
-  describe ".from" do
+  describe '.from' do
     it "wraps its argument's pointer in an AttributeList object" do
       orig = GnomeKeyring::AttributeList.new
       copy = GnomeKeyring::AttributeList.from(orig)
       copy.to_ptr.must_equal orig.to_ptr
     end
 
-    it "wraps an empty array" do
+    it 'wraps an empty array' do
       attr = GnomeKeyring::AttributeList.from([])
       attr.to_a.must_equal []
     end
 
-    it "wraps an array of Attribute" do
+    it 'wraps an array of Attribute' do
       att = GnomeKeyring::Attribute.new
       att.name = 'foo'
       attr = GnomeKeyring::AttributeList.from([att])
@@ -42,8 +42,8 @@ describe GnomeKeyring::AttributeList do
     end
   end
 
-  describe "#append_string" do
-    it "appends a string attribute" do
+  describe '#append_string' do
+    it 'appends a string attribute' do
       list = GnomeKeyring::AttributeList.new
       list.append_string 'foo', 'bar'
       attr = list.index(0)
@@ -53,8 +53,8 @@ describe GnomeKeyring::AttributeList do
     end
   end
 
-  describe "#append_uint32" do
-    it "appends a uint32 attribute" do
+  describe '#append_uint32' do
+    it 'appends a uint32 attribute' do
       list = GnomeKeyring::AttributeList.new
       list.append_uint32 'baz', 42
       attr = list.index(0)

data/test/unit/gir_ffi-gnome_keyring/attribute_test.rb

@@ -1,38 +1,38 @@
 require 'test_helper'
 
 describe GnomeKeyring::Attribute do
-  describe ".list_new" do
-    it "is private" do
+  describe '.list_new' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_new }.must_raise NoMethodError
     end
   end
 
-  describe ".list_append_string" do
-    it "is private" do
+  describe '.list_append_string' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_append_string }.must_raise NoMethodError
     end
   end
 
-  describe ".list_append_uint32" do
-    it "is private" do
+  describe '.list_append_uint32' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_append_uint32 }.must_raise NoMethodError
     end
   end
 
-  describe ".list_copy" do
-    it "is private" do
+  describe '.list_copy' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_copy }.must_raise NoMethodError
     end
   end
 
-  describe ".list_free" do
-    it "is private" do
+  describe '.list_free' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_free }.must_raise NoMethodError
     end
   end
 
-  describe ".list_to_glist" do
-    it "is private" do
+  describe '.list_to_glist' do
+    it 'is private' do
       proc { GnomeKeyring::Attribute.list_to_glist }.must_raise NoMethodError
     end
   end

data/test/unit/gir_ffi-gnome_keyring/found_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 describe GnomeKeyring::Found do
   let(:instance) { GnomeKeyring::Found.new }
 
-  describe "#attributes" do
-    it "returns nil by default" do
+  describe '#attributes' do
+    it 'returns nil by default' do
       attrs = instance.attributes
       attrs.must_be_nil
     end
 
-    it "returns an assigned AttributeList" do
+    it 'returns an assigned AttributeList' do
       attrs = GnomeKeyring::AttributeList.new
       struct = GnomeKeyring::Found::Struct.new(instance.to_ptr)
       struct[:attributes] = attrs.to_ptr
@@ -20,8 +20,8 @@ describe GnomeKeyring::Found do
     end
   end
 
-  describe "#attributes=" do
-    it "assigns its argument to the correct struct member" do
+  describe '#attributes=' do
+    it 'assigns its argument to the correct struct member' do
       attrs = GnomeKeyring::AttributeList.new
       instance.attributes = attrs
       struct = GnomeKeyring::Found::Struct.new(instance.to_ptr)

data/test/unit/gir_ffi-gnome_keyring_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 describe GnomeKeyring do
-  describe ".find_items_sync" do
-    it "calls Lib.gnome_keyring_find_items_sync with the correct values" do
+  describe '.find_items_sync' do
+    it 'calls Lib.gnome_keyring_find_items_sync with the correct values' do
       body = lambda { |type, attrs, listptr|
         type.must_equal :generic_secret
         attrs.must_be_instance_of GnomeKeyring::AttributeList
@@ -18,14 +18,14 @@ describe GnomeKeyring do
     end
   end
 
-  describe ".item_create_sync" do
-    it "calls Lib.gnome_keyring_item_create_sync with the correct values" do
+  describe '.item_create_sync' do
+    it 'calls Lib.gnome_keyring_item_create_sync with the correct values' do
       body = lambda { |keyring, type, display_name, attributes, secret, update_if_exists, item_id|
-        keyring.to_utf8.must_equal "foo"
+        keyring.to_utf8.must_equal 'foo'
         type.must_equal :generic_secret
-        display_name.to_utf8.must_equal "bar"
+        display_name.to_utf8.must_equal 'bar'
         attributes.must_be_instance_of GnomeKeyring::AttributeList
-        secret.to_utf8.must_equal "secret-name"
+        secret.to_utf8.must_equal 'secret-name'
         update_if_exists.must_equal false
 
         item_id.put_int32 0, 42
@@ -33,46 +33,46 @@ describe GnomeKeyring do
       }
 
       GnomeKeyring::Lib.stub :gnome_keyring_item_create_sync, body do
-        code, id = GnomeKeyring.item_create_sync("foo",
-                                                   :generic_secret,
-                                                   "bar",
-                                                   [],
-                                                   "secret-name",
-                                                   false)
+        code, id = GnomeKeyring.item_create_sync('foo',
+                                                 :generic_secret,
+                                                 'bar',
+                                                 [],
+                                                 'secret-name',
+                                                 false)
         code.must_equal :ok
         id.must_equal 42
       end
     end
   end
 
-  describe ".item_get_attributes_sync" do
-    it "calls Lib.gnome_keyring_item_get_attributes_sync with the correct values" do
+  describe '.item_get_attributes_sync' do
+    it 'calls Lib.gnome_keyring_item_get_attributes_sync with the correct values' do
       body = lambda { |keyring, id, attributes|
-        keyring.to_utf8.must_equal "foo"
+        keyring.to_utf8.must_equal 'foo'
         id.must_equal 42
         attributes.must_be_instance_of FFI::MemoryPointer
         :ok
       }
 
       GnomeKeyring::Lib.stub :gnome_keyring_item_get_attributes_sync, body do
-        code, list = GnomeKeyring.item_get_attributes_sync "foo", 42
+        code, list = GnomeKeyring.item_get_attributes_sync 'foo', 42
         code.must_equal :ok
         list.must_be_nil
       end
     end
   end
 
-  describe ".item_set_attributes_sync" do
-    it "calls Lib.gnome_keyring_item_set_attributes_sync with the correct values" do
+  describe '.item_set_attributes_sync' do
+    it 'calls Lib.gnome_keyring_item_set_attributes_sync with the correct values' do
       body = lambda { |keyring, id, attributes|
-        keyring.to_utf8.must_equal "foo"
+        keyring.to_utf8.must_equal 'foo'
         id.must_equal 42
         attributes.must_be_instance_of GnomeKeyring::AttributeList
         :ok
       }
 
       GnomeKeyring::Lib.stub :gnome_keyring_item_set_attributes_sync, body do
-        result = GnomeKeyring.item_set_attributes_sync "foo", 42, []
+        result = GnomeKeyring.item_set_attributes_sync 'foo', 42, []
         result.must_equal :ok
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gnome_keyring
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 description: Bindings for GnomeKeyring generated by GirFFI, with overrides.
 email:
 - matijs@matijs.net
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: GirFFI-based binding to GnomeKeyring