ADB 0.3 → 0.4

data/ChangeLog

@@ -1,3 +1,12 @@
+=== Release 0.4 / 2012-9-8
+* Enhancements
+  * Added ability to pass options to the install command
+
+=== Release 0.3 / 2012-8-22
+* Bug Fixes
+  * DateTime adjustment bug on Linux
+  * Add wait-for-device for install on Linux
+
 === Release 0.3 / 2012-8-22
 * Enhancements
   * Added remount method (mounts /system as root)

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 gem 'fuubar'
+gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
 gem 'growl'
 gem 'guard-rspec'
 gem 'guard-cucumber'

data/Guardfile

@@ -7,7 +7,7 @@ guard 'rspec', :version => 2, :cli => '--color --format Fuubar' do
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
-guard 'cucumber', :notification => true, :all_after_pass => false, :cli => '--profile default' do
+guard 'cucumber', :notification => true, :all_after_pass => false, :cli => '--profile focus' do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/cucumber.yml

@@ -1 +1,2 @@
 default:  --no-source --color --format pretty
+focus:  --no-source --color --format pretty --tags @focus

data/features/ADB.feature

@@ -17,6 +17,11 @@ 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
+    Then I should be able to install the sample application using the "-r" option
 
   Scenario: Uninstalling the application
     Given the adb server is started

data/features/step_definitions/adb_steps.rb

@@ -25,10 +25,16 @@ 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', {:serial => sn}, 60
+  install 'features/support/ApiDemos.apk', 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
+end
+
 Then /^I should be able to uninstall the sample application$/ do
   sn = devices[0]
   uninstall 'com.example.android.apis', {:serial => sn}

data/features/support/env.rb

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

data/lib/ADB.rb

@@ -2,7 +2,7 @@ require 'ADB/version'
 require 'ADB/errors'
 require 'childprocess'
 require 'tempfile'
-
+require 'date'
 #
 # Mixin that provides access to the commands of the adb executable
 # which is a part of the android toolset.
@@ -91,8 +91,8 @@ module ADB
   # @param timeout value for the command to complete.  Defaults to 30
   # seconds.
   #
-  def install(installable, target={}, timeout=30)
-    execute_adb_with(timeout, "#{which_one(target)} install #{installable}")
+  def install(installable, options=nil, target={}, timeout=30)
+    execute_adb_with(timeout, "#{which_one(target)} wait-for-device install #{options} #{installable}")
     raise ADBError, "Could not install #{installable}" unless stdout_contains "Success"
   end
 

data/lib/ADB/version.rb

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

data/spec/lib/ADB_spec.rb

@@ -129,33 +129,39 @@ describe ADB do
   context "when installing an apk" do
     it "should be able to install an application" do
       ADB.should_receive(:last_stdout).and_return("Success")
-      should_call_adb_with('install', 'Test.apk')
+      should_call_adb_with('wait-for-device', 'install', 'Test.apk')
       ADB.install 'Test.apk'
     end
 
     it "should install to the only connected device" do
       ADB.should_receive(:last_stdout).and_return("Success")
-      should_call_adb_with('-d', 'install', 'Test.apk')
-      ADB.install 'Test.apk', :device => 'blah'
+      should_call_adb_with('-d', 'wait-for-device', 'install', 'Test.apk')
+      ADB.install 'Test.apk', nil, :device => 'blah'
     end
 
     it "should install to the only emulator" do
       ADB.should_receive(:last_stdout).and_return("Success")
-      should_call_adb_with('-e', 'install', 'Test.apk')
-      ADB.install 'Test.apk', :emulator => 'blah'
+      should_call_adb_with('-e', 'wait-for-device', 'install', 'Test.apk')
+      ADB.install 'Test.apk', nil, :emulator => 'blah'
     end
 
     it "should install to a target using serial number" do
       ADB.should_receive(:last_stdout).and_return("Success")
-      should_call_adb_with('-s', 'sernum', 'install', 'Test.apk')
-      ADB.install 'Test.apk', :serial => 'sernum'
+      should_call_adb_with('-s', 'sernum', 'wait-for-device', 'install', 'Test.apk')
+      ADB.install 'Test.apk', nil, :serial => 'sernum'
     end
 
     it "should raise an error when the install fails" do
       ADB.should_receive(:last_stdout).and_return("some error")
-      should_call_adb_with('install', 'Test.apk')
+      should_call_adb_with('wait-for-device', 'install', 'Test.apk')
       expect { ADB.install('Test.apk') }.to raise_error(ADBError)
     end
+
+    it "should accept an optional parameter" do
+      ADB.should_receive(:last_stdout).and_return("Success")
+      should_call_adb_with('-s', 'sernum', 'wait-for-device', 'install', '-r', 'Test.apk')
+      ADB.install 'Test.apk', '-r', :serial => 'sernum'
+    end
   end
 
   context "when uninstalling an apk" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -100,12 +100,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3420063598173628702
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3420063598173628702
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24