life 0.2.0 → 1.0.0

data/README.md

@@ -12,17 +12,17 @@ To use Life, run the `life new` command. It can be used with the following optio
 * `--width` or `-w` specifies how many cells wide the game will be
 * `--height` or `-h` specifies how many cells high the game will be
 * `--generations` or `-g` specifies how many generations the simulation will run
+* '--seed' or '-s' is the initial pattern of the game. Pass coordinate pairs using the following pattern: `x:y x:y x:y ...`
 
 ```
 $ life new -w 3 -h 4 -g 5
 ```
 This will create a 3x4 game that runs for 5 generations
 
-When first creating a game, you will be prompted to enter which cells are initially alive.
+When first creating a game, you will be prompted to add cells some live cells.
 
 ## TODO
-* Ability to pass initial configuration as command-line option
-* Animate instead of displaying all the generations
+* Add some default configurations to start the fun
 
 ## Contributing
 

data/lib/life/cli.rb

@@ -12,32 +12,56 @@ module Life
       method_option :width, :type => :numeric, :aliases => '-w', :desc => "Width of board", :required => true
       method_option :height, :type => :numeric,:aliases => '-h', :desc => "Height of board", :required => true
       method_option :generations, :type => :numeric,:aliases => '-g', :desc => "How many generations to display", :required => true
+      method_option :seed, :type => :array, :aliases => '-s', :desc => "Initial Pattern"
 
       def new
-        seed = []
-        while yes? "Would you like to add a live cell to the grid? [Y/n]"
-          x = ask "Please enter x coordinate"
-          y = ask "Please enter y coordinate"
-          seed << [(x.to_i) - 1, (y.to_i) -1]
-        end
-
-        world = World.new options[:width], options[:height], seed
+        seed = build_seed(options[:seed])
+        max_gen = options[:generations]
+        world = build_world(options[:width], options[:height], seed)
 
-        (1..options[:generations]).each do |gen|
-          puts "== Generation #{gen} =="
-          draw(world)
-          puts ""
+        (1..max_gen).each do |gen|
+          print world.to_s("@", "_") + eol(options[:height], gen, max_gen)
+          sleep(1)
           world.tick
         end
       end
 
-      def draw(world)
-        world.current.each do |row|
-          processed_row = row.map { |cell| cell.live? ? "@" : "_"}
-          print "["
-          print processed_row.join(' ')
-          puts "]"
+      no_tasks do
+        def eol(height, curr_gen, max_gen)
+          curr_gen == max_gen ? "\n" : format("\e[1A" * (height-1) + "\r")
+        end
+
+        def build_seed(pattern)
+          pattern.map {|pair| pair.split(":").map { |coord| coord.to_i - 1 } }
+        end
+
+        def build_world(width, height, seed=[])
+          while yes? "Would you like to add a live cell to the grid? [Y/n]"
+            x = get_x(width)
+            y = get_y(height)
+            seed << [(x.to_i) - 1, (y.to_i) -1]
+          end
+          World.new height, width, seed
         end
+
+        def get_x(width)
+          x = ask("Please enter x coordinate").to_i
+          while x > width
+            puts "This number is too big"
+            x = ask("Please enter x coordinate").to_i
+          end
+          return x
+        end
+
+        def get_y(height)
+          y = ask("Please enter y coordinate").to_i
+          while y > height
+            puts "This number is too big"
+            y = ask("Please enter y coordinate").to_i
+          end
+          return y
+        end
+
       end
 
     end

data/lib/life/grid.rb

@@ -23,6 +23,13 @@ class Grid < Array
     count
   end
 
+  def to_s(live, dead)
+    rows = map do |row|
+      row.map { |cell| cell.live? ? live : dead }.join(" ")
+    end
+    rows.join("\n")
+  end
+
 private
   def x_range(x)
     west = x - 1 < 0 ? 0 : x - 1

data/lib/life/version.rb

@@ -1,3 +1,3 @@
 module Life
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/lib/life/world.rb

@@ -25,4 +25,8 @@ class World
     end
     @current = @next.deep_copy
   end
+
+  def to_s(live, dead)
+    @current.to_s(live, dead)
+  end
 end

data/spec/life/grid_spec.rb

@@ -15,6 +15,13 @@ describe Grid do
     end
   end
 
+  describe "#to_s" do
+    let(:grid) { World.new(3,3, [[0,0], [1,2], [2,1]])}
+    it "should output the correct string" do
+      grid.to_s("@", "_").should eq "@ _ _\n_ _ @\n_ @ _"
+    end
+  end
+
   describe "#deep_copy" do
     let(:grid) { Grid.new(3,4) }
     it "should create a distinct copy" do

data/spec/life/world_spec.rb

@@ -17,6 +17,13 @@ describe World do
     end
   end
 
+  describe "to_s" do
+    let(:world) { World.new(3,3, [[0,0], [1,2], [2,1]])}
+    it "should output the correct string" do
+      world.to_s("@", "_").should eq "@ _ _\n_ _ @\n_ @ _"
+    end
+  end
+
   describe "Rules" do
     before { world.tick }
     subject { world.current[1][1] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: life
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor