hanoi-jane 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49544f6ba3f25f061e296b69216675bdca3383b
-  data.tar.gz: 982b160b51f1615f11ec0aa15551327470909bb0
+  metadata.gz: 18a7024f33d514778591e76528439a5f1bbfc6c2
+  data.tar.gz: cb2e4809487b082cbb7f10d7a0ad9dc494628005
 SHA512:
-  metadata.gz: 3c65f08629c3616617e11ce36a6c914dbc20d04108187714e3e29673fd2ba037859f68780a04f9072d7d51a0f867d038951ac0fa621ed62b44e6381cfd2d4344
-  data.tar.gz: b15f6ba0c8fe1e0c9a8e9fbe5bbc18bc7fd4ace2f0dfbc950794d364d9eeef2bfd5b5d015e99baf09264862b43aca0b4952f048311499e052aaa2bb3980afcab
+  metadata.gz: e85d9650604ae1bff0ddf45a5bcdf5ee5c1eda42fd423f77af08e7e7a403c1ddf3f6de91345f653e3ca791adc2e70ee6dc75817a91a528783e77a855e293410d
+  data.tar.gz: 440b0ec941455136734c5790e6100469e410290dfd684903ffeb21cbb013337c92dd1fcfd192deb2d981e921a9e4d215ab192c0b183c2d1fea5bc377697fdd88

data/README.md

@@ -1,7 +1,6 @@
 [![Build Status](http://img.shields.io/travis/pikesley/hanoi-jane.svg?style=flat-square)](https://travis-ci.org/pikesley/hanoi-jane)
 [![Dependency Status](http://img.shields.io/gemnasium/pikesley/hanoi-jane.svg?style=flat-square)](https://gemnasium.com/pikesley/hanoi-jane)
 [![Coverage Status](http://img.shields.io/coveralls/pikesley/hanoi-jane.svg?style=flat-square)](https://coveralls.io/r/pikesley/hanoi-jane)
-[![Code Climate](http://img.shields.io/codeclimate/github/pikesley/hanoi-jane.svg?style=flat-square)](https://codeclimate.com/github/pikesley/hanoi-jane)
 [![Gem Version](http://img.shields.io/gem/v/hanoi-jane.svg?style=flat-square)](https://rubygems.org/gems/hanoi-jane)
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://pikesley.mit-license.org)
 
@@ -19,7 +18,8 @@ Yes, there are. This is very much a Solved Problem. However, I was inspired to i
 
     bundle
     bundle exec rake
-    bundle exec ./bin/hanoi console
+    bundle exec rake install
+    hanoi console
 
 ## Constrained version
 
@@ -27,12 +27,30 @@ There is a [constrained variant of the problem](https://www.youtube.com/watch?v=
 
     hanoi --constrained
 
+## API
+
+To use it in your own code, try something like:
+
+```ruby
+➔ irb
+irb(main):001:0> require 'hanoi/jane'
+=> true
+irb(main):002:0> towers = Hanoi::Jane::ConstrainedTowers.new 3
+=> {:stacks=>[[2, 1, 0], [], []], :moves=>0, :flipped=>nil, :ternary=>"000"}
+irb(main):003:0> towers.each { |state| puts state.inspect }
+{:stacks=>[[2, 1, 0], [], []], :moves=>0, :flipped=>nil, :ternary=>"000"}
+{:stacks=>[[2, 1], [0], []], :moves=>1, :flipped=>0, :ternary=>"001"}
+{:stacks=>[[2, 1], [], [0]], :moves=>2, :flipped=>0, :ternary=>"002"}
+<snip>
+```
+where `flipped` is the disc that was moved last
+
 ## pHAT
 
 In order to over-engineer this, I've wrapped a [very thin Flask app](https://github.com/pikesley/pHAT-REST) around the [MicroDot pHAT](https://shop.pimoroni.com/products/microdot-phat). Try
 
     hanoi phat --phat <address_of_your_pi> --constrained
 
-to watch this all play out on the pHAT:
+to watch this all [play out on the pHAT](https://www.youtube.com/watch?v=PAQY5XtdNO8):
 
-<blockquote class="instagram-media" data-instgrm-version="7" style=" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);"><div style="padding:8px;"> <div style=" background:#F8F8F8; line-height:0; margin-top:40px; padding:50.0% 0; text-align:center; width:100%;"> <div style=" background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAMUExURczMzPf399fX1+bm5mzY9AMAAADiSURBVDjLvZXbEsMgCES5/P8/t9FuRVCRmU73JWlzosgSIIZURCjo/ad+EQJJB4Hv8BFt+IDpQoCx1wjOSBFhh2XssxEIYn3ulI/6MNReE07UIWJEv8UEOWDS88LY97kqyTliJKKtuYBbruAyVh5wOHiXmpi5we58Ek028czwyuQdLKPG1Bkb4NnM+VeAnfHqn1k4+GPT6uGQcvu2h2OVuIf/gWUFyy8OWEpdyZSa3aVCqpVoVvzZZ2VTnn2wU8qzVjDDetO90GSy9mVLqtgYSy231MxrY6I2gGqjrTY0L8fxCxfCBbhWrsYYAAAAAElFTkSuQmCC); display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px; width:44px;"></div></div><p style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;"><a href="https://www.instagram.com/p/Bbrs3diAw1B/" style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none;" target="_blank">A post shared by Sam (@pikesley)</a> on <time style=" font-family:Arial,sans-serif; font-size:14px; line-height:17px;" datetime="2017-11-19T16:04:50+00:00">Nov 19, 2017 at 8:04am PST</time></p></div></blockquote> <script async defer src="//platform.instagram.com/en_US/embeds.js"></script>
+[![Video](https://i.imgur.com/QILZYgx.png)](https://www.youtube.com/watch?v=PAQY5XtdNO8)

data/hanoi-jane.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/lib/hanoi/jane/cli.rb

@@ -20,12 +20,10 @@ module Hanoi
           towers = ConstrainedTowers.new 5
         end
 
-        until towers.solved do
+        towers.each do |state|
           Hanoi::Jane.hit_phat towers, options[:phat]
-          towers.move
           sleep options[:interval]
         end
-        Hanoi::Jane.hit_phat towers, options[:phat]
       end
 
       desc 'console', "Solve the towers one the console"
@@ -36,13 +34,12 @@ module Hanoi
         if options[:constrained]
           towers = ConstrainedTowers.new options[:discs]
         end
-        until towers.solved do
-          puts towers
-          towers.move
+
+        towers.each do |state|
+          puts state
         end
-        puts towers
 
-        puts "%d moves to solve for %d discs" % [towers.count, options[:discs]]
+        puts "%d moves to solve for %d discs" % [towers.total, options[:discs]]
       end
     end
   end

data/lib/hanoi/jane/constrained_towers.rb

@@ -14,7 +14,18 @@ module Hanoi
       def ternary
         rebased
       end
-      
+
+      def inspect
+        i = super
+
+        i.delete :binary
+        i[:ternary] = rebased
+
+        i
+      end
+
+      private
+
       def find_stack
         case @source
         when 0

data/lib/hanoi/jane/matrix.rb

@@ -11,13 +11,13 @@ module Hanoi
 
         offset = 0
         @stacks.each do |stack|
-          count = 0
+          total = 0
           stack.each do |disc|
             shim = ((5 - (disc + 1)) / 2).round
             (disc + 1).times do |i|
-              self[6 - count][i + offset + shim] = 1
+              self[6 - total][i + offset + shim] = 1
             end
-            count += 1
+            total += 1
           end
           offset += 8
         end

data/lib/hanoi/jane/towers.rb

@@ -1,31 +1,23 @@
 module Hanoi
   module Jane
     class Towers
-      attr_reader :count, :stacks
+      include Enumerable
+
+      attr_reader :total, :stacks
 
       def initialize discs
         @discs = discs
-        @count = 0
+        @total = 0
         @base = 2
         @stacks = [(0...discs).to_a.reverse, [], []]
       end
 
       def move
-        @disc = Towers.diff Towers.rebase(@count, @base, @discs),
-                           Towers.rebase(@count += 1, @base, @discs)
-        @source = find_disc
-
+        diff
+        find_disc
         @stacks[find_stack].push @stacks[@source].pop
       end
 
-      def binary
-        rebased
-      end
-
-      def rebased
-        Towers.rebase @count, @base, @discs
-      end
-
       def solved
         rebased.chars.all? { |digit| digit.to_i == @base - 1 }
       end
@@ -34,9 +26,47 @@ module Hanoi
         Matrix.new self
       end
 
+      def inspect
+        {
+          stacks: @stacks,
+          moves: @total,
+          binary: rebased,
+          flipped: @disc
+        }
+      end
+
+      def each
+        yield self if @total == 0
+        until solved
+          move
+          yield self
+        end
+      end
+
+      def to_s
+        s = ''
+        @stacks.each do |stack|
+          s += stack.to_s
+          s += "\n"
+        end
+        s += '---'
+
+        s
+      end
+
+      def binary
+        rebased
+      end
+
+      def rebased
+        Towers.rebase @total, @base, @discs
+      end
+
+      private
+
       def find_disc
         @stacks.each_with_index do |stack, index|
-          return index if stack.index @disc
+          @source = index if stack.index @disc
         end
       end
 
@@ -55,35 +85,20 @@ module Hanoi
         return (@source + 1) % 3
       end
 
-      def inspect
-        {
-          stacks: @stacks,
-          count: rebased
-        }
-      end
-
-      def to_s
-        s = ''
-        @stacks.each do |stack|
-          s += stack.to_s
-          s += "\n"
+      def diff
+        this = binary
+        @total += 1
+        that = binary
+        this.chars.reverse.each_with_index do |bit, index|
+          if bit < that.chars.reverse[index]
+            @disc = index
+          end
         end
-        s += '---'
-
-        s
       end
 
       def Towers.rebase value, base, width
         '%0*d' % [width, value.to_s(base)]
       end
-
-      def Towers.diff first, second
-        first.chars.reverse.each_with_index do |bit, index|
-          if bit < second.chars.reverse[index]
-            return index
-          end
-        end
-      end
     end
   end
 end

data/lib/hanoi/jane/version.rb

@@ -1,5 +1,5 @@
 module Hanoi
   module Jane
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanoi-jane
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pikesley
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,10 @@ dependencies:
 description: by counting in base 2 or 3
 email:
 - sam.pikesley@gmail.com
-executables: []
+executables:
+- console
+- hanoi
+- setup
 extensions: []
 extra_rdoc_files: []
 files: