cqr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093090407d6fc0f47f1e0e39f5bd07cb907452f6
-  data.tar.gz: 3abc9d52c8c6790c7fe110fcb7e21d55e6a7b455
+  metadata.gz: 58db2f409a021efe800e37254cd64a8b2de3ca4c
+  data.tar.gz: 49c7ff066c867ebee2153adc460694e2494779df
 SHA512:
-  metadata.gz: 30ed8f07971a90f87f4f7baa865dda51b8197b89f19c018a3940edeb2c67d14a6302a41174510b66231abf9dc54520609e34e1290daa61e2b0aff5d40e62eb26
-  data.tar.gz: c9e56a1d545c629dc27decfcc02409c2e4271ff94b48f138b0a7ae85bd1523586f84a1be990f36ec9a027e059069f27f2d6755f524993aaebebd6269c99aeef0
+  metadata.gz: c9241d7f04016a719464e4d5a6977f29bef3319591bc25f43874b8c5669219e2aa3e88a04c77e3416cb419f741727c38adfc75c9e23d4d7aff8c8a4d9d91cd9c
+  data.tar.gz: 5d7367e56c5e685d7c7314eca7745c07f36e7b89b720526199859b62fe74e92a29902f9c3e3537ea47441a29350f63067577009d7775327301ac7b13108c5549

data/bin/cqr

@@ -3,6 +3,7 @@
 require 'cqr'
 require 'optparse'
 require 'pathname'
+require 'io/console'
 
 basename = Pathname.new(__FILE__).basename
 
@@ -11,10 +12,6 @@ options = { margin: 4, invert: true }
 opt_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{basename} [options] TEXT"
 
-  opts.on("-s SECRET", "--secret=SECRET", String, "[required] OTP secret") do |secret|
-    options[:secret] = secret
-  end
-
   opts.on("-m MARGIN", "--margin=MARGIN", Integer, "margin size in characters (default 4)") do |margin|
     options[:margin] = margin
   end
@@ -27,6 +24,9 @@ opt_parser = OptionParser.new do |opts|
     puts opt_parser
     exit
   end
+
+  opts.separator ""
+  opts.separator "for stdin input pass \"-\" as TEXT"
 end
 
 opt_parser.parse!
@@ -38,6 +38,10 @@ end
 
 text = ARGV.pop
 
+if text == "-"
+  text = STDIN.read
+end
+
 if !text || text.empty?
   puts opt_parser
   exit 1

data/bin/qrotp

@@ -3,12 +3,13 @@
 require 'cqr/otp'
 require 'optparse'
 require 'base32'
+require 'io/console'
 
-options = { margin: 4, invert: true }
+options = { margin: 4, invert: true, type: 'totp' }
 
 opt_parser = OptionParser.new do |opts|
-  opts.on("-n NAME", "--name=NAME", String, "[required] display name") do |name|
-    options[:name] = name
+  opts.on("-l LABEL", "--label=LABEL", String, "[required] displayed label") do |label|
+    options[:label] = label
   end
 
   opts.on("-s SECRET", "--secret=SECRET", String, "[required] OTP secret") do |secret|
@@ -28,19 +29,69 @@ opt_parser = OptionParser.new do |opts|
     options[:invert] = invert
   end
 
+  opts.on("-e", "--echo", "don't hide stdin") do |echo|
+    options[:echo] = echo
+  end
+
+  opts.on("--issuer=ISSUER", String, "issuer of the secret") do |issuer|
+    options[:issuer] = issuer
+  end
+
+  opts.on("-d DIGITS", "--digits=DIGITS", Integer, "hotp/totp, default to totp") do |digits|
+    options[:digits] = digits
+  end
+
+  opts.on("-c COUNTER", "--counter=COUNTER", Integer, "counter state, required with hotp") do |counter|
+    options[:counter] = counter
+  end
+
+  opts.on("-t TYPE", "--type=TYPE", String, "hotp/totp, default to totp") do |type|
+    options[:type] = type
+  end
+
   opts.on("-h", "--help", "display this message") do
     puts opt_parser
     exit
   end
+
+  opts.separator ""
+  opts.separator "for stdin input pass \"-\" as NAME/SECRET"
 end
 
 opt_parser.parse!
 
-if !options.has_key?(:secret) || !options.has_key?(:name)
+
+if !options.has_key?(:secret) || !options.has_key?(:label)
   puts opt_parser
   exit -1
 end
 
+if options.has_key?(:type) && options[:type] == "hotp" && !options.has_key?(:counter)
+  puts opt_parser
+  exit -1
+end
+
+if options[:secret] == "-"
+  print "Enter secret: "
+  if options[:echo]
+    options[:secret] = STDIN.gets.chomp
+  else
+    options[:secret] = STDIN.noecho(&:gets).chomp
+    puts
+  end
+end
+
+if options[:label] == "-"
+  print "Enter label: "
+  if options[:echo]
+    options[:label] = STDIN.gets.chomp
+  else
+    options[:label] = STDIN.noecho(&:gets).chomp
+    puts
+  end
+end
+
+
 
 if !options[:base32]
   binary = [options[:secret]].pack("H*")
@@ -49,10 +100,17 @@ end
 
 
 
-instance = CQR::OTP::Builder.new(options[:secret], options[:name]).to_qr
-instance.margin = options[:margin]
-instance.invert = options[:invert]
-
-puts instance.to_s
+instance = CQR::OTP::Builder.new()
+instance.secret  = options[:secret]
+instance.issuer  = options[:issuer]
+instance.type    = options[:type]
+instance.digits  = options[:digits]
+instance.counter = options[:counter]
+instance.period  = options[:period]
+instance.label   = options[:label]
 
+qr_code = instance.to_qr
+qr_code.margin  = options[:margin]
+qr_code.invert  = options[:invert]
 
+puts qr_code.to_s

data/lib/cqr.rb

@@ -1 +1,4 @@
 require 'cqr/qr_formatter'
+
+class CQRException < Exception
+end

data/lib/cqr/otp/builder.rb

@@ -3,12 +3,54 @@ require 'cqr'
 module CQR
   module OTP
     class Builder
-      def initialize(secret, name)
-        @url = "otpauth://totp/#{name}?secret=#{secret}"
-      end
+      VALID_TYPES  = [ "hotp", "totp" ].freeze
+      VALID_DIGITS = [ 6, 8, nil ].freeze
+      VALID_PERIOD = [ 30, 60, nil ].freeze
+
+      attr_accessor :secret, :label, :issuer, :type, :digits, :counter, :period
 
       def to_qr
-        QRFormatter.new(@url, 5)
+        QRFormatter.new(url)
+      end
+
+      def to_s
+        url
+      end
+
+      private
+
+      def build_type
+        raise CQRException.new("unknown type") unless VALID_TYPES.member?(type)
+        type
+      end
+
+      def build_digits
+        raise CQRException.new("wrong number of digits") unless VALID_DIGITS.member?(digits)
+        digits ? "&digits=#{digits}" : ""
+      end
+
+      def build_period
+        raise CQRException.new("wrong period") unless VALID_PERIOD.member?(period)
+        abort "period wit hotp" if period && type == "hotp"
+        period ? "&period=#{period}" : ""
+      end
+
+      def build_digits
+        digits ? "&digits=#{digits}" : ""
+      end
+
+      def build_issuer
+        issuer ? "&issuer=#{issuer}" : ""
+      end
+
+      def build_counter
+        raise CQRException.new("counter with non-hotp") if counter && type != "hotp"
+        counter ? "&counter=#{counter}" : ""
+      end
+
+      def url
+        "otpauth://#{build_type}/#{label}?secret=#{secret}#{build_digits}" +
+        "#{build_period}#{build_counter}#{build_issuer}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Arkadiusz Hiler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode
@@ -38,7 +38,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-description: CQR is comman-line tool for creating and displaying QR Codes.
+description: CQR is command-line tool for creating and displaying QR Codes.
 email:
 - arkadiusz@hiler.pl
 executables:
@@ -47,14 +47,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cqr/otp.rb
 - lib/cqr/otp/builder.rb
 - lib/cqr/qr_formatter.rb
-- lib/cqr/otp.rb
 - lib/cqr.rb
 - bin/cqr
 - bin/qrotp
 homepage: https://github.com/ivyl/cqr
-licenses: []
+licenses:
+- MIT
+- GPL-2
 metadata: {}
 post_install_message: 
 rdoc_options: []