pwqgen.rb 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,3 +1,7 @@
+= 0.0.4 / 2012-10-14
+	* Improved CLI option parsing.
+	* Reverted to vendor docopt.rb.
+
 = 0.0.3 / 2012-07-09
 
 	* Improved CLI output.

data/bin/pwqgen.rb

@@ -2,23 +2,34 @@
 
 require 'pwqgen/version'
 require 'pwqgen'
+require 'docopt'
 
-doc = "Usage: pwqgen.rb [options] [<length>]
+doc = <<DOCOPT
+Generate a random pronouncable passphrase.
+
+Usage:
+  #{__FILE__} [LENGTH]
+  #{__FILE__} [-h | --help]
+  #{__FILE__} [-v | --version]
+
+Arguments:
+  LENGTH          Number of words in the passphrase. [default: 3]
 
 Options:
   -h, --help      show this help message and exit
   -v, --version   show version and exit
 
-<length>: Number of words in the passphrase. [default: 3]
-"
-
-require 'pwqgen/docopt'
+DOCOPT
 
-options = Docopt(doc, Pwqgen::VERSION)
+begin
+  options = Docopt::docopt(doc, version: Pwqgen::VERSION)
 
-if ARGV.length > 0 && ARGV[0].to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) then
-puts Pwqgen.generate(ARGV[0].to_i)
-else
-puts Pwqgen.generate
+  if ARGV.length > 0 && ARGV[0].to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) then
+    puts Pwqgen.generate(ARGV[0].to_i)
+  else
+    puts Pwqgen.generate
+  end
+rescue Docopt::Exit => e
+  puts e.message
 end
 

data/lib/pwqgen/version.rb

@@ -1,3 +1,3 @@
 module Pwqgen
-	VERSION = "0.0.3"
+	VERSION = "0.0.4"
 end

data/pwqgen.rb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   s.required_rubygems_version = ">= 1.3.6"
-  #s.add_runtime_dependency('docopt', "~> 0.0.4")
+  s.add_runtime_dependency('docopt', "~> 0.5.0")
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwqgen.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +133,6 @@ files:
 - features/step_definitions/pwqgen.rb_steps.rb
 - features/support/env.rb
 - lib/pwqgen.rb
-- lib/pwqgen/docopt.rb
 - lib/pwqgen/pwqgen.rb
 - lib/pwqgen/version.rb
 - lib/pwqgen/wordlist.rb
@@ -144,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: pwqgen in Ruby
@@ -154,4 +169,3 @@ test_files:
 - features/support/env.rb
 - spec/lib/pwqgen_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/pwqgen/docopt.rb

@@ -1,132 +0,0 @@
-# Copyright (c) 2012 Vladimir Keleshev <vladimir@keleshev.com>, Alex Speller <alex@alexspeller.com>
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in 
-# the Software without restriction, including without limitation the rights to 
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-# of the Software, and to permit persons to whom the Software is furnished to do 
-# so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in all 
-# copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-# SOFTWARE.
-
-require 'getoptlong'
-
-class Docopt
-  attr_reader :docopts
-  
-  class UnknownOptionError < StandardError; end
-  
-  class Option
-    attr_reader :short, :long, :argcount, :value
-    
-    def initialize parse
-      @argcount                = 0
-      options, _, description = parse.strip.partition('  ')
-      options                 = options.sub(',', ' ').sub('=', ' ')
-
-      for s in options.split
-        if s.start_with? '--'
-          @long = s
-        elsif s.start_with? '-'
-          @short = s
-        else
-          @argcount = 1
-        end
-      end
-      
-      if @argcount == 1
-        matched = description.scan(/\[default: (.*)\]/)[0]
-        @value = matched ? matched[0] : nil
-      end
-    end
-    
-    def set_value val
-      if argcount.zero?
-        @value = true
-      else
-        @value = val
-      end
-    end
-    
-    def synonyms
-      ([short, long] + symbols).compact
-    end
-    
-    def symbols
-      [short, long].compact.map do |name|
-        name.gsub(/^-+/, '').to_sym
-      end
-    end
-
-    def getopt
-      [long, short, argcount].compact
-    end
-
-    def inspect
-      "#<Docopt::Option short: #{short}, long: #{long}, argcount: #{argcount}, value: #{value}>"
-    end
-
-    def == other
-      self.inspect == other.inspect
-    end
-  end
-  
-  
-  def initialize(doc, version=nil, help=true)
-    @docopts = doc.split(/^ *-|\n *-/)[1..-1].map do |line|
-      Option.new('-' + line)
-    end
-    
-    GetoptLong.new(*docopts.map(&:getopt)).each do |opt, arg|
-      docopt_option = option(opt)
-      if help and (opt == '--help' or opt == '-h')
-        puts doc.strip
-        exit
-      elsif version and opt == '--version'
-        puts version
-        exit
-      else
-        docopt_option.set_value arg
-      end
-    end
-  end
-  
-  def option name
-    option = @docopts.detect do |docopt|
-      docopt.synonyms.include?(name)
-    end
-    raise UnknownOptionError.new("#{name} option not found") unless option
-    option
-  end
-
-
-  
-  def value name
-    option(name).value
-  end
-  alias_method :[], :value
-    
-  def size
-    @docopts.size
-  end
-  
-  def inspect
-    @docopts.map do |option|
-      "#{option.short} #{option.long}=#{option.value.inspect}".strip
-    end.join("\n")
-  end
-end
-
-# Convenience method for Docopt.parse
-def Docopt *args
-  Docopt.new *args
-end