rchoice 0.2.0 → 0.3.0

data/.document

@@ -1,5 +1,5 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -1 +1 @@
---color
+--color

data/Gemfile

@@ -1,17 +1,25 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem 'rr'
-end
-
-gem 'mharris_ext'
-gem 'andand'
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.8.0"
+  gem "bundler", ">= 1.2"
+  gem "jeweler", ">= 1.5.2"
+  #gem "rcov", ">= 0"
+  gem 'rr'
+
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+
+  gem 'lre'
+end
+
+gem 'mharris_ext'
+gem 'andand'
+
+gem 'redis'

data/Gemfile.lock

@@ -1,38 +1,79 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    andand (1.3.1)
-    diff-lcs (1.1.2)
-    facets (2.9.1)
-    fattr (2.2.0)
+    andand (1.3.3)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
+    diff-lcs (1.1.3)
+    facets (2.9.3)
+    fattr (2.2.1)
+    ffi (1.4.0)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    guard (1.6.2)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
+    guard-spork (1.4.2)
+      childprocess (>= 0.2.3)
+      guard (>= 1.1)
+      spork (>= 0.8.4)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mharris_ext (1.5.0)
+      rdoc
+    json (1.7.7)
+    listen (0.7.3)
+    lre (0.3.0)
+      fattr
+      mharris_ext
+      watchr
+    lumberjack (1.0.2)
+    method_source (0.8.1)
+    mharris_ext (1.6.0)
       facets
       fattr
-    rake (0.9.2.2)
-    rcov (0.9.9)
-    rr (1.0.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    redis (3.0.2)
+    rr (1.0.5)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
+    slop (3.4.3)
+    spork (0.9.2)
+    terminal-table (1.4.5)
+    thor (0.17.0)
+    watchr (0.7)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES
   andand
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  bundler (>= 1.2)
+  guard
+  guard-rspec
+  guard-spork
+  jeweler (>= 1.5.2)
+  lre
   mharris_ext
-  rcov
+  redis
   rr
-  rspec (~> 2.3.0)
+  rspec (~> 2.8.0)

data/Guardfile

@@ -0,0 +1,27 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+
+
+
+guard 'rspec', :cli => "--drb" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})   { "spec" } # { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.treetop$})   { "spec" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+
+
+
+guard 'spork' do
+  watch('config/application.rb')
+  watch('config/environment.rb')
+  watch('config/environments/test.rb')
+  watch(%r{^config/initializers/.+\.rb$})
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch('test/test_helper.rb') { :test_unit }
+  watch(%r{features/support/}) { :cucumber }
+end

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2011 Mike Harris
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2011 Mike Harris
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,19 +1,19 @@
-= choice
-
-Description goes here.
-
-== Contributing to choice
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Mike Harris. See LICENSE.txt for
-further details.
-
+= choice
+
+Description goes here.
+
+== Contributing to choice
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Mike Harris. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -1,50 +1,42 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rchoice"
-  gem.homepage = "http://github.com/mharris717/rchoice"
-  gem.license = "MIT"
-  gem.summary = %Q{choice}
-  gem.description = %Q{choice}
-  gem.email = "mharris717@gmail.com"
-  gem.authors = ["Mike Harris"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "choice #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "rchoice"
+  gem.homepage = "http://github.com/mharris717/rchoice"
+  gem.license = "MIT"
+  gem.summary = %Q{choice}
+  gem.description = %Q{choice}
+  gem.email = "mharris717@gmail.com"
+  gem.authors = ["Mike Harris"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rchoice.rb

@@ -1,11 +1,11 @@
-require 'mharris_ext'
-require 'andand'
-
-module RChoice
-  class OptionNotChosenError < Exception; end
-end
-
-d = File.expand_path(File.dirname(__FILE__))
-Dir["#{d}/rchoice/**/*.rb"].each do |f|
-  require f
+require 'mharris_ext'
+require 'andand'
+
+module RChoice
+  class OptionNotChosenError < Exception; end
+end
+
+d = File.expand_path(File.dirname(__FILE__))
+Dir["#{d}/rchoice/**/*.rb"].each do |f|
+  require f
 end

data/lib/rchoice/choice.rb

@@ -1,39 +1,42 @@
-module RChoice
-  class Choice
-    include FromHash
-    attr_accessor :optional, :action_blk, :chooser
-    fattr(:options) { [] }
-    fattr(:option_presenter) do
-      lambda { |o| o.to_s }
-    end
-    fattr(:chosen_option) do
-      res = chooser.call(self)
-      raise OptionNotChosenError.new if !res && !optional
-      res
-    end
-    def execute!
-      return unless action_blk
-      chosen_option.execute!(&action_blk) if chosen_option
-    end
-    def make_option(obj,&b)
-      return obj if obj.kind_of?(Option)
-      obj = {:base_obj => obj} unless obj.kind_of?(Hash)
-      Option.new(obj)
-    end
-    def add_option(obj,&b)
-      self.options << make_option(obj,&b)
-    end
-    def options=(raw)
-      @options = raw.map { |r| make_option(r) }
-    end
-  end
-
-  class ProcChoice < Choice
-    def execute!
-      chosen_option.execute! if chosen_option
-    end
-    def make_option(name,&b)
-      ProcOption.new(:name => name, :blk => b)
-    end
-  end
+module RChoice
+  class Choice
+    include FromHash
+    attr_accessor :optional, :action_blk, :chooser, :name, :parent_obj
+
+    fattr(:choice_id) { rand(100000000000) }
+    fattr(:options) { [] }
+    fattr(:option_presenter) do
+      lambda { |o| o.to_s }
+    end
+    fattr(:chosen_option) do
+      raise "no chooser" unless chooser
+      res = chooser.call(self)
+      raise OptionNotChosenError.new if !res && !optional
+      res
+    end
+    def execute!
+      return unless action_blk
+      chosen_option.execute!(&action_blk) if chosen_option
+    end
+    def make_option(obj,&b)
+      return obj if obj.kind_of?(Option)
+      obj = {:base_obj => obj} unless obj.kind_of?(Hash)
+      Option.new(obj)
+    end
+    def add_option(obj,&b)
+      self.options << make_option(obj,&b)
+    end
+    def options=(raw)
+      @options = raw.map { |r| make_option(r) }
+    end
+  end
+
+  class ProcChoice < Choice
+    def execute!
+      chosen_option.execute! if chosen_option
+    end
+    def make_option(name,&b)
+      ProcOption.new(:name => name, :blk => b)
+    end
+  end
 end