console-glitter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGFmZWZmMDZjZDA1MjljZTQ4NjIyZjJmODhjZTk3NDIyNjhlNDcwYg==
-  data.tar.gz: !binary |-
-    MzkzNmEwZjE4OGY5ZmMxNTAwN2I5MGVmODliZDM3YzFlNWZiZTA2Mw==
+SHA1:
+  metadata.gz: 33104b9e9e88b3aa31b5e7435f4a3e89850b876e
+  data.tar.gz: 0136e1d73e74034ce026bb00cab07b5d2193ae00
 SHA512:
-  metadata.gz: !binary |-
-    YTRhNGFmYTczYjk0YzIyY2JhYjBlNWJkNGE5Mzk2YjFmOWE5YWJhYTQ4NDNi
-    ZjMzMjYwMWEzYTRiYmE2ZWZlNDE2ZmY3MjM1NTgxZWZkYWYwZDRjZjEzOTk5
-    ZmNhNmVmMmQzZTRlZmE4NzhmYzYyMjY4OGQ5YTU5Njg0Y2Y4Y2M=
-  data.tar.gz: !binary |-
-    NTM2YzAwNmI0NTZiZjc2YWU5Y2E5OGQxNTU1ZjAwMTA1YWM4NmVkYTIxNWU0
-    NGJlZDBlZGMyYzBiNjJmM2RlY2RjMDQ1MTc0ZGVkNTZjMDljNWNjNjQyNGEy
-    NjYzZGYyZmMxOTk2Mzk3YjdjNDAzMGNiZmE2MWU3OGEwZjIzZWE=
+  metadata.gz: 0799c8ec2726665bbf64adc5aeb443b67fd0c87d7e79962446db02d665f7b9cdbac87aefba73c6f0f5fa16fbfc318891cd3a814efe9b9073712fb07941d7edee
+  data.tar.gz: 9068a4dfe4e21084c1f87cfa66eff438a008680a78b5591d8e7013f637086ccabef7f221103d3e0ed2a1ec73cc5a555a93cdaaef6a327369bcc63c726f228e33

data/lib/console-glitter/version.rb

@@ -1,3 +1,3 @@
 module ConsoleGlitter
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/console-glitter.rb

@@ -18,13 +18,16 @@ module ConsoleGlitter
     #                              will be rejected.
     #            :valid_answers  - An Array containing all valid responses.  If
     #                              this is empty, any answer will be accepted
-    #                              (except empty answers as specified above).
+    #                              (unless empty answers are disallowed as
+    #                              specified above).  Valid responses may be
+    #                              any class with a match method such as
+    #                              Strings or Regexps.
     #
     # Returns a String containing the answer provided by the user.
     def prompt(question, options = {})
       default = options[:default_answer].to_s
       allow_empty = options[:allow_empty]
-      valid = options[:valid_answers] || []
+      valid = regexify_answers(options[:valid_answers])
 
       default_display = " [#{default.strip}]" unless default.empty?
       question.strip!
@@ -38,7 +41,7 @@ module ConsoleGlitter
         if answer.empty?
           answer = nil unless allow_empty
         elsif valid.any?
-          answer = nil unless valid.grep(answer).any?
+          answer = nil unless valid.map { |valid| answer.match(valid) }.any?
         end
       end
 
@@ -54,14 +57,8 @@ module ConsoleGlitter
     #
     # Returns true or false corresponding to Y or N answer respectively.
     def prompt_yn(question, args = {})
-      args[:valid_answers] = []
-      answer = nil
-
-      until answer =~ /^[yn]/i
-        answer = prompt(question, args)
-      end
-
-      /^n/i.match(answer).nil?
+      args[:valid_answers] = [/^[yn]/i]
+      /^n/i.match(prompt(question, args)).nil?
     end
 
     # Public: Render a "spinner" on the command line and yield to a block,
@@ -149,4 +146,24 @@ module ConsoleGlitter
       grid << grid_rule
     end
   end
+
+  private
+
+  # Internal: Generate Regexps for any String in an array to be used in order
+  # to match against user input.  Strings are expected to indicate exact
+  # matches desired.
+  #
+  # valid_answers - Array containing Objects against which user input may be
+  #                 matched.
+  #
+  # Returns an Array of Regexps.
+  def regexify_answers(valid_answers)
+    valid_answers.to_a.map do |answer|
+      if answer.is_a?(String)
+        Regexp.new("^#{Regexp.escape(answer)}$")
+      else
+        answer
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-glitter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Tools for building nice looking CLI applications
 email: chris@chriswuest.com
@@ -29,12 +29,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []