From 5196fb316c1afc2b6b0d11132e105c7f1fb841fe Mon Sep 17 00:00:00 2001
From: Zapata <zapata@xs4all.nl>
Date: Sat, 29 Jan 2011 22:14:19 +0100
Subject: preliminary support for recipient management 2

---
 bin/keyringer    | 20 +++++++++++---------
 lib/backend.rb   |  1 +
 lib/keyring.rb   |  1 +
 lib/keyringer.rb |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bin/keyringer b/bin/keyringer
index 74dfcb1..d6ab3d4 100755
--- a/bin/keyringer
+++ b/bin/keyringer
@@ -12,16 +12,18 @@ end
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'keyringer'
 begin 
-  action = Keyringer.const_get(ARGV[1].capitalize)
-
-  if action.is_a?(Class)
-    instance = action.new
-    output   = instance.execute
-    puts output
+  begin
+    action = Keyringer.const_get(ARGV[1].capitalize)
+  rescue NameError
+    wrapper = Keyringer::BashWrapper.new
+    wrapper.execute
+  else
+    if action.is_a?(Class)
+      instance = action.new
+      output   = instance.execute
+      puts output
+    end
   end
-rescue NameError
-  wrapper = Keyringer::BashWrapper.new
-  wrapper.execute
 rescue SystemExit => e
   exit e.status
 rescue Exception => e
diff --git a/lib/backend.rb b/lib/backend.rb
index 18f220c..6be9016 100644
--- a/lib/backend.rb
+++ b/lib/backend.rb
@@ -1,3 +1,4 @@
 # internal requires
 $:.unshift File.dirname(__FILE__)
 require 'backend/crypt'
+require 'backend/recipients_store'
diff --git a/lib/keyring.rb b/lib/keyring.rb
index 7bfdb86..d3e9260 100644
--- a/lib/keyring.rb
+++ b/lib/keyring.rb
@@ -3,3 +3,4 @@ $:.unshift File.dirname(__FILE__)
 require 'backend'
 require 'keyring/crypt'
 require 'keyring/fs'
+require 'keyring/recipients'
diff --git a/lib/keyringer.rb b/lib/keyringer.rb
index 9d455d1..cd9c68a 100644
--- a/lib/keyringer.rb
+++ b/lib/keyringer.rb
@@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__)
 require 'keyring'
 require 'keyringer/decrypt'
 require 'keyringer/bash_wrapper'
+require 'keyringer/recipients'
 
 module Keyring
   VERSION = '2.0-alpha'
-- 
cgit v1.2.3