hanoi-jane 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a1d92da6a843d6068462542eb6728d80995eed
-  data.tar.gz: dbac7d2f1d65726fc56aad01a1653f8818915e22
+  metadata.gz: 6f2267c39b116fc8119cb14359ee81d972c1be73
+  data.tar.gz: c1ca93a586a49d31f41f7581dc5c7e63312da921
 SHA512:
-  metadata.gz: 49ed23e2f5f6abe0f6585cee6e023098ddbff0cbf70ad90c09fe499f2483264a3cce98d2046dc8324a6e219fdbe7b71931f6800856d1877f2864585a60f46e09
-  data.tar.gz: e2b44701f251b4c172c8f01880878c8f61a789b75e3d1526e1f006846a05c0dcafd4bd22f99af214f1f3de8e8d5e0768f31b24b330e1d81b96d5ce2c09463561
+  metadata.gz: 4d6a51f4f2cb063c3d2f8d9277821f91106561e9e5bf289970581c9c19279a9f3bca855ba5a996112242afc98c751c25e233bdfa90ba469fe391e8bd3df4e68b
+  data.tar.gz: cabe1718e0f925edfaca697d4bfc552510762ede7058be9bdb1062f5710ee37471cf5258100f1297349eec835d319b098b1b7604256226fd3905e503ce6d0e8e

data/lib/hanoi/jane.rb

@@ -8,9 +8,10 @@ require 'httparty'
 require 'hanoi/jane/version'
 
 require 'hanoi/jane/config'
+require 'hanoi/jane/exceptions'
 
 require 'hanoi/jane/towers/stack_finders'
-require 'hanoi/jane/towers/towers'
+require 'hanoi/jane/towers/regular_towers'
 require 'hanoi/jane/towers/constrained_towers'
 require 'hanoi/jane/towers/animated_towers'
 

data/lib/hanoi/jane/cli.rb

@@ -10,9 +10,9 @@ module Hanoi
       map %w(-v --version) => :version
 
       desc 'phat', "Solve the towers against the pHAT's webserver"
-      option :phat, type: :string, required: true
-      option :constrained, type: :boolean
-      option :interval, type: :numeric, default: 0.1
+      option :phat, type: :string, required: true, desc: 'Address of the pHAT you want to hit'
+      option :constrained, type: :boolean, desc: 'Solve the constrained variant'
+      option :interval, type: :numeric, default: 0.1, desc: 'Time between frames (ish)'
 
       def phat
         at = AnimatedTowers.new do |a|
@@ -32,38 +32,44 @@ module Hanoi
       end
 
       desc 'console', 'Solve the towers on the console'
-      option :discs, type: :numeric, default: 3
-      option :constrained, type: :boolean, default: true
-      option :interval, type: :numeric, default: 0.5
-      option :height, type: :numeric, default: 2
-      option :fancy, type: :boolean, default: false
+      option :discs, type: :numeric, default: 3, desc: 'Number of discs'
+      option :constrained, type: :boolean, default: true, desc: 'Solve the constrained variant'
+      option :interval, type: :numeric, default: 0.5, desc: 'Time between frames (ish)'
+      option :height, type: :numeric, default: 2, desc: 'Additional height above towers'
+      option :fancy, type: :boolean, default: false, desc: 'Draw the towers using emojis'
 
       def console
-        at = AnimatedTowers.new do |a|
-          a.towers = options[:constrained] ? ConstrainedTowers : Towers
-          a.discs = options[:discs]
-          a.height = options[:discs] + options[:height]
-        end
+        begin
+          at = AnimatedTowers.new do |a|
+            a.towers = options[:constrained] ? ConstrainedTowers : RegularTowers
+            a.discs = options[:discs]
+            a.height = options[:discs] + options[:height]
+          end
 
-        at.each do |frame|
-          system('clear')
+          at.each do |frame|
+            system('clear')
 
-          c = Formatters::Console.new do |c|
-            c.stacks = frame.stacks
-            c.fancy = options[:fancy]
-          end
+            c = Formatters::Console.new do |c|
+              c.stacks = frame.stacks
+              c.fancy = options[:fancy]
+            end
 
-          puts frame.value
-          puts c
+            puts frame.value
+            puts c
 
-          interval = options[:interval]
-          if frame.type == :tween
-            interval = interval * 0.1
+            interval = options[:interval]
+            if frame.type == :tween
+              interval = interval * 0.1
+            end
+            sleep interval
           end
-          sleep interval
-        end
 
-        puts '%d moves to solve for %d discs' % [at.towers.total, at.discs]
+          puts '%d moves to solve for %d discs' % [at.towers.total, at.discs]
+
+        rescue HanoiException => he
+          puts he.text
+          system('exit')
+        end
       end
     end
   end

data/lib/hanoi/jane/exceptions.rb

@@ -0,0 +1,27 @@
+module Hanoi
+  module Jane
+    class HanoiException < Exception
+      attr_reader :text
+
+      def initialize text
+        @text = text
+      end
+    end
+
+    class SearchException < HanoiException
+      attr_reader :text
+
+      def initialize text
+        @text = text
+      end
+    end
+
+    class MatrixException < HanoiException
+      attr_reader :text
+
+      def initialize text
+        @text = text
+      end
+    end
+  end
+end

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

@@ -104,14 +104,6 @@ module Hanoi
           ((5 - (size + 1)) / 2).round
         end
       end
-
-      class MatrixException < Exception
-        attr_reader :text
-
-        def initialize text
-          @text = text
-        end
-      end
     end
   end
 end

data/lib/hanoi/jane/towers/animated_towers.rb

@@ -9,7 +9,7 @@ module Hanoi
         yield self if block_given?
 
         if @discs > @height
-          raise HanoiException.new 'number_of_discs (%d) > height (%d)' % [@height, @discs]
+          raise HanoiException.new 'number_of_discs (%d) > height (%d)' % [@discs, @height]
         end
 
         @towers = @towers.new @discs
@@ -48,13 +48,5 @@ module Hanoi
         @type = type
       end
     end
-
-    class HanoiException < Exception
-      attr_reader :text
-
-      def initialize text
-        @text = text
-      end
-    end
   end
 end

data/lib/hanoi/jane/towers/constrained_towers.rb

@@ -1,8 +1,8 @@
 module Hanoi
   module Jane
-    class ConstrainedTowers < Towers
+    class ConstrainedTowers < RegularTowers
       extend ConstrainedStackFinder
-      
+
       def initialize discs = 3
         super
         @base = 3

data/lib/hanoi/jane/towers/{towers.rb → regular_towers.rb}

@@ -1,6 +1,6 @@
 module Hanoi
   module Jane
-    class Towers
+    class RegularTowers
       extend StackFinder
 
       attr_reader   :stacks, :total, :base, :disc, :from, :to
@@ -10,14 +10,14 @@ module Hanoi
         @discs = discs
         @total = 0
         @base = 2
-        @stacks = Towers.starter_stacks @discs
+        @stacks = self.class.starter_stacks @discs
 
         yield self if block_given?
       end
 
       def discs= discs
         @discs = discs
-        @stacks = Towers.starter_stacks @discs
+        @stacks = self.class.starter_stacks @discs
       end
 
       def move
@@ -25,9 +25,9 @@ module Hanoi
         @total += 1
         after = binary
 
-        @disc = Towers.diff before, after
+        @disc = self.class.diff before, after
 
-        @from = Towers.find_disc @stacks, @disc
+        @from = self.class.find_disc @stacks, @disc
         @to = self.class.find_stack stacks: @stacks, from: @from, disc: @disc, total: @total
         @stacks[@to].push @stacks[@from].pop
       end
@@ -73,16 +73,14 @@ module Hanoi
       end
 
       def rebased
-        Towers.rebase @total, @base, @discs
+        self.class.rebase @total, @base, @discs
       end
 
-      private
-
-      def Towers.starter_stacks discs
+      def RegularTowers.starter_stacks discs
         [(0...discs).to_a.reverse, [], []]
       end
 
-      def Towers.diff this, that
+      def RegularTowers.diff this, that
         this.chars.reverse.each_with_index do |bit, index|
           if bit < that.chars.reverse[index]
           return index
@@ -90,11 +88,11 @@ module Hanoi
         end
       end
 
-      def Towers.rebase value, base, width
+      def RegularTowers.rebase value, base, width
         '%0*d' % [width, value.to_s(base)]
       end
 
-      def Towers.find_disc stacks, disc
+      def RegularTowers.find_disc stacks, disc
         stacks.each_with_index do |stack, index|
           return index if stack.index disc
         end
@@ -102,13 +100,5 @@ module Hanoi
         raise SearchException.new '%s not found in stacks' % disc
       end
     end
-
-    class SearchException < Exception
-      attr_reader :text
-
-      def initialize text
-        @text = text
-      end
-    end
   end
 end

data/lib/hanoi/jane/version.rb

@@ -1,5 +1,5 @@
 module Hanoi
   module Jane
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanoi-jane
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - pikesley
@@ -141,7 +141,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- TODO.md
 - bin/console
 - bin/hanoi
 - bin/setup
@@ -154,12 +153,13 @@ files:
 - lib/hanoi/jane/animation/padded_stacks.rb
 - lib/hanoi/jane/cli.rb
 - lib/hanoi/jane/config.rb
+- lib/hanoi/jane/exceptions.rb
 - lib/hanoi/jane/formatters/console.rb
 - lib/hanoi/jane/formatters/matrix.rb
 - lib/hanoi/jane/towers/animated_towers.rb
 - lib/hanoi/jane/towers/constrained_towers.rb
+- lib/hanoi/jane/towers/regular_towers.rb
 - lib/hanoi/jane/towers/stack_finders.rb
-- lib/hanoi/jane/towers/towers.rb
 - lib/hanoi/jane/version.rb
 homepage: http://sam.pikesley.org/projects/hanoi-jane/
 licenses:

data/TODO.md

@@ -1 +0,0 @@
-Can I conditionally include a module at constructor time? To e.g. pull in the ConstrainedTowers-specific search methods