xcake 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1395ab449d68f8c6752ab847f68c2e792c4a5f
-  data.tar.gz: 4ddc2a92892c9b3055afe502e32a74dea9a0b091
+  metadata.gz: 4da03a7ad01471d0dc369726d08bdbb3b2dc57e1
+  data.tar.gz: 5175f24936447b166128f6668cef3536fb13d03d
 SHA512:
-  metadata.gz: 0f78ec259d2c68355f7683dc155b8c62ec49dfd89fc25c15f4c8a92e361fe628ad53acdbe5e9be99cd6b2facbc4b477fdef32fd9237ec4e2efbcf581006c6cf6
-  data.tar.gz: 392069628c7ebe6816cfdf4a8c67e13e584329a40392b35860782f9b8e7dbb3e324518a4cb4f9f6dec12da0677b32aa9f20ac9ebbf99302067112acafd5248e3
+  metadata.gz: 73e2ea35e70c958c7a8c019f7af31e80397f2893ae06aaf19bfdb412315db5cf11c03ce3854312c0f734ce40a5fc2a3413965e9659c2176fa71338ea3d3491ca
+  data.tar.gz: a5f97dc9a8fd031a602e1ddfb133cacf7c4656332ae4db80ece655e8c7cf02409f2d47aa7c16e510a76df50b280a5f4a4965fa8d21c6fab2d9b43c70f6483551

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+v0.6.3
+======
+- Adds support for adding system and static libraries (Thanks to @nodepad).
+- Adds support for folder references (Thanks to @nodepad).
+- Adds support for XCConfig Files (Thanks to @colinta).
+- Documentation updated to explain how to set up a unit test target (Thanks to @maximkhatskevich).
+
 v0.6.2
 ======
-- Fixes bug where certain file installers fail to register correctly and could cause issues with adding certain files to the xcode project.
+- Fixes bug where certain file installers fail to register and could cause issues with adding certain files to the Xcode project.
 
 v0.6.1
 ======
@@ -8,22 +15,22 @@ v0.6.1
 
 v0.6.0
 ======
-- Correctly infers build phases for the apple watch.
+- Infers build phases for the apple watch.
 - Fixes bug where configurations lacked a name when using shorthand syntax. (Thanks to @colinta).
 - Adds support for custom script build phases (Thanks to @colinta).
 
 v0.5.3
 ======
-- Updates `xcake bake` to more generic `xcake make` (Thanks to @roger-tan).
+- Updates `xcake bake` to the more generic `xcake make` (Thanks to @roger-tan).
 
 v0.5.2
 ======
 - Updates `xcake init` for new project syntax.
-- Adds shorthand build configuration syntax for projects which only contain one debug or release configuration (Thanks to @colinta).
+- Adds shorthand build configuration syntax for projects which contain one debug or release configuration (Thanks to @colinta).
 
 v0.5.1
 ======
-- Tweaks DSL so it is easier to access the project properties via the `project` method.
+- Tweaks DSL so it's easier to access the project properties via the `project` method.
 
 v0.5.0
 ======
@@ -55,7 +62,7 @@ v0.4.4
 
 v0.4.3
 ======
-- Correctly containing `.xcdatamodeld` files to a project, rather than the
+- Correctly adds containing `.xcdatamodeld` files to a project, rather than the
   internal `.xcdatamodel`.
 
 v0.4.2
@@ -86,7 +93,7 @@ v0.2.0
 - Now adds `--version` flag to command line, to allow you to find out Xcake's
   version.
 - Brings naming of default build configurations closer to Xcode's, so that it
-  works with existing build   scripts.
+  works with existing build scripts.
 - Adds support for Watch OS 2 Applications.
 
 v0.1.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcake (0.6.2)
+    xcake (0.6.4)
       claide (~> 0.9.1)
       hooks (~> 0.4.1)
       molinillo
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -20,7 +20,7 @@ GEM
     claide (0.9.1)
     coderay (1.1.1)
     colored (1.2)
-    coveralls (0.8.11)
+    coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
@@ -35,7 +35,7 @@ GEM
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.8.4)
-    molinillo (0.4.3)
+    molinillo (0.4.4)
     necromancer (0.3.0)
     pastel (0.5.3)
       equatable (~> 0.5.0)
@@ -49,7 +49,7 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/docs/Cakefile.md

@@ -98,7 +98,26 @@ We can also specify a testing targets for other targets as well:
 
 ```ruby
 application_for :mac, 8.0 do |target|
-  unit_tests_for target
+  unit_tests_for target 
+end
+```
+
+The above code will create a complementary unit tests target for the `target`. The unit tests target name will be default `<target.name>Tests`, so if your `target.name` is "MyFirstApp" then your unit tests target will be named "MyFirstAppTests", and Xcake will include any files that are placed under folder with the same name/path (if it exists).
+
+If you want to manually control configuration of unit tests targets (and/or have multiple ones), then you should do like this:
+
+```ruby
+application_for :mac, 8.0 do |target|
+
+  unit_tests_for target do |test_target|
+  
+        test_target.name = "MyAwesomeTests"
+        test_target.include_files = ["Tests/**/*.*"]
+        
+        # configure any other target-related properties
+        # as you would do with normal target
+
+    end 
 end
 ```
 
@@ -175,8 +194,8 @@ to the project to match the file system.
 for file patterns
 
 ```ruby
-target.include_files = "DifferentAppFolder/*.*"
-target.include_files << "OtherFolder/*.*"
+target.include_files = ["FolderOne/*.*"] # array
+target.include_files << "FolderTwo/**/*.*" # add an item to array
 ```
 
 #### Exclude Files
@@ -188,8 +207,8 @@ will be excluded from the project
 for file patterns
 
 ```ruby
-target.exclude_files = "FolderToIgnore/*.*"
-target.exclude_files << "OtherFolderToIgnore/*.*"
+target.exclude_files = ["FolderToIgnore/*.*"] # array
+target.exclude_files << "OtherFolderToIgnore/*.*" # add an item to array
 ```
 
 ## Configurations

data/lib/xcake.rb

@@ -41,6 +41,7 @@ require "xcake/generator/target_generator"
 require "xcake/generator/target_dependency_generator"
 require "xcake/generator/target_framework_generator"
 require "xcake/generator/target_build_phase_generator"
+require "xcake/generator/target_library_generator"
 
 # TODO: Merge these into one target build phase generator
 require "xcake/generator/target_file_reference_generator"
@@ -52,6 +53,7 @@ require "xcake/file_reference_installer/compile_xcdatamodeld_file_reference_inst
 require "xcake/file_reference_installer/copy_resources_file_reference_installer"
 require "xcake/file_reference_installer/copy_xcassets_file_reference_installer"
 require "xcake/file_reference_installer/header_file_reference_installer"
+require "xcake/file_reference_installer/link_library_file_reference_installer"
 
 module Xcake
 

data/lib/xcake/configuration.rb

@@ -26,6 +26,13 @@ module Xcake
     #
     attr_accessor :settings
 
+    # @return [String] the name of the xcconfig file to use for
+    #         the build configuration.
+    #
+    #         This is resolved to a PBXFileReference.
+    #
+    attr_accessor :configuration_file
+
     # @param    [String] name
     #           the name of the configuration.
     #           This is used for the build configuration name.

data/lib/xcake/dependency.rb

@@ -3,6 +3,7 @@ require 'xcodeproj'
 #TODO: Figure out a more robust Dependency system
 # - Needs to handle subclass of subclass.....
 # - Needs to have better mixin hiearchy
+# - Implement a pre-dependency (Something that this needs to happen in front of)
 
 module Xcake
   module Dependency

data/lib/xcake/file_reference_installer/copy_resources_file_reference_installer.rb

@@ -2,6 +2,7 @@ module Xcake
   # This build phase generator detects
   # files and adds them to the copy resources phase.
   #
+  # Note: This installer is always the last to be executed.
   class CopyResourcesFileReferenceInstaller < FileReferenceInstaller
 
     def self.dependencies
@@ -11,7 +12,11 @@ module Xcake
     end
 
     def self.can_install_node(node)
-      !File.directory?(node.path)
+      extension = File.extname(node.path)
+      (!File.directory?(node.path) ||
+        (File.directory?(node.path) &&
+            ![".xcassets", ".xcdatamodeld", ".lproj"].include?(extension) &&
+            node.children.count == 0))
     end
 
     def add_file_reference_to_target(file_reference, target)

data/lib/xcake/file_reference_installer/link_library_file_reference_installer.rb

@@ -0,0 +1,15 @@
+module Xcake
+  # This build phase generator detects library
+  # files and adds them to the frameworks build phase.
+  #
+  class LinkLibraryFileReferenceInstaller < FileReferenceInstaller
+    def self.can_install_node(node)
+      !File.directory?(node.path) &&
+        %w(.a .dylib .so).include?(File.extname(node.path))
+    end
+
+    def add_file_reference_to_target(file_reference, target)
+      target.frameworks_build_phases.add_file_reference(file_reference)
+    end
+  end
+end

data/lib/xcake/file_reference_installer/xcconfig_file_reference_installer.rb

@@ -0,0 +1,17 @@
+module Xcake
+  # This build phase generator detects xcconfigs
+  # files, adds them to the project and tries to connect them
+  # to a configuration.
+  #
+  # TODO: In future we will implement a 2 phase file installer system.
+  class XCConfigFileReferenceInstaller < FileReferenceInstaller
+    def self.can_install_node(node)
+      !File.directory?(node.path) &&
+        %w(.xcconfig).include?(File.extname(node.path))
+    end
+
+    def add_file_reference_to_target(file_reference, target)
+      #target.frameworks_build_phases.add_file_reference(file_reference)
+    end
+  end
+end

data/lib/xcake/generator/configuration_generator.rb

@@ -1,7 +1,7 @@
 require 'xcodeproj'
 
 module Xcake
-  # This generator processes the configuraions
+  # This generator processes the configurations
   # and creates xcode build configurations.
   #
   class ConfigurationGenerator < Generator
@@ -30,7 +30,18 @@ module Xcake
 
         native_configuration_object = @context.native_object_for(configuration_object)
         native_configuration_object.build_configurations << build_configuration
+
+        xcconfig = install_xcconfig(configuration)
+        native_configuration_object.base_configuration_reference = xcconfig
       end
     end
+
+    def install_xcconfig(configuration)
+      # TODO: Remove need to construct a Node Object to do this.
+      node = Node.new
+      node.path = configuration.configuration_file
+      native_group = @context.native_object_for(node)
+      native_group.new_reference(node.path)
+    end
   end
 end

data/lib/xcake/generator/target_custom_build_phase_generator.rb

@@ -6,6 +6,7 @@ module Xcake
     end
 
     def visit_target(target)
+      # TODO: Refactor this system.
       native_target = @context.native_object_for(target)
       target.build_phases.each do |phase|
         puts "Adding custom phase \"#{phase.name}\" for #{target}"

data/lib/xcake/generator/target_library_generator.rb

@@ -0,0 +1,16 @@
+module Xcake
+  class TargetLibraryGenerator < Generator
+    def self.dependencies
+      [TargetGenerator, ConfigurationGenerator]
+    end
+
+    def visit_target(target)
+      puts "Integrating System Libraries for #{target}..."
+
+      native_target = @context.native_object_for(target)
+      if target.system_libraries
+        native_target.add_system_libraries(target.system_libraries)
+      end
+    end
+  end
+end

data/lib/xcake/target.rb

@@ -150,6 +150,14 @@ module Xcake
     #
     attr_accessor :system_frameworks
 
+    # @return [Array<String>] system libraries to include for the target
+    #
+    # @example
+    #
+    #    spec.system_libraries = ["z", "sqlite3"]
+    #
+    attr_accessor :system_libraries
+
     # @return [Array<Target>] targets to use as dependencies
     #
     attr_accessor :target_dependencies
@@ -180,6 +188,10 @@ module Xcake
       @system_frameworks ||= default_system_frameworks_for self.platform
     end
 
+    def system_libraries
+      @system_libraries ||= []
+    end
+
     def target_dependencies
       @target_dependencies ||= []
     end

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = "0.6.2".freeze
+  VERSION = "0.6.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,8 @@ files:
 - lib/xcake/file_reference_installer/copy_resources_file_reference_installer.rb
 - lib/xcake/file_reference_installer/copy_xcassets_file_reference_installer.rb
 - lib/xcake/file_reference_installer/header_file_reference_installer.rb
+- lib/xcake/file_reference_installer/link_library_file_reference_installer.rb
+- lib/xcake/file_reference_installer/xcconfig_file_reference_installer.rb
 - lib/xcake/generator.rb
 - lib/xcake/generator/configuration_generator.rb
 - lib/xcake/generator/project_generator.rb
@@ -226,6 +228,7 @@ files:
 - lib/xcake/generator/target_file_reference_generator.rb
 - lib/xcake/generator/target_framework_generator.rb
 - lib/xcake/generator/target_generator.rb
+- lib/xcake/generator/target_library_generator.rb
 - lib/xcake/informative.rb
 - lib/xcake/node.rb
 - lib/xcake/plugin.rb