xcake 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dde5e41df8ae9a58444f1ed09ecd44797f5643d
-  data.tar.gz: 03bb619369f0fbfb00ecd3e2bc9655e487936dc4
+  metadata.gz: 922659236668f3f498562f2355111f765332f962
+  data.tar.gz: 38fdc71a060d82c42168b4950379193fcca38737
 SHA512:
-  metadata.gz: 95a03f9e827e88375540b34c6a925508d1c368175c650943c8dd4ed1d9a0b42cd392074bba01e880ec6bad817ff21a97975cca29883f3a8ac8cbaa193cf3288f
-  data.tar.gz: 081eeba95e84cfe935024b6d8eaf71b677e1c6f49fc432fb613645dcaaad0ae62dafd444c6d3b9f06268787396e10a33259705f74166d7571c70575a512f318e
+  metadata.gz: 99a37036e27cb624edb346a4bb911e7b78034a54d730d0e09934c712c070e6ce385b4eebfda2df60354eef117fadf49ff03e22a3e3a3c838e1dee835dde57856
+  data.tar.gz: 0f8527a7d02ba8466bae4969f741c892c209b0e118579677eac6bd7c4d7f36fa0dbecc9f69c6745bf6dbd20c611b0d69319cf1abd34ec10b7edcd24122bf5319

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.8.13
+=======
+- Fixes some of the gem being bundled with older code
+
 v0.8.12
 =======
 - Fixes bug with the target file reference generator

data/lib/xcake.rb

@@ -39,12 +39,12 @@ require 'xcake/dsl/project/hooks'
 
 require 'xcake/dsl/scheme'
 
-require 'xcake/dsl/scheme'
-
 require 'xcake/dsl/target'
 require 'xcake/dsl/target/sugar'
 require 'xcake/dsl/target/configurable'
 
+require 'xcake/dsl/build_rule'
+
 require 'xcake/dsl/build_phase'
 require 'xcake/dsl/build_phase/headers_build_phase'
 require 'xcake/dsl/build_phase/shell_script_build_phase'

data/lib/xcake/context/xcodeproj_context.rb

@@ -11,6 +11,8 @@ module Xcake
       case dsl_object
       when BuildPhase
         create_object_for_build_phase(dsl_object)
+      when BuildRule
+        create_object_for_build_rule(dsl_object)
       when Project
         create_object_for_project(dsl_object)
       when Target
@@ -26,6 +28,10 @@ module Xcake
       @project.new(build_phase.build_phase_type)
     end
 
+    def create_object_for_build_rule(build_rule)
+      @project.new(Xcodeproj::Project::Object::PBXBuildRule)
+    end
+
     def create_object_for_project(project)
       
       project_path = "./#{project.name}.xcodeproj"

data/lib/xcake/dsl/build_rule.rb

@@ -0,0 +1,76 @@
+module Xcake
+  # This class is used to describe a build rule for a
+  # Xcode project; This forms part of the DSL
+  # and is usually stored in files named `Cakefile`.
+  #
+  class BuildRule
+    # @return [String] the name of the rule.
+    #
+    attr_accessor :name
+
+    # @return [String] the type of the files that should be processed by
+    #         this rule.
+    #
+    # @example
+    #   `pattern.proxy`.
+    #
+    attr_accessor :file_type
+
+    # @return [ObjectList<PBXFileReference>] the file references for the
+    #         output files.
+    #
+    attr_accessor :output_files
+
+    # @return [ObjectList<String>] the compiler flags used when creating the
+    #         respective output files.
+    #
+    attr_accessor :output_files_compiler_flags
+
+    # @return [String] the content of the script to use for the build rule.
+    #
+    # @note   This attribute is present if the #{#compiler_spec} is
+    #         `com.apple.compilers.proxy.script`
+    #
+    attr_accessor :script
+
+    # @param    [Proc] block
+    #           an optional block that configures the build rule through the DSL.
+    #
+    # @example  Creating a Build Rule.
+    #
+    #           BuildRule.new do |p|
+    #             p.name "test"
+    #           end
+    #
+    def initialize
+      @output_files = []
+      @output_files_compiler_flags = []
+
+      yield(self) if block_given?
+    end
+
+    # This method is called when generating the build rules
+    # subclasses should implement this to handle the
+    # configuration of the build phase
+    #
+    def configure_native_build_rule(native_build_rule, _context)
+      native_build_rule.name = name
+      native_build_rule.compiler_spec = "com.apple.compilers.proxy.script"
+      native_build_rule.file_type = file_type
+      native_build_rule.script = script.strip_heredoc
+      if output_files_compiler_flags.empty? then
+        output_files.each do |file|
+          native_build_rule.add_output_file(file)
+        end
+      else
+        output_files.zip(output_files_compiler_flags).each do |file, flag|
+          native_build_rule.add_output_file(file, flag)
+        end
+      end
+    end
+
+    def to_s
+      "BuildRule<#{name}>"
+    end
+  end
+end

data/lib/xcake/dsl/target.rb

@@ -42,6 +42,11 @@ module Xcake
     #
     attr_accessor :build_phases
 
+    # @return [Array<BuildRule>] the list
+    #                             of build rules for the project.
+    #
+    attr_accessor :build_rules
+
     # @!group File patterns
 
     #
@@ -189,6 +194,7 @@ module Xcake
     def initialize
       @pinned_build_phases = []
       @build_phases = []
+      @build_rules = []
       @exclude_files = []
       @linked_targets = []
       @system_libraries = []

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/scheme_generator.rb

@@ -13,18 +13,30 @@ 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)
 
           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)
 
           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
+
+          native_ui_test_target = native_project.find_ui_test_target_for_target(target)
+
+          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
 
           # # TODO: Spec
@@ -37,7 +49,6 @@ module Xcake
           #   build_action.add_entry(entry)
           # end
 
-          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
@@ -48,6 +59,7 @@ module Xcake
       end
     end
 
+
     def leave_project(project)
       scheme_list = @context.scheme_list
       scheme_list.save

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/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
 

data/lib/xcake/ui.rb

@@ -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.8.13'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -198,6 +198,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - James Campbell
@@ -252,6 +252,7 @@ files:
 - lib/xcake/dsl/build_phase/copy_files_build_phase.rb
 - lib/xcake/dsl/build_phase/headers_build_phase.rb
 - lib/xcake/dsl/build_phase/shell_script_build_phase.rb
+- lib/xcake/dsl/build_rule.rb
 - lib/xcake/dsl/configurable.rb
 - lib/xcake/dsl/configuration.rb
 - lib/xcake/dsl/configuration/proxies/preproccessor_definitions_setting_proxy.rb
@@ -271,6 +272,7 @@ files:
 - lib/xcake/generator/project_metadata_generator.rb
 - lib/xcake/generator/scheme_generator.rb
 - lib/xcake/generator/target_build_phase_generator.rb
+- lib/xcake/generator/target_build_rule_generator.rb
 - lib/xcake/generator/target_dependency_generator.rb
 - lib/xcake/generator/target_file_reference_generator.rb
 - lib/xcake/generator/target_framework_generator.rb