oplop 0.0.2 → 0.0.3

data/bin/oplop

@@ -1,48 +1,65 @@
 #!/usr/bin/env ruby
 oplop_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(oplop_dir) unless $LOAD_PATH.include?(oplop_dir)
+
 require 'oplop'
 require 'oplop/cli'
 require 'highline/import'
+require 'optparse'
 
+# -- options
+options = {}
+optparse = OptionParser.new do |opts|
+  opts.banner = Oplop::Cli.banner
 
-if ARGV.first =~ /\-help|\?/ or ARGV.empty?
-  puts Oplop::Cli.help
-  exit 0
-end
+  options[:verbose] = false
+  opts.on( '-v', '--verbose', 'Output the password to STDOUT' ) do
+    options[:verbose] = true
+  end
 
-new_or_label = ARGV.shift
-mode = :query
+  options[:new] = false
+  opts.on( '-n', '--new', 'New mode (2 prompt for master)') do
+    options[:new] = true
+  end
+
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    puts "\n"
+    puts Oplop::Cli.help
+    exit
+  end
 
-label = if new_or_label =~ /\-new/
-          mode = :new
-          ARGV.shift || ""
-        else
-          new_or_label
-        end
+end.parse!
+
+# -- program
+label = ARGV.shift
 
 if label.empty?
   puts "!! You need to pass in a label!"
   exit 2
 end
 
-
-case mode
-when :query
-  master = ask("Enter your master password: ") { |q| q.echo = "*" }
-when :new
+if options[:new]
   master = ask("Enter your master password: ") { |q| q.echo = "*" }
   master_confirm = ask("Enter your master password (again): ") { |q| q.echo = "*" }
   if (master != master_confirm)
     puts "!! Your master and confirm don't match!"
     exit 2
   end
+else
+  master = ask("Enter your master password: ") { |q| q.echo = "*" }
 end
 
 password = Oplop.password(:label => label, :master => master)
 
-puts "\n    Password for #{label}:\t#{password}\n\n"
+if options[:verbose]
+  puts "\n    Password for #{label}:\t#{password}\n\n"
+end
 
 if Oplop::Cli.copy_to_clipboard(password)
-  print "This has been copied to your clipboard.\n"
+  print "Your #{label} password has been copied to your clipboard.  \n"
+else
+  print "!! Could not copy to clipboard, try installing xclip. "
+  print "Run with --verbose flag to see password on STDOUT." unless options[:verbose]
+  print "\n"
 end

data/lib/oplop.rb

@@ -10,31 +10,33 @@ module Oplop
   #
   def self.password(args={})
     unless (args.keys.include?(:master) && args.keys.include?(:label))
-      raise ArgumentError.new "Master and label are required arguments."
+      raise ArgumentError.new 'Master and label are required arguments.'
     end
     
-    master_label = "%s%s" % [ args.delete(:master), args.delete(:label) ]
+    master_label = '%s%s' % [ args.delete(:master), args.delete(:label) ]
     
-    raise ArgumentError.new "Unknown keys #{args.keys.join(",")}." if args.keys.any?
+    raise ArgumentError.new "Unknown keys #{args.keys.join(',')}." if args.keys.any?
     
-    password = urlsafe_b64encode(master_label)
+
+    password = urlsafe_b64encode(Digest::MD5.digest(master_label))
     
     if password.respond_to?(:encode)
       password = password.encode('UTF-8')
     end
     
     if m = password.match(/\d+/)
-      password = "%s%s" % [ m[0], password ] if (m.begin(0) >= LENGTH)
+      password = '%s%s' % [ m[0], password ] if (m.begin(0) >= LENGTH)
     else
-      password = "1%s" % password
+      password = '1%s' % password
     end
     
     password[0,LENGTH]
   end
 
   # See http://www.ietf.org/rfc/rfc4648.txt
+  # Ruby 1.8.x does not have this as part of the Base64 lib
   def self.urlsafe_b64encode(string)
-    Base64.encode64(Digest::MD5.digest(string)).tr('+/', '-_').gsub("\n",'')
+    Base64.encode64(string).tr('+/', '-_')
   end
 
 end

data/lib/oplop/cli.rb

@@ -1,32 +1,35 @@
 module Oplop
   module Cli
-    
+   
+    def self.banner
+      "Usage: oplop [OPTIONS] [label]"
+    end
+
     def self.help
       help = <<-HELP
-Usage: oplap [OPTION] [label]
-
-Simple cli program to generate oplap passwords.
+This is a simple cli program to generate oplop passwords.
 
-You will be prompted for your master password.  If you are 
-on a Mac (or have pbcopy installed), or if you have xclip 
-installed, the password will be copied to your clipboard.
+You will be prompted for your master password.  
 
-Options:
+The default behavior is to copy the password to your clipboard, and
+not display it.  This works if you are on a Mac (and/or have pbcopy 
+installed), or if you have xclip (installed for Linux).
 
-  --help        : This help message
-  --new         : Runs in new mode, double prompts for
-                  master password.
-  
-Examples:
+If you do not have pbcopy or xclip, you will have to run the program
+in verbose mode (--verbose).
 
-Get my github password:
+Here are some examples:
 
-  oplap github
+Copy my github password to clipboard:
+  oplop github
 
-Generate a new password for amazon:
+Print my gmail password to STDOUT.
+  oplop --verbose gmail
 
-  oplap --new amazon
+Copy a new password for amazon (prompts for master twice):
+  oplop --new amazon
 
+Feedback, patches and bugs: https://github.com/bkaney/oplop
 HELP
     end
 

data/lib/oplop/version.rb

@@ -1,3 +1,3 @@
 module Oplop
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,95 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oplop
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - Brian Kaney
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-12 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-14 00:00:00.000000000 -04:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &85745850 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *85745850
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &85789370 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *85789370
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &85789090 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *85789090
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &85788830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *85788830
 description: Provides a ruby library and command line tool for Oplop
-email: 
+email:
 - brian@vermonster.com
-executables: 
+executables:
 - oplop
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -105,36 +79,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/bkaney/oplop
 licenses: []
-
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oplop
-rubygems_version: 1.3.7
-signing_key: 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: Oplop for Ruby
 test_files: []
-