combinatorial_puzzle_solver 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c97ab26d922c738ae675bbc88cb26d8b8d259d5
-  data.tar.gz: f2cf755474ec48ee6b028795e243619fef637976
+  metadata.gz: 48253eaf2c103bd7c5b330bc03c906109f8bda85
+  data.tar.gz: 7c8fe758d89eaa7f2e34ff227ad71896bf8be0ec
 SHA512:
-  metadata.gz: 616483c367ca49dfbbea46f862dcda1bdfae2b5f07eaf3dacab3cacaffa0e87f5dd6054745d2bd6d019999010176335a4c9269660b80718cf385019cfdc8a0bf
-  data.tar.gz: bb60d2804922912522d8622e1feee0124030754c8a68ba0ed4125cd972806f290511d51e3eb6d042efda925e691dce3ca0aa4e9a6650dd72b189b1dd002d300c
+  metadata.gz: 22ee49551ca08bf0f05b4996e8a2de23f56f3d7ab9f6e999e9a8616cec04535f7c2b7ea9fc67954af63b6ac796978fd40f971460d194d0c95c21a833310330b9
+  data.tar.gz: b91eb716f44882ee61ff8e8e38549f2139cc31bd22ba6b420aae192f943a4b43c4aa38696302e32d0a065b1b31c56c9d595206f1c6d3bc869db77a543a0f8bf5

data/README.md

@@ -1,4 +1,4 @@
-# Combinatorial Puzzle Solver
+# Combinatorial Puzzle Solver [![Gem Version](https://badge.fury.io/rb/combinatorial_puzzle_solver.svg)](http://badge.fury.io/rb/combinatorial_puzzle_solver)
 
 A resolver of combinatorial number-placement puzzles, like Sudoku.
 

data/Rakefile

@@ -1,40 +1,22 @@
 require "bundler/gem_tasks"
-Bundler.setup
-
-require 'rake/clean'
-require 'yard'
-require 'rspec/illustrate/yard'
-require "rspec/core/rake_task"
-
-desc "Execute tests"
-RSpec::Core::RakeTask.new(:test)
-
-desc "Execute RSpec and create a test report at ./doc/api.rspec."
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--format RSpec::Formatters::YARD --out ./doc/api.rspec"
-end
-
-desc "Create documentation."
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.files   = ['lib/**/*.rb', 'doc/api.rspec', '-', 'doc/api.rspec', 'doc/examples.md' ]
-end
-task :doc => [:spec, :examples]
-CLEAN.include("doc")
-CLEAN.include(".yardoc")
+require 'rspec/illustrate/default_rake_targets'
 
 desc "Create example documentation."
+task :examples => ['tmp/examples.md']
+
 require_relative 'example_puzzles/compile_examples'
-task :examples => ['doc/examples.md']
-file 'doc/examples.md' => FileList["example_puzzles/*"] do
+file 'tmp/examples.md' => FileList["example_puzzles/*"] do
   markdown = compile_examples_to_markdown(Dir.glob('example_puzzles/*.yaml'),2)
-  File.write('doc/examples.md', markdown)
+  File.write('tmp/examples.md', markdown)
   $stderr.puts "examples ok!"
 end
 
-desc "List the undocumented code."
-YARD::Rake::YardocTask.new(:list_undoc) do |t|
-  t.stats_options = ['--list-undoc']
-end
+# remove the old doc-task defined in rspec/illustrate/default_rake_targets
+Rake::Task['doc'].clear
 
-task :default => :doc
+desc "Create documentation."
+YARD::Rake::YardocTask.new(:doc) do |t|
+  t.files   = ['lib/**/*.rb', 'tmp/api.rspec', '-', 'tmp/api.rspec', 'tmp/examples.md' ]
+end
+task :doc => [:spec, :examples]
 

data/combinatorial_puzzle_solver.gemspec

@@ -23,9 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-illustrate", "~> 0.2.0"
-
+  spec.add_development_dependency "rspec-illustrate", "~> 0.2.5"
   spec.add_development_dependency "yard", "~>  0.8.7.6"
-  spec.add_development_dependency "redcarpet", "~>  3.2.2"
+  spec.add_development_dependency "redcarpet", "~>  3.3"
 
 end

data/lib/combinatorial_puzzle_solver/sudoku.rb

@@ -67,20 +67,20 @@ module CombinatorialPuzzleSolver
 
     # @return [Array<Array<Identifier>>] the identifiers grouped by squares
     def squares
-      slices = @identifiers.each_slice(@dimension).each_slice(@dimension).to_a
+      slices = columns.flatten.each_slice(@dimension).each_slice(@dimension).to_a
       slices.transpose.flatten.each_slice(@size).to_a
     end
 
     # @return [String] a simple string representation of the sudoku puzzle.
     def to_s
       horizontal = "\n#{Array.new(@dimension){"-" * (@dimension*2-1) }.join("+")}\n"
-      divisors = [horizontal, "\n", "|", " "]
+      separators = [" ", "|", "\n", horizontal]
 
-      strings = @identifiers.collect{|id| (id.has_value?) ? id.value.to_s : " "}
-      while divisor = divisors.pop do
-        strings = strings.each_slice(@dimension).collect{|s| s.join(divisor) }
-      end
-      strings.join
+      values = @identifiers.collect{|id| (id.has_value?) ? id.value.to_s : " "}
+      separators.each{|separator|
+        values = values.each_slice(@dimension).collect{|s| s.join(separator) }
+      }
+      values.join
     end
 
     # @return [String] a string representation of an identifier, which would be

data/lib/combinatorial_puzzle_solver/version.rb

@@ -1,4 +1,4 @@
 module CombinatorialPuzzleSolver
   # the current version
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combinatorial_puzzle_solver
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Erik Schlyter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.3'
 description: A resolver of combinatorial number-placement puzzles, like Sudoku.
 email:
 - erik@erisc.se