everyday-cli-utils 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7892604af4bb9b58227dea18a0c14a9c8daaffb9
-  data.tar.gz: b0dfde2c8a940aeb9f09104f27b523f0a8867a5b
+  metadata.gz: 5d91beab1a1ce74081ab57134a8047ee6b6497f1
+  data.tar.gz: a071acf57054f2d6f81434b9fd5c9c48f09cffdd
 SHA512:
-  metadata.gz: 65770fbd4440a17dfafd6d5b4234aad239de0ee499f5c7be24e8f1ed3589d02f190f80fdb3e4822c9887371194ae3acf7c17d58148fcefac67a01b6c02e8dddf
-  data.tar.gz: 83ad2e2ad25d0fd7cfe1efdeb9fba19a71215f2ee27372cce584da79f51e7bb6b18c993bfcd2352d60a5482f5d6475c15b7a7a2b50c95e6648fb6cd798dca36a
+  metadata.gz: 67772a3f5c101be779fc63de1d3044180a7d1978214c4ba23e9f176236407b0958a7849d98aab5e6eec312b07a91f0225aef827e5cfba245e93f8a877d7b1b69
+  data.tar.gz: 4ec99aec1bcef43da7bcda9f5d687670c6f2de182b0a0f220c4641442787f062c7c5e0c3233c5ee030cb4f4d43af22c52207dd271627bae434a01fbab5f0971a

data/lib/everyday-cli-utils/ask.rb

@@ -2,33 +2,32 @@ require 'readline'
 
 module EverydayCliUtils
   module Ask
-    def self::setup_options(options)
+    def self.setup_options(options)
       mapped = []
       options.each_with_index { |v, k|
-        mapped << "#{k+1}) #{v.to_s}"
+        mapped << "#{k + 1}) #{v}"
       }
       mapped.join("\n")
     end
 
-    def self::ask(question, options, &block)
+    def self.ask(question, options, &block)
       val = '-1'
-      while true
+      loop do
         print "#{question}\n\n#{setup_options(options)}\n\n"
         val = Readline.readline("Please enter your choice (1 - #{options.count}): ", true)
-        if !(val =~ /^\d+$/).nil? && (1..options.count).include?(val.to_i)
-          break
-        end
+        break if !(val =~ /^\d+$/).nil? && (1..options.count).include?(val.to_i)
         print "\n\nYou must enter an integer between 1 and #{options.count}. Please try again.\n\n"
       end
       block.call(options[val.to_i - 1])
     end
 
-    def self::ask_yn(question, &block)
-      resp = Readline.readline("#{question} (yes/no) ", true)
-      block.call(resp.downcase == 'yes' || resp.downcase == 'y')
+    def self.ask_yn(question, options = {}, &block)
+      resp = Readline.readline("#{question} ([y]es/[n]o) ", true)
+      val = resp.downcase == 'yes' || resp.downcase == 'y'
+      block.call(val) if !options[:only] || options[:only] == (val ? :yes : :no)
     end
 
-    def self::hash_to_options(hash, extra = [])
+    def self.hash_to_options(hash, extra = [])
       hash.keys + extra
     end
   end

data/lib/everyday-cli-utils/version.rb

@@ -1,3 +1,3 @@
 module EverydayCliUtils
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-cli-utils
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler