oplop 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe387253f3e7471b962a13a3f4f9f6adf74779a51967b267cebb1cdb2262345c
-  data.tar.gz: 04ebb187af0d95379363d07af159e85b5a6cbbbca711ee2f131e8193e3805ba1
+  metadata.gz: da687d83f164bc06c61d8013127d72fd41ae7bc3974c5f6976fba4b1dbf1cce3
+  data.tar.gz: ae5d3252688c2f38766ef9d31d078723c394a8c28021c7b1ce85aa717484f0c3
 SHA512:
-  metadata.gz: 82b7ec63eaabe9d9b3aee0b00631a4d7f8fb74d8a2273418c76e84f39995cd7dd68f4e67b0660d5221767df7faa27aea5476d76f583f0609cf7c9bf0f6ee39bb
-  data.tar.gz: f31f3e781ae750b59f91e46577c2631c755ddde0f3831adf16988985cca245070cae97dfae53427cd3dedf94a7b771ead7f5bd008f27a3100fce415a2a3d246d
+  metadata.gz: d55f5ecc8bcc8d2132b647893c86300b1bfc49221183e4e4164fd463cd2f66a16d5fba7880f3aba7c23d0c21a50a4ede2ac4d6fed2d1281e95a382edcd0bb57d
+  data.tar.gz: 9be6c692c906b38ec9dfc584a4aab1f68cdeec303b18df6d09f586eed6ed4732dea9288d7c4af0defac44e2e27717ca9cf9b83f76280ef6f9de364679683d069

data/README.md

@@ -19,21 +19,21 @@ 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)
+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.password(:master => "master-password", :label => "*nickname")
-Oplop.password(:master => "master-password", :label => "8*nickname")
-Oplop.password(:master => "master-password", :label => "nickname", :length => 8)
+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.password(:master => "master-password", :label => "20*nickname")
+Oplop::V1.password(:master => "master-password", :label => "20*nickname")
 ```
 
 CLI

data/bin/oplop

@@ -53,7 +53,7 @@ if options[:new]
   end
 end
 
-password = Oplop.password(:label => label, :master => master, :length => Oplop::LEGACY_LENGTH)
+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

@@ -1,6 +1,6 @@
 require 'open3'
 
-class Oplop
+module Oplop
   module Cli
 
     def self.banner

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 @@
-class Oplop
-  VERSION = "2.0.0"
+module Oplop
+  VERSION = "2.1.0"
 end

data/lib/oplop.rb

@@ -1,45 +1,3 @@
-require 'digest/md5'
-require 'base64'
+module Oplop; end
 
-class Oplop
-  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
+require 'oplop/v1'

data/oplop.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "oplop"
 
-  s.add_dependency  'highline', '~> 1.6'
+  s.add_dependency  'highline', '~> 2.0'
 
-  s.add_development_dependency 'rake', '~> 10.1'
-  s.add_development_dependency 'rspec', '~> 2.14'
-  s.add_development_dependency 'yajl-ruby', '~> 1.2'
+  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")

data/spec/oplop_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Oplop do
+describe Oplop::V1 do
   describe ".password" do
     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
-          password = Oplop.password(:master => testdata["master"], :label => "*" + testdata["label"])
+          password = Oplop::V1.password(:master => testdata["master"], :label => "*" + testdata["label"])
           expect(password).to eq testdata["password"]
 
-          password = Oplop.password(:master => testdata["master"], :length => 8, :label => testdata["label"])
+          password = Oplop::V1.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: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Brian Kaney
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 description: Provides a ruby library and command line tool for Oplop
 email:
 - brian@vermonster.com
@@ -84,17 +84,18 @@ files:
 - 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
+- spec/testdata/v1.json
 homepage: http://github.com/bkaney/oplop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,12 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: oplop
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Oplop for Ruby
 test_files:
 - spec/oplop_spec.rb
 - spec/spec_helper.rb
-- spec/testdata.json
+- spec/testdata/v1.json