calabash-android 0.4.18 → 0.4.19.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c44c0e993a7a43772eeba1e688c898e44bf09c6
-  data.tar.gz: 3dfac41109392ced77865e6b0e8853c7fa90252d
+  metadata.gz: fc390e245e5b9be8eb0ae9d5a6cb6cbe0a01a44d
+  data.tar.gz: 533f881055f03da5ef544bb7fb9343715a4b7218
 SHA512:
-  metadata.gz: fc19afcc81335aa79fd2eb45cc34c58fd0a21bc298f059ce7061a453d4ddf564c3347b0321ac7573828f6977dd9a39769d2f1463e498e484f5ef60061775c69b
-  data.tar.gz: 3879719b56b1aa587f552ff601db1f36e7576d2b7105496d08b5fbf48206f739186c53037acc28c226edd928bb9dcdef402e23f9e1aa982e6126ef0d38e1b064
+  metadata.gz: a4d48a41c066bf1842e1fa31c21ca61d389700d06776882c678428381125b2d97f1833b5ddfd5939b0690d6956f0619ce6de3f4ba4468bd899b8416e940ef0cb
+  data.tar.gz: 2280fe20ead2d488704d0cd306cb03dbbf9dc596781ff6c259a3dac1bbf0fe855ddb7ab9d2fdaff0c129308cc01e4b01e2b2123d602631e8dc1526d144a1b226

data/bin/calabash-android

@@ -86,18 +86,6 @@ elsif cmd == 'console'
 elsif cmd == 'setup'
   Env.exit_if_env_not_set_up
   calabash_setup
-elsif cmd == 'extract-manifest'
-  Env.exit_if_env_not_set_up
-  if ARGV.empty?
-    puts "Please specify an app"
-    exit 1
-  end
-  unless File.exist? ARGV.first
-    puts "No such file #{ARGV.first}"
-    exit 1
-  end
-
-  puts manifest ARGV.first
 elsif cmd == 'resign'
   Env.exit_if_env_not_set_up
   unless File.exist?(File.expand_path(ARGV.first))

data/lib/calabash-android/helpers.rb

@@ -1,45 +1,29 @@
 require "stringio"
-require 'rexml/document'
-require 'rexml/xpath'
 require 'zip/zip'
 require 'tempfile'
 require 'escape'
 require 'rbconfig'
 require 'calabash-android/java_keystore'
 
-include REXML
-
 def package_name(app)
-  require 'rexml/document'
-  require 'rexml/xpath'
-
-  manifest = Document.new(manifest(app))
-  manifest.root.attributes['package']
+  package_line = aapt_dump(app, "package").first
+  raise "'package' not found in aapt output" unless package_line
+  m = package_line.match(/name='([^']+)'/)
+  raise "Unexpected output from aapt: #{package_line}" unless m
+  m[1]
 end
 
 def main_activity(app)
-  manifest = Document.new(manifest(app))
-  main_activity = manifest.elements["//action[@name='android.intent.action.MAIN']/../.."].attributes['name']
-  #Handle situation where main activity is on the form '.class_name'
-  if main_activity.start_with? "."
-    main_activity = package_name(app) + main_activity
-  elsif not main_activity.include? "." #This is undocumentet behaviour but Android seems to accept shorthand naming that does not start with '.'
-    main_activity = "#{package_name(app)}.#{main_activity}"
-  end
-  main_activity
+  launchable_activity_line = aapt_dump(app, "launchable-activity").first
+  raise "'launchable-activity' not found in aapt output" unless launchable_activity_line
+  m = launchable_activity_line.match(/name='([^']+)'/)
+  raise "Unexpected output from aapt: #{launchable_activity_line}" unless m
+  m[1]
 end
 
-def manifest(app)
-  out_path = manifest_path(app)
-  manifest_file = File.join(out_path, 'AndroidManifest.xml')
-  unless File.size?(manifest_file)
-    manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
-    output = `#{Env.java_path} -jar "#{manifest_extractor}" d -s --frame-path "#{framework_path(app)}" -f "#{app}" #{out_path} 2>&1`
-    raise "Unable to extract manifest: #{output}" unless File.size?(manifest_file)
-    # Tidy up a bit. It would be nice if apktool could just dump the manifest alone.
-    FileUtils.rm_rf(%w{res assets classes.dex}.map {|f| File.join(out_path, f) })
-  end
-  File.read(manifest_file)
+def aapt_dump(app, key)
+  lines = `#{Env.tools_dir}/aapt dump badging "#{app}"`.lines.collect(&:strip)
+  lines.select { |l| l.start_with?("#{key}:") }
 end
 
 def checksum(file_path)
@@ -51,15 +35,6 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
-def manifest_path(apk_file_path)
-  "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.res"
-end
-
-def framework_path(apk_file_path)
-  "test_servers/apktool-#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}"
-end
-
-
 def build_test_server_if_needed(app_path)
   unless File.exist?(test_server_path(app_path))
     if ARGV.include? "--no-build"

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.18"
+    VERSION = "0.4.19.pre1"
   end
 end

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTWith.java

@@ -42,7 +42,7 @@ public class UIQueryASTWith implements UIQueryAST {
 				for (int i = 0; i < inputViews.size(); i++) {
 					Object o = inputViews.get(i);
 
-					if (o instanceof WebView) {
+					if (o instanceof WebView && isDomQuery()) {
 						Future webResult = evaluateForWebView((WebView) o);
 						if (webResult != null) {
 							futureResult.add(webResult);
@@ -90,8 +90,13 @@ public class UIQueryASTWith implements UIQueryAST {
 
 	}
 
-	
-	@SuppressWarnings("rawtypes")
+    private boolean isDomQuery() {
+        System.out.println("isDomQuery: " + propertyName);
+        return propertyName.equalsIgnoreCase("css") || propertyName.equalsIgnoreCase("xpath");
+    }
+
+
+    @SuppressWarnings("rawtypes")
 	private Map evaluateForMap(Map map) {		
 		if (map.containsKey(this.propertyName)) {											
 			Object value = map.get(this.propertyName);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -177,7 +177,6 @@ files:
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
-- lib/calabash-android/lib/apktool-cli-1.5.3-SNAPSHOT.jar
 - lib/calabash-android/lib/manifest_extractor.jar
 - lib/calabash-android/lib/screenshotTaker.jar
 - lib/calabash-android/management/adb.rb
@@ -890,9 +889,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.10