Merge remote branch 'origin/ruby' into ruby

Conflicts:
	bin/keyringer
	lib/keyringer.rb

7 files changed, 100 insertions, 22 deletions

diff --git a/bin/keyringer b/bin/keyringer
index d6ab3d4..098719b 100755
--- a/bin/keyringer
+++ b/bin/keyringer
@@ -1,19 +1,33 @@
 #!/usr/bin/env ruby
-
+#
+# Keyringer key 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/>.
+#
 # TODO
 # - a lot of things
 
-def usage
-  puts "Usage:
-#{File.basename($0)} TODO! "
-  exit 1
-end
-
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'keyringer'
+
 begin 
+  Keyringer::Parser.new
+  puts "Performing action #{$action.capitalize}"
   begin
-    action = Keyringer.const_get(ARGV[1].capitalize)
+    action = Keyringer::Actions.const_get($action.capitalize)
   rescue NameError
     wrapper = Keyringer::BashWrapper.new
     wrapper.execute
@@ -28,6 +42,8 @@ rescue SystemExit => e
   exit e.status
 rescue Exception => e
   puts "Fatal error: #{e.inspect}"
+  puts e.backtrace.join("\n")
+
   exit 1
 end
 
diff --git a/lib/keyringer.rb b/lib/keyringer.rb
index cd9c68a..bef6892 100644
--- a/lib/keyringer.rb
+++ b/lib/keyringer.rb
@@ -1,10 +1,11 @@
 # internal requires
 $:.unshift File.dirname(__FILE__)
 require 'keyring'
-require 'keyringer/decrypt'
 require 'keyringer/bash_wrapper'
-require 'keyringer/recipients'
+require 'keyringer/parser'
+require 'keyringer/actions/decrypt'
+require 'keyringer/actions/recipients'
 
-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/recipients.rb b/lib/keyringer/actions/recipients.rb
index 16b5a88..16b5a88 100644
--- a/lib/keyringer/recipients.rb
+++ b/lib/keyringer/actions/recipients.rb
diff --git a/lib/keyringer/bash_wrapper.rb b/lib/keyringer/bash_wrapper.rb
index ba4b4d0..b93a080 100644
--- a/lib/keyringer/bash_wrapper.rb
+++ b/lib/keyringer/bash_wrapper.rb
@@ -1,7 +1,7 @@
 module Keyringer
   class BashWrapper
     def execute
-      exec("keyringer " + ARGV.join(' '))
+      exec("keyringer #{$keyring} #{$action} " + $args.join(' '))
     end
   end
 end
diff --git a/lib/keyringer/decrypt.rb b/lib/keyringer/decrypt.rb
deleted file mode 100644
index 9f872aa..0000000
--- a/lib/keyringer/decrypt.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Keyringer
-  class Decrypt
-    def execute
-      filename = ARGV[2]
-      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