travian_bot 0.2.4 → 0.3.0

data/Gemfile

@@ -7,4 +7,8 @@ end
 
 gem 'selenium-webdriver'
 gem 'chronic_duration'
-gem 'term-ansicolor'
+gem 'term-ansicolor'
+
+# Possible Gems to use.
+gem 'bombshell' # Custom IRB consoles made easy https://github.com/rossmeissl/bombshell
+# gem 'rubikon' # A simple to use, yet powerful Ruby framework for building console-based applications. https://github.com/koraktor/rubikon

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    bombshell (0.1.5)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     chronic_duration (0.9.6)
@@ -26,6 +27,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bombshell
   bundler
   chronic_duration
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/bin/travianshell

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'travian_bot/shell'
+require 'bombshell'
+
+Bombshell.launch(TravianBot::Shell)

data/lib/travian_bot.rb

@@ -1,3 +1 @@
-class TravianBot
-  autoload :Application,  'travian_bot/application'
-end
+Dir.glob(File.join(File.dirname(__FILE__), '/travian_bot/*.rb')).sort.each { |lib| load lib }

data/lib/travian_bot/application.rb

@@ -16,14 +16,19 @@ class TravianBot
         h1('Welcome to your TravianBot')
         @game = login
         
-        current_building_queue
-        current_troop_movements
-        current_avaible_buildings
+        #current_building_queue
+        #current_troop_movements
+        #current_avaible_buildings
         
         h2('Custom actions actions')
-        text 'closest_adventure'
-        command = gets
-        start_closest_adventure @game if command == 'closest_adventure'
+        text '1 => closest_adventure'
+        new_line
+        
+        command = gets.chomp
+        if '1'.eql?(command)
+          h2 'Start the closest adventure'
+          puts start_closest_adventure(@game) 
+        end
         @game.quit
       
         return 1
@@ -38,6 +43,7 @@ class TravianBot
           text building.to_s
         end  
         new_line
+        sleep(3)
       end
        
       def current_building_queue
@@ -53,6 +59,7 @@ class TravianBot
           end
         end  
         new_line
+        sleep(3)
       end
       
       def current_troop_movements
@@ -68,6 +75,7 @@ class TravianBot
           end
         end
         new_line
+        sleep(3)
       end
     end
   end

data/lib/travian_bot/application/display.rb

@@ -12,13 +12,11 @@ class TravianBot
         puts "#{text}".red
         puts "=".red * text.length
         puts ' '
-        puts ' '
       end
       
       def h2(text)
         puts "#{text}".yellow
         puts "-".yellow * text.length
-        puts ' '
       end
       
       def text(text)

data/lib/travian_bot/application/hero.rb

@@ -18,11 +18,21 @@ class TravianBot
         shortest_quest = quests.sort{|a,b| a[1] <=> b[1]}.first.first
         elements[shortest_quest].find_element(:class, 'gotoAdventure').click
         
-        link = selenium.find_element(:link_text, 'Abenteuer starten')
-        link.click
+        begin
+          link = selenium.find_element(:link_text, 'Abenteuer starten')
+          link.click
+        rescue
+          return ['Currently the hero is busy for a quest.', [0, 0]]
+        end
+        
+        mission_name = selenium.find_element(:xpath, '//span[@class="coordinates coordinatesWithText"]/span[@class="coordText"]')
+        coordinate_x = selenium.find_element(:xpath, 'span[@class="coordinates coordinatesWithText"]/span[@class="coordinateX"]')
+        coordinate_y = selenium.find_element(:xpath, 'span[@class="coordinates coordinatesWithText"]/span[@class="coordinateY"]')
         
         confirm_link = selenium.find_element(:id, 'btn_ok')
         confirm_link.click
+        
+        [mission_name, [coordinate_x.sub('(', ''), coordinate_y.sub(')', '')]]
       end
     end
   end

data/lib/travian_bot/shell.rb

@@ -0,0 +1,28 @@
+require 'bombshell'
+require 'travian_bot/application'
+
+class TravianBot
+ class Shell < Bombshell::Environment
+   include Bombshell::Shell
+   include TravianBot::Application::Connection
+   include TravianBot::Application::Hero
+
+   prompt_with 'travianbot'
+   
+   having_launched do
+    @browser = login
+    init # binding is on your shell *class*
+   end
+   
+   def start_quest
+     start_closest_adventure @browser
+   end
+
+   def help
+     h1 'Help'
+   end
+   
+   private
+   include TravianBot::Application::Display
+ end
+end

data/travian_bot.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "travian_bot"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Simecek"]
-  s.date = "2011-10-25"
+  s.date = "2011-10-27"
   s.description = "A little bot for travian."
   s.email = "roman.simecek@cyt.ch"
-  s.executables = ["travianbot"]
+  s.executables = ["travianbot", "travianshell"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/travianbot",
+    "bin/travianshell",
     "lib/travian_bot.rb",
     "lib/travian_bot/application.rb",
     "lib/travian_bot/application/buildings.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/travian_bot/application/navigation.rb",
     "lib/travian_bot/application/queue.rb",
     "lib/travian_bot/application/time.rb",
+    "lib/travian_bot/shell.rb",
     "test/helper.rb",
     "test/test_travian_bot.rb",
     "travian_bot.gemspec"
@@ -52,12 +54,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<selenium-webdriver>, [">= 0"])
       s.add_runtime_dependency(%q<chronic_duration>, [">= 0"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_runtime_dependency(%q<bombshell>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
       s.add_dependency(%q<selenium-webdriver>, [">= 0"])
       s.add_dependency(%q<chronic_duration>, [">= 0"])
       s.add_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_dependency(%q<bombshell>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
@@ -65,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<selenium-webdriver>, [">= 0"])
     s.add_dependency(%q<chronic_duration>, [">= 0"])
     s.add_dependency(%q<term-ansicolor>, [">= 0"])
+    s.add_dependency(%q<bombshell>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travian_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2156662640 !ruby/object:Gem::Requirement
+  requirement: &2152470780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156662640
+  version_requirements: *2152470780
 - !ruby/object:Gem::Dependency
   name: chronic_duration
-  requirement: &2156661960 !ruby/object:Gem::Requirement
+  requirement: &2152470300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156661960
+  version_requirements: *2152470300
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156659580 !ruby/object:Gem::Requirement
+  requirement: &2152469820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156659580
+  version_requirements: *2152469820
+- !ruby/object:Gem::Dependency
+  name: bombshell
+  requirement: &2152469340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152469340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156658900 !ruby/object:Gem::Requirement
+  requirement: &2152468860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156658900
+  version_requirements: *2152468860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156658280 !ruby/object:Gem::Requirement
+  requirement: &2152468380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,11 +76,12 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156658280
+  version_requirements: *2152468380
 description: A little bot for travian.
 email: roman.simecek@cyt.ch
 executables:
 - travianbot
+- travianshell
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -83,6 +95,7 @@ files:
 - Rakefile
 - VERSION
 - bin/travianbot
+- bin/travianshell
 - lib/travian_bot.rb
 - lib/travian_bot/application.rb
 - lib/travian_bot/application/buildings.rb
@@ -92,6 +105,7 @@ files:
 - lib/travian_bot/application/navigation.rb
 - lib/travian_bot/application/queue.rb
 - lib/travian_bot/application/time.rb
+- lib/travian_bot/shell.rb
 - test/helper.rb
 - test/test_travian_bot.rb
 - travian_bot.gemspec
@@ -110,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4286807613602955578
+      hash: 1724651346905237761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: