selendroid 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4135ff97c70ae62d000fd1a3e78c163e4ceb3625
-  data.tar.gz: de1ce02cdb9a22ce5ee5d54726493dc9d13da773
+  metadata.gz: dcfead51e966b8a67a0ddf17b987739cae0ea3dc
+  data.tar.gz: e5ae1d7a18516794ae627bc31a39c5527652d112
 SHA512:
-  metadata.gz: 480e7af69bc1e7c9933d7ce9df1c2c994c296fcfe728bd9e60ff26d1e599a5bf3cfbbb2c8c2d931e8129ea4a0638e5922dc32e1a8a7bf975be9616243f51e37c
-  data.tar.gz: f0fae2a104d395c77d1fdf023948028cafbb1b3968417d6a54619d002c06c94bd0701d492b5ae4814ebe0f9f15e1b3d094d9da6596e820d449ba4d2541cb9335
+  metadata.gz: df3256fcae516f7f537d49d8cfe4b17740721366a6b9273c5fcd68fb9d81263d271142191602b6e86405bef3e3b24dd3132eb62a88fa8310f3d1ddb5710e07ec
+  data.tar.gz: 2f4e7435fa2ba5a361b32f52596101797ef5849e7649ce0d923a2b01d3ba0efe136e302e478e5d760cd9239f7a8bdf03520d93b96ae52fe18e3f9712598421e8

data/README.md

@@ -1,52 +1,15 @@
 Selendroid
 ==========
 
-[![Build Status](https://api.travis-ci.org/DominikDary/selendroid.png)](https://travis-ci.org/DominikDary/selendroid)
+Selendroid is a test automation framework which drives of the UI of Android native and hybrid applications (apps). 
+Tests are written using the Selenium 2 client API and for testing the application under test must not be modified. 
 
-Selendroid is a test automation framework which drives of the UI of Android native and hybrid applications (apps). Tests are written using the Selenium 2 client API and for testing the application under test must not be modified. 
+Selendroid can be used on emulators and real devices and can be integrated as a node into the Selenium Grid 
+for scaling and parallel testing. 
 
-Selendroid can be used on emulators and real devices and can be integrated as a node into the Selenium Grid for scaling and parallel testing. 
-
-
-Latest News:
-------------
-
-* Selendroid Version 0.3 is released ([List of Features](https://github.com/DominikDary/selendroid/blob/master/changelog.md))
-
-Getting started
----------------
-
-Selendroid is based on the Android instrumentation framework, so therefor only testing one specific app is supported.
-Selendroid-server in combination with the application under test (aut) must be installed on the device in order to be able to run automated end-to-end tests.
-
-To write and run tests with selendroid, first a customized selendroid-server for your aut must be created. To simplify this process I have created a Ruby gem:
-		
-		# Please note that ruby minimum version 1.9.2 is required
-		sudo gem install selendroid
-		selendroid build-and-start pathToYour.apk
-		
-Run your tests
---------------
-
-A sample test looks like:
-
-```java
-		driver = new AndroidDriver(new URL("http://localhost:8080/wd/hub"), getDefaultCapabilities());
-		driver.findElement(By.id("startUserRegistration")).click();
-		
-		WebDriverWait wait = new WebDriverWait(driver, 5);
-		WebElement inputUsername =
-         	wait.until(ExpectedConditions.presenceOfElementLocated(By.id("inputUsername")));
-		inputUsername.sendKeys(user.getUsername());
-		Assert.assertEquals(nameInput.getText(), "Mr. Burns");
-		nameInput.clear();
-		nameInput.sendKeys(user.getName());
-		takeScreenShot("User data entered.");
-		driver.findElement(By.id("btnRegisterUser")).click();
-```
 
 You want more details?
 ----------------------
 
-Check out our [wiki](https://github.com/DominikDary/selendroid/wiki/).
+Check out our [documentation](http://selendroid.io).
 

data/bin/selendroid

@@ -18,23 +18,13 @@ def print_comamndline_help
   <command-name> can be one of
     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  <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
       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 documentation: 
+    http://selendroid.io    
 EOF
 end
 
@@ -75,32 +65,16 @@ elsif cmd == 'shell'
 
   exit 0  
 elsif cmd == 'build'
-  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
+  puts "This command name is not any longer supported. Please use the selendroid-standalone.jar. 
+  More details can be found here: http://selendroid.io/setup.html"
   exit 0
 elsif cmd=='build-and-start'
-  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)
-    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
+  puts "This command name is not any longer supported. Please use the selendroid-standalone.jar. 
+  More details can be found here: http://selendroid.io/setup.html"
   exit 0
 elsif cmd=='start'  
-  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)
-    main_activity = get_app_main_activity(app_apk_under_test)
-    start_selendroid_server(main_activity)
-    wait_for_selendroid_server
-  end
+  puts "This command name is not any longer supported. Please use the selendroid-standalone.jar. 
+  More details can be found here: http://selendroid.io/setup.html"
   exit 0
 elsif cmd == 'version'
   puts Selendroid::VERSION

data/lib/selendroid/commands.rb

@@ -37,18 +37,3 @@ def java_command
   end
 end
 
-def jarsigner_command
-  if is_windows?
-    "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
-  else
-    "\"#{ENV["JAVA_HOME"]}/bin/jarsigner\""
-  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

@@ -4,46 +4,6 @@ require 'zip/zip'
 require 'tempfile'
 require 'colorize'
 
-def rebuild_selendroid(app)
-    aut_base_package = get_app_base_package(app)
-    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)
-
-    unsigned_test_apk = File.join(File.dirname(__FILE__), '..','..', 'selendroid-prebuild/selendroid-server.apk')
-    android_platform = Dir["#{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/android-*"].last
-    raise "No Android SDK found in #{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/" unless android_platform
-    Dir.mktmpdir do |workspace_dir|
-      Dir.chdir(workspace_dir) do
-        FileUtils.cp(unsigned_test_apk, "TestServer.apk")
-        FileUtils.cp(File.join(File.dirname(__FILE__), '..','..', 'selendroid-prebuild/AndroidManifest.xml'), "AndroidManifest.xml")
-
-        unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/org.openqa.selendroid.testapp/, '#{aut_base_package}')" AndroidManifest.xml}
-          raise "Could not replace package name in manifest"
-        end
-
-        unless system %Q{#{aapt_command} package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
-          raise "Could not create dummy.apk"
-        end
-
-        Zip::ZipFile.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
-        Zip::ZipFile.open("TestServer.apk") do |zip_file|
-          zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
-        end
-      end
-      sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
-      begin
-
-      rescue Exception => e
-        puts e
-        raise "Could not sign test server"
-      end
-    end
-    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)
   default_cmd = "#{aapt_command} dump badging #{app} "
   windows_cmd = "#{default_cmd} | findSTR package "
@@ -102,55 +62,6 @@ def get_first_android_device
   device.tr("\n","")
 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 !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 #{Dir.home}/.android/debug.keystore #{app_path} androiddebugkey"
-  unless system(cmd)
-    raise "Could not sign app (#{app_path}"
-  end
-end
-
-def selendroid_server_path(base_package)
-  "selendroid-server-#{Selendroid::VERSION}.apk"
-end
+end

data/lib/selendroid/selendroid_driver.rb

@@ -77,7 +77,7 @@ 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/.ServerInstrumentation"
+  selendroid_server_start_cmd = "#{adb_command} shell am instrument -e main_activity '#{main_activity}' io.selendroid/.ServerInstrumentation"
   system(selendroid_server_start_cmd)
   unless ENV["SELENDROID_SERVER_PORT"]
     ENV["SELENDROID_SERVER_PORT"] = "8080"
@@ -90,6 +90,7 @@ def wait_for_selendroid_server
   unless ENV["SELENDROID_SERVER_PORT"]
     ENV["SELENDROID_SERVER_PORT"] = "8080"
   end
+
   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.3.2"
+  VERSION = "0.4.0"
 end

data/selendroid.gemspec

@@ -8,17 +8,16 @@ Gem::Specification.new do |gem|
   gem.version       = Selendroid::VERSION
   gem.authors       = ["Dominik Dary"]
   gem.email         = ["ddary@acm.org"]
-  gem.homepage      = "http://dominikdary.github.com/selendroid/"
+  gem.homepage      = "http://selendroid.io"
   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.}
+  gem.summary       = %q{Shell utility for selendroid.}
   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 = (Dir["**/*"].reject { |f| File.directory?(f) || ignores.any? { |i| File.fnmatch(i, f) } } + dotfiles).sort
 
   gem.required_ruby_version = '>= 1.9.2'
   gem.executables   = "selendroid"
   gem.require_paths = ["lib"]
-  gem.add_dependency( "rubyzip")
   gem.add_dependency( "colorize")
   gem.add_dependency( "retriable")
   gem.add_dependency( "awesome_print")

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: selendroid
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dominik Dary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  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: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -115,12 +101,8 @@ files:
 - 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
-homepage: http://dominikdary.github.com/selendroid/
+homepage: http://selendroid.io
 licenses: []
 metadata: {}
 post_install_message: 
@@ -142,5 +124,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Utility so simplify usage of the selendroid-server.
+summary: Shell utility for selendroid.
 test_files: []

data/lib/troido/README.md

@@ -1,6 +0,0 @@
-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-prebuild/AndroidManifest.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openqa.selendroid"
-    android:versionCode="1"
-    android:versionName="0.3.1" >
-
-    <uses-sdk android:minSdkVersion="10" />
-
-    <instrumentation
-        android:name="org.openqa.selendroid.ServerInstrumentation"
-        android:targetPackage="org.openqa.selendroid.testapp" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application android:label="Selendroid" >
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-</manifest>