fastlane-plugin-settings_bundle 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f891e5430642d33047c7d6969cf1817478fa3f70
-  data.tar.gz: b796c2a301b53edfd81df28cd20c079fa2da5636
+SHA256:
+  metadata.gz: 894d54cea6624d141891ed6cfe3d75262bbf3a98ab320c394fa90fb800452eec
+  data.tar.gz: b51715a677193a4845c373b37560988592d1f3ae34c8752867ebc0e7d3b23499
 SHA512:
-  metadata.gz: 659115b4d87db5d6d8422cb3c11c2e846815a8c90f64ab6c383ed7eb21842c47a6bf99da1b4d334cf7c8b8afe01e0ac03bf1e4153642e60502641a993c01d04e
-  data.tar.gz: 590a1626c9b96c1a97e22a4c0cc23948a7e5a332a478125ffee72f5c51fd7902fda1879e6d22081fafe2e141ab2d5ddac926268530a40e582b03d1541694da7e
+  metadata.gz: 326ade281fc1d28150282a573801a00f121c534f49c5353a0a0f6b40e2592fc6c3e86bc5fd36e7a1b698f4b3600b56a77072fe610d0634d93b3f5cd0f13af43c
+  data.tar.gz: 0d9e18830364d9d9ff5698b951b27dd0b7300050e8f1c2410f6491ba2ab0d4bf8177c8d00d42346589e1e075ccfc268ef0a53556c7f200b6c66a49f6cbc2b224

data/README.md

@@ -122,6 +122,40 @@ update_settings_bundle(
 )
 ```
 
+### Use with commit_version_bump
+
+As of version 1.3.0 (which requires Fastlane 2.64.0), it is no longer necessary
+to pass a `settings` parameter to the built-in `commit_version_bump` action
+when using `update_settings_bundle`.
+
+```ruby
+increment_build_number
+update_settings_bundle key: "CurrentAppVersion",
+                     value: ":version (:build)"
+commit_version_bump
+```
+
+```ruby
+increment_build_number
+update_settings_bundle key: "CurrentAppVersion",
+                     value: ":version (:build)",
+                      file: "About.plist"
+commit_version_bump
+```
+
+```ruby
+increment_build_number
+update_settings_bundle key: "CurrentAppVersion",
+                     value: ":version (:build)" # in Root.plist
+update_settings_bundle key: "CurrentFrameworkVersion",
+                     value: ":version (:build)",
+                      file: "Framework.plist",
+                    target: "MyFramework"
+commit_version_bump
+```
+
+Also see the [example apps](./examples) and [example Fastfile](./fastlane/Fastfile) in the repo.
+
 ## Examples
 
 [SettingsBundleExample]: ./examples/SettingsBundleExample

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

@@ -125,6 +125,8 @@ module Fastlane
 
           # Save (raises)
           Plist::Emit.save_plist settings_plist, plist_path
+
+          Actions.add_modified_files [plist_path]
         end
 
         def xcodeproj_path_from_params(params)
@@ -156,28 +158,21 @@ module Fastlane
         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]
+          setting_value = target.resolved_build_setting(setting_name)[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?
+          search_position = 0
+          while (matches = /\$\(([^(){}]*)\)|\$\{([^(){}]*)\}/.match(setting_value, search_position))
+            macro_name = matches[1] || matches[2]
+            search_position = setting_value.index(macro_name) - 2
 
-          expanded_macro = macro_name == "SRCROOT" ? "." : expanded_build_setting(target, macro_name, configuration)
-          return setting_value if expanded_macro.nil?
+            expanded_macro = macro_name == "SRCROOT" ? "." : expanded_build_setting(target, macro_name, configuration)
+            search_position += macro_name.length + 3 and next if expanded_macro.nil?
 
-          setting_value.gsub!(/\$[{(]#{macro_name}[})]/, expanded_macro)
-
-          expand_macros target, setting_value, configuration
+            setting_value.gsub!(/\$\(#{macro_name}\)|\$\{#{macro_name}\}/, expanded_macro)
+            search_position += expanded_macro.length
+          end
+          setting_value
         end
       end
     end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-settings_bundle
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,6 +124,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.64.0
 description: 
 email: jgvdthree@gmail.com
 executables: []
@@ -154,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Fastlane plugin to update static settings in an iOS settings bundle