selendroid 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12013bb253f5d28c4d82bddc15744e3db5c0536d
-  data.tar.gz: 556b8e6f820a48be1250db7a85e843f92ac7f551
+  metadata.gz: 41fa062891d9e2bf72e3b4a3197293dae252d7e6
+  data.tar.gz: d6b9698f140dadeb70f9ed9c2a4c7d57a29d4156
 SHA512:
-  metadata.gz: ddd47e822d1b4e813c20ca56ca8f320b5db126801ccd1ded22507fb0a15cee13474ae18440e85986504460555e7089d40fdc5bd954ea651677fd64d2b31d626d
-  data.tar.gz: 33c46345cb7c0e957e6255d39d8f4e603416e045e56534aa2f5aa1a7231eb132bddbd0044da6dd65a6891105dde3ee7c3db52ee1bef23d0cd5597218b29a8dab
+  metadata.gz: 49a06488d8cc4696d0ea31d3edccc26eade1b64236125458423aedb3b252d4240c1cda6be219fd1e54b52d23df98e5223db2d40d05b13f2e501c53a307081b90
+  data.tar.gz: 13d08c92b0d7ed1869eea75d5a169be6e3330314d57683f9385e628510382fe3b1d62a094646227086e985e80d1203dc8b3006ecaa159d4519c6e96af4c12fd8

data/.gitignore

@@ -8,8 +8,6 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
-selendroid-test-app-0.1-SNAPSHOT.apk
-selendroid-server-0.0.1.apk
 coverage
 doc/
 lib/bundler/man

data/LICENSE.txt

@@ -1,6 +1,4 @@
-Copyright (c) 2013 Dary, Dominik
-
-Apache License 2.0
+Copyright 2013 Selendroid commiters
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -24,6 +24,7 @@ Now you will find your customized selendroid-server. To run the server:
 
 A sample test looks like:
 
+```java
 		driver = new AndroidDriver(new URL("http://localhost:8080/wd/hub"), getDefaultCapabilities());
 		driver.findElement(By.id("startUserRegistration")).click();
 		
@@ -36,14 +37,10 @@ A sample test looks like:
 		nameInput.sendKeys(user.getName());
 		takeScreenShot("User data entered.");
 		driver.findElement(By.id("btnRegisterUser")).click();
+```
 
-More details about selendroid can be found in the [wiki](https://github.com/DominikDary/selendroid/wiki/).
+## You want more details?
 
-Current state
--------------
-
-Please keep in mind that this project is in very early stages. Help is appreciated. Reach us out in the issues or via email.
-
-You can track the current progress on the following [link](https://github.com/DominikDary/selendroid/wiki/JSON-Wire-Protocol)
+Please have a look at the [wiki](https://github.com/DominikDary/selendroid/wiki/).
 
 

data/bin/selendroid

@@ -28,7 +28,7 @@ def print_comamndline_help
     start  <apk>
       Starts the selendroid server on the first available Android device.
       Commamd expects that the apps are already installed on the device.
-    shell
+    shell  <apk>
       Starts the selendroid-server on the device (apps must be already in-
       stalled) and opens an irb shell with an active WebDriver session.
     version
@@ -47,12 +47,11 @@ def relative_to_full_path(file_path)
   File.expand_path(file_path)
 end
 
-def raise_if_android_home_not_set
+def raise_if_android_and_java_home_not_set
   raise "Please set the ANDROID_HOME environment variable" unless ENV["ANDROID_HOME"]
+  raise "Please set the JAVA_HOME environment variable" unless ENV["JAVA_HOME"]
 end
 
-require File.join(File.dirname(__FILE__), "selendroid-shell")
-
 if (ARGV.length == 0)
   print_comamndline_help
   exit 0
@@ -62,17 +61,28 @@ if cmd == 'help'
   print_comamndline_help
   exit 0
 elsif cmd == 'shell'
-  selendroid_shell
+  raise_if_android_and_java_home_not_set
+  puts "Please specify the app you want to automate!" if (ARGV.empty? or not is_apk_file?(ARGV.first))
+  unless ENV["SELENDROID_SERVER_PORT"]
+    ENV["SELENDROID_SERVER_PORT"] = "8080"
+  end
+  while not ARGV.empty? and is_apk_file?(ARGV.first)
+    ENV["MAIN_ACTIVITY"]  = get_app_main_activity(relative_to_full_path(ARGV.shift))
+    ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
+
+    system "#{RbConfig.ruby} -S irb"
+  end
+
   exit 0  
 elsif cmd == 'build'
-  raise_if_android_home_not_set
+  raise_if_android_and_java_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))
   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  
+  raise_if_android_and_java_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)
@@ -83,7 +93,7 @@ elsif cmd=='build-and-start'
   end
   exit 0
 elsif cmd=='start'  
-  raise_if_android_home_not_set  
+  raise_if_android_and_java_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)

data/lib/selendroid/commands.rb

@@ -4,9 +4,9 @@ end
 
 def adb_command
    if is_windows?
-     "#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe"
+     "\"#{ENV["ANDROID_HOME"]}/platform-tools/adb.exe\""
    else
-     "#{ENV["ANDROID_HOME"]}/platform-tools/adb"
+     "\"#{ENV["ANDROID_HOME"]}/platform-tools/adb\""
    end
 end
 
@@ -16,24 +16,32 @@ end
 
 def aapt_command
   if is_windows?
-     "#{ENV["ANDROID_HOME"]}\\platform-tools\\aapt.exe"
+     "\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt.exe\""
   else
-    "#{ENV["ANDROID_HOME"]}/platform-tools/aapt"
+    "\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt\""
   end
 end
 
 def java_command
   if is_windows?
-    "#{ENV["JAVA_HOME"]}\\bin\\java.exe"
+    "\"#{ENV["JAVA_HOME"]}/bin/java.exe\""
   else
-    "#{ENV["JAVA_HOME"]}/bin/java"
+    "\"#{ENV["JAVA_HOME"]}/bin/java\""
   end
 end
 
 def jarsigner_command
   if is_windows?
-    "#{ENV["JAVA_HOME"]}\\bin\\jarsigner.exe"
+    "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
   else
-    "#{ENV["JAVA_HOME"]}/bin/jarsigner"
+    "\"#{ENV["JAVA_HOME"]}/bin/jarsigner\""
   end
-end  
+end  
+
+def keytool_command
+  if is_windows?
+    "\"#{ENV["JAVA_HOME"]}/bin/keytool.exe\""
+  else
+    "\"#{ENV["JAVA_HOME"]}/bin/keytool\""
+  end
+end

data/lib/selendroid/selendroid_builder.rb

@@ -6,7 +6,7 @@ require 'colorize'
 
 def rebuild_selendroid(app)
     aut_base_package = get_app_base_package(app)
-    log "Building selendroid-server for package #{aut_base_package.dump}".green
+    log "Building selendroid-server for package #{aut_base_package}".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)
@@ -45,17 +45,29 @@ def rebuild_selendroid(app)
 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
+  default_cmd = "#{aapt_command} dump badging #{app} "
+  windows_cmd = "#{default_cmd} | findSTR package "
+  x_cmd = "#{default_cmd} | grep package "
+  if is_windows?
+    manifest_package = %x[#{windows_cmd} ]
+  else
+    manifest_package = %x[ #{x_cmd} ]
+  end    
+
+  manifest_package.match(/name=['"]([^'"]+)['"]/)[1]
 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
+  default_cmd = "#{aapt_command} dump badging #{app} "
+  windows_cmd = "#{default_cmd} | findSTR launchable-activity "
+  x_cmd = "#{default_cmd} | grep launchable-activity "
+  if is_windows?
+    manifest_activity = %x[ #{windows_cmd}]
+  else
+    manifest_activity = %x[ #{x_cmd}]
+  end    
+
+  manifest_activity.match(/name=['"]([^'"]+)['"]/)[1]
 end  
 
 def is_app_installed_on_device(app_base_package, device_arg)
@@ -69,14 +81,25 @@ def is_app_installed_on_device(app_base_package, device_arg)
 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}'"
+  windows_cmd = "#{adb_command} devices | more +1"
+  x_cmd = "#{adb_command} devices |  head -2 | tail -1 "
+
+  if is_windows?
+     device = %x[ #{windows_cmd}]
+  else
+     device = %x[ #{x_cmd}]    
+  end
+  message_no_device = "No running Android device was found. Is the device plugged in or the emulator started?"
+  if device.nil? || device.empty?
+    raise message_no_device
+  end  
+  
+  device = device.split[0]
   if device.nil? || device.empty?
-    raise "No running Android device was found. Is the device plugged in or the emulator started?"
+    raise message_no_device
   end  
-  device
+
+  device.tr("\n","")
 end
 
 def prepare_device(app)
@@ -93,6 +116,7 @@ def prepare_device(app)
 
   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}]
@@ -115,8 +139,13 @@ def resign_apk(app_path, dest_path)
 end
 
 def sign_apk(app_path, dest_path)
+  if !File.file?( Dir.home+"/.android/debug.keystore")
+     log "keystore missing - creating one"
+     cmd= "#{keytool_command} -genkey -v -keystore #{Dir.home}/.android/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname \"CN=Android Debug,O=Android,C=US\" -storetype JKS -sigalg MD5withRSA  -keyalg RSA"
+     system(cmd)
+  end  
 
-  cmd = "#{jarsigner_command} -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 #{Dir.home}/.android/debug.keystore #{app_path} androiddebugkey"
   unless system(cmd)
     raise "Could not sign app (#{app_path}"
   end

data/lib/selendroid/selendroid_driver.rb

@@ -77,20 +77,20 @@ def start_selendroid_server(activity)
     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}`
+  selendroid_server_start_cmd = "#{adb_command} shell am instrument -e main_activity '#{main_activity}' org.openqa.selendroid/.ServerInstrumentation"
+  system(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}`
+  system(forward_cmd)
 end
 
 def wait_for_selendroid_server
   unless ENV["SELENDROID_SERVER_PORT"]
     ENV["SELENDROID_SERVER_PORT"] = "8080"
   end
-  retriable :tries => 5, :interval => 3 do
+  retriable :tries => 10, :interval => 3 do
     url = URI.parse("http://localhost:#{ENV["SELENDROID_SERVER_PORT"]}/wd/hub/status")
     the_request = Net::HTTP::Get.new("#{url.path}")
 

data/lib/selendroid/version.rb

@@ -1,3 +1,3 @@
 module Selendroid
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/selendroid-prebuild/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.openqa.selendroid"
     android:versionCode="1"
-    android:versionName="0.2" >
+    android:versionName="0.3.0" >
     <uses-sdk android:minSdkVersion="10" />
 
     <instrumentation android:name="org.openqa.selendroid.ServerInstrumentation"  android:targetPackage="org.openqa.selendroid.testapp" />

data/selendroid.gemspec

@@ -11,8 +11,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://dominikdary.github.com/selendroid/"
   gem.description   = %q{"Selenium for Android Apps" (Test automate native or hybrid Android apps with Selendroid.)}
   gem.summary       = %q{Utility so simplify usage of the selendroid-server.}
+  ignores = File.readlines('.gitignore').grep(/\S+/).map {|s| s.chomp }
+  dotfiles = [ '.gitignore']
+  gem.files = (Dir["**/*"].reject { |f| File.directory?(f) || ignores.any? { |i| File.fnmatch(i, f) } } + dotfiles+ Dir["selendroid-prebuild"]).sort
 
-  gem.files         = `git ls-files`.split("\n") + Dir["selendroid-prebuild"]
   gem.executables   = "selendroid"
   gem.require_paths = ["lib"]
   gem.add_dependency( "rubyzip")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selendroid
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Dominik Dary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -109,7 +109,6 @@ files:
 - README.md
 - Rakefile
 - bin/selendroid
-- bin/selendroid-shell.rb
 - irbrc
 - lib/selendroid.rb
 - lib/selendroid/commands.rb

data/bin/selendroid-shell.rb

@@ -1,17 +0,0 @@
-require 'selendroid/selendroid_driver'
-
-def selendroid_shell
-  unless ENV["SELENDROID_SERVER_PORT"]
-    ENV["SELENDROID_SERVER_PORT"] = "8080"
-  end
-  
-  unless ENV["MAIN_ACTIVITY"]
-    ENV["MAIN_ACTIVITY"] = "org.openqa.selendroid.testapp.HomeScreenActivity"
-  end
-  ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
-  
-  system "#{RbConfig.ruby} -S irb"
-end
-
-
-