shiritori 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15306fc6b5e758835b251847186d047d17f5a097
-  data.tar.gz: 670e46f10cde90c3cf71be56db9754f702e7778d
+  metadata.gz: 7ca46091473a69da8cca24df97a965bfd65f6300
+  data.tar.gz: a50c380b8b86bfb402d2641da8d7477eda101b8e
 SHA512:
-  metadata.gz: 7909844236da3afcf8f0b4e52fd46b3a43e5e1db968062b6ae76712e883fc36b11448ca9f247ef530e83da51812e08232cde009cfe9024b9e206c721830b5aad
-  data.tar.gz: 87cc9b4e7551c9ffbd1895710a0a9c48474d26942b4e50fb137eb69e0232b147a8d4129ab40a4d862cd086e1dfcb2e24e4d7cfb4a1ef327fba52f97a273df1b6
+  metadata.gz: 90aae5e28b8c64edb6097fb5434f79716776f8cd86038876824028e10cc732f163cc5ee04dda157ff6a91e308a8dcf396b84f14a0a946e9b3e01f43b964e4cf1
+  data.tar.gz: 29c19a4710ee8a3ee4ac88aab3e86dc8ae4d464aa9b158f9a0a2b1660fac61aa5b71e4ec04dd3b759bba9d633955cfb58a76a62ddeddb3533355a0511eabd4f3

data/lib/shiritori/search_method.rb

@@ -4,20 +4,16 @@ module Shiritori
 
     def get_all_method
       @check_list = {}
-      @method_list = []
-
-      scan_method
+      @method_list = scan_methods
 
       @method_list - UNUSE_METHOD
     end
 
-    def scan_method(klass = BasicObject)
-      @check_list[klass] = true
-      @method_list |= klass.instance_methods
+    def scan_methods(klass = BasicObject)
+      klasses = ObjectSpace.each_object(Class).to_a
+      klasses |= klasses.map(&:singleton_class)
 
-      ObjectSpace.each_object(Class) do |subclass|
-        scan_method(subclass) if klass != subclass && @check_list[subclass].nil?
-      end
+      klasses.map(&:instance_methods).inject(&:|)
     end
   end
 end

data/lib/shiritori/shiritori.rb

@@ -3,7 +3,7 @@ require 'readline'
 
 module Shiritori
   class Main
-    attr_reader :current_object, :chain_count, :error_count, :mode, :use_method_list
+    attr_reader :current_object, :chain_count, :error_count, :mode, :used_method_list
     include SearchMethod
     include View
 
@@ -34,7 +34,7 @@ module Shiritori
     def update(action: nil, object: nil)
       if action
         @all_method.delete(action)
-        @use_method_list << action
+        @used_method_list << action
         @current_object = object
         @chain_count += 1
       end
@@ -53,7 +53,7 @@ module Shiritori
       @all_method = get_all_method
       @current_class = Object
       @current_chain = []
-      @use_method_list = []
+      @used_method_list = []
       @chain_count = 0
       @error_count = 0
       @success = false
@@ -68,7 +68,7 @@ module Shiritori
 
         begin
           Thread.new do
-            timeout(TIME_LIMIT) do
+            Timeout.timeout(TIME_LIMIT) do
               @current_object = eval(command.chomp)
             end
           end.join
@@ -116,7 +116,13 @@ module Shiritori
         command = command.chomp.sub(/^\./, '')
 
         begin
-          result = exec_method_chain(command, current_object)
+          begin 
+            object = Marshal.load(Marshal.dump(current_object))
+          rescue Exception => ex
+            object = current_object
+          end
+
+          result = try_method_chain(command, object)
           
           redo unless result
 
@@ -132,7 +138,7 @@ module Shiritori
             puts "Exec command #{[@current_object.to_ss, command].join('.')}"
             @current_chain << command
             update(action: action, object: object)
-          else
+          elsif used_method_list[action]
             $error_message = "#{action} is already used."
             raise Shiritori::UseSameMethodError
           end
@@ -145,7 +151,7 @@ module Shiritori
       end
     end
 
-    def exec_method_chain(command, object)
+    def try_method_chain(command, object)
       method_name = command.scan(METHOD_PATTERN).first.to_sym
       result = [method_name]
 
@@ -159,7 +165,7 @@ module Shiritori
           Thread.new do
             raise NoMethodError unless object.respond_to?(method_name)
 
-            timeout(TIME_LIMIT) do
+            Timeout.timeout(TIME_LIMIT) do
               result << eval('object.' + command)
             end
           end.join
@@ -177,7 +183,7 @@ module Shiritori
 
     private
     def help_me(current_object)
-      can_use_methods = current_object.methods - use_method_list
+      can_use_methods = current_object.methods - used_method_list
 
       new_line
 

data/lib/shiritori/version.rb

@@ -1,3 +1,3 @@
 module Shiritori
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/shiritori/random_method_spec.rb

@@ -8,7 +8,4 @@ describe "Shiritori test" do
   describe "Random singleton methods" do
     it { instance_check(:new, %q(0), obj: __class__) }
   end
-
-  describe "Random instance methods" do  
-  end
-end
+end

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ module Helpers
   end
 
   def check(method, obj = same_object)
-    main.exec_method_chain(method, obj)
+    main.try_method_chain(method, obj)
   end
 
   def compare_range(a, b)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiritori
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - siman-man