quokkadb 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f60608d57f3ba4097e8717c201959fdfc0ce44ca
-  data.tar.gz: c67bcf704502e927ca25d5e9d1f7ebf2130b98ca
+  metadata.gz: 0fae6990c8b8c093f96f8b0ed0b439053aa0e8fd
+  data.tar.gz: dfb982eefe167628101b6c072fc85d953dec318a
 SHA512:
-  metadata.gz: a4a08d0c5b3ae8d52f4c9825744f766531f667ba6c43643c3ea5d1839fff6c56113fde9888ac14a6c71f2286564502b19b570bdb80fecb1cb9fbda2d67a51754
-  data.tar.gz: ca429693a315c247044eca240b9ba30708763a22633f7bb7eb636d9c01900b3ed0f5995eb475f9aa7017c441a948e5b66e66fab6f7729ca4d3ab65e5dc9eca76
+  metadata.gz: 124aefe9ad62d314b8af69c2917f8b69548a12f1b905daa935f0dbafaa6beaebf38f82f095cd661dbc5f1749df112792c2aa647471e9e44291b560b161573501
+  data.tar.gz: b63adf55be4f723084776a22a152dca8687da540d0a5459fbdb3b2e09650b741dc899b8bfbf92963efc4ed60139d3276626a0f7eba879ece974154a1cfdb9474

data/lib/quokkadb/adb.rb

@@ -1,16 +1,18 @@
-module ADB
+class ADB
 
-  def ADB.find_tests(runner:, package:, serial: nil, annotation: nil, shards: nil, index: nil)
+  attr_accessor :callback
+
+  def find_tests(runner:, package:, serial: nil, annotation: nil, shards: nil, index: nil)
     puts("adb #{serial ? "-s #{serial}" : ''} shell am instrument #{annotation ? "-e annotation #{annotation}" : ''} -e numShards 4 -e shardIndex 0 -r -w #{package}/#{runner}\n")
     `adb #{serial ? "-s #{serial}" : ''} shell am instrument #{annotation ? "-e annotation #{annotation}" : ''} #{shards ? "-e numShards #{shards}" : ''} #{index ? "-e shardIndex #{index}" : ''} -e log true -r -w #{package}/#{runner}`
   end
 
-  def ADB.execute_test(runner:, package:, test_name:, class_name:)
+  def execute_test(runner:, package:, test_name:, class_name:)
     puts("adb shell am instrument -w -e class #{class_name}##{test_name} #{package}/#{runner}")
     `adb shell am instrument -w -e class #{class_name}##{test_name} #{package}/#{runner}`
   end
 
-  def ADB.mass_execute(runner:, package:, tests:)
+  def mass_execute(runner:, package:, tests:)
     tests_list = []
     tests.each do |test_info|
       tests_list.push("#{test_info.class_name}##{test_info.name}")
@@ -20,16 +22,16 @@ module ADB
     `adb shell am instrument -w -e class #{tests_list.join(',')} -r #{package}/#{runner}`
   end
 
-  def ADB.run_tests(runner:, package:, serial: nil, annotation: nil, shards: nil, index: nil, &callback)
-    command = "adb #{serial ? "-s #{serial}" : ''} shell am instrument #{annotation ? "-e annotation #{annotation}" : ''} #{ADB.generate_sharding_options(shards: shards, index: index)} -r -w #{package}/#{runner}"
+  def run_tests(runner:, package:, serial: nil, annotation: nil, shards: nil, index: nil)
+    command = "adb #{serial ? "-s #{serial}" : ''} shell am instrument #{annotation ? "-e annotation #{annotation}" : ''} #{generate_sharding_options(shards: shards, index: index)} -r -w #{package}/#{runner}"
     puts("Command: #{command}")
     pipe = IO.popen(command)
     while (line = pipe.gets)
-      callback.call(line)
+      @callback.call(line)
     end
   end
 
-  def ADB.generate_sharding_options(shards:, index:)
+  def generate_sharding_options(shards:, index:)
     return "" unless shards
 
     "#{shards != '' ? "-e numShards #{shards}" : ''} #{index && index != '' ? "-e shardIndex #{index}" : ''}"

data/lib/quokkadb.rb

@@ -1,26 +1,46 @@
-require 'quokkadb/adb.rb'
-require 'quokkadb/test.rb'
-require 'quokkadb/test_result.rb'
-require 'quokkadb/adb_test_parser.rb'
+require_relative './quokkadb/adb.rb'
+require_relative './quokkadb/test.rb'
+require_relative './quokkadb/test_result.rb'
+require_relative './quokkadb/adb_test_parser.rb'
 require 'colorize'
 
-module QuokkADB
+class QuokkADB
 
-  def QuokkADB.run(runner:, package:, annotation: nil, shards: nil, index: nil, serial: nil, background_black: false)
+  attr_accessor :ADB
+  attr_accessor :parser
+
+  def initialize(runner:, package:, annotation: nil, shards: nil, index: nil, serial: nil, background_black: false)
+    @runner = runner
+    @package = package
+    @annotation = annotation
+    @shards = shards
+    @index = index
+    @serial = serial
+    @background_black = background_black
+
+    @ADB = ADB.new()
+    @parser = ADBTestParser.new()
+  end
+
+  def run()
     full_log = ""
-    parser = ADBTestParser.new()
-    ADB.run_tests(
-      runner: runner,
-      package: package,
-      annotation: annotation,
-      shards: shards,
-      index: index,
-      serial: serial
-    ) { |line|
+    @ADB.callback = lambda { |line|
       full_log += line
-      parser.parse_line(line: line, background_black: background_black)
+      @parser.parse_line(line: line, background_black: @background_black)
     }
+    @ADB.run_tests(
+      runner: @runner,
+      package: @package,
+      annotation: @annotation,
+      shards: @shards,
+      index: @index,
+      serial: @serial
+    )
+
+    parse_results(full_log)
+  end
 
+  def parse_results(full_log)
     full_log.each_line do |log|
       if (log.include?("FAILURES!!!") or log.include?("Process crashed while executing") or log.include?("INSTRUMENTATION_FAILED"))
         puts("exit 1")
@@ -28,7 +48,7 @@ module QuokkADB
       end
     end
 
-    parser.test_results.each do |result|
+    @parser.test_results.each do |result|
       if (!result.passed)
         puts("exit 1")
         exit(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quokkadb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Joe Beveridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies: []
 description: ADB test parsing libraryr
 email: joe.beveridge@shopify.com