ADB 0.5.5 → 0.5.6

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+.idea

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3-p194@ADB --create
+rvm 1.9.3-p392@ADB --create

data/.travis.yml

@@ -1,37 +1,34 @@
 language: java
 before_install:
-  # download the latest android sdk and unzip
-  - wget http://dl.google.com/android/android-sdk_r18-linux.tgz
-  - tar -zxf android-sdk_r18-linux.tgz
-  
-  # This is a bit of a hack to get the android-15 arm abi installed
-  - wget http://dl.google.com/android/repository/sysimg_armv7a-15_r02.zip
-  - mkdir ~/builds/joelbyler/ADB/android-sdk-linux/system-images
-  - mkdir ~/builds/joelbyler/ADB/android-sdk-linux/system-images/android-15
-  - unzip sysimg_armv7a-15_r02.zip -d ~/builds/joelbyler/ADB/android-sdk-linux/system-images/android-15
-  
-  # setup your ANDROID_HOME and PATH environment variables
-  # use ~/builds/[Github username]/[project]/android-sdk-linux
-  - export ANDROID_HOME=~/builds/joelbyler/ADB/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-  
-  # only update the sdk for the tools and platform-tools (1,2) and whatever api level
-  # you are building for android (run "android list sdk" to get the full list.  9 = 2.3.3 or API level 10
-  #- android list sdk --all
-  - android update sdk -u -f --filter 1,2
-  - android update sdk -u -f --filter android-15
-  
-  # Create an emulator for testing against
-  - echo no | android create avd -n Android_4.0.3 -t 1 --force
-  - echo "hw.ramSize=2048" >> ~/.android/avd/Android_4.0.3.i
 
-  # Need to figure out how to get the emulator to start up properly
-  #- emulator -avd Android_4.0.3 -port 5554 -no-window -no-audio -no-boot-anim &
-  #- adb wait-for-device
+    # Install base Android SDK
+    - sudo apt-get update -qq
+    - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
+    - wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
+    - tar xzf android-sdk_r21.0.1-linux.tgz
+    - export ANDROID_HOME=$PWD/android-sdk-linux
+    - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+
+    # This is a bit of a hack to get the android-15 arm abi installed
+    - wget http://dl.google.com/android/repository/sysimg_armv7a-15_r02.zip
+    - mkdir -p ${ANDROID_HOME}/system-images/android-15
+    - unzip sysimg_armv7a-15_r02.zip -d ${ANDROID_HOME}/system-images/android-15
+
+    # Update SDK
+    - android update sdk -u -f --filter 1,2    
+    - android update sdk -u -f --filter android-15
+
+    # Create an emulator for testing against
+    - echo no | android create avd -n Android_4.0.3 -t 1 --force
+    - echo "hw.ramSize=2048" >> ~/.android/avd/Android_4.0.3.i
+
+    # Need to figure out how to get the emulator to start up properly
+    - emulator -avd Android_4.0.3 -port 5554 -no-window -no-audio -no-boot-anim &
+    - sh wait_for_emulator.sh
 
 language: ruby
 rvm:
   - 1.9.3
 
-#after_script:
-  #- bundle exec rake test
+after_script:
+  - bundle exec rake test

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Release 0.5.6 / 2013-7-14
+* Enhancements
+  * Added a helper method to list packages, list_packages(switches)
+
 === Release 0.5.5 / 2012-9-18
 * Enhancements
   * Added last Stdout and Stderr to ADBError messages
@@ -5,7 +9,7 @@
 === Release 0.5.4 / 2012-9-19
 * Fixes
   * Corrected push, pull when multiple arguments used
-  
+
 === Release 0.5.3 / 2012-9-18
 * Enhancements
   * Added travis-ci config file for automated specs

data/features/ADB.feature

@@ -17,7 +17,7 @@ Feature: Using the ADB module
     Given the adb server is started
     And I am connected to the local device
     Then I should be able to install the sample application
-    
+
   Scenario: Providing command line options for installation
     Given the adb server is started
     And I am connected to the local device
@@ -32,7 +32,7 @@ Feature: Using the ADB module
     Given the adb server is started
     And I am connected to the local device
     When I change the devices date and time to 08/10/2012 11:25
-    Then the device time should be Aug 10 11:25:00 EDT 2012
+    Then the device time should be Aug 10 11:25:00
 
   Scenario: Forwarding ports
     Given the adb server is started
@@ -58,4 +58,6 @@ Feature: Using the ADB module
     Given the adb server is started
     Then I should be able to pull a file from the local device
 
-
+  Scenario: List installed packages
+    Given the adb server is started
+    Then I can list the installed packages

data/features/step_definitions/adb_steps.rb

@@ -1,6 +1,6 @@
 APK_FILE_NAME = 'features/support/ApiDemos.apk'
 TEMP_FILE_NAME = 'cuke_test_file.txt'
-TEMP_FILE_REMOTE_LOCATION = '/sdcard/'
+TEMP_FILE_REMOTE_LOCATION = '/sdcard'
 
 When /^the adb server is started$/ do
   start_server
@@ -23,6 +23,7 @@ Given /^I am connected to the local device$/ do
 end
 
 Then /^I should see the device "(.*?)"$/ do |device|
+puts devices
   devices.should include device
 end
 
@@ -80,15 +81,20 @@ 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("mount -o rw,remount #{TEMP_FILE_REMOTE_LOCATION}", {: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(TEMP_FILE_NAME, 'w'){ |f|  f.write('Temporary file for adb testing. If found, please delete.') }
 
   # push the file
-  push(TEMP_FILE_NAME, "#{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", {:serial => sn})
+  push(TEMP_FILE_NAME, "#{TEMP_FILE_REMOTE_LOCATION}/#{TEMP_FILE_NAME}", {:serial => sn})
   last_stderr.should_not include 'failed to copy'
 
 end
@@ -98,11 +104,16 @@ 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 #{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", {:serial => sn})
+  shell("touch #{TEMP_FILE_REMOTE_LOCATION}/#{TEMP_FILE_NAME}", {:serial => sn})
 
   # pull the file
-  pull "#{TEMP_FILE_REMOTE_LOCATION}#{TEMP_FILE_NAME}", #{TEMP_FILE_NAME}", {:serial => sn})
+  pull "#{TEMP_FILE_REMOTE_LOCATION}/#{TEMP_FILE_NAME}", "#{TEMP_FILE_NAME}", {:serial => sn}
 
   # confirm that the file was created
   File.exists?(TEMP_FILE_NAME).should == true
 end
+
+Then(/^I can list the installed packages$/) do
+  list_packages
+  last_stdout.should include 'com.leandog.brazenhead'
+end

data/features/support/env.rb

@@ -17,5 +17,7 @@ end
 After do
   stop_server
   sleep 1
+
+  File.delete ('cuke_test_file.txt') unless not File.exists?('cuke_test_file.txt')
 end
 

data/lib/ADB.rb

@@ -11,7 +11,7 @@ require 'date'
 module ADB
   include ADB::Instrumentation
 
-  attr_reader :last_stdout, :last_stderr  
+  attr_reader :last_stdout, :last_stderr
 
   #
   # start the server process
@@ -125,12 +125,25 @@ module ADB
     execute_adb_with(timeout, "#{which_one(target)} wait-for-device shell #{command}")
   end
 
+  #
+  # execute shell list packages command
+  #
+  # @param [String] optional switches, see adb shell list documentation
+  # @param [Hash] which device to wait for.  Valid keys are :device,
+  # :emulator, and :serial.
+  # @param timeout value for the command to complete.  Defaults to 30
+  # seconds.
+  #
+  def list_packages(switches='', target={}, timeout=30)
+    shell("pm list packages #{switches}", target, timeout)
+  end
+
   #
   # format a date for adb shell date command
   #
   # @param date to format.  Defaults current date
   #
-  def format_date_for_adb(date=Date.new) 
+  def format_date_for_adb(date=Date.new)
     date.strftime("%C%y%m%d.%H%M00")
   end
 
@@ -207,7 +220,7 @@ module ADB
   def stdout_stderr_message
     if not last_stdout.empty?
       if not last_stderr.empty?
-        return " Cause: #{last_stdout}, and Error: #{last_stderr}"    
+        return " Cause: #{last_stdout}, and Error: #{last_stderr}"
       else
         return " Cause: #{last_stdout}"
       end

data/lib/ADB/version.rb

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

data/spec/lib/ADB_spec.rb

@@ -11,7 +11,7 @@ describe ADB do
     should_call_adb_with('kill-server')
     ADB.stop_server
   end
-  
+
   it "should stop process if it takes too long" do
     ADB.should_receive(:last_stdout).and_return("device")
     process = double('process')
@@ -34,6 +34,15 @@ describe ADB do
       should_call_adb_with('wait-for-device', 'shell', 'date')
       ADB.shell('date')
     end
+
+    it "can list installed packages" do
+      should_call_adb_with('wait-for-device', 'shell', 'pm', 'list', 'packages')
+      ADB.list_packages
+    end
+    it "can list installed packages with packages" do
+      should_call_adb_with('wait-for-device', 'shell', 'pm', 'list', 'packages', '-f')
+      ADB.list_packages '-f'
+    end
   end
 
   it "should be able to build an date formatted for adb shell date command" do
@@ -67,7 +76,7 @@ describe ADB do
       should_call_adb_with('pull', '/usr/local file with spaces.txt', '/sdcard/remote file with spaces.txt')
       ADB.pull('/usr/local file with spaces.txt', '/sdcard/remote file with spaces.txt')
     end
-  
+
     it "should be able to remount the /system drive" do
       should_call_adb_with('remount')
       ADB.remount
@@ -171,7 +180,7 @@ describe ADB do
     end
 
     it "should raise an error when the install 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('wait-for-device', 'install', 'Test.apk')
       expect { ADB.install('Test.apk') }.to raise_error(ADBError)
     end
@@ -234,9 +243,9 @@ describe ADB do
     end
 
   end
-  
-  
+
+
   def should_call_adb_with(*args)
-    ChildProcess.should_receive(:build).with('adb', *args).and_return(process_mock)    
+    ChildProcess.should_receive(:build).with('adb', *args).and_return(process_mock)
   end
-end
+ end

data/wait_for_emulator.sh

@@ -0,0 +1,8 @@
+until [ "`adb devices | grep "emulator-[0-9][0-9]*[[:space:]]*device"`" ]
+do
+  echo "waiting for emulator..."
+  sleep 10
+done
+echo "emulator ready.  waiting a sec because emulators are fickle beasts..."
+sleep 45
+echo "Ready to roll"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -91,6 +91,7 @@ files:
 - spec/lib/ADB/instrumentation_spec.rb
 - spec/lib/ADB_spec.rb
 - spec/spec_helper.rb
+- wait_for_emulator.sh
 homepage: http://github.com/cheezy/ADB
 licenses: []
 post_install_message: 
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4475756240764748213
+      hash: 3749825286168687281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,10 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4475756240764748213
+      hash: 3749825286168687281
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple wrapper over Android Debug Bridge command-line tool