conway_deathmatch 0.5.0.3 → 0.6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95413f3557aa8dcb568065213eb0e296c951aac2
-  data.tar.gz: 7640ea076629eaab5134bed4f11288155916de58
+  metadata.gz: e231c26991bcf255abd1bf05004d79183d025dc8
+  data.tar.gz: 5d96b4380756b46bd477e4e0baadeae27a9a36d3
 SHA512:
-  metadata.gz: 0ce56f027fdcf40ed302a65a928c22b9b7e3677c3c755505941a3546d1391bfb5af6810f9e092e19845d55d3d3cfd533954930e815d9f8d676305fc09b714e10
-  data.tar.gz: abdedab43e2091b6a3f150e909685a90acaafe59022d73a6ce9003eb9d5b31a88fc2be44209238dd4a9339175c4043539ad85369a77106cc77bc489fa85ec33d
+  metadata.gz: e11495b48f8611b99287e3a77c14d2fe4fdd966c97833d1af41983694642e81729ac3740b9fcf3be1c3b60742f3f922b2562fed8276cef7ef9be367dc24edb84
+  data.tar.gz: f4fb473dc800d24f7f82bd03af235007dd2f00db3c122e861277b8065f053cafa8852177e0167e0bc4597b582c804a92f8b2ccaffe3e39afab08c38c43bdf634

data/Rakefile

@@ -1,14 +1,3 @@
-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|
@@ -24,45 +13,100 @@ Rake::TestTask.new do |t|
   # t.warning = true
 end
 
-desc "Generate code metrics reports"
-task :code_metrics => [:flog, :flay, :roodi] do
-end
+task default: %w[test bench]
+
+
+#
+# METRICS
+#
 
-desc "Run flog on lib/"
-task :flog do
-  puts
-  sh "flog lib | tee metrics/flog"
+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.verbose = true
+    t.dirs = ['lib']
+  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 TASKS
+#
+
 desc "Show current system load"
 task "loadavg" do
   puts File.read "/proc/loadavg"
 end
 
-# this runs against the installed gem lib, not git / filesystem
+rubylib = "RUBYLIB=lib"
+rubyprof = "ruby-prof -m1"
+scriptname = "bin/conway_deathmatch"
+scriptargs = "-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(' ')
+  sh [rubylib, rubyprof, scriptname, '--', scriptargs].join(' ')
 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(' ')
+  sh [rubylib,
+      rubyprof, '--exclude-common-cycles', scriptname, '--',
+      scriptargs].join(' ')
+end
+
+task "no-prof" do
+  sh [rubylib, scriptname, scriptargs].join(' ')
+end
+
+#
+# GEM BUILD / PUBLISH TASKS
+#
+
+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 bench no-prof]

data/VERSION

@@ -1 +1 @@
-0.5.0.3
+0.6.0.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/bin/proving_ground

@@ -1,24 +1,23 @@
 #!/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
+opts = Slop.parse do |o|
+  o.banner = "Usage: proving_ground [options]"
+  o.int '-w', '--width', 'Grid width'
+  o.int       '--height', 'Grid height'
+  o.int '-n', '--num_ticks', 'Max number of ticks to generate'
+  o.int '-p', '--num_points', 'Number of points to generate'
+  o.int '-m', '--max_collisions', 'Max number of generation collisions'
+  o.on '-h', '--help' do
+    puts o
+    exit
+  end
 end
 
 num_points = opts[:num_points] || 5
@@ -71,7 +70,7 @@ def conclude!(results, w, h)
   exit 0
 end
 
-results = { final: [0], peak: [0], score: [0], }
+results = { final: [0, []], peak: [0, []], score: [0, []], }
 seen = Set.new
 collisions = 0
 

data/conway_deathmatch.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
     'test/test_shapes.rb',
   ]
   s.executables = ['conway_deathmatch']
-  s.add_runtime_dependency "slop", "~> 3.0"
-  s.add_development_dependency "buildar", "~> 2"
+  s.add_runtime_dependency "slop", "~> 4.0"
+  s.add_development_dependency "buildar", "~> 3"
   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"
+  s.add_development_dependency "roodi", ">= 4", "< 6"
 
   # uncomment and set ENV['CODE_COVERAGE']
   # s.add_development_dependency "simplecov", "~> 0.9.0"

data/test/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/spec_helper.rb

@@ -3,7 +3,6 @@ if ENV['CODE_COVERAGE']
   SimpleCov.start
 end
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'conway_deathmatch'
 require 'conway_deathmatch/shapes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.5.0.3
+  version: 0.6.0.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: buildar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,22 @@ dependencies:
   name: roodi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Deathmatch
 email: 
 executables:
@@ -149,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Conway's Game of Life