xcode-utils 0.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083f71f7700a515fd77cd99b5ea4637c30108c95f86ac796166049644cd525c0'
-  data.tar.gz: faeace269689e68f1ed160b8728c57f7845ec834d1b87360c120fde34e26bb7a
+  metadata.gz: 824beca6355db2508531a754f7fe96d92afb45d2d280a1090b8a1be4478cdb62
+  data.tar.gz: ba97f1f06c154c98af3eb78eafbbcb1304dbb51aa1138dfe1a029b338cfa6b76
 SHA512:
-  metadata.gz: 4d51d1e3a1a5a21070ac8a899f8f85baf86fa380e67e2cb48b044c90f674c84b61b289b3e139dde65a3e180caaa66e58ebacc7b0baa0a9d1c0ad0dd372b6427c
-  data.tar.gz: 71f167297435f66b9b3d77915b6c3522960b3a497e65fa00bafe97ce80aaa4e9e485f1f47110738fa1150f6fbcaddb84e3a60f0e265a76b8e9ccf0839f152a30
+  metadata.gz: 62736a18e603f1dc93ff7b238be891fcb4de37bdcb7ba88cc9df2e8e8c12bc43873e1f188dbdf47b1afc37588160a1dfa65266b002ee041c34f30a45b6980087
+  data.tar.gz: 86bfd627682e38af122e60cc991aca6100c5cc738d017a788812c88627d2827e07b13d7317c767285aaa8558d1dc844660c5dbfac5bdd4e7d0589ada2972103e

data/README.md

@@ -1,6 +1,6 @@
 # Xcode::Utils
 
-[![Gem Version](http://img.shields.io/gem/v/xcode-utils.svg?style=flat)](http://badge.fury.io/rb/xcode-utils)
+[![Gem Version](https://badge.fury.io/rb/xcode-utils.svg)](https://badge.fury.io/rb/xcode-utils)
 
 ## Installation
 
@@ -9,6 +9,7 @@ $ gem install xcode-utils
 ```
 
 ## UITestRunner
+Make available single test page in app as standalone
 
 ### Install UITestRunner in your xcode project
 ```
@@ -110,8 +111,15 @@ Framework Search Paths
 $ xcutils carthage clean
 ```
 
+## TODO
+- [x] uitest install
+- [ ] uitest clean
+- [x] carthage command
+- [x] carthage clean
+- [ ] mvvm template install
+
 ## License
 
 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,27 +1,29 @@
 require 'xcodeproj'
 require 'plist'
 require 'nokogiri'
+require 'xcutils/colors'
 
 module XcodeUtils
   class Command
     class UITest < Command
       self.abstract_command = true
       self.command = 'uitest'
+      self.summary = 'UITestRunner installer.'
 
       class Install < UITest
         self.summary = 'Install uitest.'
 
         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
           [
-            ['--project-name=""', 'The name of your xcode project'],
-            ['--target-config=""', 'The name of build configuration to be copied to uitestrunner build configuration'],
-            ['--target-scheme=""', 'The name of build scheme to be copied to uitestrunner build scheme'],
+            ['--project-name', 'The name of your xcode project'],
+            ['--target-config', 'The name of build configuration to be copied to uitestrunner build configuration'],
+            ['--target-scheme', 'The name of build scheme to be copied to uitestrunner build scheme'],
           ]
         end
   
@@ -43,69 +45,108 @@ 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 "😭 Abort to install. Project #{project_name} does not exist".red
+          end
+          @project = Xcodeproj::Project.open(@project_path)
+        end
+
+        def generate_project_configuration
+          puts "Generating project configuration #{@uitest_name} into #{@project_name}"
     
-          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 "Skip to generate project configuration for #{@uitest_name}. It 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|
+              break if e.name == @uitest_name
+
+              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']
+              build_settings_main_sb = e.build_settings['MAIN_STORYBOARD_FILE']
+              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 != nil ? target_main_sb : build_settings_main_sb)
+              
+              if target_main_sb.nil?
+                target_main_sb = build_settings_main_sb
               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}"
+          
+          if File.exist?(scheme_path(scheme_name))
+            puts "Skip to generate. A scheme file is already exsit, #{scheme_name}".gray
+            return
+          end
   
+          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))
@@ -116,27 +157,30 @@ 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}"
+          else
+            puts "Skip to copy template files. Files are already exsit".gray
           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 = '0.0.1'.freeze
+    VERSION = '1.0.4'.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
     }
@@ -62,7 +62,7 @@ class UITestSuite: UITestSuiteInitializable {
             logout()
             signIn()
         } else {
-            Self.authorizationProvider?.refreshAccessToken {
+            Self.authorizationProvider?.refreshToken {
                 self.runTests()
             }
         }
@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Kim
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -94,16 +94,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
 description: Xcode utils provides uitest and carthage proxy
 email:
 - pisces@linecorp.com
@@ -117,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
@@ -134,7 +140,7 @@ homepage: https://git.linecorp.com/abc/xcode-utils.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Xcode utils
 test_files: []