oplop 0.0.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5923dcc29b4f4b6afbca3f1c0e46385040152e3c
-  data.tar.gz: d37b05ca0e044ce15b5efedd05268a7b89b74da3
+SHA256:
+  metadata.gz: fe387253f3e7471b962a13a3f4f9f6adf74779a51967b267cebb1cdb2262345c
+  data.tar.gz: 04ebb187af0d95379363d07af159e85b5a6cbbbca711ee2f131e8193e3805ba1
 SHA512:
-  metadata.gz: dadf0a03d6ec98c09b2ee58a9602625423c008363f80d241cf4526e6b25525af1af1a643f4916ca18ed794db9949e8e98d21ea95d4b4a27015f5c34b8f0ee39f
-  data.tar.gz: ab93468e5ab4a3c4becaa9ce1060313f53325353ba01856f877cae2b4b7fdad2a7df11f7241cb0808da533855b13556895b4207e7ea3691ca896db7452758959
+  metadata.gz: 82b7ec63eaabe9d9b3aee0b00631a4d7f8fb74d8a2273418c76e84f39995cd7dd68f4e67b0660d5221767df7faa27aea5476d76f583f0609cf7c9bf0f6ee39bb
+  data.tar.gz: f31f3e781ae750b59f91e46577c2631c755ddde0f3831adf16988985cca245070cae97dfae53427cd3dedf94a7b771ead7f5bd008f27a3100fce415a2a3d246d

data/.ruby-version

@@ -0,0 +1 @@
+2.5.0

data/README.md

@@ -1,22 +1,48 @@
 Oplop
 =====
 
-This is a ruby implementation of Oplop http://code.google.com/p/oplop/
+This is a ruby implementation of Oplop http://code.google.com/p/oplop/, supporting the long oplop variation (see: https://github.com/thedod/loplop).
 
 Install
 =======
 
-    gem install oplop
+```
+gem install oplop
+```
 
 Usage
 =====
 
-    Oplop.password(:master => "master-password", :label => "nickname")
+Oplop and Loplop. Long Oplop defaults to 16 characters and support `<n>*` label
+prefix for specifying length.
+
+These will all produce the same password with the new default 16 character length:
+
+```ruby
+Oplop.password(:master => "master-password", :label => "nickname")
+Oplop.password(:master => "master-password", :label => "16*nickname")
+Oplop.password(:master => "master-password", :label => "nickname", :length => 16)
+```
+
+These will all produce the same password with the legacy 8 character length:
+```
+Oplop.password(:master => "master-password", :label => "*nickname")
+Oplop.password(:master => "master-password", :label => "8*nickname")
+Oplop.password(:master => "master-password", :label => "nickname", :length => 8)
+```
+
+This is a 20-character password
+```
+Oplop.password(:master => "master-password", :label => "20*nickname")
+```
 
 CLI
 ===
 
-This includes an `oplop` program.  Run `oplop --help` for more information.
+This includes an `oplop` program that defaults to 8 character passwords. And a
+new `loplop` program that defaults to 16 character passwords.
+
+Run `oplop --help` for more information.
 
 License
 =======

data/bin/loplop

@@ -0,0 +1,68 @@
+#!/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'
+
+# -- exit nicely if control-c
+Signal.trap("SIGINT") { exit 2 }
+
+# -- options
+options = {}
+optparse = OptionParser.new do |opts|
+  opts.banner = Oplop::Cli.banner
+
+  options[:verbose] = false
+  opts.on( '-v', '--verbose', 'Output the password to STDOUT' ) do
+    options[:verbose] = true
+  end
+
+  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
+
+end.parse!
+
+# -- program
+label = ARGV.shift
+
+if label.nil? or label.empty?
+  puts "!! You need to pass in a label!"
+  exit 2
+end
+
+
+master = ask("Enter your master password: ") { |q| q.echo = "*" }
+
+if options[:new]
+  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
+end
+
+password = Oplop.password(:label => label, :master => master)
+
+if options[:verbose]
+  puts "\n    Password for #{label}:\t#{password}\n\n"
+end
+
+if Oplop::Cli.copy_to_clipboard(password)
+  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/bin/oplop

@@ -53,7 +53,7 @@ if options[:new]
   end
 end
 
-password = Oplop.password(:label => label, :master => master)
+password = Oplop.password(:label => label, :master => master, :length => Oplop::LEGACY_LENGTH)
 
 if options[:verbose]
   puts "\n    Password for #{label}:\t#{password}\n\n"

data/lib/oplop.rb

@@ -1,42 +1,45 @@
 require 'digest/md5'
 require 'base64'
 
-module Oplop
+class Oplop
+  attr_reader :master, :label, :length
 
-  LENGTH = 8
+  LEGACY_LENGTH = 8
+  DEFAULT_LENGTH = 16
 
-  #
-  # Oplop.password(:master => 'p@ssw0rd', :label => 'github')
-  #
   def self.password(args={})
-    unless (args.keys.include?(:master) && args.keys.include?(:label))
-      raise ArgumentError.new 'Master and label are required arguments.'
+    self.new(args).password
+  end
+
+  def initialize(args={})
+    @master = args[:master]
+    @label = args[:label]
+    @length = args[:length] || DEFAULT_LENGTH
+
+    if @label =~ /^([0-9]*)?\*/
+      (@length, @label) = @label.split('*')
+      @length = length.to_i
+      @length = LEGACY_LENGTH if length <= 0
     end
-    
-    master_label = '%s%s' % [ args.delete(:master), args.delete(:label) ]
-    
-    raise ArgumentError.new "Unknown keys #{args.keys.join(',')}." if args.keys.any?
-    
-
-    password = urlsafe_b64encode(Digest::MD5.digest(master_label))
-    
+  end
+
+  def master_label
+    @master_label ||= '%s%s' % [ master, label ]
+  end
+
+  def password
+    password = Base64.urlsafe_encode64(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
     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(string).tr('+/', '-_')
+    password[0,length]
   end
-
 end

data/lib/oplop/cli.rb

@@ -1,8 +1,8 @@
 require 'open3'
 
-module Oplop
+class Oplop
   module Cli
-   
+
     def self.banner
       "Usage: oplop [OPTIONS] [label]"
     end
@@ -11,14 +11,14 @@ module Oplop
       help = <<-HELP
 This is a simple cli program to generate oplop passwords.
 
-You will be prompted for your master password.  
+You will be prompted for your master password.
 
-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).
+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).
 
-If you do not have pbcopy or xclip, you will have to run the program
-in verbose mode (--verbose).
+If you do not have pbcopy or xclip, you will have to run the program in verbose
+mode (--verbose).
 
 Here are some examples:
 
@@ -31,6 +31,20 @@ Print my gmail password to STDOUT.
 Copy a new password for amazon (prompts for master twice):
   oplop --new amazon
 
+NEW: loplop
+
+There is a new cli program called `loplop`, or long oplop.  It will default to
+passwords of 16 characters. It also has a new UX feature to specify the length:
+
+  loplop <n>*<label>
+
+Where <n> is how long the password will be. The max is 22 characters. If you
+start a label with *, it is a short-cut to the legacy length 8 (in other words
+`8*label` and `*label` will generate the same password).
+
+See: https://github.com/thedod/loplop
+
+
 Feedback, patches and bugs: https://github.com/bkaney/oplop
 HELP
     end
@@ -53,6 +67,6 @@ HELP
         end
       end
     end
-    
+
   end
 end

data/lib/oplop/version.rb

@@ -1,3 +1,3 @@
-module Oplop
-  VERSION = "0.0.8"
+class Oplop
+  VERSION = "2.0.0"
 end

data/shippable.yml

@@ -0,0 +1,16 @@
+# language setting
+language: ruby
+
+# version numbers
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - 2.0.0
+ - 2.1.0
+ - jruby-18mode
+ - jruby-19mode
+ - rbx
+ - ruby-head
+ - jruby-head
+ - ree

data/spec/oplop_spec.rb

@@ -2,23 +2,14 @@ require 'spec_helper'
 
 describe Oplop do
   describe ".password" do
-    specify "valid arguments" do
-      expect { Oplop.password(:master => "a", :label => "a") }.not_to raise_error
-    end
-
-    specify "invalid arguments" do
-      expect { Oplop.password }.to raise_error(ArgumentError, /Master and label are required/)
-    end
-
-    specify "invalid arguments" do
-      expect { Oplop.password(:master => "a", :label => "b", :foo => 'c') }.to raise_error(ArgumentError, /Unknown key/)
-    end
-
     context "tests from testdata.json (see Python implementation at http://code.google.com/p/oplop/)" do
       # loop around each "case" in testdata.yml
       Yajl::Parser.new.parse(File.new(File.dirname(__FILE__) + "/testdata.json", 'r')).each do |testdata|
         specify testdata["why"] do
-          password = Oplop.password(:master => testdata["master"], :label => testdata["label"])
+          password = Oplop.password(:master => testdata["master"], :label => "*" + testdata["label"])
+          expect(password).to eq testdata["password"]
+
+          password = Oplop.password(:master => testdata["master"], :length => 8, :label => testdata["label"])
           expect(password).to eq testdata["password"]
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oplop
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Kaney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -70,19 +70,23 @@ description: Provides a ruby library and command line tool for Oplop
 email:
 - brian@vermonster.com
 executables:
+- loplop
 - oplop
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
+- bin/loplop
 - bin/oplop
 - lib/oplop.rb
 - lib/oplop/cli.rb
 - lib/oplop/version.rb
 - oplop.gemspec
+- shippable.yml
 - spec/oplop_spec.rb
 - spec/spec_helper.rb
 - spec/testdata.json
@@ -106,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oplop
-rubygems_version: 2.2.0
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Oplop for Ruby