xcode-utils 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6a88462f11625079d48f69db98fc5300fbdf733598fa2b2bfef97946d628e2
-  data.tar.gz: cf5857085391c9b590ea301f5bb63d9e9feeed83f35d99c40d0c32ca7f058dc8
+  metadata.gz: '078c1054432a4dfb2ccd967637b74aa4cbc2aabdb67c80d000361c2407987694'
+  data.tar.gz: 3bd681d4b310c1f961bb9f85263965c44e73185f41cfa2a24310d987b7babb90
 SHA512:
-  metadata.gz: 804232e58a8061b39d83f1db06a7afa9d8b73ce0d576d8991e45c7f3abd8fb9df9e75661425f5358907dc95f5d34e88b52bfe6eae8810db5508c1f28c144f3da
-  data.tar.gz: b268b7a14c2d79eb96fd923e91bf1888b241c1d706b023397b66452b92a0d65be4a10cdfda36785f32a67a13b0a5ccdf1a799664ca1bf8f21cae578e1ccb5472
+  metadata.gz: 654da996344614593d38fab2a17f90abd2e1a7342fcdf74b55aa1defbf2f7315005c7ea501d00a78cc12400d2a9eaa2992be3c924dff143de88332584359b211
+  data.tar.gz: 449501e3a2db25ede86c450c0437eec792893c4bf5a82ccd7595bb7f2a158a7f59aa1fdfab7b6af82dbe0ac04519bebe668698e197834df57df33cadde9e1341

data/lib/xcutils/uitest.rb

@@ -45,21 +45,24 @@ module XcodeUtils
         end
   
         def run
-          puts "Input: project_name: #{@project_name}, target_config: #{@taget_config}, target_scheme: #{@target_scheme}"
+          puts "🤖 Run: project_name: #{@project_name}, target_config: #{@taget_config}, target_scheme: #{@target_scheme}".green
           open_project
           generate_project_configuration
-          generate_build_configuration
-          generate_scheme_file
+          generate_build_configurations
+          generate_scheme_files
           copy_template_files
 
           if !@project.nil?
+            puts "Save project".green
             @project.save()
-            puts "🦾 Installing Completed".green
+            puts "🤩 Finished".green
+          else
+            puts "😡 Aborted".red
           end
         end
 
         def open_project
-          puts "🤖 Installing #{@uitest_name} into #{@project_name}".green
+          puts "Open project #{@project_name}"
 
           if !Dir.exist?(@project_path)
             abort "😭 Abort to install. Project #{project_name} does not exist".red
@@ -73,7 +76,7 @@ module XcodeUtils
           configuration_list = @project.root_object.build_configuration_list
     
           if configuration_list.build_settings(@uitest_name) != nil
-            puts "Skip to generate project configuration for #{@uitest_name}. It is already installed in the project #{@project_name}".gray
+            puts "\tSkip to generate project configuration for #{@uitest_name}. It is already installed in the project #{@project_name}".gray
             return
           end
     
@@ -83,7 +86,9 @@ module XcodeUtils
           configuration_list.build_configurations << configuration
         end
   
-        def generate_build_configuration
+        def generate_build_configurations
+          puts "Generating build configurations"
+    
           @project.targets.each { |target|
             target_config = target.build_configurations.select { |e| e.name == @taget_config }.first
             target_main_sb = nil
@@ -91,7 +96,7 @@ module XcodeUtils
             target.build_configurations.each { |e|
               break if e.name == @uitest_name
 
-              puts "Configure build configuration #{e.name} in #{target.name}"
+              puts "\tConfigure build configuration #{e.name} in #{target.name}"
 
               path = e.build_settings['INFOPLIST_FILE']
               plist = Plist.parse_xml(path)
@@ -121,13 +126,13 @@ module XcodeUtils
             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}"
+              puts "\tGenerating build configuration #{@uitest_name} into #{target.name}"
               new_config = @project.new(Xcodeproj::Project::Object::XCBuildConfiguration)
               new_config.name = @uitest_name
               new_config.base_configuration_reference = target_config.base_configuration_reference
               target.build_configurations << new_config
             else
-              puts "Configure build configuration #{@uitest_name} in #{target.name}"
+              puts "\tConfigure build configuration #{@uitest_name} in #{target.name}"
               new_config = test_config
             end
 
@@ -137,40 +142,45 @@ module XcodeUtils
           }
         end
 
-        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)}"
+        def generate_scheme_files
+          puts "Generating scheme files"
+    
+          @project.targets.each { |target|
+            scheme_name = "#{target.name} #{@uitest_name}"
+            
+            if File.exist?(scheme_path(scheme_name))
+              puts "\tSkip to generate. A scheme file is already exsit, #{scheme_name}".gray
+              next
+            end
+    
+            puts "\tGenerating 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))
-          scheme.launch_action.build_configuration = @uitest_name
-          scheme.save_as(@project_path, scheme_name)
+            FileUtils.copy_file(scheme_path(@target_scheme), scheme_path(scheme_name))
+    
+            scheme = Xcodeproj::XCScheme.new(scheme_path(scheme_name))
+            scheme.launch_action.build_configuration = @uitest_name
+            scheme.save_as(@project_path, scheme_name)
+          }
         end
 
         def copy_template_files
-          puts "Adding references for files and resources into project #{@project_name}"
-
+          puts "Copy template files"
+    
           @project.targets.each { |target|
             template_path = "./#{target.name}/#{@uitest_name}"
 
             if !Dir.exist?(template_path)
-              puts "Copying template files into target #{target.name}"
+              puts "\tCopying template files into target #{target.name}"
               path = File.expand_path('../../../templates', __FILE__)
               FileUtils.copy_entry path, "./#{target.name}"
             else
-              puts "Skip to copy template files. Files are already exsit".gray
+              puts "\tSkip to copy template files. Files are already exsit".gray
             end
 
             target_group = @project.groups.select { |e| e.path == target.name }.first
 
             if target_group.groups.select { |e| e.path == @uitest_name }.first.nil?
+              puts "\tAdding references for files and resources into target #{target.name}"
               template_group = target_group.new_group(nil, @uitest_name)
               add_files("#{template_path}/*", template_group, target)
             end
@@ -200,6 +210,8 @@ module XcodeUtils
                 if item.include? ".storyboard" or item.include? ".xib"
                   set_custom_module(item)
                   main_target.add_resources([i])
+                else
+                  main_target.add_resources([i])
                 end
               end
           end

data/lib/xcutils/version.rb

@@ -1,3 +1,3 @@
 module XcodeUtils
-    VERSION = '1.0.5'.freeze
+    VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Steve Kim
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide