aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-01 14:07:24 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-01 14:07:24 -0200
commitec02fa7e647d7cd2b8b93a779fd16c655abf38ab (patch)
tree8e8a81df9928b39dbc5d6091ef1a659cd16de552
parent76d0fabcaee4b8a6bdf8c00df45b1813b87e22f2 (diff)
downloadkeyringer-ec02fa7e647d7cd2b8b93a779fd16c655abf38ab.tar.gz
keyringer-ec02fa7e647d7cd2b8b93a779fd16c655abf38ab.tar.bz2
Moving Fs to backend
-rw-r--r--lib/backend.rb1
-rw-r--r--lib/backend/fs.rb (renamed from lib/keyring/fs.rb)2
-rw-r--r--lib/keyring.rb1
-rw-r--r--lib/keyring/crypt.rb2
4 files changed, 3 insertions, 3 deletions
diff --git a/lib/backend.rb b/lib/backend.rb
index 6275bcb..76abd01 100644
--- a/lib/backend.rb
+++ b/lib/backend.rb
@@ -25,6 +25,7 @@ require 'git'
# internal requires
$:.unshift File.dirname(__FILE__)
+require 'backend/fs'
require 'backend/git'
require 'backend/crypt'
require 'backend/recipients_store'
diff --git a/lib/keyring/fs.rb b/lib/backend/fs.rb
index 26bdcb8..b657ec9 100644
--- a/lib/keyring/fs.rb
+++ b/lib/backend/fs.rb
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-module Keyring
+module Backend
class Fs
def get_as_string(filename)
data = ''
diff --git a/lib/keyring.rb b/lib/keyring.rb
index 31d9e11..65927dd 100644
--- a/lib/keyring.rb
+++ b/lib/keyring.rb
@@ -22,6 +22,5 @@
$:.unshift File.dirname(__FILE__)
require 'backend'
require 'keyring/crypt'
-require 'keyring/fs'
require 'keyring/recipients'
require 'keyring/user_config'
diff --git a/lib/keyring/crypt.rb b/lib/keyring/crypt.rb
index 06b8ad7..8f0ac5d 100644
--- a/lib/keyring/crypt.rb
+++ b/lib/keyring/crypt.rb
@@ -21,7 +21,7 @@
module Keyring
class Crypt
def decrypt(filename)
- file = Fs.new()
+ file = Backend::Fs.new()
content = file.get_as_string(filename)
crypt = Backend::Crypt.new(nil)
return crypt.decrypt(content)