ADB 0.5.4 → 0.5.5

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Release 0.5.5 / 2012-9-18
+* Enhancements
+  * Added last Stdout and Stderr to ADBError messages
+
 === Release 0.5.4 / 2012-9-19
 * Fixes
   * Corrected push, pull when multiple arguments used

data/features/step_definitions/adb_steps.rb

@@ -1,3 +1,7 @@
+APK_FILE_NAME = 'features/support/ApiDemos.apk'
+TEMP_FILE_NAME = 'cuke_test_file.txt'
+TEMP_FILE_REMOTE_LOCATION = '/sdcard/'
+
 When /^the adb server is started$/ do
   start_server
 end
@@ -25,14 +29,14 @@ end
 Then /^I should be able to install the sample application$/ do
   sn = devices[0]
   wait_for_device({:serial => sn}, 60)
-  install 'features/support/ApiDemos.apk', nil, {:serial => sn}, 60
+  install APK_FILE_NAME, nil, {:serial => sn}, 60
   last_stdout.should include 'Success'
 end
 
 Then /^I should be able to install the sample application using the "(.*?)" option$/ do |option|
   sn = devices[0]
   wait_for_device({:serial => sn}, 60)
-  install 'features/support/ApiDemos.apk', option, {:serial => sn}, 60
+  install APK_FILE_NAME, option, {:serial => sn}, 60
 end
 
 Then /^I should be able to uninstall the sample application$/ do
@@ -76,15 +80,15 @@ Then /^I should be able to push a file to the local device$/ do
   sn = devices[0]
   wait_for_device({:serial => sn}, 60)
   remount({:serial => sn})
-  shell('rm /system/cuke_test_file.txt', {:serial => sn})
-  shell('ls /system/cuke_test_file.txt', {:serial => sn})
+  shell("rm #{TEMP_FILE_NAME}", {:serial => sn})
+  shell("ls #{TEMP_FILE_NAME}", {:serial => sn})
   last_stdout.should include 'No such file or directory'
 
   # create the temp file
-  File.open('cuke_test_file.txt', 'w'){ |f|  f.write('Temporary file for adb testing. If found, please delete.') }
+  File.open(TEMP_FILE_NAME, 'w'){ |f|  f.write('Temporary file for adb testing. If found, please delete.') }
 
   # push the file
-  push('cuke_test_file.txt', '/system/cuke_test_file.txt', {:serial => sn})
+  push(TEMP_FILE_NAME, "#{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", {:serial => sn})
   last_stderr.should_not include 'failed to copy'
 
 end
@@ -94,11 +98,11 @@ Then /^I should be able to pull a file from the local device$/ do
   sn = devices[0]
   wait_for_device({:serial => sn}, 60)
   remount({:serial => sn})
-  shell("touch /system/cuke_test_file.txt", {:serial => sn})
+  shell("touch #{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", {:serial => sn})
 
   # pull the file
-  pull('/system/cuke_test_file.txt', 'cuke_test_file.txt', {:serial => sn})
+  pull "#{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", #{TEMP_FILE_NAME}", {:serial => sn})
 
   # confirm that the file was created
-  File.exists?('cuke_test_file.txt').should == true
+  File.exists?(TEMP_FILE_NAME).should == true
 end

data/lib/ADB.rb

@@ -21,7 +21,7 @@ module ADB
   #
   def start_server(timeout=30)
     execute_adb_with(timeout, 'start-server')
-    raise ADBError, "Server didn't start" unless stdout_contains "daemon started successfully"
+    raise ADBError, "Server didn't start#{stdout_stderr_message}" unless stdout_contains "daemon started successfully"
   end
 
   #
@@ -44,7 +44,7 @@ module ADB
   #
   def connect(hostname='localhost', port='5555', timeout=30)
     execute_adb_with(timeout, "connect #{hostname}:#{port}")
-    raise ADBError, "Could not connect to device at #{hostname}:#{port}" unless stdout_contains "connected to #{hostname}"
+    raise ADBError, "Could not connect to device at #{hostname}:#{port}#{stdout_stderr_message}" unless stdout_contains "connected to #{hostname}"
   end
 
   #
@@ -95,7 +95,7 @@ module ADB
   #
   def install(installable, options=nil, target={}, timeout=30)
     execute_adb_with_exactly(timeout, *"#{which_one(target)} wait-for-device install #{options}".split, installable)
-    raise ADBError, "Could not install #{installable}" unless stdout_contains "Success"
+    raise ADBError, "Could not install #{installable}#{stdout_stderr_message}" unless stdout_contains "Success"
   end
 
   #
@@ -109,7 +109,7 @@ module ADB
   #
   def uninstall(package, target={}, timeout=30)
     execute_adb_with(timeout, "#{which_one(target)} uninstall #{package}")
-    raise ADBError, "Could not uninstall #{package}" unless stdout_contains "Success"
+    raise ADBError, "Could not uninstall #{package}#{stdout_stderr_message}" unless stdout_contains "Success"
   end
 
   #
@@ -204,6 +204,19 @@ module ADB
 
   private
 
+  def stdout_stderr_message
+    if not last_stdout.empty?
+      if not last_stderr.empty?
+        return " Cause: #{last_stdout}, and Error: #{last_stderr}"    
+      else
+        return " Cause: #{last_stdout}"
+      end
+    elsif not last_stderr.empty?
+        return " Error: #{last_stderr}"
+    end
+    ''
+  end
+
   def execute_adb_with(timeout, arguments)
     args = arguments.split
     execute_adb_with_exactly timeout, *args

data/lib/ADB/version.rb

@@ -1,3 +1,3 @@
 module ADB
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/lib/ADB_spec.rb

@@ -209,10 +209,30 @@ describe ADB do
     end
 
     it "should raise an error when the uninstall fails" do
-      ADB.should_receive(:last_stdout).and_return('some error')
+      ADB.should_receive(:last_stdout).any_number_of_times.and_return('some error')
       should_call_adb_with('uninstall', 'com.example')
       expect { ADB.uninstall('com.example') }.to raise_error(ADBError)
     end
+
+    it "should raise an error when the uninstall fails" do
+      ADB.should_receive(:last_stdout).any_number_of_times.and_return('some stdout message')
+      should_call_adb_with('uninstall', 'com.example')
+      expect { ADB.uninstall('com.example') }.to raise_error(ADBError, "Could not uninstall com.example Cause: some stdout message")
+    end
+
+    it "should raise an error when the uninstall fails" do
+      ADB.should_receive(:last_stderr).any_number_of_times.and_return('some stderr message')
+      should_call_adb_with('uninstall', 'com.example')
+      expect { ADB.uninstall('com.example') }.to raise_error(ADBError, "Could not uninstall com.example Error: some stderr message")
+    end
+
+    it "should raise an error when the uninstall fails" do
+      ADB.should_receive(:last_stdout).any_number_of_times.and_return('some stdout message')
+      ADB.should_receive(:last_stderr).any_number_of_times.and_return('some stderr message')
+      should_call_adb_with('uninstall', 'com.example')
+      expect { ADB.uninstall('com.example') }.to raise_error(ADBError, "Could not uninstall com.example Cause: some stdout message, and Error: some stderr message")
+    end
+
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1465908384621988337
+      hash: 4475756240764748213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1465908384621988337
+      hash: 4475756240764748213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24