ludy 0.1.8 → 0.1.9

data/lib/puzzle_generator.rb

@@ -3,9 +3,11 @@
 
 require 'puzzle_generator/puzzle'
 
-require 'rubygems'
-require 'facets/hash/reverse_merge'
-require 'facets/timer'
+require 'ludy/hash/reverse_merge'
+
+# require 'rubygems' if RUBY_VERSION < '1.9.0'
+# require 'facets/timer'
+require 'ludy/timer' # simple and stupid timer....
 
 module PuzzleGenerator
 
@@ -17,7 +19,7 @@ module PuzzleGenerator
 
   LastTriedInfo = {}
   def self.generate timeout = 5, &generator
-    timer = Timer.new(timeout).start
+    timer = Ludy::Timer.new(timeout).start
     tried_times = 1
     begin
       result = generator.call
@@ -26,7 +28,7 @@ module PuzzleGenerator
         result = generator.call
       end
     ensure
-      timer.stop
+      # timer.stop
       LastTriedInfo.merge! :tried_times => tried_times, :tried_duration => timer.total_time
     end
     result

data/lib/puzzle_generator/chain.rb

@@ -9,13 +9,15 @@ module PuzzleGenerator
       @direct = direct
       x, y = position
       @data = case @direct
-                when Up   : ([x]*invoke).zip((y...y+invoke).to_a)
-                when Right: (x...x+invoke).to_a.zip([y]*invoke)
-                when Left : (x-invoke+1..x).to_a.zip([y]*invoke)
+                when Up   ; ([x]*invoke).zip((y...y+invoke).to_a)
+                when Right; (x...x+invoke).to_a.zip([y]*invoke)
+                when Left ; (x-invoke+1..x).to_a.zip([y]*invoke)
               end
     end
     def <=> rhs; @data <=> rhs.instance_variable_get('@data'); end
     def == rhs; (self <=> rhs) == 0; end
+    alias_method :eql?, :==
+    def hash; @data.hash; end
     def each &block; @data.each &block; self end
     def [] index; @data[index]; end
     def to_a; @data.clone; end

data/lib/puzzle_generator/chained_map.rb

@@ -3,12 +3,11 @@ require 'puzzle_generator/misc'
 require 'puzzle_generator/chain'
 require 'puzzle_generator/map'
 
+require 'ludy/kernel/deep_copy'
 require 'ludy/array/combine'
-
-require 'rubygems'
-gem 'facets', '>=2.0.0'
-require 'facets/enumerable/combos'
-require 'facets/random' # for Array#pick
+require 'ludy/array/rotate'
+require 'ludy/array/choice' # for Array#choice!
+require 'ludy/array/product' if RUBY_VERSION < '1.9.0'
 
 module PuzzleGenerator
 
@@ -40,7 +39,8 @@ module PuzzleGenerator
     def init_map
       @maps = [make_map]
       @result_map = make_map_array
-      @picked_chain = make_init_chains([(0..@option[:width]-@option[:invoke]), [0]].combos).pick
+      # @picked_chain = make_init_chains([(0..@option[:width]-@option[:invoke]), [0]].combos).pick
+      @picked_chain = make_init_chains((0..@option[:width]-@option[:invoke]).to_a.product([0])).choice
       put_picked_chain_on @maps
       resolve_map
     end
@@ -51,7 +51,7 @@ module PuzzleGenerator
 
     def chain_ok?
       raise GenerationFailed.new("ChainedMap: last result_map: #{@result_map.inspect}") if @picked_chain.nil?
-      @maps_preview = @maps.deep_clone
+      @maps_preview = @maps.deep_copy
       put_picked_chain_on @maps_preview
 
       result = check_overlap_and_resolve_it &&
@@ -66,8 +66,8 @@ module PuzzleGenerator
       @maps << (new_map || make_map)
       chains = @maps[-1].break_chains @maps[-2], @result_map
 
-      @picked_chain = chains.pick!
-      @picked_chain = chains.pick! until chain_ok?
+      @picked_chain = chains.choice!
+      @picked_chain = chains.choice! until chain_ok?
 
       put_picked_chain_on @maps
       @picked_chain = nil
@@ -86,7 +86,7 @@ module PuzzleGenerator
       }
     end
     def check_overlap_and_resolve_it
-      @result_map_preview = @maps_preview.body.inject(make_map_array){ |result, map|
+      @result_map_preview = @maps_preview[0...-1].inject(make_map_array){ |result, map|
         result.each_with_index{ |column, x|
           column.each_with_index{ |value, y|
             # assert one of them is zero or they are all zero
@@ -97,7 +97,7 @@ module PuzzleGenerator
       }
     end
     def check_broken_except_last
-      @maps_preview.body.all?{ |map|
+      @maps_preview[0...-1].all?{ |map|
         result = true
         map.each_with_index_2d{ |i, x, y|
           result &&= !check_left_chain( map, x, y) &&

data/lib/puzzle_generator/map.rb

@@ -2,11 +2,9 @@
 require 'puzzle_generator/misc'
 require 'puzzle_generator/chain'
 
-require 'rubygems'
-gem 'facets', '>=2.0.0'
-require 'facets/enumerable/combos'
-require 'facets/enumerable/uniq_by'
-require 'facets/random' # for Kernel#maybe
+require 'ludy/kernel/maybe'
+require 'ludy/array/count' if RUBY_VERSION < '1.9.0'
+require 'ludy/array/product' if RUBY_VERSION < '1.9.0'
 
 # a = [[1,2],[3,4],[5,6]]
 # [a, [1,2,3]].combos
@@ -88,7 +86,8 @@ module PuzzleGenerator
     end
     def with_directs target
       # [target, [Up] + [Right, Left]*10].combos
-      [target, [Up, Right, Left]].combos
+      # [target, [Up, Right, Left]].combos
+      target.product [Up, Right, Left]
       # e.g., [[[0, 0], Up], [[0, 0], Right], [[0, 0], Left], [[1, 0], Up], ...]
     end
     def to_chains target
@@ -101,7 +100,8 @@ module PuzzleGenerator
     def strip_duplicated_chain target
       # target.uniq never works for non-num nor non-string :(
       # target.sort.inject([]){ |r, i| r.last == i ? r : r<<i }
-      target.uniq_by{|i|i}
+      # target.uniq_by{|i|i}
+      target.uniq # it works when hash and eql? take effect...
     end
     def strip_out_bounded_chain target
       target.select{ |chain| chain.bound_ok? @option[:width], @option[:height] }

data/lib/puzzle_generator/misc.rb

@@ -1,8 +1,6 @@
 
-require 'rubygems'
-gem 'facets', '>=2.0.0'
-require 'facets/kernel/deep_clone'
-require 'facets/array/pad'
+require 'ludy/kernel/deep_copy'
+require 'ludy/array/pad'
 
 module PuzzleGenerator
   Up, Right, Left = (0..2).to_a
@@ -36,7 +34,7 @@ module PuzzleGenerator
       }
     end
     def check_answer_correctness result_map = @result_map
-      map = Map.new @option.merge(:data => result_map.deep_clone)
+      map = Map.new @option.merge(:data => result_map.deep_copy)
       drop_blocks map # because of answer is stripped
 
       @chained = true
@@ -81,7 +79,10 @@ module PuzzleGenerator
       }
     end
     def drop_blocks map
-      map.each_column{ |column| column.map!{ |i| i==0 ? nil : i }.compact!.pad!(@option[:height], 0) }
+      map.each_column{ |column|
+        column.map!{ |i| i==0 ? nil : i }.compact!
+        column.pad!(@option[:height], 0)
+      }
     end
     def check_left_chain map, x, y
       # this should be rewrited

data/lib/puzzle_generator/puzzle.rb

@@ -3,10 +3,7 @@ require 'puzzle_generator/misc'
 require 'puzzle_generator/chained_map'
 require 'puzzle_generator/colored_map'
 
-require 'rubygems'
-gem 'facets', '>=2.0.0'
-require 'facets/array/rotate'
-require 'facets/timer'
+require 'ludy/array/rotate'
 
 module PuzzleGenerator
 

data/spec/ludy_spec.rb

@@ -1,3 +1,9 @@
+# $Id$
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe Ludy do
+end
 
 # bowling.rb
 class Bowling # :nodoc:
@@ -20,3 +26,5 @@ describe Bowling do
     @bowling.score.should == 0
   end
 end
+
+# EOF

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# $Id$
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib tmp]))
+
+Spec::Runner.configure do |config|
+  # == Mock Framework
+  #
+  # RSpec uses it's own mocking framework by default. If you prefer to
+  # use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+end
+
+# EOF

data/tasks/doc.rake

@@ -7,7 +7,6 @@ namespace :doc do
   desc 'Generate RDoc documentation'
   Rake::RDocTask.new do |rd|
     rd.main = PROJ.rdoc_main
-    rd.options << '-d' if !WIN32 and `which dot` =~ %r/\/dot/
     rd.rdoc_dir = PROJ.rdoc_dir
 
     incl = Regexp.new(PROJ.rdoc_include.join('|'))
@@ -24,8 +23,7 @@ namespace :doc do
     title = "#{PROJ.rubyforge_name}'s " + title if PROJ.rubyforge_name != title
 
     rd.options << "-t #{title}"
-    # FIXME: please add rdoc option to Rakefile, then i don't have to add this line.
-    rd.options << '--charset=utf-8' << '--inline-source' << '--line-numbers'
+    rd.options.concat(PROJ.rdoc_opts)
   end
 
   desc 'Generate ri locally for testing'

data/tasks/gem.rake

@@ -69,12 +69,12 @@ namespace :gem do
 
   desc 'Install the gem'
   task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.file_name}"
+    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name}"
   end
 
   desc 'Uninstall the gem'
   task :uninstall do
-    sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' #{PROJ.name}"
+    sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' -x #{PROJ.name}"
   end
 
 end  # namespace :gem

data/tasks/manifest.rake

@@ -17,7 +17,18 @@ namespace :manifest do
     end
 
     File.open(fn, 'w') {|fp| fp.puts files.sort}
-    system "#{DIFF} -du Manifest.txt #{fn}"
+    lines = %x(#{DIFF} -du Manifest.txt #{fn}).split("\n")
+    if HAVE_FACETS_ANSICODE and ENV.has_key?('TERM')
+      lines.map! do |line|
+        case line
+        when %r/^(-{3}|\+{3})/; nil
+        when %r/^@/; Console::ANSICode.blue line
+        when %r/^\+/; Console::ANSICode.green line
+        when %r/^\-/; Console::ANSICode.red line
+        else line end
+      end
+    end
+    puts lines.compact
     rm fn rescue nil
   end
 
@@ -36,6 +47,9 @@ namespace :manifest do
     files << fn unless test ?f, fn
     File.open(fn, 'w') {|fp| fp.puts files.sort}
   end
-end
+end  # namespace :manifest
+
+desc 'Alias to manifest:check'
+task :manifest => 'manifest:check'
 
 # EOF

data/tasks/post_load.rake

@@ -0,0 +1,18 @@
+# $Id$
+
+# This file does not define any rake tasks. It is used to load some project
+# settings if they are not defined by the user.
+
+unless PROJ.changes
+  PROJ.changes = paragraphs_of('History.txt', 0..1).join("\n\n")
+end
+
+unless PROJ.description
+  PROJ.description = paragraphs_of('README.txt', 'description').join("\n\n")
+end
+
+unless PROJ.summary
+  PROJ.summary = PROJ.description.split('.').first
+end
+
+# EOF

data/tasks/setup.rb

@@ -68,10 +68,12 @@ PROJ.svn_tags = 'tags'
 PROJ.svn_branches = 'branches'
 
 # Load the other rake files in the tasks folder
-Dir.glob('tasks/*.rake').sort.each {|fn| import fn}
+rakefiles = Dir.glob('tasks/*.rake').sort
+rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
+import(*rakefiles)
 
 # Setup some constants
-WIN32 = %r/win32/ =~ RUBY_PLATFORM unless defined? WIN32
+WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
 
 DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
 
@@ -100,7 +102,7 @@ SUDO = if WIN32 then ''
 RCOV = WIN32 ? 'rcov.cmd'  : 'rcov'
 GEM  = WIN32 ? 'gem.cmd'   : 'gem'
 
-%w(rcov spec/rake/spectask rubyforge bones).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
@@ -115,8 +117,28 @@ end
 #    changes = paragraphs_of('History.txt', 0..1).join("\n\n")
 #    summary, *description = paragraphs_of('README.txt', 3, 3..8)
 #
-def paragraphs_of(path, *paragraphs)
-  File.read(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
+def paragraphs_of( path, *paragraphs )
+  title = String === paragraphs.first ? paragraphs.shift : nil
+  ary = File.read(path).delete("\r").split(/\n\n+/)
+
+  result = if title
+    tmp, matching = [], false
+    rgxp = %r/^=+\s*#{Regexp.escape(title)}/i
+    paragraphs << (0..-1) if paragraphs.empty?
+
+    ary.each do |val|
+      if val =~ rgxp
+        break if matching
+        matching = true
+        rgxp = %r/^=+/i
+      elsif matching
+        tmp << val
+      end
+    end
+    tmp
+  else ary end
+
+  result.values_at(*paragraphs)
 end
 
 # Adds the given gem _name_ to the current project's dependency list. An
@@ -130,11 +152,13 @@ def depend_on( name, version = nil )
   PROJ.dependencies << (version.nil? ? [name] : [name, ">= #{version}"])
 end
 
-# Adds the given _path_ to the include path if it is not already there
+# Adds the given arguments to the include path if they are not already there
 #
-def ensure_in_path( path )
-  path = File.expand_path(path)
-  $:.unshift(path) if test(?d, path) and not $:.include?(path)
+def ensure_in_path( *args )
+  args.each do |path|
+    path = File.expand_path(path)
+    $:.unshift(path) if test(?d, path) and not $:.include?(path)
+  end
 end
 
 # Find a rake task using the task name and remove any description text. This
@@ -148,4 +172,18 @@ def remove_desc_for_task( names )
   end
 end
 
+# Change working directories to _dir_, call the _block_ of code, and then
+# change back to the original working directory (the current directory when
+# this method was called).
+#
+def in_directory( dir, &block )
+  curdir = pwd
+  begin
+    cd dir
+    return block.call
+  ensure
+    cd curdir
+  end
+end
+
 # EOF

data/tasks/spec.rake

@@ -8,12 +8,14 @@ namespace :spec do
   Spec::Rake::SpecTask.new(:run) do |t|
     t.spec_opts = PROJ.spec_opts
     t.spec_files = PROJ.specs
+    t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
     t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
     t.spec_files = PROJ.specs
+    t.libs += PROJ.libs
   end
 
   if HAVE_RCOV
@@ -21,6 +23,7 @@ namespace :spec do
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.spec_opts = PROJ.spec_opts
       t.spec_files = PROJ.specs
+      t.libs += PROJ.libs
       t.rcov = true
       t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
     end

data/test/example_puzzle.rb

@@ -3,15 +3,15 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'ludy')
 require 'puzzle_generator'
 
 PuzzleGenerator.debug = true
-p = PuzzleGenerator::Puzzle.new :level => 4, :timeout => 10, :invoke_max => 5
+pg = PuzzleGenerator::Puzzle.new :level => 4, :timeout => 2, :invoke_max => 5
 begin
-  p.generate
-  p.display_map
-rescue Timeout::Error
-  puts 'Timeout!!'
+  pg.generate
+  pg.display_map
+rescue Ludy::Timeout => e
+  puts e
 ensure
-  p p.tried_times
-  p p.tried_duration
+  p pg.tried_times
+  p pg.tried_duration
 end
 
 # level => 7