Skip to content

Commit be4dca6

Browse files
Merge pull request #358 from bayandin/change-toml-parser
Replace toml with tomlrb
2 parents 2ce8376 + 9a386c4 commit be4dca6

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

appium_lib.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717
s.add_runtime_dependency 'selenium-webdriver', '~> 2.48'
1818
s.add_runtime_dependency 'awesome_print', '~> 1.6'
1919
s.add_runtime_dependency 'json', '~> 1.8'
20-
s.add_runtime_dependency 'toml', '~> 0.0'
20+
s.add_runtime_dependency 'tomlrb', '~> 1.1'
2121
s.add_runtime_dependency 'nokogiri', '~> 1.6.6'
2222

2323
s.add_development_dependency 'posix-spawn', '~> 0.3'

lib/appium_lib/driver.rb

+2-5
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,10 @@ def self.load_appium_txt(opts = {})
8383
Appium::Logger.info "Exists? #{toml_exists}" if verbose
8484

8585
fail "toml doesn't exist #{toml}" unless toml_exists
86-
require 'toml'
86+
require 'tomlrb'
8787
Appium::Logger.info "Loading #{toml}" if verbose
8888

89-
data = File.read toml
90-
data = TOML::Parser.new(data).parsed
91-
# TOML creates string keys. must symbolize
92-
data = Appium.symbolize_keys data
89+
data = Tomlrb.load_file(toml, symbolize_keys: true)
9390
Appium::Logger.ap_info data unless data.empty? if verbose
9491

9592
if data && data[:caps] && data[:caps][:app] && !data[:caps][:app].empty?

0 commit comments

Comments
 (0)