greyhawkweather 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.0.6 2011-04-26
+* Fixing problems due to RangeHash update
+
 === 0.0.5 2011-01-04
 
 * Fixing warnings when running the script

data/lib/baselinedata.rb

@@ -1,4 +1,4 @@
-require 'YAML' unless defined? :YAML
+require 'YAML' unless defined? YAML
 
 require 'temperaturerange'
 require 'skyconditions'

data/lib/greyhawkweather.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Greyhawkweather
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/precipitationoccurance.rb

@@ -1,4 +1,4 @@
-require 'YAML' unless defined? :YAML
+require 'YAML' unless defined? YAML
 
 require 'rangehash'
 
@@ -12,8 +12,9 @@ class PrecipitationOccurance < RangeHash
     PrecipitationOccurance.new(data)
   end
 
-  def initialize(args = nil)
-    super args, NullPrecipitationInfo.new()
+  def initialize(args = {})
+    super NullPrecipitationInfo.new()
+    merge!(args)
   end
   
   def type(dieroller, temp_range = nil, terrain = :plains)
@@ -67,17 +68,16 @@ class PrecipitationOccurance < RangeHash
 
   def line_above(precip_info)
     prev_key = sorted_keys[[0,index_of_precip(precip_info)-1].max]
-    @key_value_hash[prev_key]
+    self[prev_key]
   end
   
   def line_below(precip_info)
     next_key = sorted_keys[[sorted_keys.length,index_of_precip(precip_info)+1].min]
-    @key_value_hash[next_key]
+    self[next_key]
   end
   
   def index_of_precip(precip_info)
-    key = @key_value_hash.index(precip_info)
+    key = index(precip_info)
     index_of_key = sorted_keys.index(key)
   end
-  
 end

data/lib/skyconditions.rb

@@ -3,7 +3,8 @@ require 'rangehash'
 class SkyConditions
   def initialize (clear_range, partly_range, cloudy_range)
     hash = { clear_range => :clear, partly_range => :partly_cloudy, cloudy_range => :cloudy}
-    @condition_ranges = RangeHash.new(hash , :none)
+    @condition_ranges = RangeHash.new(:none)
+    @condition_ranges.merge!(hash)
   end
   
   def condition(roller)

data/lib/weathergenerator.rb

@@ -32,13 +32,13 @@ class WeatherGenerator
   end
   
   def check_record_high_low(dieroller)
-    record_high_low_range = RangeHash.new({ 1 => [:low, :low, :low],
+    record_high_low_range = RangeHash.new(:normal)
+    record_high_low_range.merge!({ 1 => [:low, :low, :low],
                                           2 => [:low, :low],
                                           3..4 => :low,
                                           97..98 => :high,
                                           99 => [:high, :high],
-                                          100 => [:high, :high, :high]},
-                                          :normal)
+                                          100 => [:high, :high, :high]})
     record_high_low_range[dieroller.roll(100)]
   end
 end

data/todo.org

@@ -25,26 +25,29 @@ Minimum features needed to let me use the tool in my own game
 ** DONE check for requirements on precip
 *** DONE temp range
 *** DONE terrain
+** DONE clean up after gem-ify work, and removal of rangehash
+** DONE rearrange code a bit (helper classes in subdirectories etc.)
+* Release #1.5
+** TODO Switch to rspec
+* Release #2
 ** need to calc diff in base temp caused by latitude
+** modify weather given terrain
 ** duration of record high/low
-
 ** determine windspeed from precipitation
+** clean warnings from test runs
+** report affects of precip (duration etc.)
+** greyhawk calendar festivals
 
-** DONE clean up after gem-ify work, and removal of rangehash
-** TODO clean warnings from test runs
+* humidity
+* report wind chill temp
+* report high wind effect table
+* need to calc diff in base temp caused by altitude
 * fix infinite loop in weather generation (probaly only a problem in tests)
 * need to calc diff in sun-rise/-set time caused by longitude
-* need to calc diff in base temp caused by altitude
 * phase of moons for date
 * sunrise/sunset times for date
-* modify weather given terrain
 * interpret special precipitation (based upon terrain)
-* report wind chill temp
-* report high wind effect table
-* report affects of precip (duration etc.)
-* humidity
 * arbitrary start day
-* greyhawk calendar festivals
-* DONE rearrange code a bit (helper classes in subdirectories etc.)
 * precipitation occurance chart should not be publically a ranged hash?
 * ranged hash sorting is bad stuff (and not yet complete!)
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: greyhawkweather
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mark Simpson
@@ -36,7 +36,7 @@ cert_chain:
   rPnJW2hNpPLFrA==
   -----END CERTIFICATE-----
 
-date: 2011-01-04 00:00:00 -05:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,53 +56,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id004
 description: |-
   This program will assist in the generation of randomized weather for
   the Greyhawk AD&D Campaign setting.  It uses data from the Greyhawk
@@ -161,6 +129,7 @@ files:
 - test/test_weather_generator.rb
 - test/test_wind.rb
 - todo.org
+- .gemtest
 has_rdoc: true
 homepage: http://github.com/verdammelt/Greyhawk-Weather
 licenses: []
@@ -192,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: greyhawkweather
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: This program will assist in the generation of randomized weather for the Greyhawk AD&D Campaign setting