shiritori 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca46091473a69da8cca24df97a965bfd65f6300
-  data.tar.gz: a50c380b8b86bfb402d2641da8d7477eda101b8e
+  metadata.gz: 04d232b530daf6a056a86f3ae98b296b8b3bc58c
+  data.tar.gz: b5814ea22d52b5b8325c54ca090a2a5ed60846d6
 SHA512:
-  metadata.gz: 90aae5e28b8c64edb6097fb5434f79716776f8cd86038876824028e10cc732f163cc5ee04dda157ff6a91e308a8dcf396b84f14a0a946e9b3e01f43b964e4cf1
-  data.tar.gz: 29c19a4710ee8a3ee4ac88aab3e86dc8ae4d464aa9b158f9a0a2b1660fac61aa5b71e4ec04dd3b759bba9d633955cfb58a76a62ddeddb3533355a0511eabd4f3
+  metadata.gz: 27cbeeea5685fd0c81daea5b0af46a5b063ca37b47b3950113a5044226d4322c573ccb920329634189c0d4935f93dc6dde5aee710f4b937ebb4753f3ef87bd33
+  data.tar.gz: 3cbe2a3accfd50b08a0b10efb210ef279ffe54f03ac955c37e949e225a97c50696f54fcca15034d4b5e3b160b8ae5a78db61b796a7c132d4acb7a79d5837615d

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+/vendor/bundle
 .config
 .yardoc
 Gemfile.lock
@@ -20,6 +21,7 @@ tmp
 # Ignore junk file
 shiritori-*/*
 doc/
+.rspec_status
 **/*.swp
 *.swp
 **/*~

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -3,5 +3,7 @@ rvm:
 - 2.0.0
 - 2.1
 - 2.2
+- 2.3
+- 2.4.0
 
 script: bundle exec rspec spec

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/shiritori

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'shiritori'
+require 'optparse'
 
-Shiritori::CLI.start(ARGV)
+options = { mode: 'normal' }
+
+opt_parse = OptionParser.new do |opt|
+  opt.banner = 'Usage: shiritori [options]'
+  opt.on('-m', '--mode', 'set shiritori difficulty') { |mode| options[:mode] = mode }
+end
+
+Shiritori::CLI.start(options)

data/lib/shiritori.rb

@@ -1,5 +1,3 @@
-require "thor"
-
 require "shiritori/version"
 require "shiritori/search_method"
 require "shiritori/error"

data/lib/shiritori/cli.rb

@@ -1,10 +1,8 @@
 module Shiritori
-  class CLI < Thor
+  class CLI
     GAME_MODE = [:easy, :normal]
 
-    desc "start", "Start GAME!"
-    option :mode
-    def start
+    def self.start(options)
       mode = (options[:mode])? options[:mode].to_sym : :normal
 
       if GAME_MODE.include?(mode)

data/lib/shiritori/convert.rb

@@ -1,5 +1,5 @@
 class String
-  BLANK_PATTERN = /^\s*$/
+  BLANK_PATTERN = /^[[:space:]]*$/
   
   def blank?
     self.size == 0 or self == BLANK_PATTERN
@@ -7,7 +7,7 @@ class String
 end
 
 class NilClass
-  def to_ss
+  def __to_s__
     'nil'
   end
 end
@@ -18,7 +18,7 @@ module Kernel
 end
 
 class Object
-  def to_ss
+  def __to_s__
     inspect
   end
 end
@@ -30,7 +30,7 @@ BasicObject.class_eval do
 end
 
 class BasicObject
-  def to_ss
+  def __to_s__
     self
   end
 
@@ -42,5 +42,5 @@ class BasicObject
     ::Kernel.eval(str, __binding__)
   end
 
-  alias_method :to_s, :to_ss
+  alias_method :to_s, :__to_s__
 end

data/lib/shiritori/search_method.rb

@@ -1,19 +1,9 @@
 module Shiritori
   module SearchMethod
-    UNUSE_METHOD = [:exit]
+    UNUSE_METHOD = [:exit, :abort]
 
-    def get_all_method
-      @check_list = {}
-      @method_list = scan_methods
-
-      @method_list - UNUSE_METHOD
-    end
-
-    def scan_methods(klass = BasicObject)
-      klasses = ObjectSpace.each_object(Class).to_a
-      klasses |= klasses.map(&:singleton_class)
-
-      klasses.map(&:instance_methods).inject(&:|)
+    def get_all_methods
+      ObjectSpace.each_object(Module).map(&:instance_methods).inject(&:|) - UNUSE_METHOD
     end
   end
 end

data/lib/shiritori/shiritori.rb

@@ -50,7 +50,7 @@ module Shiritori
     end
 
     def init(mode)
-      @all_method = get_all_method
+      @all_method = get_all_methods
       @current_class = Object
       @current_chain = []
       @used_method_list = []
@@ -73,7 +73,7 @@ module Shiritori
             end
           end.join
 
-          @current_chain << @current_object.to_ss
+          @current_chain << @current_object.__to_s__
           @success = true
           break
         rescue Exception => ex
@@ -135,10 +135,10 @@ module Shiritori
           elsif action == :exit
             break
           elsif @all_method.include?(action)
-            puts "Exec command #{[@current_object.to_ss, command].join('.')}"
+            puts "Exec command #{[@current_object.__to_s__, command].join('.')}"
             @current_chain << command
             update(action: action, object: object)
-          elsif used_method_list[action]
+          elsif used_method_list.include?(action)
             $error_message = "#{action} is already used."
             raise Shiritori::UseSameMethodError
           end
@@ -172,7 +172,7 @@ module Shiritori
         rescue Exception => ex
           @error_count += 1
           $error_message = ex.message
-          failed_message("Exec command #{[@current_object.to_ss, command].join('.')}")
+          failed_message("Exec command #{[@current_object.__to_s__, command].join('.')}")
           failed_message("Failed! : #{$error_message}")
           return false
         end
@@ -190,7 +190,7 @@ module Shiritori
       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"
+        puts "\e[#{RED}mOh.. Sorry, help command can use when easy mode.\e[m"
       end
 
       new_line

data/lib/shiritori/version.rb

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

data/lib/shiritori/view.rb

@@ -38,7 +38,7 @@ module Shiritori
       puts "+#{'-' * chain_size}+"
 
       cls = "#{current_class}"
-      obj = "#{current_object.to_ss}"
+      obj = "#{current_object.__to_s__}"
       cls_size = ["#{current_class}".size, 13].max + PADDING
       cnt_size = 11 + PADDING
       obj_size = ["#{current_object}".size, 14].max + PADDING

data/shiritori.gemspec

@@ -12,17 +12,14 @@ Gem::Specification.new do |spec|
   spec.description   = %q{shiritori}
   spec.homepage      = "https://github.com/siman-man/shiritori"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
 end

data/spec/shiritori/basic_object_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/bignum_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/enumerator_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/false_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/fixnum_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/nil_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/random_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
   let(:__class__){ Random }

data/spec/shiritori/range_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
   let(:__class__){ Range }

data/spec/shiritori/shiritori_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'stringio'
 
 describe "Shiritori test" do
@@ -22,6 +21,17 @@ describe "Shiritori test" do
     end
   end
 
+  describe 'use same method' do
+    it 'UseSameMethodError occur' do
+      fake_stdin(%w("Ruby" nil? nil?)) do
+        expect { shiritori.start }.to output(/Can't use same method/).to_stdout
+      end
+
+      expect(shiritori.current_object).to eq(false)
+      expect(shiritori.error_count).to eq(1)
+    end
+  end
+
   describe 'Timeout' do
     context 'Timeout::Error occur' do
       it 'first object sleep' do

data/spec/shiritori/string_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/shiritori/symbol_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
   let(:__class__){ Symbol }

data/spec/shiritori/true_method_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Shiritori test" do
   let(:main){ Shiritori::Main.new }
 

data/spec/spec_helper.rb

@@ -60,7 +60,15 @@ module Helpers
     expect(__result__).to eq __expect__
   end
 end
- 
-RSpec.configure do |conf|
-  conf.include(Helpers)
+
+RSpec.configure do |config|
+  config.include(Helpers)
+
+  config.example_status_persistence_file_path = '.rspec_status'
+
+  config.order = :random
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shiritori
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - siman-man
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: shiritori
 email:
 - k128585@ie.u-ryukyu.ac.jp
@@ -103,9 +61,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -172,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: shiritori

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :rspec do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-