aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/keyringer.rb5
-rw-r--r--lib/keyringer/actions/decrypt.rb12
-rw-r--r--lib/keyringer/decrypt.rb10
-rw-r--r--lib/keyringer/parser.rb59
-rw-r--r--lib/parser.rb53
5 files changed, 74 insertions, 65 deletions
diff --git a/lib/keyringer.rb b/lib/keyringer.rb
index 9d455d1..5b925fe 100644
--- a/lib/keyringer.rb
+++ b/lib/keyringer.rb
@@ -1,9 +1,10 @@
# internal requires
$:.unshift File.dirname(__FILE__)
require 'keyring'
-require 'keyringer/decrypt'
require 'keyringer/bash_wrapper'
+require 'keyringer/parser'
+require 'keyringer/actions/decrypt'
-module Keyring
+module Keyringer
VERSION = '2.0-alpha'
end
diff --git a/lib/keyringer/actions/decrypt.rb b/lib/keyringer/actions/decrypt.rb
new file mode 100644
index 0000000..8fdd175
--- /dev/null
+++ b/lib/keyringer/actions/decrypt.rb
@@ -0,0 +1,12 @@
+module Keyringer
+ module Actions
+ class Decrypt
+ def execute
+ filename = $args[0]
+ crypt = Keyring::Crypt.new
+ output = crypt.decrypt(filename)
+ return output
+ end
+ end
+ end
+end
diff --git a/lib/keyringer/decrypt.rb b/lib/keyringer/decrypt.rb
deleted file mode 100644
index a36d6d9..0000000
--- a/lib/keyringer/decrypt.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Keyringer
- class Decrypt
- def execute
- filename = $args[0]
- crypt = Keyring::Crypt.new
- output = crypt.decrypt(filename)
- return output
- end
- end
-end
diff --git a/lib/keyringer/parser.rb b/lib/keyringer/parser.rb
new file mode 100644
index 0000000..a3e71cf
--- /dev/null
+++ b/lib/keyringer/parser.rb
@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+#
+# Keyringer secret management system.
+#
+# Copyright (C) 2011 Keyringer Development Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+module Keyringer
+ class Parser
+ def initialize
+ require 'optparse'
+
+ options = {}
+ optparse = OptionParser.new do |opts|
+ # Set a banner, displayed at the top of the help screen.
+ opts.banner = "Usage: #{File.basename($0)} [options] file1 file2 ..."
+
+ # TODO: example option
+ options[:verbose] = false
+ opts.on( '-v', '--verbose', 'Output more information' ) do
+ options[:verbose] = true
+ end
+
+ # TODO: example option
+ options[:logfile] = nil
+ opts.on( '-l', '--logfile FILE', 'Write log to FILE' ) do |file|
+ options[:logfile] = file
+ end
+
+ # This displays the help screen
+ opts.on( '-h', '--help', 'Display this help message' ) do
+ puts opts
+ exit
+ end
+ end
+
+ # Parse using 'parse!' to remove all options found at ARGV
+ optparse.parse!
+
+ # Parse positional arguments
+ $args = ARGV
+ $keyring = $args.shift
+ $action = $args.shift
+ end
+ end
+end
diff --git a/lib/parser.rb b/lib/parser.rb
deleted file mode 100644
index 13895c3..0000000
--- a/lib/parser.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Keyringer secret management system.
-#
-# Copyright (C) 2011 Keyringer Development Team.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-require 'optparse'
-
-options = {}
-optparse = OptionParser.new do |opts|
- # Set a banner, displayed at the top of the help screen.
- opts.banner = "Usage: #{File.basename($0)} [options] file1 file2 ..."
-
- # TODO: example option
- options[:verbose] = false
- opts.on( '-v', '--verbose', 'Output more information' ) do
- options[:verbose] = true
- end
-
- # TODO: example option
- options[:logfile] = nil
- opts.on( '-l', '--logfile FILE', 'Write log to FILE' ) do |file|
- options[:logfile] = file
- end
-
- # This displays the help screen
- opts.on( '-h', '--help', 'Display this help message' ) do
- puts opts
- exit
- end
-end
-
-# Parse using 'parse!' to remove all options found at ARGV
-optparse.parse!
-
-# Parse positional arguments
-$args = ARGV
-$keyring = $args.shift
-$action = $args.shift