optimus-runner 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8096cac7293e8f3265d694b03b90bf190efd73f
-  data.tar.gz: 65b1877b63b2aebee8779c6e440a3767ba993847
+  metadata.gz: 2e505f6a2697c2006afb3da56cc4d26dd2ba2e69
+  data.tar.gz: 745799c8af7236b430d28799e28efaa92136d41b
 SHA512:
-  metadata.gz: 881a541700e202ee0acb4d68e347d7d1cfe754faa301466c49d646fc592cf0e4b46193705280c37abdfa4570feeddbff5340f919aef8ef22b41c18e064d1965a
-  data.tar.gz: a47e5e62a5956e81084c5abfc2eef047ba0da46eb707c3692b7f1b0ccd60b1a6ff3e0d06c61f0e8e6f897dbbbfc63121ba4d5b8543cbb93c43564a780ff45447
+  metadata.gz: 19c2450e21e3f7dfa1be5566b9265a880b5ca8d4a0546627b0bcb308470bd80235a1484ff5efd750c1891fd11a0a7554aad55e98b9fa034d452b6a54afbe82c1
+  data.tar.gz: 6c27ffcbd2fb1137b150fb02e2dfe008f8381547f8a59c6eed0d26028cfa19e265fae0f41bb123922b326dec5068874037589b4163e1b449727cb5172463ec14

data/exe/optimus_runner_manager

@@ -2,6 +2,7 @@
 require 'optimus-runner/server/optimus_runner_sm'
 require 'rufus/scheduler'
 require 'logger'
+require 'optimus-runner/utils/optimuscloudenv.rb'
 
 
 optimus_runner_sm = OptimusRunnerSM.new
@@ -9,7 +10,7 @@ scheduler = Rufus::Scheduler.new
 logger = Logger.new(STDOUT)
 logger.level = Logger::WARN
 logger.info "Starting Optimus runner..."
-
+OptimusCloudEnvLoader.new.loadEnv
 scheduler.interval '5s', :first_in => 0.1 do
     logger.info "Is Optimus runner idle? #{optimus_runner_sm.idle?}"
     optimus_runner_sm.create if optimus_runner_sm.idle?

data/lib/optimus-runner/DeviceDetails.rb

@@ -1,7 +1,9 @@
 require 'HTTParty'
+require 'clients/mdb_client'
 
 class DeviceDetails
 
+
   def get_device_details
     device_names = self.process_android_devices
     android_device_details = find_android_devices(device_names)
@@ -14,31 +16,17 @@ class DeviceDetails
 
   def process_android_devices
     devices = `adb devices`
-    query = { deviceLog: devices }.to_json
-    puts query
-    headers = {
-         'Content-Type': "Application/json"
-    }
-    response = HTTParty.post('http://localhost:9099/processDevices', body: query, headers: headers)
+    return MDBClient.new.format_android_devices devices
   end
 
   def process_ios_devices
     devices = `instruments -s devices | grep 'iPhone'`
-    p devices
-    body = { deviceLog: devices }.to_json
-    headers = {
-        'Content-Type': "Application/json"
-    }
-    response = HTTParty.post('http://localhost:9099/processIosDevices', body: body, headers: headers)
-    p response
-    res  = JSON.parse(response.to_s)
-    return res
+    return MDBClient.new.format_ios_devices devices
   end
 
   def find_android_devices(device_names)
-    res  = JSON.parse(device_names.to_s)
     device_details = []
-    res.each do |a|
+    device_names.each do |a|
       device_model =  `adb -s #{a['udid']} shell getprop ro.product.model`
       device_os_version =  `adb -s #{a['udid']} shell getprop ro.build.version.release`
       a['deviceName'] = device_model.to_s.rstrip

data/lib/optimus-runner/clients/AkiraClient.rb

@@ -4,7 +4,7 @@ class AkriaClient
   attr_accessor :base_uri
 
   def initialize
-    @base_uri = "http://localhost:6889"
+    @base_uri = ENV["AKIRA"] || "http://localhost:6889"
   end
 
   def save_sessions(session_info)

data/lib/optimus-runner/clients/mdb_client.rb

@@ -0,0 +1,32 @@
+require 'HTTParty'
+
+class MDBClient
+
+  def initialize
+    @base_uri = ENV["MDB"] || "http://localhost:9099"
+  end
+
+  def format_android_devices(devices)
+    query = { deviceLog: devices }.to_json
+    puts query
+    response = HTTParty.post("#{@base_uri}/processDevices", body: query, headers: default_headers)
+    device_names  = JSON.parse(response.to_s)
+    return  device_names
+  end
+
+  def format_ios_devices(devices)
+    body = { deviceLog: devices }.to_json
+    response = HTTParty.post("#{@base_uri}/processIosDevices", body: body, headers: default_headers)
+    device_names  = JSON.parse(response.to_s)
+    return device_names
+  end
+
+  def default_headers
+    headers = {
+        'Content-Type': "Application/json"
+    }
+    return headers
+  end
+
+
+end

data/lib/optimus-runner/server/appium_server_manager.rb

@@ -1,6 +1,9 @@
 require 'optimus-runner/server/optimus_runner_sm'
 require 'rufus/scheduler'
 require 'logger'
+require 'dotenv'
+require 'optparse'
+require 'optimus-runner/utils/optimuscloudenv.rb'
 
 
 optimus_runner_sm = OptimusRunnerSM.new
@@ -8,6 +11,7 @@ scheduler = Rufus::Scheduler.new
 logger = Logger.new(STDOUT)
 logger.level = Logger::WARN
 logger.info "Starting Optimus runner..."
+logger.info "Loading Optimus Cloud Env"
 
 scheduler.interval '5s', :first_in => 0.1 do
     logger.info "Is Optimus runner idle? #{optimus_runner_sm.idle?}"
@@ -17,3 +21,4 @@ scheduler.interval '5s', :first_in => 0.1 do
     optimus_runner_sm.restart if optimus_runner_sm.session_terminated?
 end
 scheduler.join
+

data/lib/optimus-runner/utils/optimuscloudenv.rb

@@ -0,0 +1,15 @@
+require 'dotenv'
+require 'optparse'
+
+
+class OptimusCloudEnvLoader
+  def loadEnv
+    optparser = OptionParser.new do |parser|
+      parser.on('-e=FILE','--env=FILE', "Optimus Cloud Environment file") do |file|
+        p file
+        Dotenv.load(file)
+      end
+    end
+    optparser.parse!(ARGV)
+  end
+end

data/lib/optimus-runner/version.rb

@@ -1,3 +1,3 @@
 module Gandalf
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/optimus-runner.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty", "~> 0.16.3"
   spec.add_dependency 'open4', '~> 1.3'
   spec.add_dependency 'random-port', '~> 0.3.1'
+  spec.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency 'aasm', '~> 5.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optimus-runner
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - KrishnanandB
@@ -86,6 +86,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,11 +186,13 @@ files:
 - lib/optimus-runner/DeviceDetails.rb
 - lib/optimus-runner/SessionInfoBuilder.rb
 - lib/optimus-runner/clients/AkiraClient.rb
+- lib/optimus-runner/clients/mdb_client.rb
 - lib/optimus-runner/commands/ShellCommands.rb
 - lib/optimus-runner/server/appium_server_manager.rb
 - lib/optimus-runner/server/array_manipulations.rb
 - lib/optimus-runner/server/optimus_runner_sm.rb
 - lib/optimus-runner/server/scheduler.rb
+- lib/optimus-runner/utils/optimuscloudenv.rb
 - lib/optimus-runner/version.rb
 - lib/optimus_runner_control.rb
 - optimus-runner.gemspec