rubotium 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1b0f0bd231baeeb352f147b7eed2517a2bbf3c0
-  data.tar.gz: c7cfcc8c601126f54bc4dfea8c6a11575cfb7f40
+  metadata.gz: 0b9bfc8633530e1490ee76cc637163c96b6b3dbc
+  data.tar.gz: 4d65fbd91f0bd74450d76258881a35a680238f86
 SHA512:
-  metadata.gz: e22610e5725858e4c8a5af4e9868e1fc5ed7dc03c229a393239e153c76bf62b122bbaa3273435530892d38b01ed6e6feeed82e9275f7b24f4f2f993ad027be8f
-  data.tar.gz: 4a976b43dfdd6ebd0105bbcce1742897256b01bc3aaa457c7ede59db7b66325039e0c7a8e2c6d52b2a0c7a7bf7853bd26ebf8d087eae9147202e816279e38015
+  metadata.gz: f8ce8e1a7e9f348fb2d6cc6fa6760a322e984dde2f73177f7a9987fdb08df5404394dd147a2b2bf435d130e313f0c61a3b96abe9cd1d2ed81538c50b0d15c7b9
+  data.tar.gz: 08b5304e3cac70a3db5270e6fe175075206049afb01fd4c15fb4ea84651882cff8279308a4485bb2fec750a5284bab0faca744a9933325e7fefc9430c014fd05

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

@@ -44,7 +44,7 @@ module Rubotium
             end
           rescue NoMethodError
             CMD.run_command(adb_command + ' ' + commands)
-          end
+          end.result
         end
 
         private

data/lib/rubotium/adb/devices.rb

@@ -3,7 +3,7 @@ module Rubotium
     class Devices
 
       def attached
-        parse.map{|device_serial|
+        get_device_list.map{|device_serial|
           create_device(device_serial)
         }
       end
@@ -14,12 +14,16 @@ module Rubotium
       end
 
       def adb_devices_command
-        CMD.run_command('adb devices', { :timeout => 5 } )
+        CMD.run_command('adb kill-server')
+        CMD.run_command('adb start-server')
+        CMD.run_command('adb devices', { :timeout => 5 } ).result
       end
 
-      def parse
-        list = adb_devices_command.split("\n")
-        list.shift
+      def get_device_list
+        tries = 4
+        while ((list = adb_devices_command.split("\n")[1..-1]).empty? && tries > 0)
+          tries -= 1
+        end
         attached_devices list
       end
 

data/lib/rubotium/apk/android_apk.rb

@@ -26,15 +26,15 @@ module Rubotium
 
       def results
         @results ||= aapt.dump(@path)
-        if $?.exitstatus != 0 or @results.index("ERROR: dump failed")
-          raise(RuntimeError, @results)
+        if @results.status_code != 0
+          raise(RuntimeError, @results.result)
         end
         @results
       end
 
       def parsed_aapt
         vars = Hash.new
-        results.split("\n").each do |line|
+        results.result.split("\n").each do |line|
           key, value = _parse_line(line)
           next if key.nil?
           if vars.key?(key)

data/lib/rubotium/cmd.rb

@@ -1,17 +1,45 @@
 require 'timeout'
 module Rubotium
   class CMD
+    attr_reader :read, :write
+    attr_reader :command_to_run, :buffer, :pid
+
     class << self
+
       def run_command(command_to_run, opts = {})
         begin
-          Timeout::timeout(opts[:timeout] || 10 * 60) {
+          Timeout::timeout(opts[:timeout] || 150) {
             Rubotium.logger.debug "[EXECUTING]: #{command_to_run}"
-            `#{command_to_run}`
+            new(command_to_run).execute
           }
         rescue Timeout::Error
           ""
         end
       end
     end
+
+    def initialize(command_to_run)
+      @command_to_run = command_to_run
+      @read, @write = IO.pipe
+      @buffer = ''
+    end
+
+    def execute
+      spawn_process
+      read_buffer
+      _, status = Process.waitpid2(pid)
+      CmdResult.new(status, buffer)
+    end
+
+    def read_buffer
+      while (!read.closed? && !read.eof? && line=read.readline)
+        buffer << line
+      end
+    end
+
+    def spawn_process
+      @pid = spawn(command_to_run, out: write, err: write)
+      write.close
+    end
   end
 end

data/lib/rubotium/cmd_result.rb

@@ -0,0 +1,10 @@
+module Rubotium
+  class CmdResult
+    attr_reader :status_code, :result
+
+    def initialize(status_code, result)
+      @status_code = status_code
+      @result = result
+    end
+  end
+end

data/lib/rubotium/version.rb

@@ -1,3 +1,3 @@
 module Rubotium
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/rubotium.rb

@@ -2,6 +2,7 @@ require 'rubotium/version'
 require 'rubotium/adb'
 require 'rubotium/apk'
 require 'rubotium/cmd'
+require 'rubotium/cmd_result'
 require 'rubotium/device'
 require 'rubotium/devices'
 require 'rubotium/tests_runner'

data/spec/fixtures/adb_devices_results.rb

@@ -3,19 +3,23 @@ module Fixtures
     module Devices
       class << self
         def two_devices_attached_one_is_offline
-          "List of devices attached \nemulator-5554\toffline\nemulator-5556\tdevice\n\n"
+          Rubotium::CmdResult.new(0,"List of devices attached \nemulator-5554\toffline\nemulator-5556\tdevice\n\n")
         end
 
         def two_devices_attached
-          "List of devices attached \nemulator-5554\tdevice\nemulator-5556\tdevice\n\n"
+          Rubotium::CmdResult.new(0, "List of devices attached \nemulator-5554\tdevice\nemulator-5556\tdevice\n\n")
         end
 
-        def one_device_offline
-          "List of devices attached \nemulator-5554\toffline\n\n"
+        def one_device_attached_and_offline
+          Rubotium::CmdResult.new(0, "List of devices attached \nemulator-5554\toffline\n\n")
         end
 
-        def one_device
-          "List of devices attached \nemulator-5554\tdevice\n\n"
+        def one_device_attached
+          Rubotium::CmdResult.new(0, "List of devices attached \nemulator-5554\tdevice\n\n")
+        end
+
+        def no_devices_attached
+          Rubotium::CmdResult.new(0, "List of devices attached \n\n")
         end
       end
     end

data/spec/lib/rubotium/adb/adb_devices_spec.rb

@@ -9,9 +9,9 @@ describe Rubotium::Adb::Devices do
     }
   end
 
-  context 'with one device attached' do
+  context 'when one device is attached' do
     before do
-      Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.one_device)
+      Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.one_device_attached)
     end
 
     it 'should return one device' do
@@ -32,7 +32,7 @@ describe Rubotium::Adb::Devices do
     end
   end
 
-  context 'with offline devices' do
+  context 'when two devices are attached and one is offline' do
     before do
       Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.two_devices_attached_one_is_offline)
     end
@@ -45,11 +45,24 @@ describe Rubotium::Adb::Devices do
     end
   end
 
-  context 'with no devices attached' do
+  context 'when one device is attached and offline' do
     before do
-      Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.one_device_offline)
+      Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.one_device_attached_and_offline)
     end
+    it 'should return zero devices if none are online' do
+      devices.attached.should == []
+    end
+  end
+
+  context 'when no devices are attached' do
+    it 'should run adb_devices_command 5 times' do
+      devices.should_receive(:adb_devices_command).exactly(5).times
+          .and_return(Fixtures::Adb::Devices.no_devices_attached.result)
+      devices.attached
+    end
+
     it 'should return zero devices if none are attached' do
+      Rubotium::CMD.stub(:run_command).and_return(Fixtures::Adb::Devices.no_devices_attached)
       devices.attached.should == []
     end
   end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Rubotium::Adb::Commands::Command do
   let(:subject) { described_class.new(serial) }
   let(:adb_command) { 'the command' }
-  let(:result) { 'result' }
+  let(:result) { Rubotium::CmdResult.new(0, 'result') }
   let(:command_to_run) { double(Object) }
 
   before do
@@ -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)).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)).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)).to eq 'result'
     end
   end
 end

data/spec/lib/rubotium/apk/android_apk_spec.rb

@@ -24,8 +24,8 @@ describe Rubotium::Apk::AndroidApk do
     let(:apk) { described_class.new(aapt, dummy_file_path) }
 
     it 'should raise exception' do
-      expect(aapt).to receive(:dump).and_return "W/zipro   (77199): Error opening archive spec/lib/rubotium/apk/mock/dummy.apk: Invalid file
-ERROR: dump failed because assets could not be loaded"
+      expect(aapt).to receive(:dump).and_return Rubotium::CmdResult.new(1, "W/zipro   (77199): Error opening archive spec/lib/rubotium/apk/mock/dummy.apk: Invalid file
+ERROR: dump failed because assets could not be loaded")
       expect{apk.package_name}.to raise_error(RuntimeError)
     end
   end
@@ -34,7 +34,7 @@ ERROR: dump failed because assets could not be loaded"
     let(:apk) { described_class.new(aapt, sample_file_path) }
 
       it 'should read package_name' do
-        expect(aapt).to receive(:dump).and_return "package: name='com.example.sample' versionCode='1' versionName='1.0' platformBuildVersionName=''
+        expect(aapt).to receive(:dump).and_return Rubotium::CmdResult.new(0, "package: name='com.example.sample' versionCode='1' versionName='1.0' platformBuildVersionName=''
 sdkVersion:'7'
 targetSdkVersion:'15'
 application-label:'sample'
@@ -50,7 +50,7 @@ feature-group: label=''
 supports-screens: 'small' 'normal' 'large' 'xlarge'
 supports-any-density: 'true'
 locales: '--_--' 'ja'
-densities: '160' '240' '320'"
+densities: '160' '240' '320'")
         expect(apk.package_name).to eql 'com.example.sample'
       end
 

data/test.rb

@@ -1,42 +1,11 @@
-require "observer"
+require 'parallel'
 
-class Ticker          ### Periodically fetch a stock price.
-  include Observable
+q = Queue.new
 
-  def test_changed(msg)
-    changed
+(0..10).to_a.each{|e| q.push(e)}
+b = (1..4).to_a
+Parallel.map(b, :in_processes => 10){|executor|
+  until(q.empty?)
+  puts q.pop
   end
-
-  def test_notify(msg)
-    notify_observers(msg)
-  end
-end
-
-class Observer
-  def initialize(ticker, name)
-    @ticker = ticker
-    @name = name
-    ticker.add_observer(self)
-  end
-
-  def unsubscribe
-    @ticker.delete_observer(self)
-  end
-
-  def update(*args)
-    puts @name
-    p *args
-  end
-
-  def message_missing(*args)
-    puts @name
-    p args
-  end
-
-end
-
-
-ticker = Ticker.new()
-observer = Observer.new(ticker, "observer1")
-
-
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubotium
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Slawomir Smiechura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - lib/rubotium/apk/aapt.rb
 - lib/rubotium/apk/android_apk.rb
 - lib/rubotium/cmd.rb
+- lib/rubotium/cmd_result.rb
 - lib/rubotium/device.rb
 - lib/rubotium/devices.rb
 - lib/rubotium/formatters/html_formatter.css