conway_deathmatch 0.5.0.3 → 0.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95413f3557aa8dcb568065213eb0e296c951aac2
-  data.tar.gz: 7640ea076629eaab5134bed4f11288155916de58
+SHA256:
+  metadata.gz: d20c966d1ffe3ac886d2315514779065ff4e17a3fd8c3927401eae066642bdba
+  data.tar.gz: de732dcf01de06570287852844cd87a6d629b448c27a73b111e4c4cc2cdcdad8
 SHA512:
-  metadata.gz: 0ce56f027fdcf40ed302a65a928c22b9b7e3677c3c755505941a3546d1391bfb5af6810f9e092e19845d55d3d3cfd533954930e815d9f8d676305fc09b714e10
-  data.tar.gz: abdedab43e2091b6a3f150e909685a90acaafe59022d73a6ce9003eb9d5b31a88fc2be44209238dd4a9339175c4043539ad85369a77106cc77bc489fa85ec33d
+  metadata.gz: 81dbf4124a1cc0a97410221405f52aad977a378f455f38eddc49896f387891731d32f37d45e0d9bf686cd8453faa6441363e20deb99affdb64c2ed8d4d372743
+  data.tar.gz: cce9be6dd2fb3a4dc2b047d39ec56dc14dbc81f2eb3301e4e8822ba11fefd5d3c291d187ede915fac6cf12d547fecfab4a565d88cbe3fc03cb7a7eadebd965e3

data/README.md

@@ -1,8 +1,5 @@
-[![Build Status](https://travis-ci.org/rickhull/conway_deathmatch.svg?branch=master)](https://travis-ci.org/rickhull/conway_deathmatch)
+[![CI Status](https://github.com/rickhull/conway_deathmatch/actions/workflows/ci.yaml/badge.svg)](https://github.com/rickhull/conway_deathmatch/actions/workflows/ci.yaml)
 [![Gem Version](https://badge.fury.io/rb/conway_deathmatch.svg)](http://badge.fury.io/rb/conway_deathmatch)
-[![Code Climate](https://codeclimate.com/github/rickhull/conway_deathmatch/badges/gpa.svg)](https://codeclimate.com/github/rickhull/conway_deathmatch)
-[![Dependency Status](https://gemnasium.com/rickhull/conway_deathmatch.svg)](https://gemnasium.com/rickhull/conway_deathmatch)
-[![Security Status](https://hakiri.io/github/rickhull/conway_deathmatch/master.svg)](https://hakiri.io/github/rickhull/conway_deathmatch/master)
 
 Introduction
 ===

data/Rakefile

@@ -1,68 +1,117 @@
-require 'buildar'
-
-Buildar.new do |b|
-  b.gemspec_file = 'conway_deathmatch.gemspec'
-  b.version_file = 'VERSION'
-  b.use_git = true
-end
-
-task default: %w[test bench]
-task travis: %w[test bench ruby-prof]
-
 require 'rake/testtask'
+
 desc "Run tests"
 Rake::TestTask.new do |t|
   t.name = "test"
-  t.pattern = "test/test_*.rb"
-  # t.warning = true
+  t.pattern = "test/*.rb"
+  t.warning = true
 end
 
 desc "Run benchmarks"
 Rake::TestTask.new do |t|
   t.name = "bench"
-  t.pattern = "test/bench_*.rb"
-  # t.warning = true
+  t.pattern = "test/bench/*.rb"
+  t.warning = true
 end
 
-desc "Generate code metrics reports"
-task :code_metrics => [:flog, :flay, :roodi] do
-end
+task default: :test
 
-desc "Run flog on lib/"
-task :flog do
-  puts
-  sh "flog lib | tee metrics/flog"
+#
+# METRICS
+#
+
+metrics_tasks = []
+
+begin
+  require 'flog_task'
+  FlogTask.new do |t|
+    t.threshold = 200
+    t.dirs = ['lib']
+    t.verbose = true
+  end
+  metrics_tasks << :flog
+rescue LoadError
+  warn 'flog_task unavailable'
 end
 
-desc "Run flay on lib/"
-task :flay do
-  puts
-  sh "flay lib | tee metrics/flay"
+begin
+  require 'flay_task'
+  FlayTask.new do |t|
+    t.dirs = ['lib']
+    t.verbose = true
+  end
+  metrics_tasks << :flay
+rescue LoadError
+  warn 'flay_task unavailable'
 end
 
-desc "Run roodi on lib/"
-task :roodi do
-  puts
-  sh "roodi -config=.roodi.yml lib | tee metrics/roodi"
+begin
+  require 'roodi_task'
+  RoodiTask.new config: '.roodi.yml', patterns: ['lib/**/*.rb']
+  metrics_tasks << :roodi
+rescue LoadError
+  warn "roodi_task unavailable"
 end
 
+desc "Generate code metrics reports"
+task code_metrics: metrics_tasks
+
+
+#
+# PROFILING
+#
+
 desc "Show current system load"
 task "loadavg" do
   puts File.read "/proc/loadavg"
 end
 
-# this runs against the installed gem lib, not git / filesystem
+def lib_sh(cmd)
+  sh "RUBYLIB=lib #{cmd}"
+end
+
+def rprof_sh(script, args, rprof_args = '')
+  lib_sh ['ruby-prof', rprof_args, script, '--', args].join(' ')
+end
+
+rprof_args = "-m1"
+xname = "bin/conway_deathmatch"
+xargs = "-n 100 -s 0 --renderfinal"
+
 desc "Run ruby-prof on bin/conway_deathmatch (100 ticks)"
 task "ruby-prof" => "loadavg" do
-  sh ["ruby-prof -m1 bin/conway_deathmatch",
-      "-- -n100 -s0 --renderfinal",
-      "| tee metrics/ruby-prof"].join(' ')
+  rprof_sh xname, xargs, rprof_args
 end
 
-# this runs against the installed gem lib, not git / filesystem
 desc "Run ruby-prof with --exclude-common-cycles"
 task "ruby-prof-exclude" => "ruby-prof" do
-  sh ["ruby-prof -m1 --exclude-common-cycles bin/conway_deathmatch",
-      "-- -n100 -s0 --renderfinal",
-      "| tee metrics/ruby-prof-exclude"].join(' ')
+  rprof_sh xname, xargs, "#{rprof_args} --exclude-common-cycles"
 end
+
+task "no-prof" do
+  lib_sh [xname, xargs].join(' ')
+end
+
+#
+# GEM BUILD / PUBLISH
+#
+
+begin
+  require 'buildar'
+
+  Buildar.new do |b|
+    b.gemspec_file = 'conway_deathmatch.gemspec'
+    b.version_file = 'VERSION'
+    b.use_git = true
+  end
+rescue LoadError
+  # ok
+end
+
+
+#
+# TRAVIS CI
+#
+
+desc "Rake tasks for travis to run"
+task travis: %w[test no-prof]

data/VERSION

@@ -1 +1 @@
-0.5.0.3
+0.6.2.1

data/bin/conway_deathmatch

@@ -1,31 +1,35 @@
 #!/usr/bin/env ruby
 
-gem 'slop', '~> 3'
 require 'slop'
 require 'conway_deathmatch'
 require 'conway_deathmatch/shapes'
 
 # process cmdline options
 #
-opts = Slop.parse(help: true,
-                  banner: true,
-                  strict: true,
-                  optional_arguments: true) do
-  banner 'Usage: conway_deathmatch [options]'
+opts = Slop.parse do |o|
+  o.banner = "Usage: conway_deathmatch [options]"
+  o.int '-x', '--width', 'Grid width'
+  o.int '-y', '--height', 'Grid height'
+  o.int '-n', '--ticks', 'Max number of ticks to generate'
+  o.float '-s', '--sleep', 'Sleep duration'
+  o.string '-p', '--points', 'e.g. acorn 50 18 p 1 2 p 3 4'
+  o.bool '-g', '--step', 'Pause each tick for user input'
+  o.bool '-r', '--renderfinal', 'Only render the final state'
+  o.string '-d', '--deathmatch', 'single|aggressive|defensive|friendly'
+  o.string '--one', 'points for population "1"'
+  o.string '--two', 'points for population "2"'
+  o.string '--three', 'points for population "3"'
 
-  on 'x', 'width=',      '[int] Grid width', as: Integer
-  on 'y', 'height=',     '[int] Grid height', as: Integer
-  # on 'D', 'dimensions=', '[str] width x height', as: String
-  on 'n', 'ticks=',  '[int] Max number of ticks to generate', as: Integer
-  on 's', 'sleep=',      '[flt] Sleep duration', as: Float
-  on 'p', 'points=',     '[str] e.g. "acorn 50 18 p 1 2 p 3 4"', as: String
-  on 'g', 'step',        'Hold ticks for user input'
-  on 'r', 'renderfinal', 'Only render the final state'
-  on 'd', 'deathmatch',
-     '[str] single|aggressive|defensive|friendly', as: String
-  on      'one=',        '[str] points for population "1"', as: String
-  on      'two=',        '[str] points for population "2"', as: String
-  on      'three=',      '[str] points for population "3"', as: String
+  o.on '-h', '--help' do
+    puts o
+    exit
+  end
+end
+
+def opts.error(msg = nil)
+  puts self
+  puts "ERROR: #{msg}" if msg
+  exit 1
 end
 
 width = opts[:width] || 70
@@ -40,7 +44,7 @@ deathmatch = case opts[:deathmatch].to_s.downcase
              when 'd', 'defensive' then :defensive
              when 'f', 'friendly' then :friendly
              else
-               raise "unknown: #{opts[:deathmatch]}"
+               opts.error("unknown deathmatch option: #{opts[:deathmatch]}")
              end
 
 # create game
@@ -71,7 +75,7 @@ while n.nil? or count <= n
   b.tick
 
   if opts.step?
-    gets
+    $stdin.gets
   else
     sleep slp if slp > 0.0
   end

data/conway_deathmatch.gemspec

@@ -1,37 +1,19 @@
 Gem::Specification.new do |s|
   s.name        = 'conway_deathmatch'
-  s.version     = File.read(File.join(__dir__, 'VERSION')).chomp
-  s.summary     = "Conway's Game of Life"
-  s.description = "Deathmatch"
+  s.summary     = "Conway's Game of Life, Deathmatch Edition (tm)"
+  s.description = "Several distinct populations competing for survival"
   s.authors     = ["Rick Hull"]
   s.homepage    = 'https://github.com/rickhull/conway_deathmatch'
   s.license     = 'GPL'
-  s.files       = [
-    'conway_deathmatch.gemspec',
-    'VERSION',
-    'Rakefile',
-    'README.md',
-    'lib/conway_deathmatch.rb',
-    'lib/conway_deathmatch/shapes.rb',
-    'lib/conway_deathmatch/shapes/classic.yaml',
-    'lib/conway_deathmatch/shapes/discovered.yaml',
-    'bin/conway_deathmatch',
-    'bin/proving_ground',
-    'test/bench_grid.rb',
-    'test/spec_helper.rb',
-    'test/test_grid.rb',
-    'test/test_shapes.rb',
-  ]
+
+  s.required_ruby_version = ">= 2"
+  s.version     = File.read(File.join(__dir__, 'VERSION')).chomp
+
+  s.files  = %w[conway_deathmatch.gemspec VERSION Rakefile README.md]
+  s.files += Dir['lib/**/*.rb']
+  s.files += Dir['test/**/*.rb']
+  s.files += Dir['bin/**/*.rb']
   s.executables = ['conway_deathmatch']
-  s.add_runtime_dependency "slop", "~> 3.0"
-  s.add_development_dependency "buildar", "~> 2"
-  s.add_development_dependency "minitest", "~> 5"
-  s.add_development_dependency "ruby-prof", "~> 0"
-  s.add_development_dependency "flog", "~> 4.0"
-  s.add_development_dependency "flay", "~> 2.0"
-  s.add_development_dependency "roodi", "~> 4.0"
 
-  # uncomment and set ENV['CODE_COVERAGE']
-  # s.add_development_dependency "simplecov", "~> 0.9.0"
-  s.required_ruby_version = "~> 2"
+  s.add_runtime_dependency "slop", "~> 4.0"
 end

data/lib/conway_deathmatch.rb

@@ -1,15 +1,8 @@
-#require 'conway_deathmatch/shapes'
-#require 'lager'
-
 # Provides a 2d array for the grid
 # Implements standard and deathmatch evaluation rules
 # Boundaries are toroidal: they wrap in each direction
 #
 class ConwayDeathmatch
-  #extend Lager
-  #log_to $stderr
-  class BoundsError < RuntimeError; end
-
   DEAD = '.'
   ALIVE = '0'
 
@@ -27,7 +20,6 @@ class ConwayDeathmatch
     @height = height
     @grid = self.class.new_grid(width, height)
     @deathmatch = deathmatch
-    #@lager = self.class.lager
   end
 
   # Conway's Game of Life transition rules

data/test/{bench_grid.rb → bench/grid.rb}

@@ -3,8 +3,8 @@ require 'minitest/benchmark'
 require 'conway_deathmatch'
 require 'conway_deathmatch/shapes'
 
-BENCH_NEW_THRESH = (ENV['BENCH_NEW_THRESH'] || 0.9).to_f
-BENCH_TICK_THRESH = (ENV['BENCH_TICK_THRESH'] || 0.9995).to_f
+bnew = (ENV['BENCH_NEW_THRESH'] || 0.9).to_f
+btick = (ENV['BENCH_TICK_THRESH'] || 0.9995).to_f
 Shapes = ConwayDeathmatch::Shapes
 
 describe "ConwayDeathmatch.new Benchmark" do
@@ -12,7 +12,7 @@ describe "ConwayDeathmatch.new Benchmark" do
     bench_exp 9, 9999, 3
   end
 
-  bench_performance_linear "width*height", BENCH_NEW_THRESH do |n|
+  bench_performance_linear "width*height", bnew do |n|
     ConwayDeathmatch.new(n, n)
   end
 end
@@ -22,14 +22,13 @@ describe "ConwayDeathmatch#tick Benchmark" do
     bench_exp 1, 100, 3
   end
 
-  bench_performance_linear "acorn demo", BENCH_TICK_THRESH do |n|
+  bench_performance_linear "acorn demo", btick do |n|
     b = ConwayDeathmatch.new(70, 40)
     Shapes.add(b, "acorn 50 18")
     n.times { b.tick }
   end
 
-  bench_performance_linear "aggressive deathmatch demo",
-                           BENCH_TICK_THRESH do |n|
+  bench_performance_linear "aggressive deathmatch demo", btick do |n|
     b = ConwayDeathmatch.new(70, 40)
     b.deathmatch = :aggressive
     Shapes.add(b, "acorn 30 30", "1")
@@ -37,8 +36,7 @@ describe "ConwayDeathmatch#tick Benchmark" do
     n.times { b.tick }
   end
 
-  bench_performance_linear "defensive deathmatch demo",
-                           BENCH_TICK_THRESH do |n|
+  bench_performance_linear "defensive deathmatch demo", btick do |n|
     b = ConwayDeathmatch.new(70, 40)
     b.deathmatch = :defensive
     Shapes.add(b, "acorn 30 30", "1")
@@ -46,8 +44,7 @@ describe "ConwayDeathmatch#tick Benchmark" do
     n.times { b.tick }
   end
 
-  bench_performance_linear "friendly deathmatch demo",
-                           BENCH_TICK_THRESH do |n|
+  bench_performance_linear "friendly deathmatch demo", btick do |n|
     b = ConwayDeathmatch.new(70, 40)
     b.deathmatch = :friendly
     Shapes.add(b, "acorn 30 30", "1")

data/test/grid.rb

@@ -0,0 +1,127 @@
+require_relative 'helper'
+require 'conway_deathmatch'
+
+describe ConwayDeathmatch do
+  before do
+    @alive = ConwayDeathmatch::ALIVE
+    @dead = ConwayDeathmatch::DEAD
+  end
+
+  describe "an empty grid" do
+    before do
+      @x = 5
+      @y = 5
+      @grid = ConwayDeathmatch.new(@x, @y)
+    end
+
+    it "consists entirely of dead cells" do
+      expect(@grid.population[@dead]).must_equal @x * @y
+      expect(@grid.population.keys.length).must_equal 1
+    end
+
+    it "stays dead after a tick" do
+      expect(@grid.tick.population[@dead]).must_equal @x*@y
+      expect(@grid.population.keys.length).must_equal 1
+    end
+
+    it "can be populated by a 2x2 block" do
+      @grid.populate 1,1
+      @grid.populate 1,2
+      @grid.populate 2,1
+      @grid.populate 2,2
+
+      expect(@grid.population[@dead]).must_equal @x * @y - 4
+      expect(@grid.population[@alive]).must_equal 4
+
+      0.upto(4) { |x|
+        0.upto(4) { |y|
+          if x.between?(1, 2) and y.between?(1, 2)
+            expect(@grid.value(x, y)).must_equal @alive
+          else
+            expect(@grid.value(x, y)).must_equal @dead
+          end
+        }
+      }
+    end
+  end
+
+  describe "aggressive deathmatch" do
+    it "allows survivors to switch sides" do
+      # don't risk an infinite loop if a bug is present
+      99.times {
+        @grid = ConwayDeathmatch.new(5, 3, :aggressive)
+        @grid.populate(1, 1, :team)    # friendly
+        @grid.populate(2, 1, :team)    # friendly; eventual survivor
+        @grid.populate(3, 1, :hostile) # enemy
+
+        @grid.tick
+
+        # exit the loop when the survivor switches sides
+        break if @grid.value(2, 1) == :hostile
+      }
+
+      # expect to fail once per 2^99 runs
+      expect(@grid.population.fetch(:team)).must_equal 2
+      expect(@grid.population.fetch(:hostile)).must_equal 1
+
+      # survivors
+      team = [[2, 0], [2, 2]]
+      hostile = [[2, 1]]
+
+      0.upto(4) { |x|
+        0.upto(2) { |y|
+          val = team.include?([x, y]) ? :team :
+                  (hostile.include?([x, y]) ? :hostile : @dead)
+          expect(@grid.value(x, y)).must_equal(val)
+        }
+      }
+    end
+  end
+
+  describe "defensive deathmatch" do
+    it "won't allow survivors to switch sides" do
+      16.times {
+        @grid = ConwayDeathmatch.new(5, 3, :defensive)
+        @grid.populate(1, 1, :team) # friendly
+        @grid.populate(2, 1, :team) # survivor
+        @grid.populate(3, 1, :hostile) # enemy
+        @grid.tick
+
+        expect(@grid.population.fetch(:team)).must_equal 3
+        0.upto(4) { |x|
+          0.upto(2) { |y|
+            if x == 2 and y.between?(0, 2)
+              expect(@grid.value(x, y)).must_equal :team
+            else
+              expect(@grid.value(x, y)).must_equal @dead
+            end
+          }
+        }
+      }
+    end
+  end
+
+  describe "friendly deathmatch" do
+    it "allows survivors even with excess hostiles nearby" do
+      @grid = ConwayDeathmatch.new(5, 5, :friendly)
+      @grid.populate(1, 2, :team)    # friendly
+      @grid.populate(2, 2, :team)    # friendly, eventual survivor
+      @grid.populate(3, 2, :team)    # friendly
+      @grid.populate(2, 1, :hostile) # enemy
+      @grid.populate(2, 3, :hostile) # enemy
+      expect(@grid.population.fetch(:team)).must_equal 3
+      expect(@grid.population.fetch(:hostile)).must_equal 2
+
+      @grid.tick
+
+      # (2,2) alive despite 4 neighbors (2 friendly); now all else @dead
+      expect(@grid.population.fetch(:team)).must_equal 1
+      0.upto(4) { |x|
+        0.upto(4) { |y|
+          expect(@grid.value(x, y)).
+            must_equal(x == 2 && y == 2 ? :team : @dead)
+        }
+      }
+    end
+  end
+end

data/test/helper.rb

@@ -0,0 +1,50 @@
+if ENV['CODE_COVERAGE'] and
+  !%w[false no].include?(ENV['CODE_COVERAGE'].downcase)
+
+  require 'simplecov'
+  require "simplecov_json_formatter"
+
+  class SimpleCov::Formatter::TextFormatter
+    FILENAME = 'metrics/coverage'
+
+    def format(result)
+      tot = result.files
+      rpt = ["Coverage: %0.1f%%" % tot.covered_percent,
+             "Strength: %0.2f" % tot.covered_strength,
+             "   Lines: %i" % tot.lines_of_code,
+             " Covered: %i" % tot.covered_lines,
+             "     N/A: %i" % tot.never_lines,
+            ]
+      if tot.missed_lines > 0
+        rpt << "Missed: %i" % tot.missed_lines
+      end
+      if tot.skipped_lines > 0
+        rpt << "Skipped: %i" % tot.skipped_lines
+      end
+      rpt << result.files.map { |sfile|
+        "%i%% (%i/%i)\t%s" % [sfile.covered_percent,
+                              sfile.covered_lines.length,
+                              sfile.lines_of_code,
+                              sfile.filename]
+      }.join("\n")
+      rpt = rpt.join("\n")
+
+      puts
+      puts rpt
+      if File.writable?(FILENAME)
+        File.open(FILENAME, 'w') { |f|
+          f.write(rpt + "\n")
+        }
+        puts "wrote #{FILENAME}"
+      end
+    end
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::TextFormatter,
+    SimpleCov::Formatter::JSONFormatter,
+  ]
+
+  SimpleCov.start
+end
+require 'minitest/autorun'

data/test/shapes.rb

@@ -0,0 +1,9 @@
+require_relative 'helper'
+require 'conway_deathmatch/shapes'
+
+describe ConwayDeathmatch::Shapes do
+  it "recognizes acorn" do
+    expect(ConwayDeathmatch::Shapes.classic.fetch("acorn")).
+      must_be_instance_of Array
+  end
+end

data/test/shapes_on_grid.rb

@@ -0,0 +1,35 @@
+require_relative 'helper'
+require 'conway_deathmatch'
+require 'conway_deathmatch/shapes'
+
+describe "Shapes on the grid" do
+  before do
+    @alive = ConwayDeathmatch::ALIVE
+    @grid = ConwayDeathmatch.new(20, 20)
+    ConwayDeathmatch::Shapes.add(@grid, "acorn 0 0")
+  end
+
+  it "recognizes \"acorn 0 0\"" do
+    ConwayDeathmatch::Shapes.classic.fetch("acorn").each { |xy_ary|
+      expect(@grid.value(*xy_ary)).must_equal @alive
+    }
+    expect(@grid.population.fetch(@alive)).must_equal 7
+  end
+
+  it "ticks correctly" do
+    @grid.tick
+    new_points = [
+      [0, 1],
+      [1, 1],
+      [2, 1],
+      [4, 1],
+      [4, 2],
+      [5, 1],
+      [5, 2],
+      [5, 3],
+    ].each { |xy_ary|
+      expect(@grid.value(*xy_ary)).must_equal @alive
+    }
+    expect(@grid.population.fetch(@alive)).must_equal new_points.length
+  end
+end

metadata

@@ -1,115 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.5.0.3
+  version: 0.6.2.1
 platform: ruby
 authors:
 - Rick Hull
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: buildar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: flog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: flay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: roodi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: Deathmatch
-email: 
+description: Several distinct populations competing for survival
+email:
 executables:
 - conway_deathmatch
 extensions: []
@@ -119,27 +35,25 @@ files:
 - Rakefile
 - VERSION
 - bin/conway_deathmatch
-- bin/proving_ground
 - conway_deathmatch.gemspec
 - lib/conway_deathmatch.rb
 - lib/conway_deathmatch/shapes.rb
-- lib/conway_deathmatch/shapes/classic.yaml
-- lib/conway_deathmatch/shapes/discovered.yaml
-- test/bench_grid.rb
-- test/spec_helper.rb
-- test/test_grid.rb
-- test/test_shapes.rb
+- test/bench/grid.rb
+- test/grid.rb
+- test/helper.rb
+- test/shapes.rb
+- test/shapes_on_grid.rb
 homepage: https://github.com/rickhull/conway_deathmatch
 licenses:
 - GPL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -148,9 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.4
+signing_key:
 specification_version: 4
-summary: Conway's Game of Life
+summary: Conway's Game of Life, Deathmatch Edition (tm)
 test_files: []

data/bin/proving_ground

@@ -1,137 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'set'
-gem 'slop', '~> 3'
-require 'slop'
-require 'conway_deathmatch'
-require 'conway_deathmatch/shapes'
-
-# process cmdline options
-#
-opts = Slop.parse(help: true,
-                  banner: true,
-	          strict: true,
-		  optional_arguments: true) do
-  banner 'Usage: proving_ground [options]'
-
-  on 'w', 'width=',      '[int] Grid width', as: Integer
-  on      'height=',     '[int] Grid height', as: Integer
-  on 'n', 'num_ticks=',  '[int] Max number of ticks to generate', as: Integer
-  on 'p', 'num_points=', '[int] Number of points to generate', as: Integer
-  on 'm', 'max_collisions=', '[int] Max number of collisions', as: Integer
-end
-
-num_points = opts[:num_points] || 5
-width = opts[:width] || num_points * 5
-height = opts[:height] || num_points * 5
-num_ticks = opts[:num_ticks] || num_points * 5
-max_c = opts[:max_collisions] || num_points ** 2
-
-# choose center point
-# choose next point within 2 units randomly
-def generate_points(num_points, width, height)
-  points = [[width / 2, height / 2]]
-  count = 0
-  while points.length < num_points
-    raise("sanity check failed") if count > num_points * 2
-    count += 1
-    next_p = next_point(points.sample)
-    if next_p[0].between?(0, width - 1) and next_p[1].between?(0, height - 1)
-      points << next_p unless points.include?(next_p)
-    else
-      # debug
-      puts "#{next_p.inspect} out of bounds"
-    end
-  end
-  points
-end
-
-def next_point(prev_point)
-  prev_point.map { |dim| random_within(dim, 2) }
-end
-
-def random_within(x, dist)
-  new_x = x - dist + rand(dist * 2)
-  new_x += 1 if new_x >= x
-  new_x
-end
-
-def shape_str(points)
-  points.map { |point| "p #{point[0]} #{point[1]}" }.join(' ')
-end
-
-def conclude!(results, w, h)
-  results.each { |k, res|
-    puts "#{k} population: #{res[0]}"
-    puts "shape_str: #{shape_str(res[1])}"
-    puts
-  }
-  puts "Grid: #{w}x#{h}"
-
-  exit 0
-end
-
-results = { final: [0], peak: [0], score: [0], }
-seen = Set.new
-collisions = 0
-
-Signal.trap("INT") { conclude!(results, width, height) }
-
-loop {
-  # generate a random shape
-  points = generate_points(num_points, width, height)
-
-  # have we seen these points before?
-  hsh = points.hash
-  if seen.member? hsh
-    collisions += 1
-    puts "X" * collisions
-    break if collisions > max_c # exit the loop, stop generating points
-    next
-  end
-  seen << hsh
-
-  # initialize grid with generated shape
-  b = ConwayDeathmatch.new(width, height)
-  b.add_points(points)
-
-  current = peak = score = 0     # track population (results)
-  static_count = 0               # detect a stabilized grid
-
-  # iterate the game of life
-  num_ticks.times { |i|
-    b.tick
-
-    # evaluate grid
-    last = current
-    current = b.population[ConwayDeathmatch::ALIVE]
-    peak = current if current > peak
-    score += current * i
-
-    # cease ticks for static or (soon-to-be) empty grids
-    break if current < 3
-    static_count = (current == last ? static_count + 1 : 0)
-    break if static_count > 3
-  }
-
-  puts "#{current} (#{peak}) [#{score}]"
-
-  # track the highest populators
-  #
-  if current > results[:final][0]
-    results[:final] = [current, points]
-    puts "\tLargest final: #{current}"
-  end
-
-  if peak > results[:peak][0]
-    results[:peak] = [peak, points]
-    puts "\tLargest peak: #{peak}"
-  end
-
-  if score > results[:score][0]
-    results[:score] = [score, points]
-    puts "\tLargest score: #{score}"
-  end
-}
-
-conclude!(results, width, height)

data/lib/conway_deathmatch/shapes/classic.yaml

@@ -1,175 +0,0 @@
-acorn:
-  - [0, 2]
-  - [1, 0]
-  - [1, 2]
-  - [3, 1]
-  - [4, 2]
-  - [5, 2]
-  - [6, 2]
-
-beacon:
-  - [0, 0]
-  - [0, 1]
-  - [1, 0]
-  - [2, 3]
-  - [3, 2]
-  - [3, 3]
-
-beehive:
-  - [0, 1]
-  - [1, 0]
-  - [1, 2]
-  - [2, 0]
-  - [2, 2]
-  - [3, 1]
-
-blinker:
-  - [0, 1]
-  - [1, 1]
-  - [2, 1]
-
-block:
-  - [0, 0]
-  - [0, 1]
-  - [1, 0]
-  - [1, 1]
-
-block_engine_count:
-  - [0, 5]
-  - [2, 4]
-  - [2, 5]
-  - [4, 1]
-  - [4, 2]
-  - [4, 3]
-  - [6, 0]
-  - [6, 1]
-  - [6, 2]
-  - [7, 1]
-
-block_engine_space:
-  - [0, 0]
-  - [0, 1]
-  - [1, 0]
-  - [1, 3]
-  - [2, 0]
-  - [2, 3]
-  - [2, 4]
-  - [3, 2]
-  - [4, 0]
-  - [4, 2]
-  - [4, 3]
-  - [4, 4]
-
-block_engine_stripe:
-  - [0, 0]
-  - [1, 0]
-  - [2, 0]
-  - [3, 0]
-  - [4, 0]
-  - [5, 0]
-  - [6, 0]
-  - [7, 0]
-  - [9, 0]
-  - [10, 0]
-  - [11, 0]
-  - [12, 0]
-  - [13, 0]
-  - [17, 0]
-  - [18, 0]
-  - [19, 0]
-  - [26, 0]
-  - [27, 0]
-  - [28, 0]
-  - [29, 0]
-  - [30, 0]
-  - [31, 0]
-  - [32, 0]
-  - [34, 0]
-  - [35, 0]
-  - [36, 0]
-  - [37, 0]
-  - [38, 0]
-
-boat:
-  - [0, 0]
-  - [0, 1]
-  - [1, 0]
-  - [1, 2]
-  - [2, 1]
-
-diehard:
-  - [0, 1]
-  - [1, 1]
-  - [1, 2]
-  - [5, 2]
-  - [6, 0]
-  - [6, 2]
-  - [7, 2]
-
-glider:
-  - [0, 2]
-  - [1, 0]
-  - [1, 2]
-  - [2, 1]
-  - [2, 2]
-
-loaf:
-  - [0, 1]
-  - [1, 0]
-  - [1, 2]
-  - [2, 0]
-  - [2, 3]
-  - [3, 1]
-  - [3, 2]
-
-lwss:
-  - [0, 1]
-  - [0, 3]
-  - [1, 0]
-  - [2, 0]
-  - [3, 0]
-  - [3, 3]
-  - [4, 0]
-  - [4, 1]
-  - [4, 2]
-
-rpent:
-  - [0, 1]
-  - [1, 0]
-  - [1, 1]
-  - [1, 2]
-  - [2, 0]
-
-swastika:
-  - [0, 0]
-  - [0, 1]
-  - [0, 2]
-  - [0, 3]
-  - [0, 6]
-  - [1, 3]
-  - [1, 6]
-  - [2, 3]
-  - [2, 6]
-  - [3, 0]
-  - [3, 1]
-  - [3, 2]
-  - [3, 4]
-  - [3, 5]
-  - [3, 6]
-  - [4, 0]
-  - [4, 3]
-  - [5, 0]
-  - [5, 3]
-  - [6, 0]
-  - [6, 3]
-  - [6, 4]
-  - [6, 5]
-  - [6, 6]
-
-toad:
-  - [0, 1]
-  - [0, 2]
-  - [1, 3]
-  - [2, 0]
-  - [3, 1]
-  - [3, 2]

data/lib/conway_deathmatch/shapes/discovered.yaml

@@ -1,112 +0,0 @@
-# discovered via proving_ground
-a4: # boner
-  - [0, 2]
-  - [1, 0]
-  - [1, 1]
-  - [2, 2]
-
-a5:
-  - [0, 1]
-  - [1, 3]
-  - [2, 2]
-  - [3, 0]
-  - [3, 2]
-
-b5:
-  - [0, 0]
-  - [1, 0]
-  - [1, 1]
-  - [1, 2]
-  - [2, 1]
-
-c5:
-  - [0, 1]
-  - [1, 0]
-  - [1, 2]
-  - [2, 2]
-  - [3, 3]
-
-d5: # peace
-  - [0, 2]
-  - [1, 0]
-  - [1, 1]
-  - [2, 1]
-  - [3, 0]
-
-
-e5: # cross (peace + 1)
-  - [0, 1]
-  - [1, 0]
-  - [1, 1]
-  - [1, 2]
-  - [2, 1]
-
-a6: # zed
-  - [0, 2]
-  - [1, 0]
-  - [1, 1]
-  - [2, 3]
-  - [2, 4]
-  - [3, 2]
-
-b6: # trinary
-  - [0, 2]
-  - [1, 1]
-  - [2, 2]
-  - [2, 3]
-  - [3, 2]
-  - [4, 0]
-
-c6: # cardioid
-  - [0, 0]
-  - [0, 1]
-  - [1, 1]
-  - [1, 2]
-  - [2, 0]
-  - [2, 1]
-
-a7:
-  - [0, 3]
-  - [1, 4]
-  - [1, 1]
-  - [2, 0]
-  - [2, 1]
-  - [3, 2]
-  - [4, 1]
-
-b7: # rocket
-  - [0, 0]
-  - [0, 1]
-  - [0, 2]
-  - [1, 3]
-  - [2, 0]
-  - [2, 1]
-  - [2, 2]
-
-c7: # urawizardarry
-  - [0, 0]
-  - [1, 1]
-  - [2, 2]
-  - [3, 2]
-  - [4, 3]
-  - [5, 4]
-  - [5, 5]
-
-d7: # A
-  - [0, 2]
-  - [1, 1]
-  - [1, 3]
-  - [2, 0]
-  - [2, 1]
-  - [2, 3]
-  - [2, 4]
-
-a8: # A
-  - [0, 2]
-  - [1, 1]
-  - [1, 2]
-  - [2, 0]
-  - [2, 1]
-  - [3, 1]
-  - [3, 2]
-  - [4, 2]

data/test/spec_helper.rb

@@ -1,13 +0,0 @@
-if ENV['CODE_COVERAGE']
-  require 'simplecov'
-  SimpleCov.start
-end
-
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'conway_deathmatch'
-require 'conway_deathmatch/shapes'
-
-ALIVE = ConwayDeathmatch::ALIVE
-DEAD = ConwayDeathmatch::DEAD
-Shapes = ConwayDeathmatch::Shapes

data/test/test_grid.rb

@@ -1,141 +0,0 @@
-require_relative './spec_helper'
-
-describe ConwayDeathmatch do
-  describe "an empty grid" do
-    before do
-      @x = 5
-      @y = 5
-      @grid = ConwayDeathmatch.new(@x, @y)
-    end
-
-    it "must have dead population" do
-      @grid.population[DEAD].must_equal @x * @y
-      @grid.population.keys.length.must_equal 1
-    end
-
-    it "must still be dead after a tick" do
-      @grid.tick.population[DEAD].must_equal @x*@y
-      @grid.population.keys.length.must_equal 1
-    end
-
-    it "must accept a block" do
-      @grid.populate 1,1
-      @grid.populate 1,2
-      @grid.populate 2,1
-      @grid.populate 2,2
-
-      @grid.population[DEAD].must_equal @x * @y - 4
-      @grid.population[ALIVE].must_equal 4
-
-      0.upto(4) { |x|
-        0.upto(4) { |y|
-          if x.between?(1, 2) and y.between?(1, 2)
-            @grid.value(x, y).must_equal ALIVE
-          else
-            @grid.value(x, y).must_equal DEAD
-          end
-        }
-      }
-    end
-  end
-
-  describe "adding shapes" do
-    before do
-      @grid = ConwayDeathmatch.new(40, 40)
-      Shapes.add(@grid, "acorn 0 0")
-    end
-
-    it "must recognize \"acorn 0 0\"" do
-      Shapes.classic.fetch("acorn").each { |xy_ary|
-        @grid.value(*xy_ary).must_equal ALIVE
-      }
-      @grid.population.fetch(ALIVE).must_equal 7
-    end
-
-    it "must tick correctly" do
-      @grid.tick
-      new_points = [
-        [0, 1],
-        [1, 1],
-        [2, 1],
-        [4, 1],
-        [4, 2],
-        [5, 1],
-        [5, 2],
-        [5, 3],
-      ].each { |xy_ary|
-        @grid.value(*xy_ary).must_equal ALIVE
-      }
-      @grid.population.fetch(ALIVE).must_equal new_points.length
-    end
-  end
-
-  describe "aggressive deathmatch" do
-    it "must allow survivors to switch sides" do
-      32.times {
-        @grid = ConwayDeathmatch.new(5, 3, :aggressive)
-        @grid.populate(1, 1, '1') # friendly
-        @grid.populate(2, 1, '1') # survivor
-        @grid.populate(3, 1, '2') # enemy
-
-        @grid.tick
-        break if @grid.value(2, 1) == '2'
-      }
-
-      @grid.population.fetch('1').must_equal 2
-      @grid.population.fetch('2').must_equal 1
-      0.upto(4) { |x|
-        0.upto(2) { |y|
-          if x == 2 and y.between?(0, 2)
-            @grid.value(x, y).must_equal(y == 1 ? '2' : '1')
-          else
-            @grid.value(x, y).must_equal DEAD
-          end
-        }
-      }
-    end
-  end
-
-  describe "defensive deathmatch" do
-    it "must not allow survivors to switch sides" do
-      16.times {
-        @grid = ConwayDeathmatch.new(5, 3, :defensive)
-        @grid.populate(1, 1, '1') # friendly
-        @grid.populate(2, 1, '1') # survivor
-        @grid.populate(3, 1, '2') # enemy
-        @grid.tick
-
-        @grid.population.fetch('1').must_equal 3
-        0.upto(4) { |x|
-          0.upto(2) { |y|
-            if x == 2 and y.between?(0, 2)
-              @grid.value(x, y).must_equal '1'
-            else
-              @grid.value(x, y).must_equal DEAD
-            end
-          }
-        }
-      }
-    end
-  end
-
-  describe "friendly deathmatch" do
-    it "must allow survivors with excess hostiles nearby" do
-      @grid = ConwayDeathmatch.new(5, 5, :friendly)
-      @grid.populate(1, 2, '1') # friendly
-      @grid.populate(2, 2, '1') # survivor
-      @grid.populate(3, 2, '1') # friendly
-      @grid.populate(2, 1, '2') # enemy
-      @grid.populate(2, 3, '2') # enemy
-      @grid.tick
-
-      @grid.population.fetch('1').must_equal 1
-      # (2,2) alive despite 4 neighbors, only 2 friendly; all else DEAD
-      0.upto(4) { |x|
-        0.upto(4) { |y|
-          @grid.value(x, y).must_equal (x == 2 && y == 2 ? '1' : DEAD)
-        }
-      }
-    end
-  end
-end

data/test/test_shapes.rb

@@ -1,15 +0,0 @@
-require_relative './spec_helper'
-
-describe Shapes do
-  it "must recognize acorn" do
-    Shapes.classic.fetch("acorn").must_be_instance_of Array
-  end
-
-  it "must confirm acorn on the grid" do
-    @grid = ConwayDeathmatch.new(20, 20)
-    Shapes.add(@grid, "acorn 0 0")
-    Shapes.classic.fetch("acorn").each { |xy_ary|
-      @grid.value(*xy_ary).must_equal ALIVE
-    }
-  end
-end