hanoi-jane 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2267c39b116fc8119cb14359ee81d972c1be73
-  data.tar.gz: c1ca93a586a49d31f41f7581dc5c7e63312da921
+  metadata.gz: 29597fd9ae3dadaf88e2edb71d794ba60c9a3f44
+  data.tar.gz: a26ad504df7e1df2aaa61b619c9337440dc2dac0
 SHA512:
-  metadata.gz: 4d6a51f4f2cb063c3d2f8d9277821f91106561e9e5bf289970581c9c19279a9f3bca855ba5a996112242afc98c751c25e233bdfa90ba469fe391e8bd3df4e68b
-  data.tar.gz: cabe1718e0f925edfaca697d4bfc552510762ede7058be9bdb1062f5710ee37471cf5258100f1297349eec835d319b098b1b7604256226fd3905e503ce6d0e8e
+  metadata.gz: b0ddbeb638c7e2e6a90da9c2dc4a079da42dd69397ee184e70135a5f3131e0a8b51f95f7bff3298f87d2671572ea71188bf9df71b389d7b834cb3f3718a59c75
+  data.tar.gz: a8886bb1e1cbcd00ff9a064572b5b34aeab4a9830e3e5e1ea0e537383fd3dc1a527cd6d59dd6827166f7212f502ed1f9faa54b1584326af2fbcb1f82d7a08e70

data/config/config.yml

@@ -2,14 +2,12 @@ chars:
   regular:
     space: ' '
     disc: 'o'
-    pole: '|'
     vert_divider: '|'
     horiz_divider: '-'
 
   fancy:
     space: ' '
     disc: '🎾'
-    pole: '💈'
     vert_divider: '🔺'
     horiz_divider: '🔻'
 
@@ -28,3 +26,6 @@ digits:
     - [1, 1, 0]
     - [0, 1, 0]
     - [0, 1, 1]
+
+animation:
+  tween-scale: 0.1

data/lib/hanoi/jane.rb

@@ -1,6 +1,5 @@
 require 'singleton'
 require 'yaml'
-require 'ostruct'
 
 require 'thor'
 require 'httparty'
@@ -10,31 +9,34 @@ require 'hanoi/jane/version'
 require 'hanoi/jane/config'
 require 'hanoi/jane/exceptions'
 
-require 'hanoi/jane/towers/stack_finders'
 require 'hanoi/jane/towers/regular_towers'
 require 'hanoi/jane/towers/constrained_towers'
 require 'hanoi/jane/towers/animated_towers'
 
 require 'hanoi/jane/animation/animation'
+require 'hanoi/jane/animation/frame'
 require 'hanoi/jane/animation/lifter'
 require 'hanoi/jane/animation/dropper'
 require 'hanoi/jane/animation/padded_stacks'
+require 'hanoi/jane/animation/drop_in'
+require 'hanoi/jane/animation/smoosher'
 
 require 'hanoi/jane/formatters/matrix'
 require 'hanoi/jane/formatters/console'
 
 module Hanoi
   module Jane
-    def self.hit_phat stacks, value, phat
-      matrix = Formatters::Matrix.new do |m|
-        m.stacks = stacks
-        m.digits = value
+    def self.render_to_phat source, interval, phat
+      source.each do |frame|
+        Hanoi::Jane.hit_phat frame.to_dots, phat
+        sleep interval * interval_factor(frame)
       end
-      matrix.populate
+    end
 
+    def self.hit_phat grid, phat
       url = "http://#{phat}/lights"
       payload = {
-        matrix: matrix
+        matrix: grid
       }
       headers = {
         'Content-Type' => 'application/json',
@@ -43,5 +45,31 @@ module Hanoi
 
       HTTParty.patch(url, body: payload.to_json, headers: headers)
     end
+
+    def self.render_to_console source, interval, fancy
+      source.each do |frame|
+        Hanoi::Jane.draw_console frame.stacks, frame.value, fancy
+        sleep interval * interval_factor(frame)
+      end
+    end
+
+    def self.draw_console stacks, value, fancy = false
+      system('clear')
+
+      c = Formatters::Console.new do |c|
+        c.stacks = stacks
+        c.fancy = fancy
+      end
+
+      puts value
+      puts c
+    end
+
+    def self.interval_factor frame
+      if frame.animtype == :tween
+        return Config.instance.config.animation['tween-scale']
+      end
+      1
+    end
   end
 end

data/lib/hanoi/jane/animation/drop_in.rb

@@ -0,0 +1,43 @@
+module Hanoi
+  module Jane
+    class DropIn
+      include Enumerable
+
+      attr_accessor :height, :discs
+      attr_reader   :stacks, :disc, :animtype
+
+      def initialize
+        @height = 7
+        @discs = 3
+        @animtype = :tween
+        yield self if block_given?
+
+        @stacks = PaddedStacks.new [[], [], []], @height
+        @disc = discs - 1
+        @dropper = Dropper.new @stacks[0], @disc, true
+      end
+
+      def value
+        '0' * (@discs - @disc)
+      end
+
+      def each
+        while @disc >= 0
+          @dropper = Dropper.new @stacks[0], @disc, (@disc == 0 ? false : true)
+          @dropper.each do |state|
+            @stacks[0] = state.to_a
+            yield self
+          end
+          @disc -= 1
+        end
+      end
+
+      def to_dots
+        Formatters::Matrix.new do |m|
+          m.stacks = @stacks
+          m.digits = '0' * (@discs - @disc)
+        end
+      end
+    end
+  end
+end

data/lib/hanoi/jane/animation/dropper.rb

@@ -1,9 +1,10 @@
 module Hanoi
   module Jane
     class Dropper < Array
-      def initialize stack, item
+      def initialize stack, item, full_drop = false
         stack.map { |i| self.push i }
         @item = item
+        @full_drop = full_drop
       end
 
       def drop
@@ -16,10 +17,17 @@ module Hanoi
       end
 
       def dropped
-        (self[(Dropper.position self, @item) - 1] || self[(Dropper.position self, @item)]) || (Dropper.position self, @item) == 0
+        if @full_drop
+          return self[(Dropper.position self, @item)] || (Dropper.position self, @item) < 0
+        end
+        
+        (
+          self[(Dropper.position self, @item) - 1] ||
+          self[(Dropper.position self, @item)]
+        ) || (Dropper.position self, @item) == 0
       end
 
-      def each 
+      def each
         until dropped
           drop
           yield self

data/lib/hanoi/jane/animation/frame.rb

@@ -0,0 +1,20 @@
+module Hanoi
+  module Jane
+    class Frame
+      attr_reader :stacks, :animtype, :value
+
+      def initialize stacks, value, type
+        @stacks = stacks
+        @value = value
+        @animtype = type
+      end
+
+      def to_dots
+        Formatters::Matrix.new do |m|
+          m.stacks = @stacks
+          m.digits = @value
+        end
+      end
+    end
+  end
+end

data/lib/hanoi/jane/animation/smoosher.rb

@@ -0,0 +1,45 @@
+module Hanoi
+  module Jane
+    class Smoosher < Array
+      include Enumerable
+
+      attr_accessor :direction
+      attr_reader   :animtype
+
+      def initialize
+        @direction = :close
+        @step = 0.05
+        @animtype = :tween
+
+        yield self if block_given?
+      end
+
+      def each
+        @range = (0..1).step(0.05).to_a
+        @range.reverse! if @direction == :open
+        @range.each do |weight|
+          populate weight
+          yield self
+        end
+      end
+
+      def populate weight
+        7.times do |i|
+          self[i] = Smoosher.row weight
+        end
+      end
+
+      def to_dots
+        self
+      end
+
+      def Smoosher.row weight = 0
+        a = []
+        45.times do
+          a.push (weight > Random.rand) ? 1 : 0
+        end
+        a
+      end
+    end
+  end
+end

data/lib/hanoi/jane/cli.rb

@@ -11,23 +11,30 @@ module Hanoi
 
       desc 'phat', "Solve the towers against the pHAT's webserver"
       option :phat, type: :string, required: true, desc: 'Address of the pHAT you want to hit'
+      option :discs, type: :numeric, default: 5, desc: 'Number of discs'
       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|
+        smoosher = Hanoi::Jane::Smoosher.new
+        [:close, :open].each do |direction|
+          smoosher.direction = direction
+          Hanoi::Jane.render_to_phat smoosher, options[:interval], options[:phat]
+        end
+
+        drop_in = DropIn.new do |d|
+          d.height = 7
+          d.discs = options[:discs]
+        end
+
+        towers = AnimatedTowers.new do |a|
           a.towers = ConstrainedTowers
-          a.discs = 5
+          a.discs = options[:discs]
           a.height = 7
         end
 
-        at.each do |frame|
-          Hanoi::Jane.hit_phat frame.stacks, frame.value, options[:phat]
-          interval = options[:interval]
-          if frame.type == :tween
-            interval = interval * 0.1
-          end
-          sleep interval
+        [drop_in, towers].each do |source|
+          Hanoi::Jane.render_to_phat source, options[:interval], options[:phat]
         end
       end
 
@@ -40,31 +47,22 @@ module Hanoi
 
       def console
         begin
-          at = AnimatedTowers.new do |a|
+          drop_in = DropIn.new do |d|
+            d.height = options[:discs] + options[:height]
+            d.discs = options[:discs]
+          end
+
+          towers = 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')
-
-            c = Formatters::Console.new do |c|
-              c.stacks = frame.stacks
-              c.fancy = options[:fancy]
-            end
-
-            puts frame.value
-            puts c
-
-            interval = options[:interval]
-            if frame.type == :tween
-              interval = interval * 0.1
-            end
-            sleep interval
+          [drop_in, towers].each do |source|
+            Hanoi::Jane.render_to_console source, options[:interval], options[:fancy]
           end
 
-          puts '%d moves to solve for %d discs' % [at.towers.total, at.discs]
+          puts '%d moves to solve for %d discs' % [towers.towers.total, towers.discs]
 
         rescue HanoiException => he
           puts he.text

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

@@ -15,7 +15,7 @@ module Hanoi
 
           yield self if block_given?
 
-          #populate
+          populate
         end
 
         def digits= digits

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

@@ -38,15 +38,5 @@ module Hanoi
         yield Frame.new (PaddedStacks.new @towers.stacks, @height), @towers.rebased, :key
       end
     end
-
-    class Frame
-      attr_reader :stacks, :type, :value
-
-      def initialize stacks, value, type
-        @stacks = stacks
-        @value = value
-        @type = type
-      end
-    end
   end
 end

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

@@ -1,8 +1,6 @@
 module Hanoi
   module Jane
     class ConstrainedTowers < RegularTowers
-      extend ConstrainedStackFinder
-
       def initialize discs = 3
         super
         @base = 3
@@ -17,6 +15,20 @@ module Hanoi
         i[:ternary] = i.delete :binary
         i
       end
+
+      def ConstrainedTowers.find_stack stacks:, from:, disc: nil, total:
+        # if we're in the middle
+        if from == 1
+          # we always move to the right on an even total
+          if total % 2 == 0
+            return 2
+          else
+            return 0
+          end
+        end
+        # otherwise we're at the edges and can only move to the middle
+        1
+      end
     end
   end
 end

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

@@ -1,10 +1,10 @@
 module Hanoi
   module Jane
     class RegularTowers
-      extend StackFinder
+      include Enumerable
 
-      attr_reader   :stacks, :total, :base, :disc, :from, :to
-      attr_accessor :discs
+      attr_reader   :total, :base, :disc, :from, :to, :discs
+      attr_accessor :stacks
 
       def initialize discs = 3
         @discs = discs
@@ -57,6 +57,12 @@ module Hanoi
         end
       end
 
+      def clone
+        c = self.dup
+        c.stacks = self.stacks.clone.map { |s| s.clone }
+        c
+      end
+
       def to_s
         s = ''
         @stacks.each do |stack|
@@ -68,6 +74,10 @@ module Hanoi
         s
       end
 
+      def to_json
+        inspect.to_json
+      end
+
       def binary
         rebased
       end
@@ -76,6 +86,21 @@ module Hanoi
         self.class.rebase @total, @base, @discs
       end
 
+      def RegularTowers.find_stack stacks:, from:, disc:, total: nil
+        # if the next stack is empty, move there
+        if stacks[(from + 1) % 3] == []
+          return (from + 1) % 3
+        end
+
+        # if the next stack has a smaller top disc than our disc, go one more over
+        if stacks[(from + 1) % 3][-1] < disc
+          return (from + 2) % 3
+        end
+
+        # default to the next one
+        (from + 1) % 3
+      end
+
       def RegularTowers.starter_stacks discs
         [(0...discs).to_a.reverse, [], []]
       end

data/lib/hanoi/jane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanoi-jane
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,9 +148,12 @@ files:
 - hanoi-jane.gemspec
 - lib/hanoi/jane.rb
 - lib/hanoi/jane/animation/animation.rb
+- lib/hanoi/jane/animation/drop_in.rb
 - lib/hanoi/jane/animation/dropper.rb
+- lib/hanoi/jane/animation/frame.rb
 - lib/hanoi/jane/animation/lifter.rb
 - lib/hanoi/jane/animation/padded_stacks.rb
+- lib/hanoi/jane/animation/smoosher.rb
 - lib/hanoi/jane/cli.rb
 - lib/hanoi/jane/config.rb
 - lib/hanoi/jane/exceptions.rb
@@ -159,7 +162,6 @@ files:
 - 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/version.rb
 homepage: http://sam.pikesley.org/projects/hanoi-jane/
 licenses:

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

@@ -1,36 +0,0 @@
-module Hanoi
-  module Jane
-    module StackFinder
-      def find_stack stacks:, from:, disc:, total: nil
-        # if the next stack is empty, move there
-        if stacks[(from + 1) % 3] == []
-          return (from + 1) % 3
-        end
-
-        # if the next stack has a smaller top disc than our disc, go one more over
-        if stacks[(from + 1) % 3][-1] < disc
-          return (from + 2) % 3
-        end
-
-        # default to the next one
-        return (from + 1) % 3
-      end
-    end
-
-    module ConstrainedStackFinder
-      def find_stack stacks:, from:, disc: nil, total:
-        # if we're in the middle
-        if from == 1
-          # we always move to the right on an even total
-          if total % 2 == 0
-            return 2
-          else
-            return 0
-          end
-        end
-        # otherwise we're at the edges and can only move to the middle
-        1
-      end
-    end
-  end
-end