cellular_automata 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0237b3c22f9d23179fc50a5c88bc5217ce95025e
-  data.tar.gz: 93bcb9d782c3ec0643fdee8b9e04d0de01c62a3c
+  metadata.gz: cc753c35c9c45bb5df74f2678d37c0d2ba9af371
+  data.tar.gz: ff0800f910754856743abc46f147f4bb0ae19225
 SHA512:
-  metadata.gz: b0ae054a68622f16753da6ca3968a20c64af2ea6af76a342a5223f10f435553cc71be98315f607b92f159cf7e29eb435411253f5a626dc13e96d9ba8855ab8f9
-  data.tar.gz: dc06e35c815e74eeed6ba5048f352410937d8b51e67d827d7f7b3112c83cc087d3196f5910e357900fd61693d1f9227734cb316652be05de7c3fabe0f976acd7
+  metadata.gz: 30f23c199406a34c53c29a0887d0317cfb1cf78d4ba3deb1b69c949b6e446e6f8f847a077fae2e4459730fd9179b496a35f891b8a9a8f0cfeeea55377adb4e26
+  data.tar.gz: 3f27c51e0a612acd9921e20cf87e738d199ad5b2dc5767c1904adf29fdfe729e4f8bcfe6ea55386a2be6c6e90f0d675ef798cd2adb6736e002c9e4cb48f3560f

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 *.gem
 /lib/*.bundle
+/bin/cell_console

data/README.md

@@ -21,7 +21,23 @@ Or install it yourself as:
 
 ## Usage
 
-At present, it can only play Conway's Game of Life.  Run `cell` to watch.
+```
+cell [options] RULE
+    -w, --width WIDTH                Set width
+    -h, --height HEIGHT              Set height
+    -s, --scale SCALE                Factor by which to scale game board
+    -c, --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
+    -f, --full-screen                Full screen
+    -v, --version                    Print version information
+        --help                       Display this screen
+```
+
+RULE is a [standard Life Rule](http://www.conwaylife.com/wiki/Cellular_automaton) in the format `S.../B...`  The `/` is optional, and it doesn't matter which comes first.
+
+`cell_console` (a console version with simple ASCII output) also exists, but isn't near as interesting!
 
 ## Development
 
@@ -30,10 +46,6 @@ Install gosu dependencies:
 % 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).
-
 ## Contributing
 
 1. Fork it ( https://github.com/ffleming/cellular_automata/fork )

data/bin/cell

@@ -2,6 +2,7 @@
 
 require 'cellular_automata'
 require 'optparse'
+require 'gosu'
 
 def opts_from_cli
   options = {}
@@ -10,7 +11,10 @@ def opts_from_cli
     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('-r REFRESH', '--refresh REFRESH', 'Set refresh rate in seconds') { |r| options[:refresh] = r.to_f }
+    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
@@ -30,19 +34,20 @@ def opts_from_cli
 end
 
 opts = opts_from_cli
-opts[:width]  ||= 120
-opts[:height] ||= 30
-opts[:refresh] ||= 0.1
+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'
-board = CellularAutomata::Board.new(width: opts[:width], height: opts[:height], rule: rule)
+opts[:rule] = rule
 
 trap 'SIGINT' do
   exit
 end
 
-while true do
-  puts "\e[H\e[2J"
-  board.tick!
-  puts board.to_s
-  sleep opts[:refresh]
-end
+window = CellWindow.new(opts)
+window.show
+exit

data/bin/cell_console

@@ -2,16 +2,47 @@
 
 require 'cellular_automata'
 require 'optparse'
-require 'byebug'
-require 'pry'
 
-width = 120
-height = 30
-rule = 'B3S2'
-board = CellularAutomata::Board.new(width: width, height: height, rule: rule)
-board.tick!
-board.tick!
-puts board.to_s
-state = board.state
-binding.pry
-exit
+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('-r REFRESH', '--refresh REFRESH', 'Set refresh rate in seconds') { |r| options[:refresh] = r.to_f }
+    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]  ||= 120
+opts[:height] ||= 30
+opts[:refresh] ||= 0.1
+rule = ARGV[0] || 'B3S2'
+board = CellularAutomata::Board.new(width: opts[:width], height: opts[:height], rule: rule)
+
+trap 'SIGINT' do
+  exit
+end
+
+while true do
+  puts "\e[H\e[2J"
+  board.tick!
+  puts board.to_s
+  sleep opts[:refresh]
+end

data/lib/cellular_automata.rb

@@ -8,7 +8,6 @@ require "cellular_automata/cell"
 require "cellular_automata/rule"
 require "cellular_automata/board"
 require "cellular_automata/gui_window"
-require "cellular_automata/gif_writer"
 require 'cellular_c.bundle'
 
 module CellularAutomata

data/lib/cellular_automata/version.rb

@@ -1,3 +1,3 @@
 module CellularAutomata
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellular_automata
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Forrest Fleming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -152,8 +152,6 @@ email:
 executables:
 - cell
 - cell_console
-- cell_gif
-- cell_gui
 extensions:
 - ext/cellular_c/extconf.rb
 extra_rdoc_files: []
@@ -166,15 +164,12 @@ files:
 - Rakefile
 - bin/cell
 - bin/cell_console
-- bin/cell_gif
-- bin/cell_gui
 - cellular_automata.gemspec
 - ext/cellular_c/cellular_c.c
 - ext/cellular_c/extconf.rb
 - lib/cellular_automata.rb
 - lib/cellular_automata/board.rb
 - lib/cellular_automata/cell.rb
-- lib/cellular_automata/gif_writer.rb
 - lib/cellular_automata/gui_window.rb
 - lib/cellular_automata/rule.rb
 - lib/cellular_automata/version.rb

data/bin/cell_gif

@@ -1,52 +0,0 @@
-#!/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 FRAMES', '--frames FRAMES', 'Number of frames to write') { |f| options[:frames] = f.to_i }
-    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] ||= 1
-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[:frames] ||= 100
-rule = ARGV[0] || 'B3S2'
-opts[:rule] = rule
-
-trap 'SIGINT' do
-  exit
-end
-
-CellularAutomata::GifWriter.write(opts)
-exit

data/bin/cell_gui

@@ -1,53 +0,0 @@
-#!/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/lib/cellular_automata/gif_writer.rb

@@ -1,56 +0,0 @@
-module CellularAutomata::GifWriter
-  class << self
-  def write(opts={})
-    @scale = opts[:scale]
-    @cell_width = scale**opts[:cell_scale]
-    @board = CellularAutomata::Board.new(width: opts[:width]/scale, height: opts[:height]/scale, rule: opts[:rule])
-    @gif = Magick::ImageList.new
-    @width = opts[:width]
-    @height = opts[:height]
-    @frames = opts[:frames]
-    write_gif('test.gif')
-  end
-
-  private
-
-  attr_reader :board, :scale, :cell_width, :frames, :writer, :height, :width
-
-  def write_gif(outfile)
-    frames.times do |i|
-      draw_frame
-      board.tick!
-    end
-    @gif.write(outfile)
-  end
-
-  def draw_frame
-    writer = Magick::Draw.new
-    frame = Magick::Image.new(width, height) do
-      self.background_color = '#000000'
-    end
-    board.each_cell do |cell|
-      prev_1 = board.history[0][cell.y][cell.x]
-      prev_2 = board.history[1][cell.y][cell.x]
-      color = '#000000'
-      if cell.alive?
-        color = '#FFFF00'
-      elsif prev_1.alive?
-        color = '#AAAA00'
-      elsif prev_2.alive?
-        color = '#444400'
-      end
-      writer.stroke color
-      writer.fill color
-      x1 = cell.x * scale**2
-      y1 = cell.y * scale**2
-      x2 = x1 + cell_width
-      y2 = y1 + cell_width
-      writer.rectangle(x1, y1, x2, y2)
-    end
-    writer.draw(frame)
-    @gif << frame
-    print '.'
-  end
-  end
-end
-