greyhawkweather 0.0.6 → 0.0.7

data/.gitignore

@@ -0,0 +1,5 @@
+*~
+TAGS
+coverage
+coverage.info
+pkg

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in greyhawkweather.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    greyhawkweather (0.0.7)
+      rangehash (>= 0.0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rangehash (0.0.5)
+    rcov (0.9.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  greyhawkweather!
+  rcov
+  rspec

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.7 2011-08-14
+* switching to use rspec
+* switching to use bundler
+* various cleanups based upon flog/flay etc.
+
 === 0.0.6 2011-04-26
 * Fixing problems due to RangeHash update
 

data/Manifest.txt

@@ -1,3 +1,4 @@
+.rspec
 History.txt
 Manifest.txt
 PostInstall.txt
@@ -10,6 +11,7 @@ lib/baselinedata.rb
 lib/greyhawkweather.rb
 lib/greyhawkweathergenerator.rb
 lib/month.rb
+lib/options.rb
 lib/precipitation.rb
 lib/precipitationinfo.rb
 lib/precipitationoccurance.rb
@@ -22,18 +24,18 @@ lib/wind.rb
 script/console
 script/destroy
 script/generate
-test/rollers/avgroller.rb
-test/rollers/riggedroller.rb
-test/test_acceptance.rb
-test/test_dieroller.rb
-test/test_greyhawkweather.rb
-test/test_helper.rb
-test/test_month.rb
-test/test_precipitation.rb
-test/test_precipitation_occurance.rb
-test/test_singledayweather.rb
-test/test_sky_conditions.rb
-test/test_temperature_range.rb
-test/test_weather_generator.rb
-test/test_wind.rb
+spec/acceptance_spec.rb
+spec/dieroller_spec.rb
+spec/latitude_spec.rb
+spec/month_spec.rb
+spec/options_spec.rb
+spec/precipation_spec.rb
+spec/precipitation_occurance_spec.rb
+spec/singledayweather_spec.rb
+spec/sky_conditions_spec.rb
+spec/spec_helper.rb
+spec/temperature_range_spec.rb
+spec/weathergenerator_spec.rb
+spec/wind_spec.rb
+tasks/rspec.rake
 todo.org

data/Rakefile

@@ -1,26 +1,14 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/greyhawkweather'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'greyhawkweather' do
-  self.developer 'Mark Simpson', 'verdammelt@gmail.com'
-  self.post_install_message = 'PostInstall.txt'
-  self.rubyforge_name       = self.name
-  self.extra_deps         = [['rangehash','>= 0.0.1']]
-  self.extra_rdoc_files	= ["README.rdoc"]
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--format', 'progress']
 end
 
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
+desc "Run all specs with RCov"
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov = true
+  t.rcov_opts = ['--text-report', '--save', 'coverage.info', '--exclude', 'spec_helper', '--exclude', '^/']
+end
 
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+task :default => [:spec]

data/bin/greyweathergen

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby -s
 
 # arbitrary defaults: Weather will be generated for 1st of Planting
-
 $month ||= 4
 $numdays ||= 28
 $terrain ||= "plains"
@@ -12,7 +11,12 @@ gem 'rangehash'
 require File.dirname(__FILE__) + '/../lib/greyhawkweather'
 require 'GreyhawkWeatherGenerator'
 
-weather_generator = GreyhawkWeatherGenerator.create_weather_generator $month.to_i, $numdays.to_i, DieRoller.new, $terrain.to_sym
+options = WeatherGeneratorOptions.new({
+  :month => $month.to_i,
+  :num_days => $numdays.to_i,
+  :terrain => $terrain.to_sym
+})
+weather_generator = GreyhawkWeatherGenerator.create_weather_generator options
 
 i=0
 weather_generator.days.each do |d|

data/greyhawkweather.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "greyhawkweather/version"
+
+Gem::Specification.new do |s|
+  s.name        = "greyhawkweather"
+  s.version     = Greyhawkweather::VERSION
+  s.authors     = ["Mark Simpson"]
+  s.email       = ["verdammelt@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Generates randomized weather based upon the 1983 Greyhawk boxed set.}
+  s.description = <<-EOF
+    Using this gem one can generate randomized weather based upon the 
+    rules found in the 1983 boxed set.
+
+    Currently not all features of those rules are applied.
+
+    Future plans include the ability to choose different months and 
+    weather chances instead of only those from Greyhawk.
+  EOF
+
+  s.rubyforge_project = "greyhawkweather"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  s.add_dependency "rangehash", ">=0.0.5"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rcov"
+end

data/lib/baselinedata.rb

@@ -1,5 +1,3 @@
-require 'YAML' unless defined? YAML
-
 require 'temperaturerange'
 require 'skyconditions'
 require 'month'
@@ -18,7 +16,7 @@ class BaselineData
   end
 
   def month(monthnum)
-    month_data = @all_data[monthnum -1]
+    month_data = @all_data[monthnum - 1]
     Month.new(month_data[:temp_range], make_skyconditions(month_data[:sky_conditions]), month_data[:precipitation_chance])
   end
   

data/lib/greyhawkweather.rb

@@ -1,6 +1,5 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module Greyhawkweather
-  VERSION = '0.0.6'
-end
+require 'greyhawkweather/version'
+

data/lib/greyhawkweather/version.rb

@@ -0,0 +1,4 @@
+
+module Greyhawkweather
+  VERSION = '0.0.7'
+end

data/lib/greyhawkweathergenerator.rb

@@ -1,15 +1,13 @@
 require 'baselinedata'
 require 'util/dieroller'
 require 'weathergenerator'
+require 'options'
 
 class GreyhawkWeatherGenerator
-  def self.create_weather_generator (month_index, num_days = 1, dieroller = DieRoller.new, terrain = :plains)
+  def self.create_weather_generator (options)
     WeatherGenerator.new(BaselineData.load("data/baselinedata.yml"), 
-                         PrecipitationOccurance.load("data/precipitationoccurance.yml"), 
-                         month_index, 
-                         num_days, 
-                         dieroller,
-                         terrain)
+                         PrecipitationOccurance.load("data/precipitationoccurance.yml"),
+                         options)
   end
 end
 

data/lib/options.rb

@@ -0,0 +1,15 @@
+require 'util/dieroller'
+
+class WeatherGeneratorOptions
+  attr_reader :month
+  attr_reader :num_days
+  attr_reader :dieroller
+  attr_reader :terrain
+
+  def initialize (args = {})
+    @month = args.fetch(:month, 1)
+    @num_days = args.fetch(:num_days, 28)
+    @dieroller = args.fetch(:dieroller, DieRoller.new)
+    @terrain = args.fetch(:terrain, :plains)
+  end
+end	

data/lib/precipitationoccurance.rb

@@ -67,17 +67,21 @@ class PrecipitationOccurance < RangeHash
   end
 
   def line_above(precip_info)
-    prev_key = sorted_keys[[0,index_of_precip(precip_info)-1].max]
+    current_index = index_of_precip(precip_info) || 0
+    prev_key = sorted_keys[[0,current_index-1].max]
     self[prev_key]
   end
   
   def line_below(precip_info)
-    next_key = sorted_keys[[sorted_keys.length,index_of_precip(precip_info)+1].min]
+    current_index = index_of_precip(precip_info) || sorted_keys.length
+    index = [sorted_keys.length,current_index+1].min
+    next_key = sorted_keys[index]
     self[next_key]
   end
   
   def index_of_precip(precip_info)
-    key = index(precip_info)
-    index_of_key = sorted_keys.index(key)
+    pair = select {|k, v| v == precip_info }.first
+    key = pair.first
+    index_of_key = sorted_keys.index(key) 
   end
 end

data/lib/singledayweather.rb

@@ -2,18 +2,20 @@ require 'month'
 require 'precipitationoccurance'
 require 'precipitationinfo'
 require 'wind'
+require 'util/dieroller'
 
 class SingleDayWeather
   attr_reader :temperature_range
   attr_reader :sky_conditions
   attr_reader :precipitation
   attr_reader :wind
-  
+
   def initialize (month, dieroller, 
                   precipitation_occurance_chart=PrecipitationOccurance.new({ 0..100 => NullPrecipitationInfo.new() }),
                   record_temp=nil,
-                  terrain = :plains)
-    @temperature_range = month.temp_range(dieroller, record_temp)
+                  terrain = :plains,
+                  latitude = 40)
+    @temperature_range = adjust_for_latitude(month.temp_range(dieroller, record_temp), latitude)
     @sky_conditions = month.sky_conditions(dieroller)
     @record_temp = record_temp
     @precipitation =
@@ -25,5 +27,11 @@ class SingleDayWeather
   def inspect
     "#{@record_temp} #{@temperature_range} #{@sky_conditions} #{@precipitation} #{@wind}"
   end
+
+  private
+  def adjust_for_latitude (range, latitude)
+    adjustment = (latitude-40)*2
+    Range.new(range.first+adjustment, range.last+adjustment)
+  end
 end
 

data/lib/skyconditions.rb

@@ -4,7 +4,7 @@ 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(:none)
-    @condition_ranges.merge!(hash)
+    @condition_ranges.merge! hash
   end
   
   def condition(roller)

data/lib/temperaturerange.rb

@@ -15,10 +15,18 @@ class TemperatureRange
     record = make_record_array record
 
     base = @base
-    base = base + (record.find_all{ |r| r == :high}.length * (@high_adj[0] + @high_adj[1]))
-    base = base - (record.find_all{ |r| r == :low}.length * (@low_adj[0] + @low_adj[1]))
+    base = base + record_adjustment(record, :high, @high_adj)
+    base = base - record_adjustment(record, :low, @low_adj)
     base
   end
+
+  def count_records(record, type)
+	  record.find_all{|r| r == type}.length
+  end
+
+  def record_adjustment(record, type, adjustment_values)
+    (count_records(record, type) * (adjustment_values[0] + adjustment_values[1]))
+  end
   
   def make_record_array(record)
     ((record.class == Array) ? record : [record])

data/lib/util/dieroller.rb

@@ -1,11 +1,11 @@
 class DieRoller
-  def roll(nSides, modifier=0)
-    rand(nSides) + 1 + modifier
+  def roll(num_sides, modifier=0)
+    rand(num_sides) + 1 + modifier
   end
 end
 
 class NullDieRoller
-  def roll(nSides, modifier=0)
+  def roll(num_sides, modifier=0)
     -1
   end
 end

data/lib/weathergenerator.rb

@@ -3,9 +3,11 @@ require 'singledayweather'
 class WeatherGenerator
   attr_reader :days
 
-  def initialize (baselinedata, precipitation_occurance_chart, month_index, num_days, dieroller, terrain = :plains)
-    month_for_each_day = make_months_for_days_array(baselinedata, month_index, num_days)
-    @days = month_for_each_day.map { |month| make_weather month, dieroller, precipitation_occurance_chart, terrain}
+  def initialize (baselinedata, precipitation_occurance_chart, options)
+    month_for_each_day = make_months_for_days_array(baselinedata, options.month, options.num_days)
+    @days = month_for_each_day.map do |month|
+      make_weather month, options.dieroller, precipitation_occurance_chart, options.terrain
+    end
   end
   
   private
@@ -31,14 +33,18 @@ class WeatherGenerator
     SingleDayWeather.new(month, dieroller, precipitation_occurance_chart, check_record_high_low(dieroller), terrain)
   end
   
+  RECORD_HIGH_LOW_RANGES = {
+    1 => [:low, :low, :low],
+    2 => [:low, :low],
+    3..4 => :low,
+    97..98 => :high,
+    99 => [:high, :high],
+    100 => [:high, :high, :high]
+  }
+
   def check_record_high_low(dieroller)
     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]})
+    record_high_low_range.merge!(RECORD_HIGH_LOW_RANGES)
     record_high_low_range[dieroller.roll(100)]
   end
 end

data/lib/wind.rb

@@ -1,8 +1,10 @@
 
 class Wind
+  DIRECTIONS = [:N, :NE, :E, :SE, :S, :SW, :W, :NW]
+
   def initialize(dieroller)
     @speed = dieroller.roll(20, -1)
-    @direction = [:N, :NE, :E, :SE, :S, :SW, :W, :NW][dieroller.roll(8, -1)]
+    @direction = DIRECTIONS[dieroller.roll(8, -1)]
   end
   
   def to_s

data/spec/acceptance_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'greyhawkweathergenerator'
+
+describe "Acceptance Tests" do
+  context GreyhawkWeatherGenerator do
+    let(:roller) do
+      avg_roller_mock
+    end
+
+    context "generates weather with" do
+      let(:options) { WeatherGeneratorOptions.new({:month => 4, :num_days => 1, :dieroller => roller}) }
+      let(:weather) { GreyhawkWeatherGenerator.create_weather_generator(options).days[0] }
+      subject { weather }
+      its(:temperature_range) { should == (44..63) }
+      its(:sky_conditions) {  should == :partly_cloudy }
+
+      its(:precipitation) {  should be_a_kind_of(Array) }
+      its(:precipitation) {  should be }
+      
+      describe "precipation" do
+        subject { weather.precipitation[0] }
+        it { should be_a_kind_of(Precipitation) } 
+        its(:name) { should == NullPrecipitationInfo.new.name }
+      end
+    end
+    
+    it "should generate multiple days" do
+      num_days = 3
+      options = WeatherGeneratorOptions.new({:dieroller => roller, :num_days  => num_days})
+      generator = GreyhawkWeatherGenerator.create_weather_generator(options)
+
+      generator.days.should have(num_days).items
+      generator.days.should_not include(nil)
+    end
+    
+    it "generates weather for the given month" do
+      options = WeatherGeneratorOptions.new({:dieroller => roller, :month => 8})
+      generator = GreyhawkWeatherGenerator.create_weather_generator(options)
+      weather = generator.days[0]
+      weather.temperature_range.should eq((66..83))
+      weather.sky_conditions.should eq(:partly_cloudy)
+    end
+
+    it "generates weather given a terrain" do
+      roller = rigged_roller_mock 1
+      options = WeatherGeneratorOptions.new({:dieroller => roller, :terrain => :desert})
+      generator = GreyhawkWeatherGenerator.create_weather_generator(options)
+      weather = generator.days[0]
+      weather.precipitation[0].name.should == NullPrecipitationInfo.new().name
+    end
+  end
+end