ADB 0.5.2 → 0.5.3

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Release 0.5.3 / 2012-9-18
+* Enhancements
+  * Added travis-ci config file for automated specs
+* Fixes
+  * Corrected push, pull when path has space
+
 === Release 0.5.2 / 2012-9-18
 * Fixes
   * Corrected install when path has space

data/features/step_definitions/adb_steps.rb

@@ -72,10 +72,11 @@ Then /^I can attain root privileges$/ do
 end
 
 Then /^I should be able to push a file to the local device$/ do
-  # confirm that the file doesn't already exist
+  # be sure that the file doesn't already exist
   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})
   last_stdout.should include 'No such file or directory'
 

data/features/support/.travis.yml

@@ -0,0 +1,37 @@
+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
+
+language: ruby
+rvm:
+  - 1.9.3
+
+#after_script:
+  #- bundle exec rake test

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
@@ -159,11 +159,11 @@ module ADB
   # seconds.
   #
   def push(source, destination, target={}, timeout=30)
-    execute_adb_with(timeout, "#{which_one(target)} push #{source} #{destination}")
+    execute_adb_with_exactly(timeout, "#{which_one(target)} push", source, destination)
   end
 
   #
-  # push a file
+  # pull a file
   #
   # @param the fully quanified source (device) file name
   # @param the fully quanified destination (local) file name
@@ -173,7 +173,7 @@ module ADB
   # seconds.
   #
   def pull(source, destination, target={}, timeout=30)
-    execute_adb_with(timeout, "#{which_one(target)} pull #{source} #{destination}")
+    execute_adb_with_exactly(timeout, "#{which_one(target)} pull", source, destination)
   end
 
   #

data/lib/ADB/version.rb

@@ -1,3 +1,3 @@
 module ADB
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/lib/ADB_spec.rb

@@ -46,24 +46,37 @@ describe ADB do
     ADB.forward('src', 'dest')
   end
 
-  it "should push a file" do
-    should_call_adb_with('push', '/usr/foo.txt', '/sdcard/bar.txt')
-    ADB.push('/usr/foo.txt', '/sdcard/bar.txt')
-  end
+  context "when transferring files" do
 
-  it "should pull a file" do
-    should_call_adb_with('pull', '/usr/foo.txt', '/sdcard/bar.txt')
-    ADB.pull('/usr/foo.txt', '/sdcard/bar.txt')
-  end
+    it "should be able to push a file" do
+      should_call_adb_with(' push', '/usr/foo.txt', '/sdcard/bar.txt')
+      ADB.push('/usr/foo.txt', '/sdcard/bar.txt')
+    end
+
+    it "should be able to push a file with spaces in the name" do
+      should_call_adb_with(' push', '/usr/local file with spaces.txt', '/sdcard/remote file with spaces.txt')
+      ADB.push('/usr/local file with spaces.txt', '/sdcard/remote file with spaces.txt')
+    end
+
+    it "should be able to pull a file" do
+      should_call_adb_with(' pull', '/usr/foo.txt', '/sdcard/bar.txt')
+      ADB.pull('/usr/foo.txt', '/sdcard/bar.txt')
+    end
+
+    it "should be able to pull a file with spaces in the name" 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
-  end
+    it "should be able to remount the /system drive" do
+      should_call_adb_with('remount')
+      ADB.remount
+    end
 
-  it "should be able to provide root access" do
-    should_call_adb_with('root')
-    ADB.root
+    it "should be able to provide root access" do
+      should_call_adb_with('root')
+      ADB.root
+    end
   end
 
   context "when connecting to a device" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -81,6 +81,7 @@ files:
 - cucumber.yml
 - features/ADB.feature
 - features/step_definitions/adb_steps.rb
+- features/support/.travis.yml
 - features/support/ApiDemos.apk
 - features/support/env.rb
 - lib/ADB.rb
@@ -104,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4396733677998798054
+      hash: 2790238866883201100
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4396733677998798054
+      hash: 2790238866883201100
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -123,6 +124,7 @@ summary: Simple wrapper over Android Debug Bridge command-line tool
 test_files:
 - features/ADB.feature
 - features/step_definitions/adb_steps.rb
+- features/support/.travis.yml
 - features/support/ApiDemos.apk
 - features/support/env.rb
 - spec/lib/ADB/instrumentation_spec.rb