gemwarrior 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9fbe46192891851f0b80f4be5c0488423ac649
-  data.tar.gz: 0ed5b2c8a5056a4e7ad7e384da03128f5584d5c7
+  metadata.gz: 47d78c5c7f253648b1a60c476360477a02c301ac
+  data.tar.gz: 3e3a6d4bf69a3d9e97326a5e9436233fc4211a09
 SHA512:
-  metadata.gz: b881e6754a51e72f2f76ceb7504841fb3284cb4fc7699292b830d3309e45978c6391a1b8ac46181306b618b441e97fffaaffae9d8fd6b511c863b95485d04ecf
-  data.tar.gz: f413966728db827f7afda8102a065e1d05726830902a0876e32f0384ab68a358c0be25b9eff172aa187d17e8e8f74d36a73879c0c6c9d950c601b8e742770d6a
+  metadata.gz: 37567688543f4b502781c1e8178269428031240afb4a9217b50e6f68c4475838a8b6b81c3f7365bbee5170aafc2f78d7c3986af6b7229137ffb267c99707808d
+  data.tar.gz: fc5d9729554cb7464e68e159c81e2cf288438949d43d20271d8ff9dc8086ec1d09be5a62a9a2baa43616d19e7f4ed1c6cbcf1bd3eab03249b327ed6399e50dfb

data/gemwarrior.gemspec

@@ -1,33 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gemwarrior/version'
-
-Gem::Specification.new do |spec|
-  spec.name            = 'gemwarrior'
-  spec.version         = Gemwarrior::VERSION
-  spec.platform        = Gem::Platform::RUBY
-  spec.authors         = ['Michael Chadwick']
-  spec.email           = 'mike@codana.me'
-  spec.homepage        = 'http://rubygems.org/gems/gemwarrior'
-  spec.summary         = 'RPG as RubyGem'
-  spec.description     = 'A fun role-playing game in the form of a RubyGem!'
-
-  spec.files           = `git ls-files`.split("\n")
-  spec.test_files      = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.executables     = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  spec.require_paths   = ['lib']
-  spec.license         = 'MIT'
-
-  spec.add_runtime_dependency 'os', '~> 0.9', '>= 0.9.6'
-  spec.add_runtime_dependency 'matrext', '~> 0.2'
-
-  #spec.add_runtime_dependency 'feep', '~> 0.0.9'  
-  #spec.add_runtime_dependency 'wordnik', '~> 4.12'
-
-  spec.add_development_dependency 'pry-byebug', '~> 3.0'
-  spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.29'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gemwarrior/version'
+
+Gem::Specification.new do |spec|
+  spec.name            = 'gemwarrior'
+  spec.version         = Gemwarrior::VERSION
+  spec.platform        = Gem::Platform::RUBY
+  spec.authors         = ['Michael Chadwick']
+  spec.email           = 'mike@codana.me'
+  spec.homepage        = 'http://rubygems.org/gems/gemwarrior'
+  spec.summary         = 'RPG as RubyGem'
+  spec.description     = 'A fun role-playing game in the form of a RubyGem!'
+
+  spec.files           = `git ls-files`.split("\n")
+  spec.test_files      = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables     = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  spec.require_paths   = ['lib']
+  spec.license         = 'MIT'
+
+  spec.add_runtime_dependency 'os', '~> 0.9', '>= 0.9.6'
+  spec.add_runtime_dependency 'matrext', '~> 0.2'
+  spec.add_runtime_dependency 'http', '~> 0.8.10'
+  spec.add_runtime_dependency 'json', '~> 1.8.2'
+
+  #spec.add_runtime_dependency 'feep', '~> 0.0.9'  
+  #spec.add_runtime_dependency 'wordnik', '~> 4.12'
+
+  spec.add_development_dependency 'pry-byebug', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 1.8'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.29'
+end

data/lib/gemwarrior/defaults.rb

@@ -70,7 +70,7 @@ module Gemwarrior
       ITEM_DESC_FEATHER = 'Soft and tender, unlike the craven bird that probably shed it.'
       ITEM_ID_GUN = 4
       ITEM_NAME_GUN = 'gun'
-      ITEM_DESC_GUN = 'Pew pew goes this firearm you wield, ifn\'t it weren\'t unloaded.'
+      ITEM_DESC_GUN = 'Pew pew goes this firearm, you suspect.'
     end
 
     module Locations

data/lib/gemwarrior/evaluator.rb

@@ -57,7 +57,7 @@ module Gemwarrior
         return ERROR_COMMAND_INVALID
       end
       
-      command = tokens.first
+      command = tokens.first.downcase
       param = tokens[1]
 
       case command
@@ -79,7 +79,7 @@ module Gemwarrior
         world.player.rest
       when 'look', 'l'
         if param
-          world.player.cur_loc.describe_item(param)
+          world.player.cur_loc.describe_entity(param)
         else
           world.player.cur_loc.describe
         end
@@ -117,8 +117,8 @@ module Gemwarrior
         list_commands
       when 'quit', 'exit', 'q', 'x'
         puts "You sure you want to quit? (y/n): "
-        response = gets.chomp
-        if (response.downcase.eql?("y") || response.downcase.eql?("yes"))
+        response = gets.chomp.downcase
+        if (response.eql?("y") || response.eql?("yes"))
           puts QUIT_MESSAGE
           exit(0)
         else
@@ -151,7 +151,7 @@ module Gemwarrior
     def input_valid?(input)
       tokens = input.split
       commands_and_aliases = commands | aliases
-      if commands_and_aliases.include?(tokens.first)
+      if commands_and_aliases.include?(tokens.first.downcase)
         if tokens.size.between?(1,2)
           return true
         end

data/lib/gemwarrior/location.rb

@@ -11,7 +11,7 @@ module Gemwarrior
     
     ## ERRORS
     ERROR_LOCATION_ITEM_REMOVE_INVALID   = 'That item cannot be removed as it doesn\'t exist here.'
-    ERROR_LOCATION_DESCRIBE_ITEM_INVALID = 'You don\'t see that here.'
+    ERROR_LOCATION_DESCRIBE_ENTITY_INVALID = 'You don\'t see that here.'
 
     attr_accessor :id, :name, :description, :locs_connected, :danger_level, 
                   :items, :monsters_available, :monsters_abounding, :checked_for_monsters
@@ -41,19 +41,28 @@ module Gemwarrior
       unless list_monsters.nil?
         desc_text << list_monsters
       end
+      desc_text << list_paths
 
       return desc_text
     end
     
-    def describe_item(item_name)
-      if items.map(&:name).include?(item_name)
+    def describe_entity(entity_name)
+      if items.map(&:name).include?(entity_name)
         items.each do |i|
-          if i.name.eql?(item_name)
+          if i.name.eql?(entity_name)
             return "#{i.description}"
           end
         end
+      elsif
+        if monsters_abounding.map(&:name).include?(entity_name)
+          monsters_abounding.each do |m|
+            if m.name.eql?(entity_name)
+              return "#{m.description}"
+            end
+          end
+        end
       else
-        ERROR_LOCATION_DESCRIBE_ITEM_INVALID
+        ERROR_LOCATION_DESCRIBE_ENTITY_INVALID
       end
     end
     
@@ -83,6 +92,16 @@ module Gemwarrior
       return "\n >> Monster(s) abound: #{monsters_abounding.map(&:name).join(', ')}" if monsters_abounding.length > 0
     end
     
+    def list_paths
+      valid_paths = []
+      locs_connected.each do |key, value|
+        unless value.nil?
+          valid_paths.push(key.to_s)
+        end
+      end
+      return "\n >> Paths: #{valid_paths.join(', ')}"
+    end
+    
     def has_monster?
       found = false
       unless danger_level.eql?(:none)

data/lib/gemwarrior/player.rb

@@ -122,7 +122,7 @@ module Gemwarrior
       unless direction.nil?
         if can_move?(direction)
           new_loc_id = cur_loc.locs_connected[direction.to_sym]
-          cur_loc = loc_by_id(locations, new_loc_id)
+          self.cur_loc = loc_by_id(locations, new_loc_id)
           print_traveling_text
           cur_loc.checked_for_monsters = false
           cur_loc.describe

data/lib/gemwarrior/repl.rb

@@ -6,11 +6,13 @@ require 'os'
 
 require_relative 'version'
 require_relative 'evaluator'
+require_relative 'wordlist'
 
 module Gemwarrior  
   class Repl
     # CONSTANTS
     ## MESSAGES
+    QUIT_MESSAGE   = 'Temporal flux detected. Shutting down...'
     SPLASH_MESSAGE = 'Welcome to Gem Warrior, where randomized fortune is just as likely as mayhem.'
     
     attr_accessor :world, :eval
@@ -56,11 +58,11 @@ module Gemwarrior
     end
     
     def print_fortune
-      noun1_vals = ["abutments", "bains", "crocuses", "chapes", "civility", "fingering", "gabardines", "nooks", "scalawags", "squiggles"]
-      noun2_vals = ["asterisms", "deniers", "diastoles", "extremities", "payments", "specters", "splats", "thalamuses", "wallets", "xylophones"]
-      noun3_vals = ["blebs", "blowholes", "dancers", "dinges", "dualism", "ebullitions", "gullets", "knops", "phaetons", "snickers"]
-      
-      puts "* Remember: #{noun1_vals[rand(0..9)]} and #{noun2_vals[rand(0..9)]} are the key to #{noun3_vals[rand(0..9)]} *\n\n"
+      noun1_values = WordList.new('noun-plural')
+      noun2_values = WordList.new('noun-plural')
+      noun3_values = WordList.new('noun-plural')
+
+      puts "* Remember: #{noun1_values.get_random_value} and #{noun2_values.get_random_value} are the key to #{noun3_values.get_random_value} *\n\n"
     end
 
     def setup_screen(initialCommand = nil)

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/gemwarrior/wordlist.rb

@@ -0,0 +1,84 @@
+# lib/gemwarrior/wordlist.rb
+# List of words for flavor text, hopefully randomized from Wordnik
+
+require 'http'
+require 'json'
+
+module Gemwarrior
+  class WordList
+    STATIC_NOUN_VALUES = ["abutments", "asterisms", "bains", "blebs", "blowholes", "chapes", "civility", "crocuses", "dancers", "deniers", "diastoles", "dinges", "dualism", "ebullitions", "extremities", "fingering", "gabardines", "gullets", "knops", "nooks", "payments", "phaetons", "scalawags", "snickers", "specters", "splats", "squiggles", "thalamuses", "wallets", "xylophones"]
+  
+    attr_accessor :type, :limit, :words, :error
+  
+    def initialize(type, limit = 10)
+      self.type = type
+      self.limit = limit
+      self.words = populate_words(type, limit)
+      self.error = nil
+    end
+
+    def get_random_value
+      words[rand(0..limit)]
+    end
+    
+    def list_words
+      words.join(',')
+    end
+
+    private
+
+    def populate_words(type, limit = 10)
+      url = 'http://api.wordnik.com:80/v4/words.json/randomWords'
+      api_key = ENV['WORDNIK_API_KEY']
+
+      case type
+      when 'noun', 'noun-plural', 'adjective', 'verb'
+      else
+        return get_static_values
+      end
+      
+      json_return = HTTP.get(
+        url, 
+        :params => { 
+          :hasDictionaryDef => true,  
+          :includePartOfSpeech => type, 
+          :minCorpusCount => 1, 
+          :maxCorpusCount => -1, 
+          :minDictionaryCount => 1,
+          :maxDictionaryCount => -1,
+          :minLength => 5,
+          :maxLength => 12,
+          :sortBy => 'alpha',
+          :sortOrder => 'asc',
+          :limit => limit,
+          :api_key => api_key
+        }
+      )
+      
+      json_data = JSON.parse(json_return.to_s)
+
+      if json_data.include?('type') && json_data.include?('message')
+        error = "wordnik #{json_data['type']}: #{json_data['message']}"
+        return get_static_values
+      else
+        word_list = []
+        json_data.map {|j| word_list.push(j['word'])}
+        if word_list.length > 0
+          return word_list
+        else
+          error = 'Empty array from Wordnik'
+          return get_static_values
+        end
+      end
+    end
+    
+    def get_static_values
+      static_values = []
+      0.upto(10) do
+        static_values.push(STATIC_NOUN_VALUES[rand(0..STATIC_NOUN_VALUES.length-1)])
+      end
+      return static_values
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -44,6 +44,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.10
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +169,7 @@ files:
 - lib/gemwarrior/player.rb
 - lib/gemwarrior/repl.rb
 - lib/gemwarrior/version.rb
+- lib/gemwarrior/wordlist.rb
 - lib/gemwarrior/world.rb
 - spec/rubywarrior_spec.rb
 - spec/spec_helper.rb