rubotium 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98f8adacba06f733bb479e15adb159d6e0e3573d
-  data.tar.gz: ab84bac5542cf856854244aeb94dae7d93e862da
+  metadata.gz: 9e9781a5ba16f5293e432aae0106505dbfc12dfd
+  data.tar.gz: 57ddec45936548bd2951f3e9ab6508a506fd9ac8
 SHA512:
-  metadata.gz: 4836e4d8406b5e1c73d41649c9342b6a4cb9a510cf813d1f0d37bedde6f3c1323c1aa42d1b81f26be3b83e26b080d57b9e0f47e10d874dc3d58890184edbcfa4
-  data.tar.gz: f7ab6265fb21fc7919db3a5fb938801afcf37e7995bf829e852d4298eb6a31257f00ef205445bc38887677d9a253950845c122611fc4af14fe44e9c98d15f87d
+  metadata.gz: bd989f92d2004b97869b55f74c70b550dcbbfccab8316af538ed1fc7f56e76c655bffb7bcf5856a5e77534a84691d28cc7b82d1fa463f3e8bc2fb55228a10cad
+  data.tar.gz: c9604c4c2eceef8c520dc08cbca2b63fd9b08efd802a346fc940c4810127aca477adb98cb9644806432ca39481984d4b4e28e1d8476430dbd645950e9712b521

data/lib/rubotium/adb/commands/command.rb

@@ -7,27 +7,27 @@ module Rubotium
         end
 
         def clean_logcat
-          execute(logcat_command(:clean => true))
+          execute(logcat_command(:clean => true)).result
         end
 
         def logcat
-          execute(logcat_command(:dump => true))
+          execute(logcat_command(:dump => true)).result
         end
 
         def install(apk_path)
-          execute(install_command(apk_path))
+          execute(install_command(apk_path)).result
         end
 
         def uninstall(package_name)
-          execute(uninstall_command(package_name))
+          execute(uninstall_command(package_name)).result
         end
 
         def pull(files_glob)
-          execute(pull_command(files_glob))
+          execute(pull_command(files_glob)).result
         end
 
         def push(local_glob, remote_dest)
-          execute(push_command(local_glob, remote_dest))
+          execute(push_command(local_glob, remote_dest)).result
         end
 
         def shell(command)
@@ -44,7 +44,7 @@ module Rubotium
             end
           rescue NoMethodError
             CMD.run_command(adb_command + ' ' + commands)
-          end.result
+          end
         end
 
         private

data/lib/rubotium/cmd.rb

@@ -13,7 +13,7 @@ module Rubotium
             new(command_to_run).execute
           }
         rescue Timeout::Error
-          ""
+          CmdResult.new(1, '')
         end
       end
     end

data/lib/rubotium/device.rb

@@ -6,11 +6,11 @@ module Rubotium
     end
 
     def name
-      @name ||= adb_command.shell('getprop ro.product.model').strip
+      @name ||= adb_command.shell('getprop ro.product.model').result.strip
     end
 
     def sdk
-      @sdk ||= adb_command.shell('getprop ro.build.version.sdk').strip
+      @sdk ||= adb_command.shell('getprop ro.build.version.sdk').result.strip
     end
 
     def clean_logcat

data/lib/rubotium/test_cases_reader.rb

@@ -7,7 +7,7 @@ module Rubotium
     end
 
     def read_tests
-      result = device.shell(instrument_command)
+      result = device.shell(instrument_command).result
       Rubotium::Adb::Parsers::TestResultsParser.new(result).test_results.map{|test|
         create_runnable_test(test)
       }

data/lib/rubotium/test_runners/instrumentation_test_runner.rb

@@ -21,11 +21,21 @@ module Rubotium
       attr_reader :device, :test_package
 
       def execute(command)
-        Rubotium::Adb::Parsers::TestResultsParser.new(device.shell(command))
+        cmd_result = device.shell(command)
+        if (cmd_result.status_code == 1)
+          Struct.new(
+            test_results: [],
+            count: 0,
+            failed?: true,
+            successful?: false,
+            time: 0,
+            message: "test timed out"
+          )
+        else
+          Rubotium::Adb::Parsers::TestResultsParser.new(cmd_result.result)
+        end
       end
 
-
-
       def instrument_command (runnable_test)
         "am instrument -w -r -e class #{runnable_test.name} #{test_package.name}/#{test_package.test_runner}"
       end

data/lib/rubotium/version.rb

@@ -1,3 +1,3 @@
 module Rubotium
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/lib/rubotium/adb/commands/command_spec.rb

@@ -16,7 +16,7 @@ describe Rubotium::Adb::Commands::Command do
     let(:shell_command) { "adb #{adb_command}" }
 
     it 'executes the command without a serial' do
-      expect(subject.execute(command_to_run)).to eq 'result'
+      expect(subject.execute(command_to_run).result).to eq 'result'
     end
   end
 
@@ -25,7 +25,7 @@ describe Rubotium::Adb::Commands::Command do
     let(:shell_command) { "adb #{adb_command}" }
 
     it 'executes the command without a serial' do
-      expect(subject.execute(command_to_run)).to eq 'result'
+      expect(subject.execute(command_to_run).result).to eq 'result'
     end
   end
 
@@ -34,7 +34,7 @@ describe Rubotium::Adb::Commands::Command do
     let(:shell_command) { "adb -s #{serial} #{adb_command}" }
 
     it 'executes the command with a serial' do
-      expect(subject.execute(command_to_run)).to eq 'result'
+      expect(subject.execute(command_to_run).result).to eq 'result'
     end
   end
 end

data/spec/lib/rubotium/device_spec.rb

@@ -19,8 +19,8 @@ shared_examples 'a Rubotium::Device' do
     device.pull(files_to_pull)
   end
 
-  it "knows it's name" do
-    expect(command).to receive(:shell).with("getprop ro.product.model").and_return('MyNameIs')
+  it 'knows its name' do
+    expect(command).to receive(:shell).with('getprop ro.product.model').and_return(result)
     expect(device.name).to eql('MyNameIs')
   end
 
@@ -33,7 +33,8 @@ end
 
 describe Rubotium::Device do
   let(:device)  { described_class.new(serial) }
-  let(:command) { double(Rubotium::Adb::Commands::Command)}
+  let(:command) { double(Rubotium::Adb::Commands::Command) }
+  let(:result) { (OpenStruct.new(:status_code => 0, :result => 'MyNameIs')) }
 
   before do
     device.stub(:adb_command).and_return(command)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubotium
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Slawomir Smiechura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler