rchoice 0.2.0 → 0.3.0

data/lib/rchoice/choosers/command_line_chooser.rb

@@ -1,20 +1,20 @@
-module RChoice
-  class CommandLineChooser
-    def call(choice)
-      print_line "Choose"
-      choice.options.each_with_index do |op,i|
-        print_line "#{i}. #{choice.option_presenter[op]}"
-      end
-      get_choice(choice)
-    end
-    def print_line(ln)
-      puts ln
-    end
-    def get_choice(choice)
-      choice.options[get_choice_num]
-    end
-    def get_choice_num
-      STDIN.gets.safe_to_i
-    end
-  end
+module RChoice
+  class CommandLineChooser
+    def call(choice)
+      print_line "Choose #{choice.name}"
+      choice.options.each_with_index do |op,i|
+        print_line "#{i}. #{choice.option_presenter[op]}"
+      end
+      get_choice(choice)
+    end
+    def print_line(ln)
+      puts ln
+    end
+    def get_choice(choice)
+      choice.options[get_choice_num]
+    end
+    def get_choice_num
+      STDIN.gets.safe_to_i
+    end
+  end
 end

data/lib/rchoice/choosers/redis_chooser.rb

@@ -0,0 +1,33 @@
+module RChoice
+  class RedisChooser
+    def call(choice)
+      print_line "Choose #{choice.name}"
+      choice.options.each_with_index do |op,i|
+        print_line "#{i}. #{choice.option_presenter[op]}"
+      end
+      get_choice(choice)
+    end
+    def print_line(ln)
+      puts ln
+    end
+    def get_choice(choice)
+      choice.options[get_choice_num(choice)]
+    end
+    def get_choice_num(choice)
+      require 'redis'
+      redis = Redis.new(:host => "spadefish.redistogo.com", :port => 9897, :password => "511c6d49855d3551c335781860c06cb3")
+      k = "choice-#{choice.choice_id}"
+      puts "waiting for #{k}"
+      File.create "vol/choice.txt",k
+      (0...10000).each do |i|
+        val = redis.get(k)
+        if val.present?
+          return val.safe_to_i
+        else
+          sleep(0.5)
+        end
+      end
+      raise "no answer"
+    end
+  end
+end

data/lib/rchoice/core_ext.rb

@@ -1,31 +1,31 @@
-class Array
-  def rand_el
-    i = rand(length)
-    self[i]
-  end
-end
-
-class Object
-  def blank?
-    to_s.strip == ''
-  end
-  def present?
-    !blank?
-  end
-end
-
-class String
-  def valid_number_format?
-    return false if blank?
-    return false unless self.strip =~ /^[0-9\.\-]+$/
-    true
-  end
-  def safe_to_i
-    raise "not valid number format #{self}" unless valid_number_format?
-    to_i
-  end
-  def safe_to_f
-    raise "not valid number format #{self}" unless valid_number_format?
-    to_f
-  end
+class Array
+  def rand_el
+    i = rand(length)
+    self[i]
+  end
+end
+
+class Object
+  def blank?
+    to_s.strip == ''
+  end
+  def present?
+    !blank?
+  end
+end
+
+class String
+  def valid_number_format?
+    return false if blank?
+    return false unless self.strip =~ /^[0-9\.\-]+$/
+    true
+  end
+  def safe_to_i
+    raise "not valid number format '#{self}'" unless valid_number_format?
+    to_i
+  end
+  def safe_to_f
+    raise "not valid number format #{self}" unless valid_number_format?
+    to_f
+  end
 end

data/lib/rchoice/option.rb

@@ -1,24 +1,24 @@
-module RChoice
-  class Option
-    include FromHash
-    attr_accessor :base_obj
-    fattr(:execute_args) { [base_obj] }
-    def execute!(&b)
-      b.call(*execute_args)
-    end
-    def to_s
-      base_obj.to_s
-    end
-  end
-
-  class ProcOption < Option
-    include FromHash
-    attr_accessor :name, :blk
-    def execute!
-      blk.call
-    end
-    def to_s
-      name
-    end
-  end
+module RChoice
+  class Option
+    include FromHash
+    attr_accessor :base_obj
+    fattr(:execute_args) { [base_obj] }
+    def execute!(&b)
+      b.call(*execute_args)
+    end
+    def to_s
+      base_obj.to_s
+    end
+  end
+
+  class ProcOption < Option
+    include FromHash
+    attr_accessor :name, :blk
+    def execute!
+      blk.call
+    end
+    def to_s
+      name
+    end
+  end
 end

data/rchoice.gemspec

@@ -1,77 +1,89 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rchoice}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mike Harris"]
-  s.date = %q{2011-12-14}
-  s.description = %q{choice}
-  s.email = %q{mharris717@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/rchoice.rb",
-    "lib/rchoice/choice.rb",
-    "lib/rchoice/choosers/command_line_chooser.rb",
-    "lib/rchoice/core_ext.rb",
-    "lib/rchoice/option.rb",
-    "rchoice.gemspec",
-    "spec/choice_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/mharris717/rchoice}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{choice}
-  s.test_files = [
-    "spec/choice_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mharris_ext>, [">= 0"])
-      s.add_runtime_dependency(%q<andand>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-    else
-      s.add_dependency(%q<mharris_ext>, [">= 0"])
-      s.add_dependency(%q<andand>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mharris_ext>, [">= 0"])
-    s.add_dependency(%q<andand>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "rchoice"
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mike Harris"]
+  s.date = "2013-05-15"
+  s.description = "choice"
+  s.email = "mharris717@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rchoice.rb",
+    "lib/rchoice/choice.rb",
+    "lib/rchoice/choosers/command_line_chooser.rb",
+    "lib/rchoice/choosers/redis_chooser.rb",
+    "lib/rchoice/core_ext.rb",
+    "lib/rchoice/option.rb",
+    "rchoice.gemspec",
+    "spec/choice_spec.rb",
+    "spec/spec_helper.rb",
+    "vol/choice.txt",
+    "vol/set_choice.rb"
+  ]
+  s.homepage = "http://github.com/mharris717/rchoice"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "choice"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<andand>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_development_dependency(%q<guard-spork>, [">= 0"])
+      s.add_development_dependency(%q<lre>, [">= 0"])
+    else
+      s.add_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_dependency(%q<andand>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, [">= 1.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_dependency(%q<guard-spork>, [">= 0"])
+      s.add_dependency(%q<lre>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mharris_ext>, [">= 0"])
+    s.add_dependency(%q<andand>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, [">= 1.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_dependency(%q<guard-spork>, [">= 0"])
+    s.add_dependency(%q<lre>, [">= 0"])
+  end
+end
+

data/spec/choice_spec.rb

@@ -1,108 +1,123 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'ProcChoice' do
-  before do
-    @results = []
-    @choice = RChoice::ProcChoice.new
-    @choice.add_option(:a) { @results << :a }
-    @choice.add_option(:b) { @results << :b }
-  end
-  describe 'choosing first' do
-    before do
-      @choice.chooser = lambda { |c| c.options.first }
-    end
-    it 'should execute first action' do
-      @choice.execute!
-      @results.should == [:a]
-    end
-  end
-end
-
-describe 'loading options' do
-  before do
-    @choice = RChoice::Choice.new(:options => [3,7])
-  end
-  it 'should load options' do
-    @choice.options.first.class.should == RChoice::Option
-  end
-end
-describe "Choice" do
-  before do
-    @choice = RChoice::Choice.new
-    @choice.add_option 3
-    @choice.add_option 7
-  end
-
-  describe 'choosing first' do
-    before do
-      @choice.chooser = lambda { |c| c.options.first }
-    end
-    it 'should choose first' do
-      @choice.chosen_option.base_obj.should == 3
-    end
-  end
-
-  describe 'choosing none' do
-    before do
-      @choice.chooser = lambda { |c| nil }
-    end
-    it 'should allow no choice if optional is true' do
-      @choice.optional = true
-      @choice.chosen_option.should be_nil
-    end
-    it 'should error if optional is false' do
-      lambda { @choice.chosen_option }.should raise_error(RChoice::OptionNotChosenError)
-    end
-
-    describe 'cl chooser' do
-      before do
-        chooser = RChoice::CommandLineChooser.new
-        stub(chooser).get_choice_num { 1 }
-        stub(chooser).print_line(anything) { }
-        @choice.chooser = chooser
-      end
-      it 'should choose first' do
-        @choice.chosen_option.base_obj.should == 7
-      end
-    end
-  end
-
-  describe 'executing' do
-    before do
-      @results = []
-      @choice.action_blk = lambda { |op| @results << op }
-      @choice.chooser = lambda { |c| c.options.first }
-    end
-    it 'should call action' do
-      @choice.execute!
-      @results.should == [3]
-    end
-  end
-end
-
-describe 'core' do
-  it 'should parse 0' do
-    '0'.safe_to_i.should == 0
-    ' 0 '.safe_to_i.should == 0
-  end
-  it 'should parse 1' do
-    '1'.safe_to_i.should == 1
-    ' 1 '.safe_to_i.should == 1
-  end
-  it 'should parse -1' do
-    '-1'.safe_to_i.should == -1
-    ' -1 '.safe_to_i.should == -1
-  end
-  it 'should not parse blank' do
-    lambda { ''.safe_to_i }.should raise_error
-    lambda { '   '.safe_to_i }.should raise_error
-  end
-  it 'should not parse junk' do
-    lambda { ' ab'.safe_to_i }.should raise_error
-    lambda { 'a4'.safe_to_i }.should raise_error
-  end
-  it 'should parse -1.5' do
-    '-1.5'.safe_to_i.should == -1
-    ' -1.5 '.safe_to_i.should == -1
-  end
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'ProcChoice' do
+  before do
+    @results = []
+    @choice = RChoice::ProcChoice.new
+    @choice.add_option(:a) { @results << :a }
+    @choice.add_option(:b) { @results << :b }
+  end
+  describe 'choosing first' do
+    before do
+      @choice.chooser = lambda { |c| c.options.first }
+    end
+    it 'should execute first action' do
+      @choice.execute!
+      @results.should == [:a]
+    end
+  end
+end
+
+describe 'loading options' do
+  before do
+    @choice = RChoice::Choice.new(:options => [3,7])
+  end
+  it 'should load options' do
+    @choice.options.first.class.should == RChoice::Option
+  end
+end
+
+describe 'redis' do
+  let(:choice) do
+    res = RChoice::Choice.new(:options => [3,7])
+    res.chooser = RChoice::RedisChooser.new
+    res
+  end
+  it 'should load options' do
+    choice.options.first.class.should == RChoice::Option
+  end
+  it 'gets answer' do
+    puts choice.chosen_option.inspect
+  end
+end
+
+describe "Choice" do
+  before do
+    @choice = RChoice::Choice.new
+    @choice.add_option 3
+    @choice.add_option 7
+  end
+
+  describe 'choosing first' do
+    before do
+      @choice.chooser = lambda { |c| c.options.first }
+    end
+    it 'should choose first' do
+      @choice.chosen_option.base_obj.should == 3
+    end
+  end
+
+  describe 'choosing none' do
+    before do
+      @choice.chooser = lambda { |c| nil }
+    end
+    it 'should allow no choice if optional is true' do
+      @choice.optional = true
+      @choice.chosen_option.should be_nil
+    end
+    it 'should error if optional is false' do
+      lambda { @choice.chosen_option }.should raise_error(RChoice::OptionNotChosenError)
+    end
+
+    describe 'cl chooser' do
+      before do
+        chooser = RChoice::CommandLineChooser.new
+        stub(chooser).get_choice_num { 1 }
+        stub(chooser).print_line(anything) { }
+        @choice.chooser = chooser
+      end
+      it 'should choose first' do
+        @choice.chosen_option.base_obj.should == 7
+      end
+    end
+  end
+
+  describe 'executing' do
+    before do
+      @results = []
+      @choice.action_blk = lambda { |op| @results << op }
+      @choice.chooser = lambda { |c| c.options.first }
+    end
+    it 'should call action' do
+      @choice.execute!
+      @results.should == [3]
+    end
+  end
+end
+
+describe 'core' do
+  it 'should parse 0' do
+    '0'.safe_to_i.should == 0
+    ' 0 '.safe_to_i.should == 0
+  end
+  it 'should parse 1' do
+    '1'.safe_to_i.should == 1
+    ' 1 '.safe_to_i.should == 1
+  end
+  it 'should parse -1' do
+    '-1'.safe_to_i.should == -1
+    ' -1 '.safe_to_i.should == -1
+  end
+  it 'should not parse blank' do
+    lambda { ''.safe_to_i }.should raise_error
+    lambda { '   '.safe_to_i }.should raise_error
+  end
+  it 'should not parse junk' do
+    lambda { ' ab'.safe_to_i }.should raise_error
+    lambda { 'a4'.safe_to_i }.should raise_error
+  end
+  it 'should parse -1.5' do
+    '-1.5'.safe_to_i.should == -1
+    ' -1.5 '.safe_to_i.should == -1
+  end
 end