cellular_automata 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebba5fb93b878df9d9d9e87e16301f9df0c32cae
-  data.tar.gz: 505da2bb9ad0ed69bc29c8acc86f67ad7a8df745
+  metadata.gz: 891c6c36e259e19ad44dad69cdfef0336058978a
+  data.tar.gz: 4e5898cdadcdc8031601e70f4da409b8157fdbb1
 SHA512:
-  metadata.gz: 2846a0d673eb8cb36ec8d30225bd7cdc5615621c05bb91f6645024e5206f06e7618f5a802966b86d70d03fb36d1c97a5b48fc261dd7bca1816cd8a4a3d41a19f
-  data.tar.gz: 5628a93b80ec95eca7d7ebf03b4d9f6360852da1d55e8c147c30edf8b30c8768a8d5bca3b475131ba656cb47cc7b5cf892e5e453fa1928e53d36d0d134f0b509
+  metadata.gz: 4e7ae0a28aecd0030faefaa03fefe2671ed7d0a1e477190d48506c2178d5a5e9a9322e827fa3f52b21bd4024370ffc2b6448bc8741f49b0fdc4f7a705d6d632e
+  data.tar.gz: e59aaed8f24f32467b4c069c3df8a40e458d64cb872703f17c553933ec6a469a2b1f1696598dc7bb48dadf4425abd335f1f96929abb39cdbd9e1e2db7ec6f26a

data/README.md

@@ -25,6 +25,11 @@ At present, it can only play Conway's Game of Life.  Run `cell` to watch.
 
 ## Development
 
+Install gosu dependencies:
+```bash
+% brew install sdl2 libogg libvorbis
+```
+
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/bin/cell_gui

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require 'cellular_automata'
+require 'optparse'
+require 'gosu'
+
+def opts_from_cli
+  options = {}
+  opt_parser = OptionParser.new do |opts|
+    opts.program_name = File.basename(__FILE__)
+    opts.banner = "#{opts.program_name} [options] RULE"
+    opts.on('-w WIDTH', '--width WIDTH', 'Set width') { |w| options[:width] = w.to_i }
+    opts.on('-h HEIGHT', '--height HEIGHT', 'Set height') { |h| options[:height] = h.to_i }
+    opts.on('-s SCALE', '--scale SCALE', 'Factor by which to scale game board') { |s| options[:scale] = s.to_i }
+    opts.on('-c WIDTH', '--cell-width WIDTH', 'Factor by which to scale cells', 'Use 1 for an \'LED\' look',
+            'Use 2 for no borders around cells', 'or choose anything in between') {|w| options[:cell_scale] = w.to_f }
+    opts.on('-f', '--full-screen', 'Full screen') { options[:fullscreen] = true }
+    opts.on('-v', '--version', 'Print version information') do
+      puts "#{File.basename(__FILE__)} #{CellularAutomata::VERSION}"
+      exit true
+    end
+    opts.on('--help', 'Display this screen') do
+      puts opts
+      exit true
+    end
+  end
+  begin
+    opt_parser.parse!
+  rescue OptionParser::InvalidOption => e
+    puts e.message
+    exit false
+  end
+  options
+end
+
+opts = opts_from_cli
+opts[:width]  ||= 160
+opts[:height] ||= 120
+opts[:scale] ||= 2
+opts[:cell_scale] ||= 2.0
+opts[:cell_scale] = 2.0 if opts[:cell_scale] > 2.0
+opts[:cell_scale] = 1.0 if opts[:cell_scale] < 1.0
+opts[:fullscreen] ||= false
+rule = ARGV[0] || 'B3S2'
+opts[:rule] = rule
+
+trap 'SIGINT' do
+  exit
+end
+
+window = CellWindow.new(opts)
+window.show
+exit

data/cellular_automata.gemspec

@@ -4,24 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cellular_automata/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cellular_automata"
+  spec.name          = 'cellular_automata'
   spec.version       = CellularAutomata::VERSION
-  spec.authors       = ["Forrest Fleming"]
-  spec.email         = ["ffleming@gmail.com"]
+  spec.authors       = ['Forrest Fleming']
+  spec.email         = ['ffleming@gmail.com']
 
   spec.summary       = %q{A simulation of cellular automata}
   spec.description   = %q{A set of 0-player games, of which Conway's Game of Life is a member.}
-  spec.homepage      = "https://github.com/ffleming/cellular_automata"
+  spec.homepage      = 'https://github.com/ffleming/cellular_automata'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
+  spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.license       = 'MIT'
 
-  spec.add_development_dependency "bundler", "~> 1", ">= 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency     'gosu', '~> 0.9'
+  spec.add_development_dependency 'releasy', '~> 1', '>= 1.8'
+  spec.add_development_dependency 'bundler', '~> 1', '>= 1.8'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'byebug', '~> 4'
   spec.add_development_dependency 'pry-byebug', '~> 3.1'

data/lib/cellular_automata/board.rb

@@ -29,8 +29,6 @@ class CellularAutomata::Board
     @state = next_state
   end
 
-  private
-
   def each_cell
     (0..height-1).each do |y|
       (0..width-1).each do |x|
@@ -39,6 +37,8 @@ class CellularAutomata::Board
     end
   end
 
+  private
+
   def seed!
     each_cell { |c| c.live! if rand < 0.1 }
   end

data/lib/cellular_automata/gui_window.rb

@@ -0,0 +1,35 @@
+class CellWindow < Gosu::Window
+  attr_reader :board, :scale, :cell_width, :paused
+  alias paused? paused
+  def initialize(opts={})
+    @scale = opts[:scale]
+    @cell_width = scale**opts[:cell_scale]
+    super opts[:width]*scale, opts[:height]*scale, opts[:fullscreen]
+    @board = CellularAutomata::Board.new(width: opts[:width]/scale, height: opts[:height]/scale, rule: opts[:rule])
+    self.caption = "Cellular Automata"
+  end
+
+  def update
+    board.tick! unless paused?
+  end
+
+  def draw
+    board.each_cell do |cell|
+      color = cell.alive? ? Gosu::Color::YELLOW : Gosu::Color::BLACK
+      Gosu.draw_rect(cell.x * scale**2, cell.y * scale**2, cell_width, cell_width, color, 0, :default)
+    end
+  end
+
+  def button_down(id)
+    if id == Gosu::KbSpace
+      toggle_pause
+    else
+      exit
+    end
+  end
+
+  def toggle_pause
+    @paused = !@paused
+  end
+end
+

data/lib/cellular_automata/rule.rb

@@ -15,7 +15,7 @@ class CellularAutomata::Rule
 
   def process_rule!(rule_string)
     rules = rule_string.scan(/[BS]\d+/)
-    raise ArgumentError.new('Invalid rule string') if rules.length != 2
+    raise ArgumentError.new("Invalid rule string #{rule_string}") if rules.length != 2
     birth_string = rules.select {|s| s.start_with?('B')}.first
     survive_string = rules.select {|s| s.start_with?('S')}.first
     (birth, survive) = [birth_string, survive_string].map { |s| s[1..-1].split('').map(&:to_i) }

data/lib/cellular_automata/version.rb

@@ -1,3 +1,3 @@
 module CellularAutomata
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/cellular_automata.rb

@@ -1,10 +1,12 @@
 require 'pry'
 require 'byebug'
 require 'pry-byebug'
+require 'gosu'
 require "cellular_automata/version"
 require "cellular_automata/cell"
 require "cellular_automata/rule"
 require "cellular_automata/board"
+require "cellular_automata/gui_window"
 
 module CellularAutomata
 end

metadata

@@ -1,15 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: cellular_automata
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Forrest Fleming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gosu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: releasy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +125,7 @@ email:
 - ffleming@gmail.com
 executables:
 - cell
+- cell_gui
 extensions: []
 extra_rdoc_files: []
 files:
@@ -101,10 +136,12 @@ files:
 - README.md
 - Rakefile
 - bin/cell
+- bin/cell_gui
 - cellular_automata.gemspec
 - lib/cellular_automata.rb
 - lib/cellular_automata/board.rb
 - lib/cellular_automata/cell.rb
+- lib/cellular_automata/gui_window.rb
 - lib/cellular_automata/rule.rb
 - lib/cellular_automata/version.rb
 homepage: https://github.com/ffleming/cellular_automata