selendroid 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a178515f8a0b337abc1ada74ee5c04b18232e56
-  data.tar.gz: 1a88adb3e9d0ee5e1d7861e2a81dc8c26c2a7834
+  metadata.gz: 4135ff97c70ae62d000fd1a3e78c163e4ceb3625
+  data.tar.gz: de1ce02cdb9a22ce5ee5d54726493dc9d13da773
 SHA512:
-  metadata.gz: 53b327d43786b76d317ae8db31e58cf10e5511d071fbb830271ae4de7cf38a2010d251dc97387622051ada77867befac190bca15409c39fa491b8ae81377b4fe
-  data.tar.gz: 175be5db62cec6accf2402101e19d9d505dd91ef52541de3c2cf16465862778f47f5d76089556dddb2001fe578d3888f8c431630504de7ed87700792ca569ee4
+  metadata.gz: 480e7af69bc1e7c9933d7ce9df1c2c994c296fcfe728bd9e60ff26d1e599a5bf3cfbbb2c8c2d931e8129ea4a0638e5922dc32e1a8a7bf975be9616243f51e37c
+  data.tar.gz: f0fae2a104d395c77d1fdf023948028cafbb1b3968417d6a54619d002c06c94bd0701d492b5ae4814ebe0f9f15e1b3d094d9da6596e820d449ba4d2541cb9335

data/lib/selendroid/commands.rb

@@ -15,10 +15,17 @@ def is_windows?
 end
 
 def aapt_command
+  aapt_base_path = "\"#{ENV["ANDROID_HOME"]}/platform-tools\""
+  current_path=nil
+  if File.exist? File.dirname(aapt_base_path)
+    current_path=aapt_base_path
+  else
+    current_path="\"#{ENV["ANDROID_HOME"]}/build-tools/17.0.0\""
+  end    
   if is_windows?
-     "\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt.exe\""
+    return "\"#{current_path}/aapt.exe\""
   else
-    "\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt\""
+    return "\"#{current_path}/aapt\""
   end
 end
 

data/lib/selendroid/selendroid_builder.rb

@@ -23,7 +23,7 @@ def rebuild_selendroid(app)
           raise "Could not replace package name in manifest"
         end
 
-        unless system %Q{"#{ENV["ANDROID_HOME"]}/platform-tools/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
+        unless system %Q{#{aapt_command} package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
           raise "Could not create dummy.apk"
         end
 

data/lib/selendroid/version.rb

@@ -1,3 +1,3 @@
 module Selendroid
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selendroid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dominik Dary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip