From 9a386c4cb305a9e7440f8c699317087c36f1db33 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Mon, 21 Dec 2015 16:36:29 +0000 Subject: [PATCH] Replace toml with tomlrb --- appium_lib.gemspec | 2 +- lib/appium_lib/driver.rb | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/appium_lib.gemspec b/appium_lib.gemspec index ac00d2ee..54ec7406 100644 --- a/appium_lib.gemspec +++ b/appium_lib.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'selenium-webdriver', '~> 2.48' s.add_runtime_dependency 'awesome_print', '~> 1.6' s.add_runtime_dependency 'json', '~> 1.8' - s.add_runtime_dependency 'toml', '~> 0.0' + s.add_runtime_dependency 'tomlrb', '~> 1.1' s.add_runtime_dependency 'nokogiri', '~> 1.6.6' s.add_development_dependency 'posix-spawn', '~> 0.3' diff --git a/lib/appium_lib/driver.rb b/lib/appium_lib/driver.rb index 2969bf6e..4c0adae0 100644 --- a/lib/appium_lib/driver.rb +++ b/lib/appium_lib/driver.rb @@ -83,13 +83,10 @@ def self.load_appium_txt(opts = {}) Appium::Logger.info "Exists? #{toml_exists}" if verbose fail "toml doesn't exist #{toml}" unless toml_exists - require 'toml' + require 'tomlrb' Appium::Logger.info "Loading #{toml}" if verbose - data = File.read toml - data = TOML::Parser.new(data).parsed - # TOML creates string keys. must symbolize - data = Appium.symbolize_keys data + data = Tomlrb.load_file(toml, symbolize_keys: true) Appium::Logger.ap_info data unless data.empty? if verbose if data && data[:caps] && data[:caps][:app] && !data[:caps][:app].empty?