shiritori 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17184fcd8187e6c1a64d91a3bbc82d8476c99775
-  data.tar.gz: c1c6cf6c837cae1c0903d92a0068772b9ae83aee
+  metadata.gz: 210de60ebae0c8b80e6f0c8195f12ef3a6339c25
+  data.tar.gz: 38148907162c13381d5394651a52571af46967d3
 SHA512:
-  metadata.gz: 2d4d8a19cd26558424eafb426cd587dc89b5ceed620b38b0313d38524d3e80345deb2052a232430b342b7b9ec88931e3a89c3fe8e33ee74d6417c9a00296e84f
-  data.tar.gz: b81c85d900714949f64cc1f297aaa5e4e07b34fb6a650bcc072e0dcb90589e2001506f9c3b54397f274791f4a147cdb1707eb3245f7e3395e159fa5509db1998
+  metadata.gz: 215cf4485ece83ae8b88ccc5065eb5797618368f77fe309636114b2a66ee4d209a554bb76dedaa9c6bde795785b8d09781585b9733be98cfcf565c446aa1582b
+  data.tar.gz: 21254ab6c0fe3b04dae92283a21c92e878a6a5833612c84a31a7d851c3e27f114f53b98398c0715484fa37e6998db28d0af79647360a5661048acf3cc663a916

data/.gitignore

@@ -7,6 +7,7 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
+.coveralls.yml
 doc/
 lib/bundler/man
 pkg

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+- 2.0.0
+- 2.1
+- 2.2
+
+script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in shiritori.gemspec
 gemspec
+
+gem 'coveralls', require: false
+gem 'thor'

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/siman-man/shiritori.svg?branch=master)](https://travis-ci.org/siman-man/shiritori)
+[![Code Climate](https://codeclimate.com/github/siman-man/shiritori.png)](https://codeclimate.com/github/siman-man/shiritori)
+[![Coverage Status](https://coveralls.io/repos/siman-man/shiritori/badge.png)](https://coveralls.io/r/siman-man/shiritori)
+
 # Shiritori
 
 Let's try to create too long method chain!
@@ -24,6 +28,20 @@ Let's start creation long method chain.
 
 - block syntax can use only '{}', not use 'do - end' syntax.
 - if you want to pass arguments, please enclosed '()'. 
+
+bad
+
+```
+Please input next method > +5
+Exec command 3.+5
+```
+
+good
+
+```
+Please input next method > +(5)
+Exec command 3.+(5)
+```
  
 ## Usage
 
@@ -76,10 +94,9 @@ Exec command ["H", "e", "l", "l", "o"].first
 Please input next method >
 ```
 
-
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/shiritori/fork )
+1. Fork it ( https://github.com/siman-man/shiritori/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/shiritori

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

data/lib/shiritori/cli.rb

@@ -0,0 +1,17 @@
+module Shiritori
+  class CLI < Thor
+    GAME_MODE = [:easy, :normal]
+
+    desc "start", "Start GAME!"
+    option :mode
+    def start
+      mode = (options[:mode])? options[:mode].to_sym : :normal
+
+      if GAME_MODE.include?(mode)
+        Main.new.start(mode: mode)
+      else
+        puts "Mode is not only easy or normal."
+      end
+    end
+  end
+end

data/lib/shiritori/convert.rb

@@ -1,19 +1,20 @@
 class String
-  BLANK_PATTERN = /\A\s*\z/
+  BLANK_PATTERN = /^\s*$/
   
   def blank?
-    BLANK_PATTERN === self
+    self.size == 0 or self == BLANK_PATTERN
   end
 end
 
 class NilClass
   def to_ss
-    "nil"
+    'nil'
   end
 end
 
 module Kernel
   undef_method :exit
+  undef_method :abort
 end
 
 class Object
@@ -41,5 +42,5 @@ class BasicObject
     ::Kernel.eval(str, __binding__)
   end
 
-  alias :to_s :to_ss
-end
+  alias_method :to_s, :to_ss
+end

data/lib/shiritori/error.rb

@@ -1,10 +1,15 @@
 module Shiritori
-  class ShiritoriError < Exception
-  end
+  class ShiritoriError < Exception; end
 
   class UseSameMethodError < ShiritoriError
     def message
-      "Can't use same method."
+      %q(Can't use same method.)
+    end
+  end
+
+  class UndefinedObjectError < ShiritoriError
+    def message
+      'Undefined Object'
     end
   end
 end

data/lib/shiritori/search_method.rb

@@ -3,7 +3,7 @@ module Shiritori
     UNUSE_METHOD = [:exit]
 
     def get_all_method
-      @check_list = Hash.new(false)
+      @check_list = {}
       @method_list = []
 
       scan_method
@@ -12,18 +12,16 @@ module Shiritori
     end
 
     def singleton(klass)
-      class << klass; self end 
-    end 
+      class << klass; self end
+    end
 
     def scan_method(klass = BasicObject)
       @check_list[klass] = true
       @method_list |= klass.instance_methods
 
-      ObjectSpace.each_object(singleton(klass)) do |subclass| 
-        if klass != subclass
-          scan_method(subclass) unless @check_list[subclass]
-        end 
+      ObjectSpace.each_object(singleton(klass)) do |subclass|
+        scan_method(subclass) if klass != subclass && @check_list[subclass].nil?
       end
     end
   end
-end
+end

data/lib/shiritori/shiritori.rb

@@ -3,58 +3,82 @@ require 'readline'
 
 module Shiritori
   class Main
-    attr_reader :current_object, :chain_count
+    attr_reader :current_object, :chain_count, :error_count, :mode, :use_method_list
     include SearchMethod
     include View
 
+    # ColorCode
     RED = 31
     GREEN = 32
 
     EXIT_PATTERN = /\A(exit|quit)\Z/.freeze
+    HELP_PATTERN = /\A(help|h)\Z/.freeze
     METHOD_PATTERN = /[\w|\?|\>|\<|\=|\!|\[|\[|\]|\*|\/|\+|\-|\^|\~|\@|\%|\&|]+/.freeze
 
-    def start(option = [])
-      init
-      run
+    # timelimit is 1 second
+    TIME_LIMIT = 1
+
+    def start(mode: :normal)
+      welcome_message
+
+      begin
+        init(mode)
+        run
+      rescue Exception => ex
+        puts ex.message
+      ensure
+        show_result
+      end
     end
 
-    def update(result = nil)
-      if result
-        @all_method.delete(result.first)
-        @current_object = result.last
+    def update(action: nil, object: nil)
+      if action
+        @all_method.delete(action)
+        @use_method_list << action
+        @current_object = object
         @chain_count += 1
       end
 
       begin
-        @current_class = @current_object.class
-      rescue Exception => ex
-        @current_class = "Undefined"
+        @current_class = current_object.class
+      rescue NoMethodError => ex
+        @current_class = 'Undefined'
       end
 
+      show_status(@current_chain, @current_object, @current_class, @chain_count)
       @success = true
     end
 
-    def init
+    def init(mode)
       @all_method = get_all_method
-      @current_object = nil
       @current_class = Object
       @current_chain = []
+      @use_method_list = []
       @chain_count = 0
+      @error_count = 0
       @success = false
-      $error_message = nil
+      @mode = mode
 
-      loop do
+      require 'timeout'
+      require 'ripper'
 
+      loop do
         command = get_command
+        redo if command.empty?
+
+        begin
+          Thread.new do
+            timeout(TIME_LIMIT) do
+              @current_object = eval(command.chomp)
+            end
+          end.join
 
-        begin 
-          @current_object = eval(command.chomp)
           @current_chain << @current_object.to_ss
           @success = true
           break
         rescue Exception => ex
-          new_line
-          $error_message = "Undefined object error"
+          $error_message = ex.message
+          puts "\e[#{RED}m#{$error_message}\e[m"
           redo
         end
       end
@@ -62,11 +86,18 @@ module Shiritori
       update
     end
 
-    def success?
-      @success
+    def check_success
+      if @success
+        puts "\e[#{GREEN}mSuccess!\e[m"
+        @success = false
+      else
+        puts "\e[#{RED}mFailed! : #{$error_message}\e[m"
+      end
+
+      new_line
     end
 
-    def get_command(message = "Please input first object > ")
+    def get_command(message = 'Please input first object > ')
       if Shiritori.env == :development
         print message
         $stdin.gets
@@ -76,66 +107,87 @@ module Shiritori
     end
 
     def run
-
       loop do
-        show_status
-
-        if success?
-          puts "\e[#{GREEN}mSuccess!\e[m"
-          @success = false
-        else
-          puts "\e[#{RED}mFailed! : #{$error_message}\e[m"
-        end
-
-        new_line
+        command = get_command('Please input next method > ')
 
-        command = get_command("Please input next method > ")
-
-        break if command.nil?
+        break if command.nil? 
         redo if command.blank?
 
-        command = command.chomp.sub(/^\./,"")
-
-        puts "Exec command #{[@current_object.to_ss, command].join('.')}"
+        command = command.chomp.sub(/^\./, '')
 
         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
-              $error_message = "Already used method."
-            end
+          result = exec_method_chain(command, current_object)
+          
+          redo unless result
+
+          action = result.first
+          object = result.last
+
+          if action == :help
+            help_me(current_object)
+            redo
+          elsif action == :exit
+            break
+          elsif @all_method.include?(action)
+            puts "Exec command #{[@current_object.to_ss, command].join('.')}"
+            @current_chain << command
+            update(action: action, object: object)
+          else
+            $error_message = "#{action} is already used."
+            raise Shiritori::UseSameMethodError
           end
         rescue Exception => ex
+          @error_count += 1
           puts "\e[#{RED}m#{ex.message}\e[m"
         end
+
+        check_success
       end
     end
 
     def exec_method_chain(command, object)
       method_name = command.scan(METHOD_PATTERN).first.to_sym
-      result = [ method_name ]
+      result = [method_name]
 
       case command
       when EXIT_PATTERN
         return [:exit]
+      when HELP_PATTERN
+        return [:help]
       else
         begin
           Thread.new do
             raise NoMethodError unless object.respond_to?(method_name)
 
-            result << eval("object."+command)
+            timeout(TIME_LIMIT) do
+              result << eval('object.' + command)
+            end
           end.join
         rescue Exception => ex
+          @error_count += 1
           $error_message = ex.message
+          failed_message("Exec command #{[@current_object.to_ss, command].join('.')}")
+          failed_message("Failed! : #{$error_message}")
           return false
         end
       end
 
       result
     end
+
+    private
+    def help_me(current_object)
+      can_use_methods = current_object.methods - use_method_list
+
+      new_line
+
+      if mode == :easy
+        puts "You can use methods: #{can_use_methods.sample(5).inspect}"
+      else
+        puts "\e[#{RED}mOh.. Sory, help command is only exist easy mode.\e[m"
+      end
+
+      new_line
+    end
   end
 end

data/lib/shiritori/version.rb

@@ -1,3 +1,3 @@
 module Shiritori
-  VERSION = "0.1.3"
+  VERSION = '0.1.6'
 end

data/lib/shiritori/view.rb

@@ -2,37 +2,57 @@ module Shiritori
   module View
     PADDING = 2
 
+    # ColorCode
+    RED = 31
+    GREEN = 32
+
     def new_line(num = 0)
-      $stdout.puts "\n"*num
+      puts "\n" * num
     end
 
     def welcome_message
+      width = 50
+      puts "+#{'-' * width}+"
+      puts "|#{' ' * width}|"
+      puts "|#{'Welcome to the Shiritori!'.center(width)}|"
+      puts "|#{' ' * width}|"
+      puts "+#{'-' * width}+"
+    end
+
+    def failed_message(message)
+      puts "\e[#{RED}m#{message}\e[m"
     end
 
-    def show_status
+    def input_message
+    end
+
+    def show_status(current_chain, current_object, current_class, chain_count)
       new_line
-      chain = "#{@current_chain.join('.')}"
-      chain_size = [chain.size+PADDING, 22].max
+      chain = "#{current_chain.join('.')}"
+      chain_size = [chain.size + PADDING, 22].max
 
-      $stdout.puts "+#{'-'*chain_size}+"
-      $stdout.puts "|#{"Current method chain".center(chain_size)}|"
-      $stdout.puts "+#{'-'*chain_size}+"
-      $stdout.puts "|#{@current_chain.join('.').center(chain_size)}|"
-      $stdout.puts "+#{'-'*chain_size}+"
+      puts "+#{'-' * chain_size}+"
+      puts "|#{'Current method chain'.center(chain_size)}|"
+      puts "+#{'-' * chain_size}+"
+      puts "|#{current_chain.join('.').center(chain_size)}|"
+      puts "+#{'-' * chain_size}+"
 
-      cls = "#{@current_class}"
-      obj = "#{@current_object.to_ss}"
-      cls_size = ["#{@current_class}".size, 13].max+PADDING
-      obj_size = ["#{@current_object}".size, 14].max+PADDING
+      cls = "#{current_class}"
+      obj = "#{current_object.to_ss}"
+      cls_size = ["#{current_class}".size, 13].max + PADDING
+      cnt_size = 11 + PADDING
+      obj_size = ["#{current_object}".size, 14].max + PADDING
 
       new_line
-      $stdout.puts "+#{'-'*(cls_size)}+#{'-'*(obj_size)}+"
-      $stdout.puts "|#{"Current Class".center(cls_size)}|#{"Current Object".center(obj_size)}|"
-      $stdout.puts "+#{'-'*(cls_size)}+#{'-'*(obj_size)}+"
-      $stdout.puts "|#{cls.center(cls_size)}|#{obj.center(obj_size)}|"
-      $stdout.puts "+#{'-'*(cls_size)}+#{'-'*(obj_size)}+"
+      puts "+#{'-' * (cls_size)}+#{'-' * cnt_size}+#{'-' * (obj_size)}+"
+      puts "|#{'Current Class'.center(cls_size)}|#{'Chain Count'.center(cnt_size)}|#{'Current Object'.center(obj_size)}|"
+      puts "+#{'-' * (cls_size)}+#{'-' * cnt_size}+#{'-' * (obj_size)}+"
+      puts "|#{cls.center(cls_size)}|#{chain_count.to_s.center(cnt_size)}|#{obj.center(obj_size)}|"
+      puts "+#{'-' * (cls_size)}+#{'-' * cnt_size}+#{'-' * (obj_size)}+"
       new_line
-      puts "Current Chain Count: #{@chain_count}"
+    end
+
+    def show_result
     end
   end
-end
+end