From 5d0ae3722c6889fff8c00018066662260a71f3e2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 29 Jan 2011 19:57:28 -0200 Subject: Minor parsing changes --- lib/keyringer.rb | 1 + lib/keyringer/parser.rb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/keyringer.rb b/lib/keyringer.rb index 5b925fe..1f5dace 100644 --- a/lib/keyringer.rb +++ b/lib/keyringer.rb @@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__) require 'keyring' require 'keyringer/bash_wrapper' require 'keyringer/parser' +require 'keyringer/checker' require 'keyringer/actions/decrypt' module Keyringer diff --git a/lib/keyringer/parser.rb b/lib/keyringer/parser.rb index a3e71cf..ee6ddae 100644 --- a/lib/keyringer/parser.rb +++ b/lib/keyringer/parser.rb @@ -26,7 +26,7 @@ module Keyringer 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 ..." + opts.banner = "Usage: #{File.basename($0)} [arguments]" # TODO: example option options[:verbose] = false @@ -54,6 +54,10 @@ module Keyringer $args = ARGV $keyring = $args.shift $action = $args.shift + + if !$keyring or !$action + opts.on + end end end end -- cgit v1.2.3