ADB 0.2 → 0.3

data/ADB.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/ADB/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Jeffrey S. Morgan"]
-  gem.email         = ["jeff.morgan@leandog.com"]
+  gem.authors       = ["Jeffrey S. Morgan", "Joel Byler"]
+  gem.email         = ["jeff.morgan@leandog.com", "joelbyler@gmail.com"]
   gem.description   = %q{Simple wrapper over Android Debug Bridge command-line tool}
   gem.summary       = %q{Simple wrapper over Android Debug Bridge command-line tool}
   gem.homepage      = "http://github.com/cheezy/ADB"

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Release 0.3 / 2012-8-22
+* Enhancements
+  * Added remount method (mounts /system as root)
+  * Added push method to push files to a device
+  * Added pull method to pull files from a device
+  * Added root method
+
 === Release 0.2 / 2012-8-18
 * Enhancements
   * Added forward method

data/features/ADB.feature

@@ -33,3 +33,24 @@ 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 forward "tcp:7777" to "tcp:5555"
+
+  Scenario: Remount the system partition for read-write access
+    Given the adb server is started
+    And I am connected to the local device
+    Then I can remount the system partition
+
+  Scenario: Restart adb in root mode
+    Given the adb server is started
+    And I am connected to the local device
+    Then I can attain root privileges
+
+  Scenario: Push a file
+    Given the adb server is started
+    And I am connected to the local device
+    Then I should be able to push a file to the local device
+
+  Scenario: Pull a file
+    Given the adb server is started
+    Then I should be able to pull a file from the local device
+
+

data/features/step_definitions/adb_steps.rb

@@ -7,6 +7,8 @@ Then /^the adb server should be running$/ do
 end
 
 Then /^I should be able to connect to a local device$/ do
+  sn = devices[0]
+  wait_for_device({:serial => sn}, 60)
   connect('localhost')
   last_stdout.should include "connected to localhost"
   disconnect('localhost')
@@ -39,7 +41,7 @@ When /^I change the devices date and time to (.*?)$/ do |date_arg|
   shell("date -s #{format_date_for_adb(date)}", {:serial => sn}, 60)
 end
 
-Then /^the device time should be Aug (.*?)$/ do |date_str|
+Then /^the device time should be (.*?)$/ do |date_str|
   last_stdout.should include date_str
 end
 
@@ -47,3 +49,49 @@ Then /^I should be able to forward "(.*?)" to "(.*?)"$/ do |source, target|
   sn = devices[0]
   forward(source, target, {:serial => sn})
 end
+
+Then /^I can remount the system partition$/ do
+  sn = devices[0]
+  wait_for_device({:serial => sn}, 60)
+  remount({:serial => sn})
+  last_stdout.should include 'remount succeeded'
+end
+
+Then /^I can attain root privileges$/ do
+  sn = devices[0]
+  wait_for_device({:serial => sn}, 60)
+  root({:serial => sn})
+  #TODO: how to assert?
+  #last_stdout.should include 'remount succeeded'
+end
+
+Then /^I should be able to push a file to the local device$/ do
+  # confirm that the file doesn't already exist
+  sn = devices[0]
+  wait_for_device({:serial => sn}, 60)
+  remount({:serial => sn})
+  shell('ls /system/cuke_test_file.txt', {: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.') }
+
+  # push the file
+  push('cuke_test_file.txt', '/system/cuke_test_file.txt', {:serial => sn})
+  last_stderr.should_not include 'failed to copy'
+
+end
+
+Then /^I should be able to pull a file from the local device$/ do
+  # confirm that the file exists on the device and not locally
+  sn = devices[0]
+  wait_for_device({:serial => sn}, 60)
+  remount({:serial => sn})
+  shell("touch /system/cuke_test_file.txt", {:serial => sn})
+
+  # pull the file
+  pull('/system/cuke_test_file.txt', 'cuke_test_file.txt', {:serial => sn})
+
+  # confirm that the file was created
+  File.exists?('cuke_test_file.txt').should == true
+end

data/features/support/env.rb

@@ -6,7 +6,7 @@ require 'ADB'
 
 World(ADB)
 
-emulator = ChildProcess.build('emulator', '-avd', 'Android_4.0.3')
+emulator = ChildProcess.build('emulator', '-avd', 'Android_4.0.3', '-port', '5554')
 emulator.start
 
 at_exit do

data/lib/ADB.rb

@@ -146,6 +146,58 @@ module ADB
     execute_adb_with(timeout, "#{which_one(target)} forward #{source} #{destination}")
   end
 
+  #
+  # push a file
+  #
+  # @param the fully quanified source (local) file name
+  # @param the fully quanified destination (device) file name
+  # @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 push(source, destination, target={}, timeout=30)
+    execute_adb_with(timeout, "#{which_one(target)} push #{source} #{destination}")
+  end
+
+  #
+  # push a file
+  #
+  # @param the fully quanified source (device) file name
+  # @param the fully quanified destination (local) file name
+  # @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 pull(source, destination, target={}, timeout=30)
+    execute_adb_with(timeout, "#{which_one(target)} pull #{source} #{destination}")
+  end
+
+  #
+  # remount /system as read-write
+  #
+  # @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 remount(target={}, timeout=30)
+    execute_adb_with(timeout, "#{which_one(target)} remount")
+  end
+
+  #
+  # restarts the adb daemon with root permissions
+  #
+  # @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 root(target={}, timeout=30)
+    execute_adb_with(timeout, "#{which_one(target)} root")
+  end
+
   private
 
   def execute_adb_with(timeout, arguments)

data/lib/ADB/version.rb

@@ -1,3 +1,3 @@
 module ADB
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/spec/lib/ADB_spec.rb

@@ -45,7 +45,27 @@ describe ADB do
     should_call_adb_with('forward', 'src', 'dest')
     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
+
+  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 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
+  end
+
   context "when connecting to a device" do
     before(:each) do
       ADB.should_receive(:last_stdout).and_return("connected to localhost")

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
 - Jeffrey S. Morgan
+- Joel Byler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -62,6 +63,7 @@ dependencies:
 description: Simple wrapper over Android Debug Bridge command-line tool
 email:
 - jeff.morgan@leandog.com
+- joelbyler@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -98,18 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1607274235838869715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1607274235838869715
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24