gemwarrior 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94628a3d356ed158ed51481416e444b112791db7
-  data.tar.gz: cdbdbba0955d78638e3e20cd37ad146465edf5ac
+  metadata.gz: b597259ded305d57bc41028e2129e454140255ba
+  data.tar.gz: 44653fe9f3c4f48c62d1fb93a8c872375539da68
 SHA512:
-  metadata.gz: 7eb29f7a90ec1d667a35a14a4a51ee77f9562601184ca2b1f9b27632b3493b26ac3f1265691cb463fadb4eb1882217525ceecca1bf7a36a06e7651610f3c2d11
-  data.tar.gz: eebf77c6e7c393394be3a430817b084169d6a53d900c590cb1b4ea474276408c813844434e04802dd72db7f5fbad33ed1d980222c15f6aec337f708e2676a46d
+  metadata.gz: 335f48a60bfd59529f6aa07f3ddc1c8b014add206f872b7664ed092bda7f66de7d6e5e4e62d6638699f50270205a9a0c4650174c95cc6a060290db5f030015ba
+  data.tar.gz: 6c1a36f12a20ee9c6af50034b3e32e5842c811ec73a3c2d30d721c3f8cdacf506b9720115485f6c29ee728ddd3b9f170d7ea6b55b3edf03e63a2dd7004947f8d

data/lib/gemwarrior/entities/items/pedestal.rb

@@ -39,7 +39,7 @@ module Gemwarrior
         print_switches(self.switches)
         
         puts 
-        puts 'You can change the words themselves and you can push the large gem. What do you do?'
+        puts 'You can rearrange the letters in the words themselves, and you can push the large gem. What do you do?'
         puts
         puts '>> 1 Rearrange the letters in switch 1\'s word'
         puts '>> 2 Rearrange the letters in switch 2\'s word'
@@ -53,49 +53,43 @@ module Gemwarrior
         
         print '> '
         choice = gets.chomp!
-        
+
         case choice
         when '1'
           switch1 = switches[0][2].nil? ? switches[0][1] : switches[0][2]
           puts "Switch 1: #{switch1}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[0][2] = new_word
+          switches[0][2] = get_new_word(switch1)
         when '2'
           switch2 = switches[1][2].nil? ? switches[1][1] : switches[1][2]
           puts "Switch 2: #{switch2}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[1][2] = new_word
+          switches[1][2] = get_new_word(switch2)
         when '3'
           switch3 = switches[2][2].nil? ? switches[2][1] : switches[2][2]
           puts "Switch 3: #{switch3}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[2][2] = new_word
+          switches[2][2] = get_new_word(switch3)
         when '4'
           switch4 = switches[3][2].nil? ? switches[3][1] : switches[3][2]
           puts "Switch 4: #{switch4}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[3][2] = new_word
+          switches[3][2] = get_new_word(switch4)
         when '5'
           switch5 = switches[4][2].nil? ? switches[4][1] : switches[4][2]
           puts "Switch 5: #{switch5}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[4][2] = new_word
+          switches[4][2] = get_new_word(switch5)
         when '6'
           switch6 = switches[5][2].nil? ? switches[5][1] : switches[5][2]
           puts "Switch 6: #{switch6}"
           puts 'What should the switch\'s word be set to?'
-          new_word = gets.chomp!
-          switches[5][2] = new_word
+          switches[5][2] = get_new_word(switch6)
         when '7'
           pedestal_configured = true
       
           for i in 0..switches.length-1 do
-            pedestal_configured = false unless switches[i][0].eql? switches[i][2]
+            pedestal_configured = false unless switches[i][0].downcase.eql? switches[i][2].downcase
           end   
       
           if pedestal_configured
@@ -145,5 +139,15 @@ module Gemwarrior
     def jumble(word)
       word.split(//).sort_by { rand }.join('')
     end
+    
+    def get_new_word(switch)
+      new_word = gets.chomp!
+      if switch.downcase.split(//).sort == new_word.downcase.split(//).sort
+        return new_word
+      else
+        puts 'Those letters are not in the original word, sorry.'.colorize(:red)
+        return nil
+      end
+    end
   end
 end

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.9.21'
+  VERSION = '0.9.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -308,4 +308,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/rubywarrior_spec.rb
+- spec/spec_helper.rb