cliprompt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130c7d8782cb21bd861497572e1f70c561d3713a
-  data.tar.gz: a7e8e0ed439cb3efb295931f8149a2f602c6df3e
+  metadata.gz: 61b352cf68eda3ca18f4051cacd85dd3047ac665
+  data.tar.gz: 156fb8f2414b6f4eee18ddb63ac8c05b25f33673
 SHA512:
-  metadata.gz: 7a33c9fc219191d65e7f33fba11437d87795dfbc91387c6389ef9e79408297df0537f64158be384524f5097eddca13e7e700752a76d6f28ba67f3dcac1b72706
-  data.tar.gz: 2bdb0c2ee17d1e8017ee6d7b28eff9b58b7b5e15ecc1308b7bf5d3fbf8cee15973a30366379ecaaf574bb136c7ced84c99baac769afbe89bdde6cb5f06f709c0
+  metadata.gz: be597dccf32f0a9c761b2b7d88b4af36040cfa91942371f8f64d99263ad5346e976d36b66bb38b9b8e4449b43ca023ba1b3d787142136a9ee8a970c07843520a
+  data.tar.gz: 03fd5bd35e18510a1b30c06e87c46e6122948f05ae2629bf23b6b2346fb5b15407d539feede545c4b69e3cc78dab94c6bcb0c176b194e5f3119819c33b1db79c

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Cliprompt Changelog
 =====================
 
+v0.0.5 - 2014-05-27
+--------------------
+
+- fix to one space after question that was 2 spaces when no default is provided
+- when choices are a list, show the default in the question, in more than in the list
+- clean some ruby warnings (running with --debug helps)
+
 v0.0.4 - 2014-05-24
 --------------------
 

data/example.rb

@@ -64,6 +64,6 @@ class Myclass
 end
 
 m = Myclass.new
-#m.guessit
-#m.askit
+m.guessit
+m.askit
 m.biglist

data/lib/cliprompt.rb

@@ -16,28 +16,16 @@ module Cliprompt
     if options[0].class == Optionset
       opts = options[0]
     else
-      opts = Optionset.new *options
-    end
-    if opts.aslist
-      output.puts "#{question}"
-      opts.choices.each_with_index do |choice, i|
-        if opts.default == choice
-          output.printf "> %-3s %s\n", i, choice
-        else
-          output.printf "  %-3s %s\n", i, choice
-        end
-      end
-      output.print "#{MSG_CHOSE_A_NUMBER} "
-    else
-      output.print "#{question} #{opts.display} "
+      opts = Optionset.new(*options)
     end
+    output.print "#{question} #{opts.display}"
     answer = input.gets.chomp
     output.flush
     opts.validate(question, answer)
   end
 
   def guess(env, question, *options)
-    opts = Optionset.new *options
+    opts = Optionset.new(*options)
     if ENV[env]
       opts.validate(question, ENV[env])
     else

data/lib/cliprompt/optionset.rb

@@ -63,9 +63,9 @@ module Cliprompt
     end
 
     def parse_string(arg)
-      if arg.match /^[yY1](es)?(\/)?[nN0](o)?/
+      if /^[yY1](es)?(\/)?[nN0](o)?/.match(arg)
         @boolean = true
-        if /y(es)?(\/)?N/.match arg
+        if /y(es)?(\/)?N/.match(arg)
           @default = false
         else
           @default = true
@@ -76,18 +76,54 @@ module Cliprompt
     end
 
     def display
-      back = ''
       if @boolean
-        back = @default ? "[Y/n]" : "[y/N]"
+        display_boolean
+      elsif @choices.count > 0
+        if @aslist
+          display_list
+        else
+          display_choices
+        end
       else
-        if @choices.count > 0
-          back += "(#{@choices.join(' / ')})"
+        display_default
+      end
+    end
+
+    def display_boolean
+      @default ? "[Y/n] " : "[y/N] "
+    end
+
+    def display_list
+      back = "\n"
+      choices.each_with_index do |choice, i|
+        if @default == choice
+          back << sprintf("> %-3s %s\n", i, choice)
+        else
+          back << sprintf("  %-3s %s\n", i, choice)
         end
-        back += "[#{@default}]" if @default
       end
+      back << "#{Cliprompt::MSG_CHOSE_A_NUMBER} "
+      back << display_default_index.to_s
+      return back
+    end
+
+    def display_choices
+      back = ''
+      if @choices.count > 0
+        back << "(#{@choices.join(' / ')}) "
+      end
+      back << display_default.to_s
       return back
     end
 
+    def display_default
+      "[#{@default}] " if @default
+    end
+
+    def display_default_index
+      "[#{@choices.index(@default)}] " if @default
+    end
+
     def validate(question, answer)
       if answer == ''
         check_default question

data/lib/cliprompt/version.rb

@@ -1,3 +1,3 @@
 module Cliprompt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/cliprompt/optionset_spec.rb

@@ -23,7 +23,7 @@ describe Cliprompt::Optionset do
       When(:display) { set.display }
       Then { expect(choices).to eq options }
       Then { expect(default).to be_false }
-      Then { expect(display).to eq '(xxx / yyy / zzz)' }
+      Then { expect(set.display).to eq '(xxx / yyy / zzz) ' }
     end
 
     context "when there is a default specified (#{['xxx', '=yyy', 'zzz'].to_s})," do
@@ -35,7 +35,7 @@ describe Cliprompt::Optionset do
       When(:display) { set.display }
       Then { expect(choices).to eq options }
       Then { expect(default).to eq 'yyy' }
-      Then { expect(display).to eq '(xxx / yyy / zzz)[yyy]' }
+      Then { expect(display).to eq '(xxx / yyy / zzz) [yyy] ' }
     end
 
     context "when there is a mixed numeric and string choices (#{[22, 'yyy', 'zzz'].to_s})," do
@@ -46,7 +46,7 @@ describe Cliprompt::Optionset do
       When(:display) { set.display }
       Then { expect(choices).to eq options.map(&:to_s) }
       Then { expect(default).to be_false }
-      Then { expect(display).to eq '(22 / yyy / zzz)' }
+      Then { expect(display).to eq '(22 / yyy / zzz) ' }
     end
   end
 
@@ -61,7 +61,7 @@ describe Cliprompt::Optionset do
         When(:display) { set.display }
         Then { expect(choices).to eq ['xxx', 'yyy', 'zzz'] }
         Then { expect(default).to eq 'xxx' }
-        Then { expect(display).to eq '(xxx / yyy / zzz)[xxx]' }
+        Then { expect(display).to eq '(xxx / yyy / zzz) [xxx] ' }
       end
       context "when using string keys (#{{ 'default' => 'xxx', 'choices' => ['xxx', 'yyy', 'zzz'] }.to_s})," do
         Given(:options) { { 'default' => 'xxx', 'choices' => ['xxx', 'yyy', 'zzz'] } }
@@ -71,12 +71,12 @@ describe Cliprompt::Optionset do
         When(:display) { set.display }
         Then { expect(choices).to eq ['xxx', 'yyy', 'zzz'] }
         Then { expect(default).to eq 'xxx' }
-        Then { expect(display).to eq '(xxx / yyy / zzz)[xxx]' }
+        Then { expect(display).to eq '(xxx / yyy / zzz) [xxx] ' }
       end
     end
 
     context 'when there is only boolean,' do
-      context 'when  no default is given, default booean is Y,' do
+      context 'when no default is given, default booean is Y,' do
         Given(:options) { { boolean: true } }
         Given(:set) { Cliprompt::Optionset.new(options) }
         When(:default) { set.default }
@@ -84,7 +84,7 @@ describe Cliprompt::Optionset do
         When(:boolean) { set.boolean }
         Then { expect(default).to be_true }
         Then { expect(boolean).to be_true }
-        Then { expect(display).to eq '[Y/n]' }
+        Then { expect(display).to eq '[Y/n] ' }
       end
       context 'when default is given as true, default booean is Y,' do
         Given(:options) { { boolean: true, default: true } }
@@ -94,7 +94,7 @@ describe Cliprompt::Optionset do
         When(:boolean) { set.boolean }
         Then { expect(default).to be_true }
         Then { expect(boolean).to be_true }
-        Then { expect(display).to eq '[Y/n]' }
+        Then { expect(display).to eq '[Y/n] ' }
       end
        context 'when default is given as false, default boolean is N,' do
         Given(:options) { { boolean: true, default: false } }
@@ -104,7 +104,7 @@ describe Cliprompt::Optionset do
         When(:boolean) { set.boolean }
         Then { expect(default).to be_false }
         Then { expect(boolean).to be_true }
-        Then { expect(display).to eq '[y/N]' }
+        Then { expect(display).to eq '[y/N] ' }
       end
    end
   end
@@ -129,7 +129,9 @@ describe Cliprompt::Optionset do
       Given(:options) { 'something' }
       Given(:set) { Cliprompt::Optionset.new(options) }
       When(:default) { set.default }
+      When(:display) { set.display }
       Then { expect(default).to eq options }
+      Then { expect(display).to eq '[something] ' }
     end
 
     context 'when a "yesno" kind of string is passed,' do
@@ -141,7 +143,7 @@ describe Cliprompt::Optionset do
         When(:boolean) { set.boolean }
         Then { expect(default).to be_true }
         Then { expect(boolean).to be_true }
-        Then { expect(display).to eq '[Y/n]' }
+        Then { expect(display).to eq '[Y/n] ' }
       end
       context 'when using yn,' do
         Given(:options) { 'yn' }
@@ -149,7 +151,7 @@ describe Cliprompt::Optionset do
         When(:default) { set.default }
         When(:display) { set.display }
         Then { expect(default).to be_true }
-        Then { expect(display).to eq '[Y/n]' }
+        Then { expect(display).to eq '[Y/n] ' }
       end
       context 'when using YN,' do
         Given(:options) { 'YN' }
@@ -157,7 +159,7 @@ describe Cliprompt::Optionset do
         When(:default) { set.default }
         When(:display) { set.display }
         Then { expect(default).to be_true }
-        Then { expect(display).to eq '[Y/n]' }
+        Then { expect(display).to eq '[Y/n] ' }
       end
       context 'when using yesNo,' do
         Given(:options) { 'yesNo' }
@@ -165,7 +167,7 @@ describe Cliprompt::Optionset do
         When(:default) { set.default }
         When(:display) { set.display }
         Then { expect(default).to be_false }
-        Then { expect(display).to eq '[y/N]' }
+        Then { expect(display).to eq '[y/N] ' }
       end
       context 'when using yN,' do
         Given(:options) { 'yesNo' }
@@ -173,7 +175,7 @@ describe Cliprompt::Optionset do
         When(:default) { set.default }
         When(:display) { set.display }
         Then { expect(default).to be_false }
-        Then { expect(display).to eq '[y/N]' }
+        Then { expect(display).to eq '[y/N] ' }
       end
       context 'when using y/N,' do
         Given(:options) { 'yesNo' }
@@ -181,7 +183,7 @@ describe Cliprompt::Optionset do
         When(:default) { set.default }
         When(:display) { set.display }
         Then { expect(default).to be_false }
-        Then { expect(display).to eq '[y/N]' }
+        Then { expect(display).to eq '[y/N] ' }
       end
     end
 

data/spec/lib/cliprompt_spec.rb

@@ -16,7 +16,7 @@ describe Cliprompt do
       When(:args) { }
       When { input.stub(:gets).and_return answer }
       Then { expect(subject.ask(question, args)).to eq answer }
-      And  { expect(output.string).to eq "#{question}  " }
+      And  { expect(output.string).to eq "#{question} " }
     end
     context 'with a default,' do
       When(:default) { 'ooo' }
@@ -29,19 +29,19 @@ describe Cliprompt do
       When(:args) { Cliprompt::Optionset.new() }
       When { input.stub(:gets).and_return answer }
       Then { expect(subject.ask(question, args)).to eq answer }
-      And  { expect(output.string).to eq "#{question}  " }
+      And  { expect(output.string).to eq "#{question} " }
     end
     context 'with choices requested as a list,' do
       When(:args) { { choices: ['aaa', 'bbb', 'ccc'], aslist: true } }
       When { input.stub(:gets).and_return '1' }
       Then { expect(subject.ask(question, args)).to eq 'bbb' }
-      And  { expect(output.string).to eq "#{question}\n  0   aaa\n  1   bbb\n  2   ccc\n#{Cliprompt::MSG_CHOSE_A_NUMBER} " }
+      And  { expect(output.string).to eq "#{question} \n  0   aaa\n  1   bbb\n  2   ccc\n#{Cliprompt::MSG_CHOSE_A_NUMBER} " }
     end
     context 'with choices requested as a list with a default,' do
       When(:args) { { choices: ['=aaa', 'bbb', 'ccc'], aslist: true } }
       When { input.stub(:gets).and_return '' }
       Then { expect(subject.ask(question, args)).to eq 'aaa' }
-      And  { expect(output.string).to eq "#{question}\n> 0   aaa\n  1   bbb\n  2   ccc\n#{Cliprompt::MSG_CHOSE_A_NUMBER} " }
+      And  { expect(output.string).to eq "#{question} \n> 0   aaa\n  1   bbb\n  2   ccc\n#{Cliprompt::MSG_CHOSE_A_NUMBER} [0] " }
     end
     context 'with choices requested as a non-list despite there are many choices,' do
       When(:args) { { choices: %w(aaa bbb ccc ddd eee fff), aslist: false } }
@@ -53,7 +53,7 @@ describe Cliprompt do
       When(:args) { %w(aaa bbb ccc ddd eee fff) }
       When { input.stub(:gets).and_return '5' }
       Then { expect(subject.ask(question, args)).to eq 'fff' }
-      And  { expect(output.string).to eq "#{question}\n  0   aaa\n  1   bbb\n  2   ccc\n  3   ddd\n  4   eee\n  5   fff\n#{Cliprompt::MSG_CHOSE_A_NUMBER} " }
+      And  { expect(output.string).to eq "#{question} \n  0   aaa\n  1   bbb\n  2   ccc\n  3   ddd\n  4   eee\n  5   fff\n#{Cliprompt::MSG_CHOSE_A_NUMBER} " }
     end
   end
 
@@ -71,7 +71,7 @@ describe Cliprompt do
       When(:answer) { 'ooo' }
       When { input.stub(:gets).and_return answer }
       Then { expect(subject.guess(env_var, question, args)).to eq answer }
-      And  { expect(output.string).to eq "#{question}  " }
+      And  { expect(output.string).to eq "#{question} " }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cliprompt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint