framework-generate 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52393e7d7a5c188978e2e98c037d962f496e8ee
-  data.tar.gz: f88232ba8e3b446421127c2caee605f2607dcdf2
+  metadata.gz: 1a1f81cf334acb873df9c312586d80bc5e6d2461
+  data.tar.gz: c1e95eab5f0b18ced214c7cf8d24dbaea778a1a1
 SHA512:
-  metadata.gz: '05933b66155c86b44c8d4c76d8dcbb4d45d4f700cf7d84b61c934b6592b89395e685bbe20edf1a69457df2c7f9c6370635d9d19be2dfa160e99f5a17c52a3584'
-  data.tar.gz: 32a88d51219ce0e3b4fd51c8515823e41c2bbe7020e5ffdfe36d3ad97f60e884e6b065f63abdd679bdcb47a1fbfec02e207308d924cf90164e2092f37db813dd
+  metadata.gz: 7c0e028ce6f3ebd0fa9feca17391a40731f29e175fcd7b2db52f8f26b1b0ad9947b884cefb81c89dee8552967101977c7902ddc1d75a14d04fad94665ad5d3da
+  data.tar.gz: b6471b8e21ffb0f457883bb3320591eacd663a4aab2a1d52e5378b3ac9526b512b4a30e175575a1d62a08fbac0b7ccaa3b6dc7d70009430610189d98c493e1c8

data/lib/framework-generate/project.rb

@@ -2,11 +2,12 @@ require 'xcodeproj'
 
 module FrameworkGenerate
   class Project
-    attr_accessor :name, :targets
+    attr_accessor :name, :targets, :scripts_directory
 
-    def initialize(name = nil, targets = nil)
+    def initialize(name = nil, targets = nil, scripts_directory = nil)
       @name = name
       @targets = targets
+      @scripts_directory = scripts_directory
 
       yield(self) if block_given?
     end
@@ -100,6 +101,10 @@ module FrameworkGenerate
       settings
     end
 
+    def target_with_name(project, name) 
+      project.native_targets.detect { |e| e.name == name } 
+    end
+
     def generate
 
       project = Xcodeproj::Project.new(project_path)
@@ -117,10 +122,13 @@ module FrameworkGenerate
       end
 
       @targets.each do |target|
+        target.create(project, target.language, @scripts_directory)
+      end
 
+      @targets.each do |target|
         scheme = Xcodeproj::XCScheme.new
 
-        created_target = target.create(project, target.language)
+        created_target = target_with_name(project, target.name)
 
         scheme.add_build_target(created_target)
 
@@ -128,13 +136,18 @@ module FrameworkGenerate
           scheme.add_test_target(created_target)
         end
 
-        if target.test_target != nil
-          created_test_target = target.test_target.create(project, target.language)
+        unless target.test_target.nil?
+          created_test_target = target_with_name(project, target.test_target.name)
+
           created_test_target.add_dependency(created_target)
 
           scheme.add_test_target(created_test_target)
         end
 
+        unless scheme.test_action.nil?
+          scheme.test_action.code_coverage_enabled = true
+        end
+
         scheme.save_as(project.path, target.name, true)
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"] = {}
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"]['isShown'] = true

data/lib/framework-generate/target.rb

@@ -1,4 +1,5 @@
 require 'xcodeproj'
+require 'fileutils'
 
 module FrameworkGenerate
   class Target
@@ -142,15 +143,29 @@ module FrameworkGenerate
       end
     end
 
-    def copy_carthage_frameworks(project, build_phase)
-      script_file_path = File.join(File.dirname(__FILE__), 'copy-carthage-frameworks.sh')
+    def copy_carthage_frameworks(project, build_phase, scripts_directory)
+      script_file_name = 'copy-carthage-frameworks.sh'
+      script_file_path = File.join(File.dirname(__FILE__), script_file_name)
 
-      script_file = File.open(script_file_path)
+      if scripts_directory.nil?
+        script_file = File.open(script_file_path)
 
-      build_phase.shell_script = script_file.read
+        build_phase.shell_script = script_file.read
 
-      script_file.close
+        script_file.close
+      else
+        script_path = File.join(Dir.pwd, scripts_directory, script_file_name)
+        dirname = File.dirname(script_path)
+        unless File.directory?(dirname)
+          FileUtils.mkdir_p(dirname)
+        end
+
+        FileUtils.cp(script_file_path, script_path, { :preserve => true })
 
+        xcode_path = File.join("${SRCROOT}", scripts_directory, script_file_name)
+        build_phase.shell_script = " exec \"#{xcode_path}\""
+      end
+      
       add_framework_to_copy_phase(project, build_phase)
     end
 
@@ -207,7 +222,7 @@ module FrameworkGenerate
       add_build_scripts(target, @post_build_scripts)
     end
     
-    def create(project, language)
+    def create(project, language, scripts_directory)
       name = @name
       type = @type
 
@@ -250,7 +265,7 @@ module FrameworkGenerate
       # Copy frameworks to test target
       if target.test_target_type?
         build_phase = target.new_shell_script_build_phase('Copy Carthage Frameworks')
-        copy_carthage_frameworks(project, build_phase)
+        copy_carthage_frameworks(project, build_phase, scripts_directory)
       end
 
       target

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: framework-generate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pierre-Marc Airoldi