aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-01 17:25:57 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-01 17:25:57 -0200
commit016dda3698847024d102c309039f2d6f5511e6c0 (patch)
treee0ce793db473b92823ff80e3ecf6c981fd745a79
parentc4afc03b51d80f13ea5e379b192ed2792c10cf56 (diff)
downloadkeyringer-016dda3698847024d102c309039f2d6f5511e6c0.tar.gz
keyringer-016dda3698847024d102c309039f2d6f5511e6c0.tar.bz2
Adding back Keyring Fs class
-rw-r--r--lib/keyring.rb1
-rw-r--r--lib/keyringer/actions/ls.rb7
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/keyring.rb b/lib/keyring.rb
index 65927dd..ca54109 100644
--- a/lib/keyring.rb
+++ b/lib/keyring.rb
@@ -21,6 +21,7 @@
# internal requires
$:.unshift File.dirname(__FILE__)
require 'backend'
+require 'keyring/fs'
require 'keyring/crypt'
require 'keyring/recipients'
require 'keyring/user_config'
diff --git a/lib/keyringer/actions/ls.rb b/lib/keyringer/actions/ls.rb
index 2401a1d..c9b0fd1 100644
--- a/lib/keyringer/actions/ls.rb
+++ b/lib/keyringer/actions/ls.rb
@@ -22,11 +22,8 @@ module Keyringer
module Actions
class Ls
def execute
- path = Keyring::UserConfig.instance.path
- files = Dir.entries(path + "/keys/#{$args[0]}")
- files.delete('.')
- files.delete('..')
- files.join(' ')
+ fs = Keyring::Fs.new
+ fs.listKeys($args[0]).join(' ')
end
end
end