pwqgen.rb 0.0.3.pre → 0.0.3.pre.1

data/bin/pwqgen.rb

@@ -12,7 +12,7 @@ Options:
 <length>: Number of words in the passphrase. [default: 3]
 "
 
-require 'docopt'
+require 'pwqgen/docopt'
 
 options = Docopt(doc, Pwqgen::VERSION)
 

data/lib/pwqgen/docopt.rb

@@ -0,0 +1,132 @@
+# 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

data/lib/pwqgen/version.rb

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

data/pwqgen.rb.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>=1.9.2'
-  s.add_runtime_dependency('docopt', "~>0.0.4")
+  s.required_ruby_version = '>= 1.9.2'
+  s.required_rubygems_version = ">= 1.3.6"
+  #s.add_runtime_dependency('docopt', "~> 0.0.4")
 
   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.pre
+  version: 0.0.3.pre.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-01 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.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +117,7 @@ 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
@@ -154,9 +139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23