ADB 0.4 → 0.5

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.swp

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Release 0.5 / 2012-9-9
+* Enhancements
+  * Added instrument method to send an instrumentation request
+
 === Release 0.4 / 2012-9-8
 * Enhancements
   * Added ability to pass options to the install command

data/lib/ADB.rb

@@ -1,3 +1,4 @@
+require 'ADB/instrumentation'
 require 'ADB/version'
 require 'ADB/errors'
 require 'childprocess'
@@ -8,6 +9,7 @@ require 'date'
 # which is a part of the android toolset.
 #
 module ADB
+  include ADB::Instrumentation
 
   attr_reader :last_stdout, :last_stderr
 

data/lib/ADB/instrumentation.rb

@@ -0,0 +1,51 @@
+require 'ADB/errors'
+
+module ADB
+  module Instrumentation
+    #
+    # send instrumentation requests
+    # 
+    # @example
+    #   instrument "com.example/android.test.InstrumentationTestRunner"
+    #   # will run all of the tests within the 'com.example' package using the 'android.test.InstrumentationTestRunner'
+    #
+    # @example
+    #   instrument "com.example/android.test.InstrumentationTestRunner", :class => "com.example.test.SomeTestClass"
+    #
+    #   # will execute all of the tests within 'com.example.test.SomeTestClass'
+    #
+    # @param [String] runner indicates the package/runner to instrument
+    # @param [Hash] collection of key/value pairs to be sent as arguments to the instrumentation runner
+    #
+    def instrument(runner, args = {})
+      with(the(args) << using_the(runner))
+      raise ADBError, last_stdout unless last_stdout.empty?
+    end
+
+    private
+    def with(args)
+      shell *"am instrument #{args.strip}"
+    end
+
+    def using_the(runner)
+      runner.insert(0, "-w ") unless single_test?
+      runner
+    end
+
+    def the(args)
+      @args = args
+      to_args(args).join
+    end
+
+    def to_args(args)
+      args.map do |name, value|
+        "-e #{name} #{value} "
+      end
+    end
+
+    def single_test?
+      @args.has_key? :class
+    end
+
+  end
+end

data/lib/ADB/version.rb

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

data/spec/lib/ADB/instrumentation_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+class InstrumentingClass
+  include ADB
+end
+
+describe ADB::Instrumentation do
+  let(:instrumenter) { InstrumentingClass.new }
+  let(:runner) { 'com.example/com.example.TestRunner' }
+  let(:base_args) { "am instrument " }
+
+  before(:each) do
+    instrumenter.stub(:shell)
+    instrumenter.stub(:last_stdout).and_return('')
+  end
+
+  context "when instrumenting through ADB" do
+    it "should be able to run all of the tests" do
+      instrumenter.should_receive(:shell).with(*base_args.concat("-w #{runner}"))
+      instrumenter.instrument(runner)
+    end
+
+    it "should run tests in a single test class only" do
+      instrumenter.should_receive(:shell).with(*base_args.concat("-e class com.example.class #{runner}"))
+      instrumenter.instrument(runner, :class => 'com.example.class')
+    end
+
+    it "should be able to take extra arguments" do
+      instrumenter.should_receive(:shell).with(*base_args.concat("-e any thing -e should be -e able to -e be passed -w #{runner}"))
+      instrumenter.instrument(runner, :any => 'thing', :should => 'be', :able => 'to', :be => 'passed')
+    end
+
+    it "should raise an error if anything is in stderr" do
+      instrumenter.stub(:last_stdout).and_return('some problem')
+      lambda { instrumenter.instrument(runner) }.should raise_error(exception=ADBError, message="some problem")
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ADB
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -85,7 +85,9 @@ files:
 - features/support/env.rb
 - lib/ADB.rb
 - lib/ADB/errors.rb
+- lib/ADB/instrumentation.rb
 - lib/ADB/version.rb
+- spec/lib/ADB/instrumentation_spec.rb
 - spec/lib/ADB_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cheezy/ADB
@@ -102,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3420063598173628702
+      hash: 2061536077942189474
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3420063598173628702
+      hash: 2061536077942189474
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -123,5 +125,6 @@ test_files:
 - features/step_definitions/adb_steps.rb
 - features/support/ApiDemos.apk
 - features/support/env.rb
+- spec/lib/ADB/instrumentation_spec.rb
 - spec/lib/ADB_spec.rb
 - spec/spec_helper.rb