hanoi-jane 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e62c5a4e7ec717a18279751453e39469c3d42f
-  data.tar.gz: c71cbcd679a30a248911b9599669af6af6586341
+  metadata.gz: c83c6e60d1e0f4428dd46e92914cc1d5d0f5d30a
+  data.tar.gz: f3d23854bebd0539e22a78252c7e1837291b6d7f
 SHA512:
-  metadata.gz: a0f41539d1b867578d6f41ae78dbbe65cae61ae9cca5173cf395b4c25a1163f5489ddee21905392b0801263f74382b0e4e199521452e1fd11b46ed1381eec458
-  data.tar.gz: f2d42d4e7ff7a7a58042c81041ae9d7a6069cabfa90ceaca5ce3a1e715642211a04ee91e0d151aed6a0ba5404aa70ebaf4f8f2c3ac4ceece2e51cf6dbfc4e360
+  metadata.gz: 00f5f0260b30c83b267b424e5d7ee3509ae4399cfe990aa61c3ae10c3586138eae73db046208296619e20b08927673f3093aaadea712283d79f74f8b893924f9
+  data.tar.gz: 26ec239964715266ddc6f320b0d1d8150e52b3e9813205612a5f2285026c21cdc6da60d3187bf23ac79cc0492ba1ad960616b699f3f400e998e6414d83e64eae

data/lib/hanoi/jane.rb

@@ -2,10 +2,12 @@ require 'thor'
 require 'httparty'
 
 require 'hanoi/jane/version'
+
 require 'hanoi/jane/towers'
 require 'hanoi/jane/constrained_towers'
-require 'hanoi/jane/matrix'
-require 'hanoi/jane/console'
+
+require 'hanoi/jane/formatters/matrix'
+require 'hanoi/jane/formatters/console'
 
 module Hanoi
   module Jane

data/lib/hanoi/jane/formatters/console.rb

@@ -0,0 +1,53 @@
+module Hanoi
+  module Jane
+    module Formatters
+      class Console
+        def initialize towers
+          @discs = towers.discs
+          @stacks = towers.stacks.clone.map { |s| s.clone }
+        end
+
+        def to_s
+          s = ''
+          (Console.rotate @stacks.map { |s| (Console.pad s, @discs).reverse }).each do |stack|
+            s += stack.map { |s| Console.make_disc s, (Console.scale @discs) }.join ' '
+            s += "\n"
+          end
+
+          s
+        end
+
+        def Console.pad array, length
+          until array.length == length
+            array.push nil
+          end
+
+          array.reverse
+        end
+
+        def Console.make_disc width, space, char = 'o'
+          unless width
+            return ' ' * space
+          end
+
+          count = Console.scale width
+          padding = (space - count) / 2
+
+          '%s%s%s' % [
+            ' ' * padding,
+            char * count,
+            ' ' * padding
+          ]
+        end
+
+        def Console.scale size
+          (size * 2) + 1
+        end
+
+        def Console.rotate stacks
+          stacks.map { |s| s.clone }.transpose.reverse
+        end
+      end
+    end
+  end
+end

data/lib/hanoi/jane/formatters/matrix.rb

@@ -0,0 +1,82 @@
+module Hanoi
+  module Jane
+    module Formatters
+      class Matrix < Array
+        def initialize towers
+          @stacks = towers.stacks
+          @digits = towers.rebased
+
+          7.times do
+            self.push [0] * 45
+          end
+
+          offset = 0
+          @stacks.each do |stack|
+            total = 0
+            stack.each do |disc|
+              shim = ((5 - (disc + 1)) / 2).round
+              (disc + 1).times do |i|
+                self[6 - total][i + offset + shim] = 1
+              end
+              total += 1
+            end
+            offset += 8
+          end
+
+          @bit_offset = 24
+          @bit_side = :right
+          @digits.chars.each do |bit|
+            digit bit
+
+            if @bit_side == :right
+              @bit_side = :left
+              @bit_offset += 8
+            else
+              @bit_side = :right
+            end
+          end
+        end
+
+        def digit value
+          digits = {
+            0 => [
+              [1, 1, 1],
+              [1, 0, 1],
+              [1, 1, 1]
+            ],
+
+            1 => [
+              [0, 1, 0],
+              [0, 1, 0],
+              [0, 1, 0]
+            ],
+
+            2 => [
+              [1, 1, 0],
+              [0, 1, 0],
+              [0, 1, 1]
+            ]
+          }
+
+          @column = @bit_offset
+          @row = 0
+          if @bit_side == :right
+            @column += 2
+            @row = 4
+          end
+
+          insert digits[value.to_i]
+
+        end
+
+        def insert grid
+          3.times do |i|
+            3.times do |j|
+              self[@row + i][@column + j] = grid[i][j]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanoi/jane/towers.rb

@@ -23,11 +23,11 @@ module Hanoi
       end
 
       def matrix
-        Matrix.new self
+        Formatters::Matrix.new self
       end
 
       def console
-        (Console.new self).to_s
+        (Formatters::Console.new self).to_s
       end
 
       def inspect

data/lib/hanoi/jane/version.rb

@@ -1,5 +1,5 @@
 module Hanoi
   module Jane
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanoi-jane
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,9 +147,9 @@ files:
 - hanoi-jane.gemspec
 - lib/hanoi/jane.rb
 - lib/hanoi/jane/cli.rb
-- lib/hanoi/jane/console.rb
 - lib/hanoi/jane/constrained_towers.rb
-- lib/hanoi/jane/matrix.rb
+- lib/hanoi/jane/formatters/console.rb
+- lib/hanoi/jane/formatters/matrix.rb
 - lib/hanoi/jane/towers.rb
 - lib/hanoi/jane/version.rb
 homepage: http://sam.pikesley.org/projects/hanoi-jane/

data/lib/hanoi/jane/console.rb

@@ -1,55 +0,0 @@
-module Hanoi
-  module Jane
-    class Console
-      attr_reader :content
-
-      def initialize towers
-        @stacks = towers.stacks
-        @discs = towers.discs
-        @content = ''
-        x = @stacks.clone
-        y = x.map { |s| s.clone }
-
-        (Console.rotate y.map { |s| (Console.pad s, @discs).reverse }).each do |stack|
-          @content += stack.map { |s| Console.make_disc s, (Console.scale @discs) }.join ' '
-          @content += "\n"
-        end
-      end
-
-      def to_s
-        @content
-      end
-
-      def Console.pad array, length
-        until array.length == length
-          array.push nil
-        end
-
-        array.reverse
-      end
-
-      def Console.make_disc width, space, char = 'o'
-        unless width
-          return ' ' * space
-        end
-
-        count = Console.scale width
-        padding = (space - count) / 2
-
-        '%s%s%s' % [
-          ' ' * padding,
-          char * count,
-          ' ' * padding
-        ]
-      end
-
-      def Console.scale size
-        (size * 2) + 1
-      end
-
-      def Console.rotate stacks
-        stacks.map { |s| s.clone }.transpose.reverse
-      end
-    end
-  end
-end

data/lib/hanoi/jane/matrix.rb

@@ -1,80 +0,0 @@
-module Hanoi
-  module Jane
-    class Matrix < Array
-      def initialize towers
-        @stacks = towers.stacks
-        @digits = towers.rebased
-
-        7.times do
-          self.push [0] * 45
-        end
-
-        offset = 0
-        @stacks.each do |stack|
-          total = 0
-          stack.each do |disc|
-            shim = ((5 - (disc + 1)) / 2).round
-            (disc + 1).times do |i|
-              self[6 - total][i + offset + shim] = 1
-            end
-            total += 1
-          end
-          offset += 8
-        end
-
-        @bit_offset = 24
-        @bit_side = :right
-        @digits.chars.each do |bit|
-          digit bit
-
-          if @bit_side == :right
-            @bit_side = :left
-            @bit_offset += 8
-          else
-            @bit_side = :right
-          end
-        end
-      end
-
-      def digit value
-        digits = {
-          0 => [
-            [1, 1, 1],
-            [1, 0, 1],
-            [1, 1, 1]
-          ],
-
-          1 => [
-            [0, 1, 0],
-            [0, 1, 0],
-            [0, 1, 0]
-          ],
-
-          2 => [
-            [1, 1, 0],
-            [0, 1, 0],
-            [0, 1, 1]
-          ]
-        }
-
-        @column = @bit_offset
-        @row = 0
-        if @bit_side == :right
-          @column += 2
-          @row = 4
-        end
-
-        insert digits[value.to_i]
-
-      end
-
-      def insert grid
-        3.times do |i|
-          3.times do |j|
-            self[@row + i][@column + j] = grid[i][j]
-          end
-        end
-      end
-    end
-  end
-end