shiritori 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507f4984784dbfb03306eb4f06c37b86bb363ee2
-  data.tar.gz: 813b26e2b9d13d7c42cab387787f45e86670787b
+  metadata.gz: fb84441c364a1dfb4d9b46af2d071a32e2af24c7
+  data.tar.gz: 51125877608ca6f3f461fc84f1cafb1a1d7e164d
 SHA512:
-  metadata.gz: ef1da128408f68d90953ed1acdc9eb026f325ed3e33c3f9d60be1c4a5dd32e0257b6140692c039ee2d0edd6212671a24d95b93e90e9b02c2db0d5214b3c63023
-  data.tar.gz: c622ef8f9fc62d7ae150cee3d16dad4c3942130e3ca0eb3e4be6f24750220ea92c2943fec57dd234ff3036742fdda94612a2082b093a72de78b6e5a092fa7168
+  metadata.gz: 92841ab261bcab47557f04f5860b9f5c20e3eda002c471d1649529683a5f59a70054d8ada1b034babdc645f9eb5019d79303d98828a1c9f75b95527d20f4b59a
+  data.tar.gz: 842afd23db4cce22a20970179d29ed3845ed24a5cdb73042945588bf3df25951c3853115ad98d336429a88dbb0409d4b0adfd2a7e4abe27510c97ece25987fdd

data/bin/shiritori

@@ -2,4 +2,4 @@
 
 require 'shiritori'
 
-Shiritori::Main.new.start
+Shiritori::Main.new.start(ARGV)

data/lib/shiritori/convert.rb

@@ -19,7 +19,7 @@ class Object
 end
 
 BasicObject.class_eval do
-  def binding
+  def __binding__
     ::Kernel.binding
   end  
 end
@@ -34,7 +34,7 @@ class BasicObject
   end
 
   def eval(str)
-    ::Kernel.eval(str, binding)
+    ::Kernel.eval(str, __binding__)
   end
 
   alias :to_s :to_ss

data/lib/shiritori/error.rb

@@ -0,0 +1,10 @@
+module Shiritori
+  class ShiritoriError < Exception
+  end
+
+  class UseSameMethodError < ShiritoriError
+    def message
+      "Can't use same method."
+    end
+  end
+end

data/lib/shiritori/shiritori.rb

@@ -12,7 +12,7 @@ module Shiritori
     EXIT_PATTERN = /(exit|quit)/.freeze
     METHOD_PATTERN = /[\w|\?|\>|\<|\=|\!|\[|\[|\]|\*|\/|\+|\-|\^|\~|\@|\%|\&|]+/.freeze
 
-    def start
+    def start(option = [])
       init
       run
     end
@@ -21,6 +21,7 @@ module Shiritori
       if result
         @all_method.delete(result.first)
         @current_object = result.last
+        @chain_count += 1
       end
 
       begin
@@ -28,8 +29,8 @@ module Shiritori
       rescue Exception => ex
         @current_class = "Undefined"
       end
+
       @success = true
-      @chain_count += 1
     end
 
     def init
@@ -40,17 +41,22 @@ module Shiritori
       @chain_count = 0
       @success = false
 
-      $stdout.print "Please input first object > "
-      begin 
-        str = $stdin.gets.chomp
-        @current_object = eval(str)
-        @current_chain << @current_object.to_ss
-        @success = true
-      rescue Exception => ex
-        new_line
-        $stdout.puts "Undefined object error"
-        init
+      loop do
+        print "Please input first object > "
+
+        begin 
+          str = $stdin.gets.chomp
+          @current_object = eval(str)
+          @current_chain << @current_object.to_ss
+          @success = true
+          break
+        rescue Exception => ex
+          new_line
+          $stdout.puts "Undefined object error"
+          redo
+        end
       end
+
       update
     end
 
@@ -82,15 +88,19 @@ module Shiritori
 
         puts "Exec command #{[@current_object.to_ss, command].join('.')}"
 
-        if result = exec_method_chain(command, @current_object)
-          if @all_method.include?(result.first)
-            update(result)
-            @current_chain << command
-          elsif result.first == :exit
-            break
-          else
-            $stdout.puts "Already used method."
+        begin
+          if result = exec_method_chain(command, @current_object)
+            if @all_method.include?(result.first)
+              update(result)
+              @current_chain << command
+            elsif result.first == :exit
+              break
+            else
+              puts "Already used method."
+            end
           end
+        rescue Exception => ex
+          puts ex.message
         end
       end
     end

data/lib/shiritori/version.rb

@@ -1,3 +1,3 @@
 module Shiritori
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/shiritori/basic_object_method_spec.rb

@@ -4,7 +4,7 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "BasicObject instance methods" do
-    let(:object){ BasicObject.new }
+    let(:__instance__){ BasicObject.new }
 
     it { instance_check(:!) }
     it { instance_check(:!=, %Q(Object.new)) }

data/spec/shiritori/false_method_spec.rb

@@ -4,7 +4,7 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "FalseClass instance methods" do
-    let(:object){ false }
+    let(:__instance__){ false }
 
     it { instance_check(:&, %Q(true)) }
     it { instance_check(:^, %Q(true)) }

data/spec/shiritori/fixnum_method_spec.rb

@@ -4,165 +4,44 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "Fixnum instance methods" do
-    let(:object){ 16 }
-
-    def check( method )
-      main.exec_method_chain( method, object )
-    end
-
-    it '#to_s method' do
-      expect(check("to_s")).to eq [:to_s, object.to_s]
-      expect(check("to_s(2)")).to eq [:to_s, object.to_s(2)]
-      expect(check("to_s(8)")).to eq [:to_s, object.to_s(8)]
-      expect(check("to_s(16)")).to eq [:to_s, object.to_s(16)]
-    end
-
-    it '#inspect method' do
-      expect(check("inspect")).to eq [:inspect, object.inspect]
-    end
-
-    it '#-@ method' do
-      expect(check("-@")).to eq [:-@, object.-@]
-    end
-
-    it "#+ method" do
-      expect(check("+(3)")).to eq [:+, object.+(3)]
-    end
-
-    it '#- method' do
-      expect(check("-(3)")).to eq [:-, object.-(3)]
-    end
-
-    it '#* method' do
-      expect(check("*(3)")).to eq [:*, object.*(3)]
-    end
-
-    it '#/ method' do
-      expect(check("/(3)")).to eq [:/, object./(3)]
-    end
-
-    it '#div method' do
-      expect(check("div(3)")).to eq [:div, object.div(3)]
-    end
-
-    it '#% method' do
-      expect(check("%(3)")).to eq [:%, object.%(3)]
-    end
-
-    it '#modulo method' do
-      expect(check("modulo(3)")).to eq [:modulo, object.modulo(3)]
-    end
-
-    it '#divmod method' do
-      expect(check("divmod(3)")).to eq [:divmod, object.divmod(3)]
-    end
-
-    it '#fdiv method' do
-      expect(check("fdiv(3)")).to eq [:fdiv, object.fdiv(3)]
-    end
-
-    it '#** method' do
-      expect(check("**(7)")).to eq [:**, object.**(7)]
-    end
-
-    it '#abs method' do
-      expect(check("abs")).to eq [:abs, object.abs]
-    end
-
-    it '#magnitude method' do
-      expect(check("magnitude")).to eq [:magnitude, object.magnitude]
-    end
-
-    it '#== method' do
-      expect(check("==(#{object})")).to eq [:==, object.==(object)]
-      expect(check("==(#{object-1})")).to eq [:==, object.==(object-1)]
-    end
-
-    it '#=== method' do
-      expect(check("===(#{object})")).to eq [:===, object.===(object)]
-      expect(check("===(#{object-1})")).to eq [:===, object.===(object-1)]
-    end
-
-    it '#<=> method' do
-      expect(check("<=>(#{object})")).to eq [:<=>, object.<=>(object)]
-      expect(check("<=>(#{object+1})")).to eq [:<=>, object.<=>(object+1)]
-      expect(check("<=>(#{object-1})")).to eq [:<=>, object.<=>(object-1)]
-    end
-
-    it '#> method' do
-      expect(check(">(#{object})")).to eq [:>, object.>(object)]
-      expect(check(">(#{object-1})")).to eq [:>, object.>(object-1)]
-    end
-
-    it '#>= method' do
-      expect(check(">=(#{object})")).to eq [:>=, object.>=(object)]
-      expect(check(">=(#{object-2})")).to eq [:>=, object.>=(object-2)]
-    end
-
-    it '#< method' do
-      expect(check("<(#{object})")).to eq [:<, object.<(object)]
-      expect(check("<(#{object+1})")).to eq [:<, object.<(object+1)]
-    end
-
-    it '#<= method' do
-      expect(check("<=(#{object})")).to eq [:<=, object.<=(object)]
-      expect(check("<=(#{object+2})")).to eq [:<=, object.<=(object+2)]
-    end
-
-    it '#~ method' do
-      expect(check("~")).to eq [:~, object.~]
-    end
-
-    it '#& method' do
-      expect(check("&(-1)")).to eq [:&, object.&(-1)]
-    end
-
-    it '#| method' do
-      expect(check("|(1)")).to eq [:|, object.|(1)]
-    end
-
-    it '#^ method' do
-      expect(check("^(-1)")).to eq [:^, object.^(-1)]
-    end
-
-    it '#[] method' do
-      expect(check("[](0)")).to eq [:[], object.[](0)]
-    end
-
-    it '#<< method' do
-      expect(check("<<(3)")).to eq [:<<, object.<<(3)]
-    end
-
-    it '#>> method' do
-      expect(check(">>(3)")).to eq [:>>, object.>>(3)]
-    end
-
-    it '#to_f method' do
-      expect(check("to_f")).to eq [:to_f, object.to_f]
-    end
-
-    it '#size method' do
-      expect(check("size")).to eq [:size, object.size]
-    end
-
-    it '#bit_length method' do
-      expect(check("bit_length")).to eq [:bit_length, object.bit_length]
-    end
-
-    it '#zero? method' do
-      expect(check("zero?")).to eq [:zero?, object.zero?]
-    end
-
-    it '#odd? method' do
-      expect(check("odd?")).to eq [:odd?, object.odd?]
-    end
-
-    it '#even? method' do
-      expect(check("even?")).to eq [:even?, object.even?]
-    end
-
-    it '#succ method' do
-      expect(check("succ")).to eq [:succ, object.succ]
-    end
+    let(:__instance__){ 16 }
+    let(:same_object){ 16 }
+
+    it { instance_check(:to_s) }
+    it { instance_check(:to_s, %q(2)) }
+    it { instance_check(:inspect) }
+    it { instance_check(:-@) }
+    it { instance_check(:-, %Q(3)) }
+    it { instance_check(:*, %Q(3)) }
+    it { instance_check(:/, %q(3)) }
+    it { instance_check(:div, %q(3)) }
+    it { instance_check(:%, %q(3)) }
+    it { instance_check(:modulo, %q(3)) }
+    it { instance_check(:divmod, %q(3)) }
+    it { instance_check(:fdiv, %q(3)) }
+    it { instance_check(:**, %q(7)) }
+    it { instance_check(:abs) }
+    it { instance_check(:magnitude) }
+    it { instance_check(:==, %Q(#{__instance__})) }
+    it { instance_check(:===, %Q(#{__instance__})) }
+    it { instance_check(:<=>, %Q(#{__instance__})) }
+    it { instance_check(:>, %Q(#{__instance__})) }
+    it { instance_check(:>=, %Q(#{__instance__})) }
+    it { instance_check(:<, %Q(#{__instance__})) }
+    it { instance_check(:<=, %Q(#{__instance__})) }
+    it { instance_check(:~) }
+    it { instance_check(:&, %q(-1)) }
+    it { instance_check(:|, %q(1)) }
+    it { instance_check(:^, %q(-1)) }
+    it { instance_check(:[], %q(0)) }
+    it { instance_check(:<<, %q(3)) }
+    it { instance_check(:>>, %q(3)) }
+    it { instance_check(:to_f) }
+    it { instance_check(:size) }
+    it { instance_check(:bit_length) }
+    it { instance_check(:zero?) }
+    it { instance_check(:odd?) }
+    it { instance_check(:even?) }
+    it { instance_check(:succ) }
   end
 end

data/spec/shiritori/nil_method_spec.rb

@@ -4,7 +4,7 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "NilClass instance methods" do
-    let(:object){ nil }
+    let(:__instance__){ nil }
 
     it { instance_check(:&, %Q(true)) }
     it { instance_check(:^, %Q(true)) }

data/spec/shiritori/random_method_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "Shiritori test" do
+  let(:main){ Shiritori::Main.new }
+  let(:__class__){ Random }
+  let(:__instance__){ Random.new }
+
+  describe "Random singleton methods" do
+    it { instance_check(:new, %q(0), obj: __class__) }
+  end
+
+  describe "Random instance methods" do  
+  end
+end

data/spec/shiritori/range_method_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Shiritori test" do
+  let(:main){ Shiritori::Main.new }
+  let(:__class__){ Range }
+  let(:__instance__){ 1..10 }
+
+  describe "Range singleton methods" do
+    it { instance_check(:new, %q(1, 10), obj: __class__) }
+  end
+
+  describe "Range instance methods" do
+    it { instance_check(:==, %q(1..11)) }
+    it { instance_check(:===, %q(5)) }
+    it { instance_check(:include?, %q(11)) }
+    it { instance_check(:member?, %q(-1)) }
+    it { instance_check(:begin) }
+    it { instance_check(:first) }
+    it { instance_check(:bsearch) }
+    it { instance_check(:cover?, %q(11)) }
+    it { instance_check(:each) }
+    it { instance_check(:end) }
+    it { instance_check(:last) }
+    it { instance_check(:eql?, %q(1..10)) }
+    it { instance_check(:exclude_end?) }
+    it { instance_check(:hash) }
+    it { instance_check(:inspect) }
+    it { instance_check(:max) }
+    it { instance_check(:min) }
+    it { instance_check(:size) }
+    it { instance_check(:step) }
+    it { instance_check(:to_s) }    
+  end
+end

data/spec/shiritori/shiritori_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'stringio'
 
 describe "Shiritori test" do
+  let(:shiritori){ Shiritori::Main.new }
+
   describe "Game Init" do
     it "Game start init" do
       shiritori = Shiritori::Main.new
@@ -10,18 +12,23 @@ describe "Shiritori test" do
       end
       expect(shiritori.current_object).to eq ["R", "u", "b", "y"]
     end
-  end
 
-  describe "Example " do
-    
-    let(:shiritori){ Shiritori::Main.new }
-    
+    it "Invalid object" do
+      fake_stdin(%w(eixt "hello nil)) do
+        shiritori.start
+      end
+
+      expect(shiritori.chain_count).to eq 0
+    end
+  end
 
+  describe "Example" do
     it "test play 1" do
       fake_stdin(%w(3 next to_s *(5) chars first instance_eval{(1..10)} each{|n|n*100} map{|n|n+100} inject(:+) class)) do
         shiritori.start
       end
       expect(shiritori.current_object).to eq Fixnum
+      expect(shiritori.chain_count).to eq 10
     end
 
     it "test play 2" do
@@ -29,6 +36,7 @@ describe "Shiritori test" do
         shiritori.start
       end
       expect(shiritori.current_object).to eq Fixnum
+      expect(shiritori.chain_count).to eq 3
     end
 
     it "test play 3" do
@@ -36,6 +44,7 @@ describe "Shiritori test" do
         shiritori.start
       end
       expect(shiritori.current_object).to eq TrueClass
+      expect(shiritori.chain_count).to eq 3
     end
   end
 end

data/spec/shiritori/string_method_spec.rb

@@ -4,7 +4,7 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "String instance methods" do
-    let(:object){ "Ruby" }
+    let(:__instance__){ "Ruby" }
     let(:same_object){ "Ruby" }
     let(:object_int){ "100" }
     let(:object_complex){ "3+3i" }
@@ -15,10 +15,10 @@ describe "Shiritori test" do
     it { instance_check("to_s") }
     it { instance_check("inspect") }
     it { instance_check("hash") }
-    it { instance_check("<=>", %Q('#{object}')) }
-    it { instance_check("==", %Q('#{object}')) }
-    it { instance_check("===", %Q('#{object}')) }
-    it { instance_check("casecmp", %Q('#{object}')) }
+    it { instance_check("<=>", %Q('#{__instance__}')) }
+    it { instance_check("==", %Q('#{__instance__}')) }
+    it { instance_check("===", %Q('#{__instance__}')) }
+    it { instance_check("casecmp", %Q('#{__instance__}')) }
     it { instance_check("+", %Q('#{word}')) }
     it { instance_check("*", %Q(3)) }
     it { instance_check("%", %Q(3)) }

data/spec/shiritori/symbol_method_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "Shiritori test" do
+  let(:main){ Shiritori::Main.new }
+  let(:__class__){ Symbol }
+  let(:__instance__){ :ruby }
+
+  describe "Symbol instance methods" do
+    it { instance_check(:<=>, %q(:python)) }
+    it { instance_check(:==, %q(:ruby)) }
+    it { instance_check(:=~, %q(/.+/)) }
+    it { instance_check(:match, %q(/.+/)) }
+    it { instance_check(:[], %q(0)) }
+    it { instance_check(:slice, %q(0)) }
+    it { instance_check(:capitalize) }
+    it { instance_check(:casecmp, %q(:python)) }
+    it { instance_check(:downcase) }
+    it { instance_check(:empty?) }
+    it { instance_check(:encoding) }
+    it { instance_check(:id2name) }
+    it { instance_check(:to_s) }
+    it { instance_check(:inspect) }
+    it { instance_check(:intern) }
+    it { instance_check(:to_sym) }
+    it { instance_check(:length) }
+    it { instance_check(:size) }
+    it { instance_check(:succ) }
+    it { instance_check(:next) }
+    it { instance_check(:swapcase) }
+    it { instance_check(:to_proc) }
+    it { instance_check(:upcase) }
+  end
+end

data/spec/shiritori/true_method_spec.rb

@@ -4,7 +4,7 @@ describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 
   describe "TrueClass instance methods" do
-    let(:object){ true }
+    let(:__instance__){ true }
 
     it { instance_check(:&, %Q(false)) }
     it { instance_check(:^, %Q(false)) }

data/spec/spec_helper.rb

@@ -20,10 +20,19 @@ module Helpers
     main.exec_method_chain( method, obj )
   end
 
-  def instance_check(ope, *args, obj: object)
+  def compare_range( a, b )
+    a[1] = a[1].to_a
+    b[1] = b[1].to_a
+  end
+
+  def instance_check(ope, *args, obj: __instance__)
 
     begin
-      test_obj = obj.dup
+      if obj.is_a?(Class)
+        test_obj = obj
+      else
+        test_obj = obj.dup
+      end
     rescue Exception => ex
       test_obj = obj
     end
@@ -31,8 +40,14 @@ module Helpers
     ope = ope.to_s if ope.is_a?(Symbol)
 
     command = "#{ope}(#{args.join(',')})"
-    puts "self."+command
-    expect(check(command, obj||object)).to eq [ope.scan(METHOD_PATTERN).first.to_sym, test_obj.instance_eval{ eval("self."+command) } ]
+    #puts "self."+command
+
+    __self__ = check(command, obj||__instance__)
+    other = [ope.scan(METHOD_PATTERN).first.to_sym, test_obj.instance_eval{ eval("self."+command) } ]
+    
+    compare_range(__self__, other) if [Range, Enumerator].include?(__self__.last.class)
+
+    expect(__self__).to eq other
   end
 end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiritori
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - siman-man
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - bin/shiritori
 - lib/shiritori.rb
 - lib/shiritori/convert.rb
+- lib/shiritori/error.rb
 - lib/shiritori/search_method.rb
 - lib/shiritori/shiritori.rb
 - lib/shiritori/version.rb
@@ -106,8 +107,11 @@ files:
 - spec/shiritori/false_method_spec.rb
 - spec/shiritori/fixnum_method_spec.rb
 - spec/shiritori/nil_method_spec.rb
+- spec/shiritori/random_method_spec.rb
+- spec/shiritori/range_method_spec.rb
 - spec/shiritori/shiritori_spec.rb
 - spec/shiritori/string_method_spec.rb
+- spec/shiritori/symbol_method_spec.rb
 - spec/shiritori/true_method_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/siman-man/shiritori
@@ -139,8 +143,11 @@ test_files:
 - spec/shiritori/false_method_spec.rb
 - spec/shiritori/fixnum_method_spec.rb
 - spec/shiritori/nil_method_spec.rb
+- spec/shiritori/random_method_spec.rb
+- spec/shiritori/range_method_spec.rb
 - spec/shiritori/shiritori_spec.rb
 - spec/shiritori/string_method_spec.rb
+- spec/shiritori/symbol_method_spec.rb
 - spec/shiritori/true_method_spec.rb
 - spec/spec_helper.rb
 has_rdoc: