fastlane-plugin-act 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876f0124992cbea483d868bbe3f231427aaa8b74
-  data.tar.gz: 4b3dc634f953d828e05c1033f24fb62e52a6259f
+  metadata.gz: c3c85f25174252ee8a3222d7d89316d10a6e74bb
+  data.tar.gz: 5a0f10f3ffc1488ba580f79ebb95557c0f026869
 SHA512:
-  metadata.gz: 0738ad6fb21f5696cdf6f58803b4f0a553869d87bc8b035e082a758474436b05ecd8b46a4a4d390d32f63ffb76d592e3d1f454de3949279e4bc0490d79b7556c
-  data.tar.gz: e7fc4841b02bdd2b6c4e9aebd1cc7cfcd1fd33388817a56b305889a39bba70422d094b26135f98efff8b0ea7e83b16e1fe53bd3beaf54052433dd92d3342aab9
+  metadata.gz: a6e008201ba9a2b4308aaadd89df3bb69bd23754b60c9b77f527109e09b4490c7be9810e045646eb1eaa9bf3523fa433869718457cd82634ed8c6f2f45126dde
+  data.tar.gz: 138f0a0797933188e07d97d7c6c4e9eaf5fc82c68f27583cdeb0df2a6f8a67b31a28abaa6f8788d9524c676f360756e338b17ca74f9ad8bf23636429b289e450

data/README.md

@@ -12,7 +12,7 @@ fastlane add_plugin act
 
 ## About act
 
-Applies changes to plists and app icons inside a compiled IPA, combined with sigh's `resign` it makes it easy to release an IPA with different configurations 🎭
+Applies changes to plists and app icons inside an xcarchive bundle or compiled IPA, making it easy to build once and release multiple times with different configurations 🎭
 
 ## Example
 
@@ -21,9 +21,9 @@ Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plu
 Here's some usage scenarios:
 
 ```ruby
-# Modify Info.plist
+# Modify the application Info.plist
 act(
-  ipa: "example/Example.ipa",
+  archive_path: "example/Example.xcarchive",
 
   iconset: "example/Blue.appiconset",
 
@@ -38,15 +38,46 @@ act(
   ]
 )
 
-# Modify a different plist
+# Modify a different application plist
 act(
-  ipa: "example/Example.ipa",
+  archive_path: "example/Example.xcarchive",
+
+  # Using a relative path indicates a plist file inside the .app
   plist_file: "GoogleService-Info.plist",
   
   plist_values: {
     ":TRACKING_ID" => "UA-22222222-22"
   }
 )
+
+# Modify the xcarchive manifest plist
+act(
+  archive_path: "example/Example.xcarchive",
+  
+  # Prefixing with a / allows you to target any plist in the archive
+  plist_file: "/Info.plist",
+  
+  plist_values: {
+    ":TRACKING_ID" => "UA-22222222-22"
+  }
+)
+
+# Modify Info.plist in an IPA
+act(
+  archive_path: "example/Example.ipa",
+
+  iconset: "example/Blue.appiconset",
+
+  # Set a hash of plist values
+  plist_values: {
+    ":CustomApplicationKey" => "Replaced!"
+  },
+
+  # Run a list of PlistBuddy commands
+  plist_commands: [
+    "Delete :DebugApplicationKey"
+  ]
+)
 ```
 
 ## Run tests for this plugin

data/lib/fastlane/plugin/act/actions/act_action.rb

@@ -2,20 +2,28 @@ module Fastlane
   module Actions
     class ActAction < Action
       def self.run(params)
-        params[:ipa] = File.expand_path params[:ipa]
-        raise "IPA #{params[:ipa]} does not exist" unless File.exist? params[:ipa]
+        raise "You must supply an :archive_path" unless params[:archive_path] || params[:ipa]
 
-        params[:app_name] = (File.basename params[:ipa], ".*") + ".app" unless params[:app_name]
-
-        create_temp_dir = params[:temp_dir].nil?
-        params[:temp_dir] = Dir.mktmpdir if create_temp_dir
-        UI.verbose("Working in temp dir: #{params[:temp_dir]}")
-
-        archive = ActHelper::IPAArchive.new params[:ipa], params[:app_name], params[:temp_dir]
-
-        raise "IPA does not contain Payload/#{params[:app_name]}. Rename the .ipa to match the .app, or provide an app_name option value" unless archive.contains
+        if params[:ipa] then
+          warn "The ipa parameter has been superceded by archive_path and may be removed in a future release"
+          params[:archive_path] = params[:ipa]
+        end
+        
+        params[:archive_path] = File.expand_path params[:archive_path]
+        raise "Archive path #{params[:arhive_path]} does not exist" unless File.exist? params[:archive_path]
+
+        if File.directory? params[:archive_path] then
+          archive = ActHelper::XCArchive.new params[:archive_path], params[:app_name]
+        else
+          archive = ActHelper::IPAArchive.new params[:archive_path], params[:app_name], params[:temp_dir]
+        end
 
-        params[:plist_file] = "Info.plist" unless params[:plist_file]
+        if params[:plist_file] then
+          params[:plist_file] = archive.app_path(params[:plist_file]) unless params[:plist_file].start_with?("/")
+          params[:plist_file][0] = '' if params[:plist_file].start_with?("/")
+        else
+          params[:plist_file] = archive.app_path("Info.plist")
+        end
 
         ActHelper::PlistPatcher.patch(
           archive,
@@ -29,11 +37,6 @@ module Fastlane
           params[:iconset],
           !params[:skip_delete_icons]
         ) if params[:iconset]
-
-        if create_temp_dir
-          UI.verbose("Removing temp dir")
-          `rm -rf #{params[:temp_dir]}`
-        end
       end
 
       def self.description
@@ -48,8 +51,22 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :ipa,
                                   env_name: "FACELIFT_IPA",
-                               description: "Path of the IPA file being modified",
-                                  optional: false,
+                               description: "Path of the IPA file being modified. Deprecated, use  archive_path",
+                                  optional: true,
+                       conflicting_options: [:archive_path],
+                            conflict_block: proc do |value|
+                              UI.user_error!("You can't use 'ipa' and 'archive_path' options in one run")
+                            end,
+                                      type: String),
+
+          FastlaneCore::ConfigItem.new(key: :archive_path,
+                                  env_name: "FACELIFT_ARCHIVE_PATH",
+                               description: "Path of the IPA or XCARCHIVE being modified",
+                                  optional: true,
+                       conflicting_options: [:ipa],
+                            conflict_block: proc do |value|
+                              UI.user_error!("You can't use 'ipa' and 'archive_path' options in one run")
+                             end,
                                       type: String),
 
           FastlaneCore::ConfigItem.new(key: :iconset,
@@ -79,7 +96,7 @@ module Fastlane
           # Very optional
           FastlaneCore::ConfigItem.new(key: :app_name,
                                   env_name: "FACELIFT_APP_NAME",
-                               description: "The name of the .app file (including extension), if not the same as the IPA",
+                               description: "The name of the .app file (including extension), will be extracted if not supplied",
                                   optional: true,
                                       type: String),
 
@@ -91,7 +108,7 @@ module Fastlane
 
           FastlaneCore::ConfigItem.new(key: :skip_delete_icons,
                                     env_name: "FACELIFT_SKIP_DELETE_ICONS",
-                                 description: "When true, the old icon files will not be deleted from the IPA",
+                                 description: "When true, the old icon files will not be deleted from the archive",
                                     optional: true,
                                 default_value: false,
                                         type: [TrueClass, FalseClass])

data/lib/fastlane/plugin/act/helper/icon_patcher.rb

@@ -2,7 +2,7 @@ module Fastlane
   module ActHelper
     class IconPatcher
       def self.patch(archive, iconset_path, delete_old_iconset)
-        plist_path = "Info.plist"
+        plist_path = archive.app_path("Info.plist")
         archive.extract(plist_path)
 
         UI.message("Patching icons from: #{iconset_path}")
@@ -19,7 +19,7 @@ module Fastlane
           plist_buddy.exec("Add #{icons_plist_key} array")
 
           icons.each do |i|
-            relative_path = (i[:target]).to_s
+            relative_path = archive.app_path( (i[:target]).to_s )
             local_path = archive.local_path(relative_path)
             `cp #{i[:source]} #{local_path}`
             archive.replace(relative_path)
@@ -77,7 +77,7 @@ module Fastlane
           existing_icons = plist_buddy.parse_scalar_array(icon_files_value)
 
           if existing_icons.size && delete_old_iconset
-            icons_to_delete = existing_icons.map { |name| "#{name}#{idiom_suffix}*" }
+            icons_to_delete = existing_icons.map { |name| archive.app_path("#{name}#{idiom_suffix}*") }
 
             icons_to_delete.each do |icon_to_delete|
               archive.delete icon_to_delete

data/lib/fastlane/plugin/act/helper/ipa_archive.rb

@@ -1,23 +1,35 @@
 module Fastlane
   module ActHelper
     class IPAArchive
-      def initialize(ipa_file, app_name, temp_dir)
+      def initialize(ipa_file, app_name = null, temp_dir = null)
         @ipa_file = ipa_file
-        @app_path = "Payload/#{app_name}"
-        @temp_dir = temp_dir
+        
+        @create_temp_dir = temp_dir.nil?
+        @temp_dir = Dir.mktmpdir if @create_temp_dir
+        UI.verbose("Working in temp dir: #{@temp_dir}")
+
+        @app_path = "Payload/#{app_name}" if app_name
+        @app_path = IPAArchive.extract_app_path(@ipa_file) unless app_name
+
+        raise "IPA does not contain #{@app_path}" unless contains("#{@app_path}/")
       end
 
-      # Returns the full path to the given file within the temp dir
+      # Returns the full path to the given file that can be modified
       def local_path(path)
-        "#{@temp_dir}/#{@app_path}/#{path}"
+        "#{@temp_dir}/#{path}"
+      end
+
+      # Returns an archive-relative path to the given application file
+      def app_path(path)
+        "#{@app_path}/#{path}"
       end
 
       # Extract files to the temp dir
       def extract(path)
-        UI.verbose("Extracting #{@app_path}/#{path}")
+        UI.verbose("Extracting #{path}")
 
         Dir.chdir(@temp_dir) do
-          result = `unzip -o -q #{@ipa_file} #{@app_path}/#{path}`
+          result = `unzip -o -q #{@ipa_file} #{path}`
 
           if $?.exitstatus.nonzero?
             UI.important result
@@ -28,27 +40,32 @@ module Fastlane
 
       # Restore extracted files from the temp dir
       def replace(path)
-        UI.verbose("Replacing #{@app_path}/#{path}")
+        UI.verbose("Replacing #{path}")
         Dir.chdir(@temp_dir) do
-          `zip -q #{@ipa_file} #{@app_path}/#{path}`
+          `zip -q #{@ipa_file} #{path}`
         end
       end
 
       # Delete path inside the ipa
       def delete(path)
-        UI.verbose("Deleting #{@app_path}/#{path}")
+        UI.verbose("Deleting #{path}")
         Dir.chdir(@temp_dir) do
-          `zip -dq #{@ipa_file} #{@app_path}/#{path}`
+          `zip -dq #{@ipa_file} #{path}`
         end
       end
 
       def contains(path = nil)
-        `zipinfo -1 #{@ipa_file} #{@app_path}/#{path}`
+        `zipinfo -1 #{@ipa_file} #{path}`
         $?.exitstatus.zero?
       end
 
       def clean
-        `rm -rf #{temp_dir}/*`
+        `rm -rf #{temp_dir}` if @create_temp_dir
+        `rm -rf #{temp_dir}/*` unless @create_temp_dir
+      end
+
+      def self.extract_app_path(archive_path)
+        `zipinfo -1 #{archive_path} "Payload/*.app/" | sed -n '1 p'`.strip().chomp('/')
       end
     end
   end

data/lib/fastlane/plugin/act/helper/xc_archive.rb

@@ -0,0 +1,51 @@
+module Fastlane
+  module ActHelper
+    class XCArchive
+      def initialize(xcarchive_path, app_name)
+        @xcarchive_path = xcarchive_path
+        
+        @app_path = "Products/Applications/#{app_name}" if app_name
+        @app_path = "Products/#{XCArchive.extract_app_path(xcarchive_path)}" unless app_name
+      end
+
+      # Returns the full path to the given file that can be modified
+      def local_path(path)
+        "#{@xcarchive_path}/#{path}"
+      end
+
+      # Returns an archive-relative path to the given application file
+      def app_path(path)
+        "#{@app_path}/#{path}"
+      end
+
+      # Extract files to the temp dir
+      def extract(path)
+      end
+
+      # Restore extracted files from the temp dir
+      def replace(path)
+      end
+
+      # Delete path inside the ipa
+      def delete(path)
+        UI.verbose("Deleting #{path}")
+
+        Dir.glob(local_path(path)).each { |f| File.delete(f) }
+      end
+
+      def contains(path = nil)
+        File.exist? local_path(path)
+      end
+
+      def clean
+        `rm -rf #{temp_dir}/*`
+      end
+
+      def self.extract_app_path(archive_path)
+        plist_buddy = PlistBuddy.new "#{archive_path}/Info.plist"
+
+        (plist_buddy.exec "Print :ApplicationProperties:ApplicationPath").strip
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Act
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-act
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Richard Szalay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.0
+        version: 1.111.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.0
+        version: 1.111.0
 description: 
 email: richard@richardszalay.com
 executables: []
@@ -108,6 +108,7 @@ files:
 - lib/fastlane/plugin/act/helper/ipa_archive.rb
 - lib/fastlane/plugin/act/helper/plist_buddy.rb
 - lib/fastlane/plugin/act/helper/plist_patcher.rb
+- lib/fastlane/plugin/act/helper/xc_archive.rb
 - lib/fastlane/plugin/act/version.rb
 homepage: https://github.com/richardszalay/fastlane-plugin-act
 licenses:
@@ -129,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Applies changes to plists and app icons inside a compiled IPA
 test_files: []
-has_rdoc: