fastlane-plugin-settings_bundle 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ec2f564820b8e88b1b974a32e4d44414a65b0b8
-  data.tar.gz: 8da1f81314e240c30050a058df47d9c9c66cbe56
+  metadata.gz: f891e5430642d33047c7d6969cf1817478fa3f70
+  data.tar.gz: b796c2a301b53edfd81df28cd20c079fa2da5636
 SHA512:
-  metadata.gz: bab2cbe3e48fafe76e35bfce1868278a8c06910f3b26aec4d277d6b4e91b2c4e92532e0d906f07f04878c3ca577a09cef42caeef14973ae73ea1939b213145f5
-  data.tar.gz: e0744e178aff7a0415ef31801856ec11200e0a495a9fc99827509948a41e5abe86a258588332acb02ae4c5f66c54af7f5be8243702a450eb2f9f51817c9a8dbf
+  metadata.gz: 659115b4d87db5d6d8422cb3c11c2e846815a8c90f64ab6c383ed7eb21842c47a6bf99da1b4d334cf7c8b8afe01e0ac03bf1e4153642e60502641a993c01d04e
+  data.tar.gz: 590a1626c9b96c1a97e22a4c0cc23948a7e5a332a478125ffee72f5c51fd7902fda1879e6d22081fafe2e141ab2d5ddac926268530a40e582b03d1541694da7e

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jimmy Dee <jgvdthree@gmail.com>
+Copyright (c) 2017 Jimmy Dee <jgvdthree@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/fastlane/plugin/settings_bundle/actions/update_settings_bundle_action.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Jimmy Dee
+# Copyright (c) 2016-17 Jimmy Dee
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/fastlane/plugin/settings_bundle/helper/settings_bundle_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Jimmy Dee
+# Copyright (c) 2016-17 Jimmy Dee
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -58,15 +58,10 @@ module Fastlane
             raise "No application target found" if target.nil?
           end
 
-          # find the Info.plist paths for all configurations
-          info_plist_paths = target.resolved_build_setting "INFOPLIST_FILE"
-
-          raise "INFOPLIST_FILE not found in target" if info_plist_paths.nil? or info_plist_paths.empty?
-
           # this can differ from one configuration to another.
           # take from Release, since only one Settings.bundle per project
           # (not per configuration)
-          release_info_plist_path = info_plist_paths[configuration]
+          release_info_plist_path = expanded_build_setting target, "INFOPLIST_FILE", configuration
 
           raise "Info.plist not found for configuration #{configuration}" if release_info_plist_path.nil?
 
@@ -159,6 +154,31 @@ module Fastlane
           # one project found: great
           xcodeproj_paths.first
         end
+
+        def expanded_build_setting(target, setting_name, configuration)
+          setting_values = target.resolved_build_setting setting_name
+          return if setting_values.nil?
+          setting_value = setting_values[configuration]
+          return if setting_value.nil?
+          expand_macros target, setting_value, configuration
+        end
+
+        def expand_macros(target, setting_value, configuration)
+          # TODO: Properly balance these delimiters. Currently it will also match
+          # $(SETTING} and ${SETTING). See the pending spec.
+          matches = /\$[{(]([^})]+)[})]/.match(setting_value)
+          return setting_value if matches.nil?
+
+          macro_name = matches[1]
+          return setting_value if macro_name.nil?
+
+          expanded_macro = macro_name == "SRCROOT" ? "." : expanded_build_setting(target, macro_name, configuration)
+          return setting_value if expanded_macro.nil?
+
+          setting_value.gsub!(/\$[{(]#{macro_name}[})]/, expanded_macro)
+
+          expand_macros target, setting_value, configuration
+        end
       end
     end
   end

data/lib/fastlane/plugin/settings_bundle/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module SettingsBundle
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-settings_bundle
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.106.2
+        version: 2.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.106.2
+        version: 2.39.0
 description: 
 email: jgvdthree@gmail.com
 executables: []