selendroid 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7781e4c0ddf416bd42dec1e3e51cec402f3a7903
-  data.tar.gz: b904903697ac1afb4874e2e72af12edf617d622d
+  metadata.gz: 14c9a302e098b43e724d3a8da6cdec5f1031f09d
+  data.tar.gz: 1f607d7aacbbfab0e272e34fa7cdee3dbe8fc480
 SHA512:
-  metadata.gz: 395dc79ce0bb8a460addcc4e628e72b2313a3d1283ae020c6afc83375e5085037f65a9fd39255aca76619a800018f9a6f8a3716afc22a613918c74efcb473ac3
-  data.tar.gz: 091b3564573432bece4525dbbfe7373212a6cf399463e0c5558e0d23d86ab9c50271c337b589097b37b027986b57276b3a174bdc4b1cc3c77945562ba884e69d
+  metadata.gz: 1c958e755785e94a6a0a8c25e5cf89088be2e36d8525116436bee62601a6f097e2fb820ae122c4801715b33b8eb4c383de81005a8908ec862831baa8a6adf9be
+  data.tar.gz: 52f7b559fa48d33c40c5586dc5c92c4f83f91c83e4916c120f7d2c898624a6ecd4e6a52edad9cc2a7b20f648cd64a5cd73c008fbd9dec09479882319cb76dead

data/bin/selendroid

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'selendroid/selendroid_builder'
+require 'selendroid/selendroid_driver'
 require 'rbconfig'
 
 # for ruby 1.9.1 and earlier
@@ -19,12 +20,21 @@ def print_comamndline_help
       Prints more detailed help information.
     build <apk>
       Builds the selendroid-server for the given apk.
+    build-and-start  <apk>
+      Builds the selendroid-server for the given apk and starts the 
+      selendroid server. The app will be resigned with the debug 
+      certificate and will be installed on the first available An-
+      droid device.
+    start  <apk>
+      Starts the selendroid server on the first available Android device.
+      Commamd expects that the apps are already installed on the device.
     shell
-      Starts the selendroid-server on the device (apps must be already installed) and opens an irb shell with an active WebDriver session.
-      The selendroid-inspector web app is running on: http://localhost:8080/inspector.
+      Starts the selendroid-server on the device (apps must be already in-
+      stalled) and opens an irb shell with an active WebDriver session.
     version
       prints the gem version    
-    To find help, please visit the official selendroid wiki: http://goo.gl/z30pj    
+    To find help, please visit the official selendroid wiki: 
+    http://goo.gl/z30pj    
 EOF
 end
 
@@ -56,11 +66,32 @@ elsif cmd == 'shell'
   exit 0  
 elsif cmd == 'build'
   raise_if_android_home_not_set
-  puts "Please specify the app you want to build a selendroid-server for" if (ARGV.empty? or not is_apk_file?(ARGV.first))
+  puts "Please specify the app you want to build a selendroid-server for!" if (ARGV.empty? or not is_apk_file?(ARGV.first))
   while not ARGV.empty? and is_apk_file?(ARGV.first)
     rebuild_selendroid(relative_to_full_path(ARGV.shift))
   end
   exit 0
+elsif cmd=='build-and-start'
+  raise_if_android_home_not_set  
+  puts "Please specify the app you want to automate!" if (ARGV.empty? or not is_apk_file?(ARGV.first))
+  while not ARGV.empty? and is_apk_file?(ARGV.first)
+    app_apk_under_test = relative_to_full_path(ARGV.shift)
+    prepare_device(app_apk_under_test)
+    main_activity = get_app_main_activity(app_apk_under_test)
+    start_selendroid_server(main_activity)
+    wait_for_selendroid_server
+  end
+  exit 0
+elsif cmd=='start'  
+  raise_if_android_home_not_set  
+  puts "Please specify the app you want to automate!" if (ARGV.empty? or not is_apk_file?(ARGV.first))
+  while not ARGV.empty? and is_apk_file?(ARGV.first)
+    app_apk_under_test = relative_to_full_path(ARGV.shift)
+    main_activity = get_app_main_activity(app_apk_under_test)
+    start_selendroid_server(main_activity)
+    wait_for_selendroid_server
+  end
+  exit 0
 elsif cmd == 'version'
   puts Selendroid::VERSION
   exit 0

data/irbrc

@@ -17,7 +17,8 @@ IRB.conf[:SAVE_HISTORY] = 50
 IRB.conf[:HISTORY_FILE] = ".irb-history"
 
 require 'selendroid/selendroid_driver'
-start_selendroid_server
+start_selendroid_server(nil)
+wait_for_selendroid_server
 start_selendroid_client
 puts "#################### Selendroid shell ###################".green
 puts "Selendroid inspector: http://localhost:8090/inspector".green

data/lib/selendroid/commands.rb

@@ -0,0 +1,39 @@
+def log(message)
+  $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}".green
+end
+
+def adb_command
+   if is_windows?
+     "#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe"
+   else
+     "#{ENV["ANDROID_HOME"]}/platform-tools/adb"
+   end
+end
+
+def is_windows?
+  (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+end
+
+def aapt_command
+  if is_windows?
+     "#{ENV["ANDROID_HOME"]}\\platform-tools\\aapt.exe"
+  else
+    "#{ENV["ANDROID_HOME"]}/platform-tools/aapt"
+  end
+end
+
+def java_command
+  if is_windows?
+    "#{ENV["JAVA_HOME"]}\\bin\\java.exe"
+  else
+    "#{ENV["JAVA_HOME"]}/bin/java"
+  end
+end
+
+def jarsigner_command
+  if is_windows?
+    "#{ENV["JAVA_HOME"]}\\bin\\jarsigner.exe"
+  else
+    "#{ENV["JAVA_HOME"]}/bin/jarsigner"
+  end
+end  

data/lib/selendroid/selendroid_builder.rb

@@ -1,11 +1,12 @@
 require "selendroid/version"
+require "selendroid/commands"
 require 'zip/zip'
 require 'tempfile'
+require 'colorize'
 
 def rebuild_selendroid(app)
-    aut_base_package = %x[ aapt dump badging '#{app}' | grep package  | cut -d '=' -f2-|awk '{ print $1}' | tr -d "'" ]
-    aut_base_package = aut_base_package.tr("\n","")
-    puts "Building selendroid-server for package #{aut_base_package.dump}"
+    aut_base_package = get_app_base_package(app)
+    log "Building selendroid-server for package #{aut_base_package.dump}".green
     
     test_server_file_name = selendroid_server_path(aut_base_package)
     FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
@@ -39,23 +40,84 @@ def rebuild_selendroid(app)
         raise "Could not sign test server"
       end
     end
-    puts "Done signing the test server. Moved it to #{test_server_file_name}"
+    log "Done signing the test server. Moved it to #{test_server_file_name}".green
+    test_server_file_name
+end
+
+def get_app_base_package(app)
+  cmd = "#{aapt_command} dump badging '#{app}' | grep package  | cut -d '=' -f2-|awk '{ print $1}' | tr -d \"'\""
+  app_base_package = %x[ #{cmd}]
+  app_base_package = app_base_package.tr("\n","")
+  app_base_package
+end
+
+def get_app_main_activity(app)
+  cmd ="#{aapt_command} dump badging '#{app}' | grep launchable-activity  | cut -d '=' -f2-|awk '{ print $1}' | tr -d \"'\""
+  app_main_activity = %x[ #{cmd} ]
+  app_main_activity = app_main_activity.tr("\n","")
+  app_main_activity
+end  
+
+def is_app_installed_on_device(app_base_package, device_arg)
+  cmd = "#{adb_command} -s #{device_arg} shell pm list packages #{app_base_package}"
+  package_name = %x[ #{cmd}]
+  if package_name.nil? || package_name.empty?
+    return false
+  else  
+    return true
+  end  
+end
+
+def get_first_android_device
+  cmd = "#{adb_command} devices |  head -2 | tail -1 | awk '{ print $1}'"
+  device = %x[ #{cmd}]
+  device = device.tr("\n","")
+  puts "device '#{device}'"
+  if device.nil? || device.empty?
+    raise "No running Android device was found. Is the device plugged in or the emulator started?"
+  end  
+  device
+end
+
+def prepare_device(app)
+  device_serial = get_first_android_device
+  log "Using first Android device with serial: #{device_serial}".green
+  if is_app_installed_on_device("org.openqa.selndroid",device_serial)
+    uninstall_cmd = "#{adb_command} -s #{device_serial} uninstall org.openqa.selendroid"
+    %x[ #{uninstall_cmd}]
+  end
+  selendroid_file_name = rebuild_selendroid(app)
+  install_cmd = "#{adb_command} -s #{device_serial} install #{File.expand_path(selendroid_file_name)}"
+  %x[ #{install_cmd}]
+  log "The selendroid server has been rebuild and installed on the device.".green
+
+  aut_base_package = get_app_base_package(app)
+  aut_main_activity = get_app_main_activity(app)
+  if is_app_installed_on_device(aut_base_package,device_serial)
+    uninstall_cmd = "#{adb_command} -s #{device_serial} uninstall #{aut_base_package}"
+    %x[ #{uninstall_cmd}]
+  end
+  resigned_apk = "#{app.chomp('.apk')}-debug.apk"
+  resign_apk(app,resigned_apk)
+  install_cmd = "#{adb_command} -s #{device_serial} install #{resigned_apk}"    
+  %x[ #{install_cmd}]
+  log "The app has been resigned #{File.basename(resigned_apk)} and installed on the device.".green
 end
 
 def is_windows?
   (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 end
 
+def resign_apk(app_path, dest_path)
+  troido_jar = File.join(File.dirname(__FILE__), '..','..', 'lib/troido/re-sign.jar')
+  cmd = "#{java_command} -cp #{troido_jar} de.troido.resigner.main.Main #{File.expand_path(app_path)} #{File.expand_path(dest_path)}"
+  resign_output= %x[ #{cmd}]
+end
+
 def sign_apk(app_path, dest_path)
-  if is_windows?
-    jarsigner_path = "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
-  else
-    jarsigner_path = "jarsigner"
-  end
 
-  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass android -keystore ~/.android/debug.keystore #{app_path} androiddebugkey"
+  cmd = "#{jarsigner_command} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass android -keystore ~/.android/debug.keystore #{app_path} androiddebugkey"
   unless system(cmd)
-    puts "jarsigner command: #{cmd}"
     raise "Could not sign app (#{app_path}"
   end
 end

data/lib/selendroid/selendroid_driver.rb

@@ -1,6 +1,10 @@
+require "selendroid/commands"
 require 'selenium-webdriver'
 require 'json'
 require 'colorize'
+require 'retriable'
+require "net/http"
+require 'uri'
 
 include Selenium::WebDriver::DriverExtensions::HasInputDevices
 include Selenium::WebDriver::DriverExtensions::HasTouchScreen
@@ -64,26 +68,39 @@ def helpme
   
 end
 
-def start_selendroid_server
-  selendroid_server_start_cmd = "#{adb_command} shell am instrument -e main_activity '#{ENV["MAIN_ACTIVITY"]}' org.openqa.selendroid/org.openqa.selendroid.ServerInstrumentation"
+def start_selendroid_server(activity)
+  main_activity = nil
+  if activity.nil?
+    main_activity = ENV["MAIN_ACTIVITY"]
+  else
+    main_activity =activity
+  end
+  log "Starting selendroid-server with main activity: #{main_activity}"    
+  selendroid_server_start_cmd = "#{adb_command} shell am instrument -e main_activity '#{main_activity}' org.openqa.selendroid/org.openqa.selendroid.ServerInstrumentation"
   `#{selendroid_server_start_cmd}`
-  
+  unless ENV["SELENDROID_SERVER_PORT"]
+    ENV["SELENDROID_SERVER_PORT"] = "8080"
+  end
   forward_cmd = "#{adb_command} forward tcp:#{ENV["SELENDROID_SERVER_PORT"]} tcp:8080"
   `#{forward_cmd}`
 end
 
-def log(message)
-  $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}"
-end
+def wait_for_selendroid_server
+  unless ENV["SELENDROID_SERVER_PORT"]
+    ENV["SELENDROID_SERVER_PORT"] = "8080"
+  end
+  retriable :tries => 5, :interval => 3 do
+    url = URI.parse("http://localhost:#{ENV["SELENDROID_SERVER_PORT"]}/wd/hub/status")
+    the_request = Net::HTTP::Get.new("#{url.path}")
 
-def adb_command
-   if is_windows?
-     %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe")
-   else
-     %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb")
-   end
-end
+    the_response = Net::HTTP.start(url.host, url.port) { |http|
+    http.request(the_request)
+    }
 
-def is_windows?
-  (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-end
+    raise "Response was not 200, response was #{the_response.code}" if the_response.code != "200"
+    log "Selendroid server is started.".green
+  end
+
+end
+  
+  

data/lib/selendroid/version.rb

@@ -1,3 +1,3 @@
 module Selendroid
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/troido/README.md

@@ -0,0 +1,6 @@
+The re-sign tool is created by troido.de and is published under
+the apache 2.0 licence:
+
+* Source code: https://github.com/troido/resign
+* Jar download: http://www.troido.de/en/downloadslsmallgsoftware-a-driverslsmallg/files-download/1_0f7c0da1d4814335bd4142b87385e2ac
+

data/selendroid.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_dependency( "rubyzip")
   gem.add_dependency( "colorize")
+  gem.add_dependency( "retriable")
   gem.add_dependency( "awesome_print")
   gem.add_dependency( "selenium-webdriver")
   gem.add_dependency( "json")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selendroid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Dominik Dary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +112,12 @@ files:
 - bin/selendroid-shell.rb
 - irbrc
 - lib/selendroid.rb
+- lib/selendroid/commands.rb
 - lib/selendroid/selendroid_builder.rb
 - lib/selendroid/selendroid_driver.rb
 - lib/selendroid/version.rb
+- lib/troido/README.md
+- lib/troido/re-sign.jar
 - selendroid-prebuild/AndroidManifest.xml
 - selendroid-prebuild/selendroid-server.apk
 - selendroid.gemspec