crapshoot 0.1.0 → 0.1.1

data/Gemfile

@@ -1,12 +1,10 @@
 source "http://rubygems.org"
 
-gemspec
+# gemspec
+gem 'activesupport', '~> 3.0'
 
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem 'jeweler', '~> 1.5.2'
   gem 'guard-test', '~> 0.1.4'
-  gem 'treetop', '~> 1.4.9'
+  gem "shoulda", "~> 2.11.3"
 end

data/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: .
-  specs:
-    crapshoot (0.0.0)
-      activesupport (~> 3.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -25,24 +19,16 @@ GEM
       rake (>= 0.8.1)
     open_gem (1.4.2)
       launchy (~> 0.3.5)
-    polyglot (0.3.1)
     rake (0.8.7)
-    rcov (0.9.9)
     shoulda (2.11.3)
     test-unit (2.1.2)
     thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (~> 3.0)
-  bundler (~> 1.0.0)
-  crapshoot!
   guard-test (~> 0.1.4)
   jeweler (~> 1.5.2)
-  rcov
-  shoulda
-  treetop (~> 1.4.9)
+  shoulda (~> 2.11.3)

data/README.rdoc

@@ -1,6 +1,28 @@
 = crapshoot
 
-Description goes here.
+The alpha and omega of rolling dice.
+
+== Why
+
+Sometimes you want to roll four six-sided dice, drop the lowest, add three four-sided dice, and subtract seventeen.
+
+    Crapshoot.roll '4d6v + 3d4 - 17'
+
+You might otherwise want to roll three twenty-sided dice and drop the highest, and then add six:
+
+    Crapshoot.roll '3d20^+6'
+
+Or you might just want nine:
+
+    Crapshoot.roll '9'
+
+== Developing with Ragel
+
+I used the "Ragel" state machine compiler to generate the parser for this library. If you're changing the parser, you will need to install Ragel.
+
+I've had good luck with the macports and homebrew packages for Ragel; I don't anticipate any problems with any packaging of it.
+
+If you are modifying the parser, you may want to generate a Graphviz .dot or PDF document of the state machine produced by the scanner. The "rake scanner:pdf" task will generate this PDF, provided your installation of Graphviz allows it. If you're developing on Mac OS X, you can get a PDF-capable copy of Graphviz from http://www.graphviz.org/Download_macos.php .
 
 == Contributing to crapshoot
  
@@ -8,9 +30,9 @@ Description goes here.
 * 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
+* Write tests for your feature
 * 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.
+* Send me a pull request
 
 == Copyright
 

data/Rakefile

@@ -22,8 +22,9 @@ Jeweler::Tasks.new do |gem|
   # 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 'activesupport', '~> 3.0'
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_development_dependency 'shoulda', '~> 2.11.3'
+  gem.add_development_dependency 'bundler', '~> 1.0.7'
+  gem.add_development_dependency 'jeweler', '~> 1.5.2'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -57,13 +58,6 @@ end
 
 directory 'doc'
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/crapshoot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crapshoot}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryce Kerley"]
@@ -60,54 +60,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<crapshoot>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-      s.add_development_dependency(%q<treetop>, ["~> 1.4.9"])
-      s.add_development_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-      s.add_development_dependency(%q<treetop>, ["~> 1.4.9"])
+      s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<crapshoot>, [">= 0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0"])
-      s.add_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-      s.add_dependency(%q<treetop>, ["~> 1.4.9"])
-      s.add_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-      s.add_dependency(%q<treetop>, ["~> 1.4.9"])
+      s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<crapshoot>, [">= 0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0"])
-    s.add_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-    s.add_dependency(%q<treetop>, ["~> 1.4.9"])
-    s.add_dependency(%q<shoulda>, [">= 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<guard-test>, ["~> 0.1.4"])
-    s.add_dependency(%q<treetop>, ["~> 1.4.9"])
+    s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     s.add_dependency(%q<activesupport>, ["~> 3.0"])
+    s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
   end
 end
 

data/lib/crapshoot.rb

@@ -1,4 +1,3 @@
-require 'treetop'
 require 'active_support'
 %w{ scanner postfixer evaluator }.each do |f|
   require File.join(File.dirname(__FILE__), 'crapshoot', f)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bryce Kerley
@@ -17,22 +17,9 @@ cert_chain: []
 date: 2010-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: crapshoot
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,38 +30,10 @@ dependencies:
         version: "3.0"
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -86,23 +45,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: guard-test
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -114,122 +60,81 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: treetop
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 9
-        version: 1.4.9
-  type: :development
-  prerelease: false
-  version_requirements: *id008
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: activesupport
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 0
+        - 3
         - 0
-        version: 1.0.0
-  type: :development
+        version: "3.0"
+  type: :runtime
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: shoulda
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 5
         - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: guard-test
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 0
+        - 7
+        version: 1.0.7
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: treetop
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 4
-        - 9
-        version: 1.4.9
+        - 5
+        - 2
+        version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id015
+  version_requirements: *id008
 description: Crapshoot is a dice-rolling gem that parses complicated notation for most of your pen-and-paper gaming needs.
 email: bkerley@brycekerley.net
 executables: []
@@ -278,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -352312256047208438
+      hash: -2401645687353954734
       segments: 
       - 0
       version: "0"