gametel 0.5.8.1 → 0.5.9

data/features/support/env.rb

@@ -6,15 +6,6 @@ require 'gametel'
 
 World(Gametel::Navigation)
 
-keystore = {
-  :path => 'features/support/debug.keystore',
-  :alias => 'androiddebugkey',
-  :password => 'android',
-  :keystore_password => 'android'
-}
-
-server = Brazenhead::Server.new('features/support/ApiDemos.apk', keystore)
-
 require_rel '/screens'
 
 Gametel::Navigation.routes = {
@@ -28,15 +19,12 @@ Gametel::Navigation.routes = {
 }
 
 
-class Driver
-  include Brazenhead
-end
+Gametel.apk_path = 'features/support/ApiDemos.apk'
 
 Before do
-  @driver = Driver.new
-  server.start("ApiDemos")
+  @driver = Gametel.start('ApiDemos')
 end
 
 After do
-  server.stop
+  Gametel.stop
 end

data/lib/gametel.rb

@@ -1,4 +1,6 @@
+require 'brazenhead'
 require 'gametel/accessors'
+require 'gametel/driver'
 require 'gametel/navigation'
 require 'gametel/waiter'
 require 'gametel/version'
@@ -17,6 +19,27 @@ module Gametel
     cls.extend Gametel::Accessors
   end
 
+  def self.apk_path=(path)
+    @apk_path = path
+  end
+
+  def self.default_driver
+    @default_driver ||= Gametel::Driver.new
+  end
+
+  def self.default_server
+    @default_server ||= Brazenhead::Server.new @apk_path
+  end
+
+  def self.start(activity)
+    default_server.start(activity)
+    default_driver
+  end
+
+  def self.stop
+    default_server.stop
+  end
+
   def initialize(pform = :brazenhead)
     @platform = Gametel::Platforms::BrazenheadPlatform.new if pform == :brazenhead
   end

data/lib/gametel/driver.rb

@@ -0,0 +1,6 @@
+module Gametel
+  class Driver
+    include Gametel
+    
+  end
+end

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.5.8.1"
+  VERSION = "0.5.9"
 end

data/spec/lib/gametel/accessors_spec.rb

@@ -773,7 +773,7 @@ describe Gametel::Accessors do
       end
 
       it "should wait for a drawable when using index" do
-        platform.should_receive(:get_view_by_id).with(:id => 'image_id')
+        platform.should_receive(:get_view_by_id).with('image_id')
         platform.should_receive(:last_json).and_return({'hasDrawable' => 'true'})
         screen.wait_for_image_id
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.8.1
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
@@ -165,6 +165,7 @@ files:
 - features/view.feature
 - lib/gametel.rb
 - lib/gametel/accessors.rb
+- lib/gametel/driver.rb
 - lib/gametel/navigation.rb
 - lib/gametel/platforms/brazenhead/basic.rb
 - lib/gametel/platforms/brazenhead/button.rb