calabash-android 0.5.12 → 0.5.13.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc65c44acedefae1c3508534d4557a6f4c698b60
-  data.tar.gz: 49b3a48544b620c419347d65b37ddb02d37e883e
+  metadata.gz: a936fb7416c4c7acf1153a1cd062497a3f41a1f7
+  data.tar.gz: 87cc65e9872e1d93f0bf81f6e2e247501188a1fb
 SHA512:
-  metadata.gz: 8e7cfba443489fa1b13a15428931a392919508d80446c32d33ef4ce8d4b5ad4140e69c3413c5b0278aaf33b8f6c95f7dc1eb5e1b56bdda5a1a0cd3f39bc2569f
-  data.tar.gz: 32351fd93d35d8566885152c456ab6c56d3f987a5306a221b96e9baf18be744d19bd4f668360dd5de267e6b530bb9c0f49f76164c7330a4778e6e125ee0c009d
+  metadata.gz: fe170f2d0ca20077d696c5022d7a2e8300f6a1adf250381022dfa929397a7bba8d1c2d23056ac9b3966711446aa2eb41bd8de785b06ea927ff0a9545a664bd92
+  data.tar.gz: b632ce1f4b29e0e376136957ab85f9d058e1cdeabb2716d0a3aa177f84b1515a902bdc79b4237b8a9ee2a86734520cd85ea34f83cabba1fa801cf4f87b7a67c2

data/lib/calabash-android/helpers.rb

@@ -115,7 +115,25 @@ def resign_apk(app_path)
 end
 
 def unsign_apk(path)
-  files_to_remove = `"#{Env.tools_dir}/aapt" list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+  meta_files = `"#{Env.tools_dir}/aapt" list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+
+  signing_file_names = ['.mf', '.rsa', '.dsa', '.ec', '.sf']
+
+  files_to_remove = meta_files.select do |file|
+    # other will be:
+    # META-INF/foo/bar
+    #  other #=> bar
+    directory, file_name, other = file.split('/')
+
+    if other != nil || file_name.nil?
+      false
+    else
+      if signing_file_names.include?(File.extname(file_name).downcase)
+        true
+      end
+    end
+  end
+
   if files_to_remove.empty?
     log "App wasn't signed. Will not try to unsign it."
   else

data/lib/calabash-android/touch_helpers.rb

@@ -9,6 +9,8 @@ module Calabash
         if result['outcome'] != 'SUCCESS'
           raise "Failed to perform gesture. #{result['reason']}"
         end
+
+        nil
       end
 
       def tap(mark, *args)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.12"
+    VERSION = "0.5.13.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -15,10 +15,27 @@
               android:stateNotNeeded="true"
               android:noHistory="false"
               android:excludeFromRecents="true"/>
+        <activity
+            android:name="sh.calaba.instrumentationbackend.StatusReporterActivity"
+            android:label="StatusReporterActivity"
+            android:exported="true"
+            android:finishOnTaskLaunch="true"
+            android:stateNotNeeded="true"
+            android:noHistory="true"
+            android:excludeFromRecents="true"/>
+        <activity
+            android:name="sh.calaba.instrumentationbackend.ResumeTaskActivity"
+            android:label="ResumeTaskActivity"
+            android:exported="true"
+            android:finishOnTaskLaunch="true"
+            android:stateNotNeeded="true"
+            android:noHistory="true"
+            android:excludeFromRecents="true"/>
     </application>
     <uses-sdk android:minSdkVersion="4" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData2" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearPreferences" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.SetPreferences" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.GetPreferences" />
@@ -28,5 +45,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
 
 </manifest>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -265,9 +265,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.0.2