xcode-utils 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b14e3134d54007d64f78bc4f8ae7e21e1c4b7e1fa8daca331531f530eb5988fc
-  data.tar.gz: 9b7545102ade35930d143e4dcd598534c69d70cc6a0d39f9a9d28a4ec6fb3a68
+  metadata.gz: d58c6c3c1418f6bc12d54a2bcdb5a290da89564573d9fabeb127229658090f16
+  data.tar.gz: 012517dbb939e188d54b794e4cd7485c68d2cf20037ff4c7c6e1142e9b09cef0
 SHA512:
-  metadata.gz: 4d59c829bfe2e9db38e8f9ecd7a3a4dfe092082845f5f9320ee1adf48cf9f6678916264ab181c72a1fe76e9de62c85f03c5fa660cbd6586b04da7b947fe2933e
-  data.tar.gz: 45c0a89f7cd471f12d1031775102abbe3f588d45fcd6cc77bd0cd215af9e1443899cbcd7a178d6ea69095403153027055083f84f9df7b92a427463e03ec1c3f0
+  metadata.gz: 7bc9cb9139998f7a68ff3d3416d6826d8cde5df1e51d3667a3ec7dd18245d9ef701f0a25de78c134298f42958121ead1d1f3d56f634d9243882731dffee7ad29
+  data.tar.gz: d09c7b288867967fbfa7ec089fb155377eef94fa3eae53faa795fece8e19aeae4d2b7d0b0d6b4f9d812048c888bb09a1d584679253150334994d138eefdf8b35

data/README.md

@@ -9,6 +9,7 @@ $ gem install xcode-utils
 ```
 
 ## UITestRunner
+Make available single test page in app as standalone
 
 ### Install UITestRunner in your xcode project
 ```
@@ -121,4 +122,4 @@ $ xcutils carthage clean
 
 This project is licensed under the terms of the MIT license. See the [LICENSE](LICENSE) file.
 
-> This project and all fastlane tools are in no way affiliated with Apple Inc or Google. This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs. All fastlane tools run on your own computer or server, so your credentials or other sensitive information will never leave your own computer. You are responsible for how you use fastlane tools.
+> This project and all fastlane tools are in no way affiliated with Apple Inc or Google. This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs. All fastlane tools run on your own computer or server, so your credentials or other sensitive information will never leave your own computer. You are responsible for how you use fastlane tools.

data/lib/xcutils/carthage/xcconfig.rb

@@ -1,5 +1,5 @@
 require 'xcodeproj'
-require 'xcutils/carthage/colors'
+require 'xcutils/colors'
 
 module XcodeUtils
     module Carthage
@@ -24,13 +24,13 @@ module XcodeUtils
 
             def open_project
                 if !Dir.exist?(@build_path)
-                    abort("😭 The Carthage build has not yet been successful. Please try again after successful arthage build.")
+                    abort "😭 The Carthage build has not yet been successful. Please try again after successful arthage build.".red
                 end
 
                 project_names = Dir["./*.xcodeproj"]
     
                 if project_names.first.nil?
-                    abort("😭 Does not exist project to configure.")
+                    abort "😭 Does not exist project to configure.".red
                 end
                     
                 puts "💎💎 Project Found -> #{project_names.first} 💎💎"

data/lib/xcutils/uitest.rb

@@ -1,6 +1,7 @@
 require 'xcodeproj'
 require 'plist'
 require 'nokogiri'
+require 'xcutils/colors'
 
 module XcodeUtils
   class Command
@@ -14,8 +15,8 @@ module XcodeUtils
 
         self.arguments = [
           CLAide::Argument.new('PROJECT_NAME', :true),
-          CLAide::Argument.new('BASE_CONFIG_NAME', :true),
-          CLAide::Argument.new('BASE_SCHEME_NAME', :true)
+          CLAide::Argument.new('TARGET_CONFIG_NAME', :true),
+          CLAide::Argument.new('TARGET_SCHEME_NAME', :true)
         ]
   
         def self.options
@@ -44,69 +45,100 @@ module XcodeUtils
         end
   
         def run
+          puts "Input: project_name: #{@project_name}, target_config: #{@taget_config}, target_scheme: #{@target_scheme}"
+          open_project
+          generate_project_configuration
           generate_build_configuration
-          generate_scheme
+          generate_scheme_file
           copy_template_files
+
+          if !@project.nil?
+            @project.save()
+            puts "🦾 Installing Completed".green
+          end
         end
-  
-        def generate_build_configuration
-          puts "Input: project_name: #{@project_name}, target_config: #{@taget_config}, target_scheme: #{@target_scheme}"
+
+        def open_project
+          puts "🤖 Installing #{@uitest_name} into #{@project_name}".green
+
+          if !Dir.exist?(@project_path)
+            abort "😭 Project #{project_name} does not exist.".red
+          end
+          @project = Xcodeproj::Project.open(@project_path)
+        end
+
+        def generate_project_configuration
+          puts "Generating project configuration"
     
-          project = Xcodeproj::Project.open(@project_path)
-          configuration_list = project.root_object.build_configuration_list
+          configuration_list = @project.root_object.build_configuration_list
     
           if configuration_list.build_settings(@uitest_name) != nil
-            puts "uitest already install in the project #{@project_name}"
+            puts "#{@uitest_name} is already installed in the project #{@project_name}".gray
             return
           end
     
-          puts "Initializing #{@uitest_name}"
-          puts "Generating project configuration"
-    
           configuration = project.new(Xcodeproj::Project::Object::XCBuildConfiguration)
           configuration.name = @uitest_name
           configuration.build_settings = configuration_list.build_settings(@taget_config)
           configuration_list.build_configurations << configuration
-    
-          project.targets.each do |target|
-            break if target.build_configurations.select { |e| e.name == @uitest_name }.count > 0
-    
-            puts "Generating build configuration #{target.name}:#{@uitest_name}"
-    
-            base_config = target.build_configurations.select { |e| e.name == @taget_config }.first
-            org_main_storyboard_file = nil
+        end
+  
+        def generate_build_configuration
+          @project.targets.each { |target|
+            target_config = target.build_configurations.select { |e| e.name == @taget_config }.first
+            target_main_sb = nil
     
             target.build_configurations.each { |e|
+              puts "Configure build configuration #{e.name} in #{target.name}"
+
               path = e.build_settings['INFOPLIST_FILE']
-              obj = Plist.parse_xml(path)
-              var_name = '$(MAIN_STORYBOARD_FILE)'
-              e.build_settings['MAIN_STORYBOARD_FILE'] = obj['UIMainStoryboardFile'] != var_name ? obj['UIMainStoryboardFile'] : org_main_storyboard_file
-              obj['UIMainStoryboardFile'] = '$(MAIN_STORYBOARD_FILE)'
-    
-              if org_main_storyboard_file == nil
-                org_main_storyboard_file = e.build_settings['MAIN_STORYBOARD_FILE']
+              plist = Plist.parse_xml(path)
+              plist_main_sb = plist['UIMainStoryboardFile']
+              variable_name = '$(MAIN_STORYBOARD_FILE)'
+              is_not_variable = plist_main_sb != variable_name
+
+              e.build_settings['MAIN_STORYBOARD_FILE'] = is_not_variable ? plist_main_sb : target_main_sb
+              
+              if target_main_sb.nil?
+                target_main_sb = e.build_settings['MAIN_STORYBOARD_FILE']
               end
+
+              plist['UIMainStoryboardFile'] = variable_name
     
-              File.write(path, obj.to_plist)
+              if is_not_variable
+                File.write(path, plist.to_plist)
+              end
+
+              file_names_string = e.build_settings['EXCLUDED_SOURCE_FILE_NAMES']
+              file_names_string = appended(file_names_string, '$(SRCROOT)/$(PRODUCT_NAME)/UITestRunner/*')
+              file_names_string = appended(file_names_string, '$(SRCROOT)/$(PRODUCT_NAME)/UITestRunner/**/*')
+              e.build_settings['EXCLUDED_SOURCE_FILE_NAMES'] = file_names_string
             }
-    
-            new_config = project.new(Xcodeproj::Project::Object::XCBuildConfiguration)
-            new_config.name = @uitest_name
-            new_config.base_configuration_reference = base_config.base_configuration_reference
-            new_config.build_settings.update(base_config.build_settings)
+            
+            test_config = target.build_configurations.select { |e| e.name == @uitest_name }.first
+
+            if test_config.nil?
+              puts "Generating build configuration #{@uitest_name} into #{target.name}"
+              new_config = project.new(Xcodeproj::Project::Object::XCBuildConfiguration)
+              new_config.name = @uitest_name
+              new_config.target_configuration_reference = target_config.base_configuration_reference
+              target.build_configurations << new_config
+            else
+              puts "Configure build configuration #{@uitest_name} in #{target.name}"
+              new_config = test_config
+            end
+
+            new_config.build_settings.update(target_config.build_settings)
             new_config.build_settings['MAIN_STORYBOARD_FILE'] = @uitest_name
-    
-            target.build_configurations << new_config
-    
-            puts "Generating scheme #{target.name} #{@uitest_name}"
-          
-            project.save()
-          end
+            new_config.build_settings['EXCLUDED_SOURCE_FILE_NAMES'] = nil
+          }
         end
 
-        def generate_scheme
+        def generate_scheme_file
           scheme_name = "#{@project_name} #{@uitest_name}"
   
+          puts "Generating scheme file #{scheme_path(scheme_name)}"
+
           FileUtils.copy_file(scheme_path(@target_scheme), scheme_path(scheme_name))
   
           scheme = Xcodeproj::XCScheme.new(scheme_path(scheme_name))
@@ -117,27 +149,28 @@ module XcodeUtils
         def copy_template_files
           template_path = "./#{@project_name}/#{@uitest_name}"
           
-          if Dir.exist?(template_path)
-            puts "Template files already exist in the project #{@project_name}"
-            return
+          if !Dir.exist?(template_path)
+            puts "Copying template files into project #{@project_name}"
+            path = File.expand_path('../../../templates', __FILE__)
+            FileUtils.copy_entry path, "./#{@project_name}"
           end
 
-          puts "Copying template files into project #{@project_name}"
-
-          path = File.expand_path('../../../templates', __FILE__)
-          FileUtils.copy_entry path, "./#{@project_name}"
-
           puts "Adding references for files and resources into project #{@project_name}"
 
-          project = Xcodeproj::Project.open(@project_path)
+          @project.targets.each { |target|
+            target_group = @project.groups.select { |e| e.path == target.name }.first
 
-          project.targets.each { |target|
-            target_group = project.groups.select { |e| e.path == target.name }.first
-            template_group = target_group.new_group(nil, @uitest_name)
-            add_files("#{template_path}/*", template_group, target)
+            if target_group.groups.select { |e| e.path == @uitest_name }.first.nil?
+              template_group = target_group.new_group(nil, @uitest_name)
+              add_files("#{template_path}/*", template_group, target)
+            end
           }
-
-          project.save()
+        end
+        
+        def appended(string, other)
+          return other if string == nil
+          return string if string.include? other
+          return string << " #{other}"
         end
 
         def add_files(direc, current_group, main_target)

data/lib/xcutils/version.rb

@@ -1,3 +1,3 @@
 module XcodeUtils
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
 end

data/templates/UITestRunner/Base/UITestAuthorizationProvider.swift

@@ -3,12 +3,10 @@
 //  Copyright © 2020 abc-studio. All rights reserved.
 //
 
-#if DEBUG
 protocol UITestAuthorizationProvider {
     var hasAccessToken: Bool {get}
     var hasRefreshToken: Bool {get}
     func refreshToken(completion: @escaping () -> Void)
     func signIn(_ parent: UIViewController, completion: @escaping () -> Void)
     func signOut()
-}
-#endif
+}

data/templates/UITestRunner/Base/UITestSuite.swift

@@ -3,7 +3,6 @@
 //  Copyright © 2020 abc-studio. All rights reserved.
 //
 
-#if DEBUG
 import Foundation
 
 protocol UITestSuiteInitializable {
@@ -20,13 +19,14 @@ class UITestSuite: UITestSuiteInitializable {
     
     static var authorizationProvider: UITestAuthorizationProvider?
     
-    var isNewSession = false
-    var useLogin = true
-    var testRunnerViewController: UITestRunnerViewController! {
+    weak var testRunnerViewController: UITestRunnerViewController! {
         didSet {
             setUp()
         }
     }
+    
+    var isNewSession = false
+    var useLogin = true
     var view: UIView {
         return testRunnerViewController.view
     }
@@ -86,12 +86,16 @@ class UITestSuite: UITestSuiteInitializable {
 }
 
 extension UITestSuite {
+    func present(_ viewController: UIViewController, animated: Bool = false, completion: (() -> Void)? = nil) {
+        viewController.modalPresentationStyle = .fullScreen
+        testRunnerViewController.present(viewController, animated: animated, completion: completion)
+    }
+
     @discardableResult
-    func present(_ viewController: UIViewController, completion: (() -> Void)? = nil) -> UINavigationController {
-        let navigationController = UINavigationController(rootViewController: viewController)
+    func present(rootViewController: UIViewController, animated: Bool = false, completion: (() -> Void)? = nil) -> UINavigationController {
+        let navigationController = UINavigationController(rootViewController: rootViewController)
         navigationController.modalPresentationStyle = .fullScreen
-        testRunnerViewController.present(navigationController, animated: false, completion: completion)
+        testRunnerViewController.present(navigationController, animated: animated, completion: completion)
         return navigationController
     }
-}
-#endif
+}

data/templates/UITestRunner/Suites/MainTestSuite.swift

@@ -3,7 +3,6 @@
 //  Copyright © 2020 abc-studio. All rights reserved.
 //
 
-#if DEBUG
 import Foundation
 
 final class MainTestSuite: UITestSuite {
@@ -24,5 +23,4 @@ final class MainTestSuite: UITestSuite {
     private func testExample() {
         // This is an example of a functional test case.
     }
-}
-#endif
+}

data/templates/UITestRunner/UITestAuthorizationProviderImpl.swift

@@ -3,7 +3,6 @@
 //  Copyright © 2020 abc-studio. All rights reserved.
 //
 
-#if DEBUG
 struct UITestAuthorizationProviderImpl: UITestAuthorizationProvider {
 
     // MARK: - Implementations of Protocol UITestAuthorizationProvider
@@ -23,5 +22,4 @@ struct UITestAuthorizationProviderImpl: UITestAuthorizationProvider {
 
     func signOut() {
     }
-}
-#endif
+}

data/templates/UITestRunner/UITestRunnerViewController.swift

@@ -3,36 +3,39 @@
 //  Copyright © 2020 abc-studio. All rights reserved.
 //
 
-#if DEBUG
 import UIKit
 
 final class UITestRunnerViewController: UIViewController {
     
+    // MARK: - Private Properties
+    
+    private var suite: UITestSuite!
+    
     // MARK: - Overridden: UIViewController
     
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        title = "UITestRunner"
-
         UITestSuite.authorizationProvider = UITestAuthorizationProviderImpl()
+    }
 
-        runTestSuites()
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        if children.count < 1 {
+            runTestSuites()
+        }
     }
-    
-    // MARK: - Private Properties
-    
-    private var suite: UITestSuite!
 
     // MARK: - Private Methods
 
     private func runTestSuites() {
         runTestSuite(MainTestSuite.self)
     }
+
     private func runTestSuite<T: UITestSuite>(_ suiteType: T.Type) {
         suite = suiteType.init()
         suite.testRunnerViewController = self
         suite.run()
     }
-}
-#endif
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcode-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Steve Kim
@@ -123,8 +123,8 @@ files:
 - bin/xcutils
 - lib/xcutils.rb
 - lib/xcutils/carthage.rb
-- lib/xcutils/carthage/colors.rb
 - lib/xcutils/carthage/xcconfig.rb
+- lib/xcutils/colors.rb
 - lib/xcutils/command.rb
 - lib/xcutils/uitest.rb
 - lib/xcutils/version.rb