Merge pull request #20 from BranchMetrics/rexml

jdee · web-flow · commit 12a52e0f205a · 2017-08-04T16:07:47.000-07:00
Replace nokogiri with REXML
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,15 +2,14 @@ PATH
   remote: .
   specs:
     fastlane-plugin-branch (0.1.0)
-      nokogiri
       plist
       xcodeproj
 
 GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -20,10 +19,10 @@ GEM
     ast (2.3.0)
     babosa (1.0.2)
     claide (1.0.2)
-    cocoapods (1.2.1)
+    cocoapods (1.3.0)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.1)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.3.0)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
       cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -38,9 +37,9 @@ GEM
       molinillo (~> 0.5.7)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.4.4, < 2.0)
-    cocoapods-core (1.2.1)
-      activesupport (>= 4.0.2, < 5)
+      xcodeproj (>= 1.5.1, < 2.0)
+    cocoapods-core (1.3.0)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
@@ -56,7 +55,7 @@ GEM
     coderay (1.1.1)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.4)
+    commander-fastlane (4.4.5)
       highline (~> 1.7.2)
     declarative (0.0.9)
     declarative-option (0.1.0)
@@ -66,28 +65,28 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
     escape (0.0.4)
-    excon (0.57.0)
-    faraday (0.12.1)
+    excon (0.58.0)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.39.2)
+    fastlane (2.50.1)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 2.0.0)
       colored
-      commander-fastlane (>= 4.4.0, < 5.0.0)
+      commander-fastlane (>= 4.4.5, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       excon (>= 0.45.0, < 1.0.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.9)
-      fastimage (>= 1.6)
+      fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.0.1, < 2.0.0)
       google-api-client (>= 0.12.0, < 0.13.0)
       highline (>= 1.7.2, < 2.0.0)
@@ -117,8 +116,8 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
+    googleauth (0.5.3)
+      faraday (~> 0.12)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
@@ -129,32 +128,29 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.8.4)
+    i18n (0.8.6)
     json (2.1.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.15.0)
+    memoist (0.16.0)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     molinillo (0.5.7)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
     os (0.9.6)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     plist (3.3.0)
@@ -171,7 +167,7 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.0.2)
+    retriable (3.1.1)
     rouge (2.0.7)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -221,9 +217,9 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.0)
+    xcodeproj (1.5.1)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
@@ -249,4 +245,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.15.1
+   1.15.3
diff --git a/fastlane-plugin-branch.gemspec b/fastlane-plugin-branch.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri'
   spec.add_dependency 'plist'
   spec.add_dependency 'xcodeproj'
 
diff --git a/lib/fastlane/plugin/branch/actions/setup_branch_action.rb b/lib/fastlane/plugin/branch/actions/setup_branch_action.rb
@@ -1,3 +1,4 @@
+require "rexml/document"
 require "xcodeproj"
 
 module Fastlane
@@ -51,7 +52,7 @@ def self.run(params)
         if params[:android_project_path] || params[:android_manifest_path]
           # :android_manifest_path overrides :android_project_path
           manifest_path = params[:android_manifest_path] || "#{params[:android_project_path]}/app/src/main/AndroidManifest.xml"
-          manifest = File.open(manifest_path) { |f| Nokogiri::XML f }
+          manifest = File.open(manifest_path) { |f| REXML::Document.new f }
 
           helper.add_keys_to_android_manifest manifest, keys
           # :activity_name and :uri_scheme may be nil. :remove_existing_domains defaults to false
@@ -62,7 +63,7 @@ def self.run(params)
                                                         params[:remove_existing_domains]
 
           File.open(manifest_path, "w") do |f|
-            manifest.write_xml_to f, ident: 4
+            manifest.write f, 4
           end
 
           helper.add_change File.expand_path(manifest_path, Bundler.root)
diff --git a/lib/fastlane/plugin/branch/helper/android_helper.rb b/lib/fastlane/plugin/branch/helper/android_helper.rb
@@ -1,5 +1,3 @@
-require "nokogiri"
-
 module Fastlane
   module Helper
     module AndroidHelper
@@ -11,18 +9,18 @@ def add_keys_to_android_manifest(manifest, keys)
       # TODO: Work on all XML/AndroidManifest formatting
 
       def add_metadata_to_manifest(manifest, key, value)
-        element = manifest.at_css "manifest > application > meta-data[android|name=\"#{key}\"]"
+        element = manifest.elements["//manifest/application/meta-data[@android:name=\"#{key}\"]"]
         if element.nil?
-          application = manifest.at_css "manifest application"
-          application.add_child "    <meta-data android:name=\"#{key}\" android:value=\"#{value}\" />\n"
+          application = manifest.elements["//manifest/application"]
+          application.add_element "meta-data", "android:name" => key, "android:value" => value
         else
-          element["android:value"] = value
+          element.attributes["android:value"] = value
         end
       end
 
       def add_intent_filters_to_android_manifest(manifest, domains, uri_scheme, activity_name, remove_existing)
         if activity_name
-          activity = manifest.at_css "manifest > application > activity[android|name=\"#{activity_name}\""
+          activity = manifest.elements["//manifest/application/activity[@android:name=\"#{activity_name}\""]
         else
           activity = find_activity manifest
         end
@@ -39,46 +37,49 @@ def add_intent_filters_to_android_manifest(manifest, domains, uri_scheme, activi
       def find_activity(manifest)
         # try to infer the right activity
         # look for the first singleTask
-        single_task_activity = manifest.at_css "manifest > application > activity[android|launchMode=\"singleTask\"]"
+        single_task_activity = manifest.elements["//manifest/application/activity[@android:launchMode=\"singleTask\"]"]
         return single_task_activity if single_task_activity
 
         # no singleTask activities. Take the first Activity
         # TODO: Add singleTask?
-        manifest.at_css "manifest > application > activity"
+        manifest.elements["//manifest/application/activity"]
       end
 
       def add_intent_filter_to_activity(activity, domains, uri_scheme)
         # Add a single intent-filter with autoVerify and a data element for each domain and the optional uri_scheme
-        intent_filter = <<-EOF
+        intent_filter = REXML::Element.new "intent-filter"
+        intent_filter.attributes["android:autoverify"] = true
+        intent_filter.add_element "action", "android:name" => "android.intent.action.VIEW"
+        intent_filter.add_element "category", "android:name" => "android.intent.category.DEFAULT"
+        intent_filter.add_element "category", "android:name" => "android.intent.category.BROWSABLE"
+        intent_filter.elements << uri_scheme_data_element(uri_scheme) unless uri_scheme.nil?
+        app_link_data_elements(domains).each { |e| intent_filter.elements << e }
 
-          <intent-filter android:autoverify="true">
-              <action android:name="android.intent.action.VIEW"/>
-              <category android:name="android.intent.category.DEFAULT"/>
-              <category android:name="android.intent.category.BROWSABLE"/>
-              #{app_link_data_elements domains}
-              #{uri_scheme_data_element uri_scheme}
-          </intent-filter>
-        EOF
-        intent_filter += " " * 8
-        activity.add_child intent_filter
+        activity.add_element intent_filter
       end
 
       def remove_existing_domains(activity)
         # Find all intent-filters that include a data element with android:scheme
         # TODO: Can this be done with a single css/at_css call?
-        activity.css("intent-filter").each do |filter|
-          filter.remove if filter.at_css "data[android|scheme]"
+        activity.elements.each("//manifest//intent-filter") do |filter|
+          filter.remove if filter.elements["data[@android:scheme]"]
         end
       end
 
       def app_link_data_elements(domains)
-        domains.map { |d| "<data android:scheme=\"https\" android:host=\"#{d}\"/>" }.join("\n" + " " * 16)
+        domains.map do |domain|
+          element = REXML::Element.new "data"
+          element.attributes["android:scheme"] = "https"
+          element.attributes["android:host"] = domain
+          element
+        end
       end
 
       def uri_scheme_data_element(uri_scheme)
-        return "" if uri_scheme.nil?
-
-        "<data android:scheme=\"#{uri_scheme}\" android:host=\"open\"/>"
+        element = REXML::Element.new "data"
+        element.attributes["android:scheme"] = uri_scheme
+        element.attributes["android:host"] = "open"
+        element
       end
     end
   end
