travian_bot 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/travian_bot/application.rb

@@ -1,37 +1,65 @@
 require 'selenium-webdriver'
-require 'travian_bot/tools'
+require 'chronic'
+require 'yaml'
 
 class TravianBot
   class Application
     class << self
-      include Tools
             
       def run!(*arguments)
-        url, user, password = get_credentials
-        driver = Selenium::WebDriver.for :firefox
-        driver.navigate.to(url)
+        login
+        building_queue
+        close
+      
+        return 1
+      end
+      
+      private
+      
+      # Load the credentials from ENV['HOME']/.travian_bot
+      def get_credentials
+        credentials = YAML::load(File.open("#{ENV['HOME']}/.travian_bot"))
 
-        # Login
-        name_input = driver.find_element(:name, 'name')
-        password_input = driver.find_element(:name, 'password')
-        login_button = driver.find_element(:id, 's1')
+        [credentials['travian_bot']['url'], credentials['travian_bot']['usr'], credentials['travian_bot']['pwd']]
+      end
+      
+      # Login in to travian page      
+      def login
+        url, user, password = get_credentials
+        @driver = Selenium::WebDriver.for :firefox
+        @driver.navigate.to(url)
+        name_input = @driver.find_element(:name, 'name')
+        password_input = @driver.find_element(:name, 'password')
+        login_button = @driver.find_element(:id, 's1')
 
         name_input.send_keys(user)
         password_input.send_keys(password)
         login_button.submit
-
-        # Check if building something
+      end
+      
+      # Close the selenium connection
+      def close
+        @driver.quit
+      end
+      
+      # Check if building something
+      def building_queue
         begin
-          building_pipe = driver.find_element(:id, 'building_contract')
-          building_time = driver.find_element(:class, 'buildingTime').text
-          puts wait_till(building_time)
+          building_pipe = @driver.find_elements(:xpath, "//table[@id='building_contract']/tbody/tr")
+          
+          building_pipe.each do |entry|
+            puts entry.text
+          end
         rescue Selenium::WebDriver::Error::NoSuchElementError
-          puts 'Nothing to build'
+          puts 'Nothing in building queue'
         end
-
-        driver.quit
+      end
       
-        return 1
+      # Get the ending time of a string
+      def wait_till(input)
+        time = input.to_s.match(/(\d*):(\d*)$/)
+
+        Chronic.parse("today #{time[0]}:#{time[1]}")      
       end
     end
   end

data/travian_bot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "travian_bot"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Simecek"]
-  s.date = "2011-10-23"
+  s.date = "2011-10-24"
   s.description = "A little bot for travian."
   s.email = "roman.simecek@cyt.ch"
   s.executables = ["travianbot"]
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
     "bin/travianbot",
     "lib/travian_bot.rb",
     "lib/travian_bot/application.rb",
-    "lib/travian_bot/tools.rb",
     "test/helper.rb",
     "test/test_travian_bot.rb",
     "travian_bot.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travian_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-23 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2165343200 !ruby/object:Gem::Requirement
+  requirement: &2153096620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165343200
+  version_requirements: *2153096620
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &2165342140 !ruby/object:Gem::Requirement
+  requirement: &2153095920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165342140
+  version_requirements: *2153095920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165341320 !ruby/object:Gem::Requirement
+  requirement: &2153095200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165341320
+  version_requirements: *2153095200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165340160 !ruby/object:Gem::Requirement
+  requirement: &2153094300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2165340160
+  version_requirements: *2153094300
 description: A little bot for travian.
 email: roman.simecek@cyt.ch
 executables:
@@ -74,7 +74,6 @@ files:
 - bin/travianbot
 - lib/travian_bot.rb
 - lib/travian_bot/application.rb
-- lib/travian_bot/tools.rb
 - test/helper.rb
 - test/test_travian_bot.rb
 - travian_bot.gemspec
@@ -93,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -618091492996033097
+      hash: 295626495803354199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/travian_bot/tools.rb

@@ -1,18 +0,0 @@
-require 'chronic'
-require 'yaml'
-
-class TravianBot
-  module Tools
-    def get_credentials
-      credentials = YAML::load(File.open("#{ENV['HOME']}/.travian_bot"))
-      
-      [credentials['travian_bot']['url'], credentials['travian_bot']['usr'], credentials['travian_bot']['pwd']]
-    end
-    
-    def wait_till(input)
-      time = input.to_s.match(/(\d*):(\d*)$/)
-      
-      Chronic.parse("today #{time[0]}:#{time[1]}")      
-    end
-  end
-end