xcake 0.8.12 → 0.9.3

data/lib/xcake/dsl/target/sugar.rb

@@ -71,5 +71,27 @@ module Xcake
       build_phases << phase
       phase
     end
+
+    # Creates a new build rule for the
+    # target
+    #
+    # @param   [String] name
+    #          the name to use for the build rule
+    #
+    # @param   [Proc] block
+    #          an optional block that configures the build rule through the DSL.
+    #
+    # @return [BuildRule] the new xcode build rule
+    #
+    def build_rule(name, file_type, output_files, output_files_compiler_flags, script, &block)
+      rule = BuildRule.new(&block)
+      rule.name = name
+      rule.file_type = file_type
+      rule.output_files = output_files
+      rule.output_files_compiler_flags = output_files_compiler_flags
+      rule.script = script
+      build_rules << rule
+      rule
+    end
   end
 end

data/lib/xcake/event_hooks.rb

@@ -55,6 +55,11 @@ module Xcake
     #
     define_hooks :before_adding_system_framework
 
+    # Defines hook which is ran before we add build rules
+    # to a target
+    #
+    define_hooks :before_adding_build_rules
+
     # Defines hook which is ran before we add build phases
     # to a target
     #
@@ -68,6 +73,11 @@ module Xcake
     #
     define_hooks :before_adding_file
 
+    # Defines hook which is ran before we add a custom build rule to
+    # a target
+    #
+    define_hooks :before_adding_custom_build_rule
+
     # Defines hook which is ran before we add a custom build phase to
     # a target
     #

data/lib/xcake/generator.rb

@@ -3,6 +3,7 @@ module Xcake
     include Dependency
     include Plugin
     include Visitor
+    Class.send(:include, CoreExtensions::ClassDescendants) # done with send because of old ruby versions
 
     attr_accessor :context
 

data/lib/xcake/generator/default_project_structure_generator.rb

@@ -8,7 +8,6 @@ module Xcake
   # and targets have all of the same configurations.
   #
   class DefaultProjectStructureGenerator < Generator
-
     def self.dependencies
       [ProjectMetadataGenerator, TargetGenerator]
     end
@@ -40,11 +39,11 @@ module Xcake
 
       target.all_configurations.each do |c|
         target.scheme "#{target.name}-#{c.name}" do |s|
-            s.test_configuration = c.name
-            s.launch_configuration = c.name
-            s.profile_configuration = c.name
-            s.analyze_configuration = c.name
-            s.archive_configuration = c.name
+          s.test_configuration = c.name
+          s.launch_configuration = c.name
+          s.profile_configuration = c.name
+          s.analyze_configuration = c.name
+          s.archive_configuration = c.name
         end
       end
     end

data/lib/xcake/generator/project_generator.rb

@@ -1,13 +1,14 @@
 module Xcake
   class ProjectGenerator < Generator
     def self.dependencies
-      Generator.descendants.select do |g|
-        g != self
+      Generator.descendants.reject do |g|
+        g == self
       end
     end
 
     def leave_project(project)
       native_project = @context.native_object_for(project)
+      project.run_hook :before_save, native_project
       native_project.save
       project.run_hook :after_save
 

data/lib/xcake/generator/scheme_generator.rb

@@ -13,42 +13,52 @@ module Xcake
       scheme_list = @context.scheme_list
       native_target = @context.native_object_for(target)
 
-      target.schemes.each do |scheme| 
+      target.schemes.each do |scheme|
+        scheme_list.supress_autocreation_of_target(native_target)
 
-          scheme_list.supress_autocreation_of_target(native_target)
+        native_scheme = @context.native_object_for(scheme)
+        native_scheme.name = scheme.name
 
-          native_scheme = @context.native_object_for(scheme)
-          native_scheme.name = scheme.name
+        native_scheme.configure_with_targets(native_target, nil)
 
-          native_project = @context.native_object_for(@project)
-          native_unit_test_target = native_project.find_unit_test_target_for_target(target)
+        native_project = @context.native_object_for(@project)
+        native_unit_test_target = native_project.find_unit_test_target_for_target(target)
 
-          if native_unit_test_target
-            scheme_list.supress_autocreation_of_target(native_unit_test_target)
-          end
+        if native_unit_test_target
+          scheme_list.supress_autocreation_of_target(native_unit_test_target)
+          # native_scheme.add_build_target(native_unit_test_target, false)
+          native_scheme.add_test_target(native_unit_test_target)
+        end
 
-          # # TODO: Spec
-          # if native_target.library_target_type?
-          #   build_action = native_scheme.build_action
+        native_ui_test_target = native_project.find_ui_test_target_for_target(target)
 
-          #   entry = Xcodeproj::XCScheme::BuildAction::Entry.initialize()
-          #   entry.build_for_running(true)
+        if native_ui_test_target
+          scheme_list.supress_autocreation_of_target(native_ui_test_target)
+          # native_scheme.add_build_target(native_ui_test_target, false)
+          native_scheme.add_test_target(native_ui_test_target)
+        end
 
-          #   build_action.add_entry(entry)
-          # end
+        # # TODO: Spec
+        # if native_target.library_target_type?
+        #   build_action = native_scheme.build_action
 
-          native_scheme.configure_with_targets(native_target, native_unit_test_target)
-          native_scheme.test_action.build_configuration = scheme.test_configuration
-          native_scheme.launch_action.build_configuration = scheme.launch_configuration
-          native_scheme.profile_action.build_configuration = scheme.profile_configuration
-          native_scheme.analyze_action.build_configuration = scheme.analyze_configuration
-          native_scheme.archive_action.build_configuration = scheme.archive_configuration
+        #   entry = Xcodeproj::XCScheme::BuildAction::Entry.initialize()
+        #   entry.build_for_running(true)
 
-          scheme_list.schemes << native_scheme
+        #   build_action.add_entry(entry)
+        # end
+
+        native_scheme.test_action.build_configuration = scheme.test_configuration
+        native_scheme.launch_action.build_configuration = scheme.launch_configuration
+        native_scheme.profile_action.build_configuration = scheme.profile_configuration
+        native_scheme.analyze_action.build_configuration = scheme.analyze_configuration
+        native_scheme.archive_action.build_configuration = scheme.archive_configuration
+
+        scheme_list.schemes << native_scheme
       end
     end
 
-    def leave_project(project)
+    def leave_project(_project)
       scheme_list = @context.scheme_list
       scheme_list.save
     end

data/lib/xcake/generator/target_build_rule_generator.rb

@@ -0,0 +1,24 @@
+module Xcake
+  # This generator generates the build phases for each target
+  # in the project
+  #
+  class TargetBuildRuleGenerator < Generator
+    def self.dependencies
+      [TargetBuildPhaseGenerator]
+    end
+
+    def visit_target(target)
+      EventHooks.run_hook :before_adding_build_rules, target
+
+      native_target = @context.native_object_for(target)
+
+      target.build_rules.each do |rule|
+        EventHooks.run_hook :before_adding_custom_build_rule, rule, target
+
+        native_build_rule = @context.native_object_for(rule)
+        rule.configure_native_build_rule(native_build_rule, @context)
+        native_target.build_rules << native_build_rule
+      end
+    end
+  end
+end

data/lib/xcake/generator/target_file_reference_generator.rb

@@ -19,12 +19,12 @@ module Xcake
       paths_without_directories = Dir.glob(reg_exp).reject do |f|
         file_ext = File.extname(f)
         disallowed_extensions = [
-          ".xcdatamodeld",
-          ".xcassets",
-          ".framework",
-          ".bundle"
+          '.xcdatamodeld',
+          '.xcassets',
+          '.framework',
+          '.bundle'
         ]
-        
+
         File.directory?(f) && !disallowed_extensions.include?(file_ext)
       end
       paths = paths_without_directories.map do |f|
@@ -51,11 +51,12 @@ module Xcake
 
       build_phase_symbol = PathClassifier.classification_for_path(path)
 
-      if PathClassifier.should_create_build_phase_for_classification?(build_phase_symbol)
-        build_phase_class = Xcodeproj::Project::Object.const_get(build_phase_symbol)
-        build_phase = native_target.build_phase_by_class(build_phase_class)
-        build_phase.add_file_reference(file_reference)
-      end
+      return unless PathClassifier.should_create_build_phase_for_classification?(build_phase_symbol)
+      return if target.info_plist_paths.include?(path)
+
+      build_phase_class = Xcodeproj::Project::Object.const_get(build_phase_symbol)
+      build_phase = native_target.build_phase_by_class(build_phase_class)
+      build_phase.add_file_reference(file_reference)
     end
   end
 end

data/lib/xcake/generator/target_framework_generator.rb

@@ -5,14 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-      unless target.system_frameworks.nil?
-        EventHooks.run_hook :before_adding_system_framework, target
+      return if target.system_frameworks.nil?
 
-        native_target = @context.native_object_for(target)
+      EventHooks.run_hook :before_adding_system_framework, target
 
-        system_frameworks = target.system_frameworks
-        native_target.add_system_frameworks(system_frameworks)
-      end
+      native_target = @context.native_object_for(target)
+
+      system_frameworks = target.system_frameworks
+      native_target.add_system_frameworks(system_frameworks)
     end
   end
 end

data/lib/xcake/generator/target_library_generator.rb

@@ -5,15 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-
       system_libraries = target.system_libraries.to_a
 
-      unless system_libraries.empty?
-        EventHooks.run_hook :before_adding_system_library, target
+      return if system_libraries.empty?
+
+      EventHooks.run_hook :before_adding_system_library, target
 
-        native_target = @context.native_object_for(target)
-        native_target.add_system_libraries(system_libraries)
-      end
+      native_target = @context.native_object_for(target)
+      native_target.add_system_libraries(system_libraries)
     end
   end
 end

data/lib/xcake/path_classifier.rb

@@ -7,7 +7,7 @@ module Xcake
     EXTENSION_MAPPINGS = {
       PBXFrameworksBuildPhase: %w(.a .dylib .so .framework).freeze,
       PBXHeadersBuildPhase: %w(.h .hpp).freeze,
-      PBXSourcesBuildPhase: %w(.c .m .mm .cpp .swift .xcdatamodeld).freeze,
+      PBXSourcesBuildPhase: %w(.c .m .mm .cpp .swift .xcdatamodeld .java).freeze,
       PBXResourcesBuildPhase: %w(.xcassets).freeze
     }.freeze
 
@@ -20,8 +20,9 @@ module Xcake
     # into the project
     #
     def self.should_include_path?(path)
-      return false if is_locale_container?(path)
-      return false if is_inside_classified_container?(path)
+      return false if locale_container?(path)
+      return false if inside_classified_container?(path)
+
       true
     end
 
@@ -31,6 +32,7 @@ module Xcake
       end
 
       return :PBXResourcesBuildPhase if classification.nil?
+
       classification.first
     end
 
@@ -38,29 +40,31 @@ module Xcake
       classification != :PBXHeadersBuildPhase
     end
 
-    private_class_method
+    class << self
+      private
 
-    def self.is_locale_container?(path)
-      components = path.split('/')
-      File.extname(components.last) == '.lproj'
-    end
+      def locale_container?(path)
+        components = path.split('/')
+        File.extname(components.last) == '.lproj'
+      end
 
-    def self.is_inside_classified_container?(path)
-      components = path.split('/')
+      def inside_classified_container?(path)
+        components = path.split('/')
 
-      classified_component_index = components.index do |c|
-        is_classified?(c)
-      end
+        classified_component_index = components.index do |c|
+          classified?(c)
+        end
 
-      if !classified_component_index.nil?
-        classified_component_index < (components.length - 1)
-      else
-        false
+        if !classified_component_index.nil?
+          classified_component_index < (components.length - 1)
+        else
+          false
+        end
       end
-    end
 
-    def self.is_classified?(path)
-      EXTENSION_MAPPINGS.values.flatten.any? { |ext| File.extname(path) == ext }
+      def classified?(path)
+        EXTENSION_MAPPINGS.values.flatten.any? { |ext| File.extname(path) == ext }
+      end
     end
   end
 end

data/lib/xcake/ui.rb

@@ -38,7 +38,7 @@ module Xcake
       end
 
       EventHooks.before_attaching_xcconfig do |configuration|
-        board.puts_indented "- Attaching XCConfig #{configuration.configuration_file} to build configuration #{configuration.name}"
+        board.puts_indented "- Attaching XCConfig #{configuration.configuration_file} to build configuration #{configuration.name}" # rubocop:disable Metrics/LineLength
       end
 
       EventHooks.before_adding_system_library do |target|
@@ -53,6 +53,10 @@ module Xcake
         board.puts_indented "- Integrating System Frameworks #{target.system_frameworks} for #{target}"
       end
 
+      EventHooks.before_adding_build_rules do |target|
+        board.puts_indented "- Creating build rules for #{target}"
+      end
+
       EventHooks.before_adding_build_phases do |target|
         board.puts_indented "- Creating build phases for #{target}"
       end
@@ -65,6 +69,10 @@ module Xcake
         board.puts "- Adding #{node.path}"
       end
 
+      EventHooks.before_adding_custom_build_rule do |rule, target|
+        board.puts "- Adding \"#{rule}\" to #{target}"
+      end
+
       EventHooks.before_adding_custom_build_phase do |phase, target|
         board.puts "- Adding \"#{phase}\" to #{target}"
       end

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.8.12'.freeze
+  VERSION = '0.9.3'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -140,9 +140,8 @@ module Xcake
       # @return [PBXGroup] existing or new xcode group
       #
       def group_for_file_reference_path(path)
-        clean_path = path.cleanpath
         group = variant_group_for_path(path)
-        group = group_for_path(path) unless group
+        group ||= group_for_path(path)
         group
       end
 
@@ -163,6 +162,7 @@ module Xcake
         base_name = group_path.basename
 
         return nil unless base_name.to_s.include?('.lproj')
+
         parent_group = group_for_path(group_path)
 
         group = parent_group[path.basename.to_s]
@@ -181,6 +181,7 @@ module Xcake
         group_path = path.dirname.cleanpath
 
         return main_group unless group_path.to_s != '.'
+
         main_group.child_for_path(group_path.to_s)
       end
 
@@ -198,6 +199,19 @@ module Xcake
           t.name == "#{target.name}Tests"
         end
       end
+
+      # Finds a ui test target for a xcode target
+      #
+      # @param [Target] target
+      #                 target to find a xcode target for.
+      #
+      # @return [Target] ui test target
+      #
+      def find_ui_test_target_for_target(target)
+        targets.find do |t|
+          t.name == "#{target.name}UITests"
+        end
+      end
     end
   end
 end

data/lib/xcake/xcode/scheme_list.rb

@@ -18,8 +18,6 @@ module Xcake
       #
       attr_accessor :xcschememanagement
 
-      public
-
       # @param    [Project] project
       #           project to create scheme list for.
       #