diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/keyring/user_config.rb | 10 | ||||
-rw-r--r-- | lib/keyringer.rb | 2 | ||||
-rw-r--r-- | lib/keyringer/actions/ls.rb (renamed from lib/keyringer/checker.rb) | 10 |
3 files changed, 16 insertions, 6 deletions
diff --git a/lib/keyring/user_config.rb b/lib/keyring/user_config.rb index aaf79aa..21a8c33 100644 --- a/lib/keyring/user_config.rb +++ b/lib/keyring/user_config.rb @@ -23,10 +23,14 @@ module Keyring include Singleton def initialize + self.load + self.check + end + + def load @user_config = ENV['HOME'] + '/.keyringer/config' @keyrings = Backend::parse_config(@user_config) @path = @keyrings.get_value($keyring) - raise "No path configuration for #{$keyring} keyring." if @path.nil? end def keyrings @@ -36,5 +40,9 @@ module Keyring def path @path end + + def check + raise "No keydir configured for #{$keyring} keyring." if @path.nil? + end end end diff --git a/lib/keyringer.rb b/lib/keyringer.rb index f271dd1..b8d4595 100644 --- a/lib/keyringer.rb +++ b/lib/keyringer.rb @@ -26,11 +26,11 @@ $:.unshift File.dirname(__FILE__) require 'keyring' require 'keyringer/bash_wrapper' require 'keyringer/parser' -require 'keyringer/checker' require 'keyringer/console' require 'keyringer/actions/decrypt' require 'keyringer/actions/recipients' require 'keyringer/actions/init' +require 'keyringer/actions/ls' module Keyringer VERSION = '2.0-alpha' diff --git a/lib/keyringer/checker.rb b/lib/keyringer/actions/ls.rb index 5369b95..6f295ad 100644 --- a/lib/keyringer/checker.rb +++ b/lib/keyringer/actions/ls.rb @@ -19,10 +19,12 @@ # module Keyringer - class Checker - def initialize - path = Keyring::UserConfig.instance.path - raise "No path configuration for #{$keyring} keyring." if path.nil? + module Actions + class Ls + def execute + path = Keyring::UserConfig.instance.path + Dir.entries(path + '/keys').join(' ') + end end end end |