key_control 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ae894b32a61b12e85b7ba01c280974f6bcca55
-  data.tar.gz: 687ea1f4369b0753b879e61dfe875742a121fbf5
+  metadata.gz: a226c9ceecfaba7c34e789b1b075803b1c31fda1
+  data.tar.gz: f5205dc20534d1be565527d3905ac2e51a6b0853
 SHA512:
-  metadata.gz: e8608272a5c149c1b536fb888645508236c14ea1f546302dbf8b26c262e01cc6cf738f8f2e05df45948934a42f92305fd84b73af5f67c5c694ce6364fa9b24e3
-  data.tar.gz: 83d071c944ecdecd8ded2653bd268ef002344d151706b501fe03dc29bf1529da9488679b2c32cfb09f71ce36839aa2779847ce50408392ede965e1c55aaaf320
+  metadata.gz: c7f52114b183f8c1be55fd2e9c49ae3f81cf2bde49e8d2940e4bd1b1deeba0bdba811634c2ed1258e0afe9599efc2d0aeed10b5751e60ce1790d64a7208c07e6
+  data.tar.gz: 73b9a063cfe17fdda8ccce6dfb1d61cc5838a0f8130c345d96e4e7a1a9bc4cc66a6097610f4e1c44865a8e6a0cbeb212ef3fc780798916fc6f1f3b84be8fe2ad

data/lib/key_control/key_ring.rb

@@ -2,6 +2,8 @@ module KeyControl
 
   class KeyRing
 
+    attr_reader :system
+
     # Public: Get a new KeyControl::KeyRing instance with the specified keyring
     # identifier.
     #
@@ -20,7 +22,7 @@ module KeyControl
     #
     # Returns nothing.
     def []=(name, data)
-      execute(:add, "user", name, data, data.length, @keyring)
+      system.run(:add, "user", name, data, data.length, @keyring)
     end
 
     # Public: Get the data matching the passed description from the keychain.
@@ -29,26 +31,17 @@ module KeyControl
     #
     # Returns the requested data or nil.
     def [](name)
-      handle = execute(:search, "user", name, nil, @keyring)
+      handle = system.run(:search, "user", name, nil, @keyring)
       return nil if handle == -1
 
-      length = execute(:read, handle, "", 0)
-      buffer = "\x00" * length
-      execute(:read, handle, buffer, length)
-
-      buffer
+      system.get(:read, handle)
     end
 
-    private
-
-    # Private: Execute the requested action in keyctl.
-    #
-    # action - The action to perform.
-    # args   - A list of arguments which should be passed to the action.
+    # Public: Inspect the structure of and data stored in the current keyring.
     #
-    # Returns the stdout value returned by the call.
-    def execute(action, *args)
-      @system.send(action).call(*args)
+    # Returns
+    def inspect
+      system.get(:describe, @keyring)
     end
   end
 end

data/lib/key_control/system.rb

@@ -4,7 +4,59 @@ module KeyControl
 
   class System
 
-    # Public: Get a proc representing the add_key system call.
+    # Public: Execute the requested action in keyctl.
+    #
+    # action - The action to perform.
+    # args   - A list of arguments which should be passed to the action.
+    #
+    # Returns the stdout value returned by the call.
+    def run(action, *args)
+      send(action).call(*args)
+    end
+
+    # Public: Execute the requested keyctl action, buffering the output into a
+    # string in multiple passes.
+    #
+    # action - The action to perform.
+    # args   - A list of arguments which should be passed to the action.
+    #
+    # Returns a String containing the buffered output.
+    def get(action, *args)
+      length = run(action, *args, "", 0)
+      buffer = "\x00" * length
+      run(action, *args, buffer, length)
+
+      buffer
+    end
+
+    # Public: Get a symbol representing the reason for the last error set by a
+    # system call.
+    #
+    # Returns a Symbol or nil.
+    def error
+      Errno.constants.detect do |error_name|
+        errno = Errno.const_get(error_name)
+        errno::Errno == Fiddle.last_error
+      end
+    end
+
+    private
+
+    # Private: Get a handle representing the system calls available through
+    # libkeyutils.so.
+    #
+    # Returns a Fiddle::Handle.
+    def keyutils
+      @keyutils ||= KeyControl::LIBRARIES.detect do |library|
+        begin
+          break Fiddle::Handle.new(library)
+        rescue Fiddle::DLError
+          nil
+        end
+      end
+    end
+
+    # Private: Get a proc representing the add_key system call.
     #
     # Returns a Fiddle::Function.
     def add
@@ -18,7 +70,7 @@ module KeyControl
         Fiddle::TYPE_INT )
     end
 
-    # Public: Get a proc representing the request_key system call.
+    # Private: Get a proc representing the request_key system call.
     #
     # Returns a Fiddle::Function.
     def search
@@ -31,7 +83,7 @@ module KeyControl
         Fiddle::TYPE_INT )
     end
 
-    # Public: Get a proc representing the keyctl_read system call.
+    # Private: Get a proc representing the keyctl_read system call.
     #
     # Returns a Fiddle::Function.
     def read
@@ -43,20 +95,16 @@ module KeyControl
         Fiddle::TYPE_LONG )
     end
 
-    private
-
-    # Private: Get a handle representing the system calls available through
-    # libkeyutils.so.
+    # Private: Get a proc representing the keyctl_describe system call.
     #
-    # Returns a Fiddle::Handle.
-    def keyutils
-      @keyutils ||= KeyControl::LIBRARIES.detect do |library|
-        begin
-          break Fiddle::Handle.new(library)
-        rescue Fiddle::DLError
-          nil
-        end
-      end
+    # Returns a Fiddle::Function.
+    def describe
+      @describe ||= Fiddle::Function.new(
+        keyutils["keyctl_describe"],
+        [ Fiddle::TYPE_INT,
+          Fiddle::ALIGN_CHAR,
+          Fiddle::TYPE_SIZE_T ],
+        Fiddle::TYPE_INT )
     end
   end
 end

data/lib/key_control/version.rb

@@ -1,3 +1,3 @@
 module KeyControl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: key_control
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A simple wrapper for the `keyctl` utility.