oplop 0.0.7 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: da687d83f164bc06c61d8013127d72fd41ae7bc3974c5f6976fba4b1dbf1cce3
+  data.tar.gz: ae5d3252688c2f38766ef9d31d078723c394a8c28021c7b1ce85aa717484f0c3
+SHA512:
+  metadata.gz: d55f5ecc8bcc8d2132b647893c86300b1bfc49221183e4e4164fd463cd2f66a16d5fba7880f3aba7c23d0c21a50a4ede2ac4d6fed2d1281e95a382edcd0bb57d
+  data.tar.gz: 9be6c692c906b38ec9dfc584a4aab1f68cdeec303b18df6d09f586eed6ed4732dea9288d7c4af0defac44e2e27717ca9cf9b83f76280ef6f9de364679683d069

data/.ruby-version

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

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in oplop.gemspec
 gemspec

data/README.md

@@ -1,19 +1,50 @@
 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::V1.password(:master => "master-password", :label => "nickname")
+Oplop::V1.password(:master => "master-password", :label => "16*nickname")
+Oplop::V1.password(:master => "master-password", :label => "nickname", :length => 16)
+```
+
+These will all produce the same password with the legacy 8 character length:
+```
+Oplop::V1.password(:master => "master-password", :label => "*nickname")
+Oplop::V1.password(:master => "master-password", :label => "8*nickname")
+Oplop::V1.password(:master => "master-password", :label => "nickname", :length => 8)
+```
+
+This is a 20-character password
+```
+Oplop::V1.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
+=======
+
+MIT

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

@@ -7,6 +7,9 @@ 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|
@@ -39,18 +42,18 @@ if label.nil? or label.empty?
   exit 2
 end
 
+
+master = ask("Enter your master password: ") { |q| q.echo = "*" }
+
 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)
+password = Oplop::V1.password(:label => label, :master => master, :length => Oplop::V1::LEGACY_LENGTH)
 
 if options[:verbose]
   puts "\n    Password for #{label}:\t#{password}\n\n"

data/lib/oplop/cli.rb

@@ -2,7 +2,7 @@ require 'open3'
 
 module 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/v1.rb

@@ -0,0 +1,47 @@
+require 'digest/md5'
+require 'base64'
+
+module Oplop
+  class V1
+    attr_reader :master, :label, :length
+
+    LEGACY_LENGTH = 8
+    DEFAULT_LENGTH = 16
+
+    def self.password(args={})
+      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
+    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)
+      else
+        password = '1%s' % password
+      end
+
+      password[0,length]
+    end
+  end
+end

data/lib/oplop/version.rb

@@ -1,3 +1,3 @@
 module Oplop
-  VERSION = "0.0.7"
+  VERSION = "2.1.0"
 end

data/lib/oplop.rb

@@ -1,42 +1,3 @@
-require 'digest/md5'
-require 'base64'
+module Oplop; end
 
-module Oplop
-
-  LENGTH = 8
-
-  #
-  # 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.'
-    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))
-    
-    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)
-    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('+/', '-_')
-  end
-
-end
+require 'oplop/v1'

data/oplop.gemspec

@@ -11,14 +11,16 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/bkaney/oplop"
   s.summary     = %q{Oplop for Ruby}
   s.description = %q{Provides a ruby library and command line tool for Oplop}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "oplop"
 
-  s.add_dependency(%q<highline>, ["~> 1.6.1"])
-  s.add_development_dependency(%q<ruby-debug19>) 
-  s.add_development_dependency(%q<rspec>, ["~> 2.6.0"]) 
-  s.add_development_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
-  
+  s.add_dependency  'highline', '~> 2.0'
+
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.11'
+  s.add_development_dependency 'yajl-ruby', '~> 1.4'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

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

@@ -1,34 +1,18 @@
 require 'spec_helper'
 
-describe Oplop do
-  
+describe Oplop::V1 do
   describe ".password" do
-
-    specify "valid arguments" do
-      lambda{ Oplop.password(:master => "a", :label => "a") }.should_not raise_error(ArgumentError)
-    end
-
-    specify "invalid arguments" do
-      lambda{ Oplop.password }.should raise_error(ArgumentError, /Master and label are required/)
-    end
-
-    specify "invalid arguments" do
-      lambda{ Oplop.password(:master => "a", :label => "b", :foo => 'c') }.should 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|
-
+      Yajl::Parser.new.parse(File.new(File.dirname(__FILE__) + "/testdata/v1.json", 'r')).each do |testdata|
         specify testdata["why"] do
-          Oplop.password(:master => testdata["master"], :label => testdata["label"]).should == testdata["password"]
-        end
+          password = Oplop::V1.password(:master => testdata["master"], :label => "*" + testdata["label"])
+          expect(password).to eq testdata["password"]
 
+          password = Oplop::V1.password(:master => testdata["master"], :length => 8, :label => testdata["label"])
+          expect(password).to eq testdata["password"]
+        end
       end
-
     end
-
   end
-
 end

metadata

@@ -1,113 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oplop
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Brian Kaney
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-05-15 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2022-07-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.6.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Provides a ruby library and command line tool for Oplop
-email: 
+email:
 - brian@vermonster.com
-executables: 
+executables:
+- loplop
 - oplop
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
+- bin/loplop
 - bin/oplop
 - lib/oplop.rb
 - lib/oplop/cli.rb
+- lib/oplop/v1.rb
 - lib/oplop/version.rb
 - oplop.gemspec
+- shippable.yml
 - spec/oplop_spec.rb
 - spec/spec_helper.rb
-- spec/testdata.json
-has_rdoc: true
+- spec/testdata/v1.json
 homepage: http://github.com/bkaney/oplop
-licenses: []
-
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: oplop
-rubygems_version: 1.6.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.3.7
+signing_key:
+specification_version: 4
 summary: Oplop for Ruby
-test_files: 
+test_files:
 - spec/oplop_spec.rb
 - spec/spec_helper.rb
-- spec/testdata.json
+- spec/testdata/v1.json