dash 0.3.0 → 0.3.1

data/.gitignore

@@ -1,4 +1,3 @@
 *.gem
-.bundle
-Gemfile.lock
 pkg/*
+.bundle

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    dash (0.3.1)
+      clamp
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    clamp (0.2.2)
+    diff-lcs (1.1.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  dash!
+  rspec (~> 2.6)

data/bin/dash

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'dash'
+  require 'dash/cli'
 rescue LoadError
   require 'rubygems'
-  require 'dash'
+  require 'dash/cli'
 end
 
-Dash.hash(ARGV)
+Dash::CLI.run

data/dash.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency('slop', '= 2.0.0')
+  s.add_dependency('clamp')
+  s.add_development_dependency "rspec", "~> 2.6"
 end

data/lib/dash/cli.rb

@@ -0,0 +1,21 @@
+require 'clamp'
+require 'dash/password'
+
+module Dash
+  class CLI < Clamp::Command 
+    option ["-l", "--length"], "N", "make a password of N length", :default => 12 do |s|
+      Integer(s)
+    end
+    option ["-w", "--weak"], :flag, "generate a weak password"
+    parameter "DOMAIN", "the domain that needs a password", :attribute_name => :domain
+    parameter "[PASSWORD]", "your master password", :attribute_name => :password
+
+    def execute
+      puts Dash::Password.generate(domain, password, weak?, length)
+    end  
+    
+    def default_password
+      ENV['DASH_PASSWORD'] || ''
+    end
+  end
+end

data/lib/dash/password.rb

@@ -0,0 +1,25 @@
+require 'digest/sha2'
+
+module Dash
+  class Password
+    STRONG = 'ABCDEFGHJKLMNPQRSTUVWabcdefghijkmnopqrstuvw0123456789+/-_*()[]{}'
+    WEAK =  'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+    LENGTH = 12
+
+    def self.generate(domain, password, weak = false, length = LENGTH)
+      key = encrypt password
+      hash = encrypt "#{key}#{domain}"
+      charset = (weak == true) ? WEAK : STRONG
+    
+      return encode(hash, charset)[0,length]
+    end
+  
+    def self.encode(s,c)
+      (t=s.unpack('C*').inject([0,'',0]){|a,v|a[0]==0?[2,a[1]+c[v>>2,1],v*16&48]:a[0]==2?[4,a[1]+c[v>>4|a[2],1],v*4&60]:[0,a[1]+c[v>>6|a[2],1]+c[v&63,1],0]})[1]+(t[0]==0?'':t[0]==2?c[t[2],1]+'==':c[t[2],1]+'=')
+    end
+  
+    def self.encrypt(key)
+      Digest::SHA2.new(256).hexdigest(key || '')
+    end
+  end
+end

data/lib/dash/version.rb

@@ -1,3 +1,3 @@
 module Dash
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/dash_spec.rb

@@ -0,0 +1,7 @@
+require 'dash/password'
+
+describe Dash::Password do
+  it "generates consistent password" do
+    Dash::Password.generate('twitter.com','password').should eql("NpPrP8E5QGJ5")
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: dash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael McClenaghan
@@ -10,20 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -06:00
+date: 2011-07-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: slop
+  name: clamp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.6"
+  type: :development
+  version_requirements: *id002
 description: Generates a strong password that is simple to recreate so there is no need to ever store your passwords.
 email: 
 - mike@shift81.com
@@ -36,11 +47,14 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - bin/dash
 - dash.gemspec
-- lib/dash.rb
+- lib/dash/cli.rb
+- lib/dash/password.rb
 - lib/dash/version.rb
+- spec/dash_spec.rb
 has_rdoc: true
 homepage: https://github.com/shift81/dash
 licenses: []
@@ -69,5 +83,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Strong password generator
-test_files: []
-
+test_files: 
+- spec/dash_spec.rb

data/lib/dash.rb

@@ -1,52 +0,0 @@
-require 'digest/sha2'
-require 'slop'
-
-module Dash
-  extend self
-  STRONG = 'ABCDEFGHJKLMNPQRSTUVWabcdefghijkmnopqrstuvw0123456789+/-_*()[]{}'
-  WEAK =  'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-  LENGTH = 12
-
-  def hash(args)
-    return unless parse_args(args)
-    
-    @key = encrypt @password
-    @hash = encrypt "#{@key}#{@domain}"
-
-    puts encode(@hash, @charset)[0,@length]
-  end
-
-  def parse_args(args)
-    opts = Slop.parse!(args) do
-      banner "Usage: dash <domain> [options]"
-      on :p, :password, 'Your master password', :argument => true
-      on :w, :weak, 'Generate weak password with alphanumeric character set'
-      on :l, :length, 'Length of generated password', :argument => true
-    end
-    
-    @charset = opts.weak? ? WEAK : STRONG
-    @length = opts.length? ? opts[:length].to_i : LENGTH
-    
-    unless password = opts[:password] || ENV['DASH_PASSWORD']
-      puts opts.help
-      return
-    end
-    
-    unless domain = args.shift
-      puts opts.help
-      return
-    end
-    
-    @password = password.strip
-    @domain = domain.strip
-    true 
-  end
-  
-  def encode(s,c)
-    (t=s.unpack('C*').inject([0,'',0]){|a,v|a[0]==0?[2,a[1]+c[v>>2,1],v*16&48]:a[0]==2?[4,a[1]+c[v>>4|a[2],1],v*4&60]:[0,a[1]+c[v>>6|a[2],1]+c[v&63,1],0]})[1]+(t[0]==0?'':t[0]==2?c[t[2],1]+'==':c[t[2],1]+'=')
-  end
-  
-  def encrypt(key)
-    Digest::SHA2.new(256).hexdigest key
-  end
-end