xcake 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd03b14ab161ed70a1e93b9fba18cd2afb07ef4
-  data.tar.gz: 38465332b4fc403839295c20303a02e9d7971fef
+  metadata.gz: 42ae2cb0e62db43dbf402e090668547cf1ad55cb
+  data.tar.gz: 94b0c1b5d847c324c196119da602212298340c5f
 SHA512:
-  metadata.gz: 4623186e840303d74cd19d13e17350eb3bb843d19c8a18c0997b62e6b68cd1ad02ed14258a9cfa4587e643a3c37a734e5ef1ca5878f7e4dcb4613e4067fecf44
-  data.tar.gz: 8a5abfc099e37a66e6d1a368371636234f1a418b996080ca3fd8d6e7e28fcd1daa8bbb290289f2df2d9e0d4df1fed3521976effe2810d774b350e9cc298b2f7f
+  metadata.gz: 9dd1fb970e81a2de306c6444c4272c4632024bc13aa71593d2c31f097fe72c86caa05850369bfcf3b89ee75f6a00a976e176d4f90ef5773e55a8a2cb6219b995
+  data.tar.gz: 6ad5fca8fd6207c0eae412554202a759493c1b21e8b9ddf48846a5da35443395a1cc975e79bf92958e62fc8d774a7e02114c0b25696093afe14dc63208822455

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+v0.8.3
+======
+- Fixes bug with scheme generator when configuring unit tests for schemes.
+
+v0.8.2
+======
+- Adds ability to explicity specify schemes.
+- Reduced verbosity of output to the command line.
+
 v0.8.1
 ======
 - Fixes error creating shell script build phase.

data/docs/Cakefile.md

@@ -286,20 +286,6 @@ target.headers_build_phase "Build Phase Name" do |phase|
 end
 ```
 
-##### Link Libraries Build Phase
-
-You can create a Link Libraries build phase to link a lobrary when building.
-
-Note: If you import a library or framework using `include_files` then xcake
-already adds it to the Link Libraries build phase.
-
-```ruby
-target.link_build_phase "Build Phase Name" do |phase|
-  phase.files = ["LibraryToLink.a"] # array
-  phase.filwa << "OtherLibraryToLink.a" # add an item to array
-end
-```
-
 ##### Shell Script Build Phase
 
 You can create a Shell Script buld phase to run a script when building.
@@ -313,10 +299,7 @@ end
 
 ## Configurations
 
-Configurations are an abstraction of build settings and scheme settings. Depending
-on the target Xcake will create a scheme per target and per configuration.
-
-Xcake allows you define a hierarchy of build settings like you would in Xcode
+Xcake allows you define a hierarchy of build configuations like you would in Xcode
 for the Project and the Targets.
 
 ### Debug Configurations
@@ -394,7 +377,7 @@ it also has its own hiearchy of settings, which are in the following order
 - Custom Settings
   These are the settings set directly on the configuration.
 
-###Properties
+### Properties
 
 #### Name
 
@@ -448,3 +431,79 @@ Allows you to specify preprocessor definitions.
 ```ruby
 configuration.preprocessor_definitions["NAME"] = "VALUE"
 ```
+## Schemes
+
+Xcake allows you to specify schemes for launching, testing,
+profiling and archiving targets.
+
+When no schemes are specified for a target then Xcake will auto generate 
+a scheme per configuration per target (i.e "Target-Debug" and "Target-Release")
+
+### Creating A Scheme
+
+We can create a scheme with the name of the target like so:
+
+```ruby
+target.scheme(target.name)
+```
+
+If we don't configure this scheme then it will default to the reccomended
+Apple settings of using the debug build configurations for everything
+except the Archive action which will use the Release configuration.
+
+We can modify settings for a scheme easily.
+
+```ruby
+target.scheme(target.name) do |scheme|
+  scheme.build_configuration = :staging
+end
+```
+### Properties
+
+#### Name
+
+Sets the name of the scheme
+
+```ruby
+scheme.name = "MyApp"
+```
+
+#### Test Configuration
+
+Sets the configuration to use when running tests
+
+```ruby
+scheme.test_configuration = :debug
+```
+
+#### Launch Configuration
+
+Sets the configuration to use when running tests
+
+```ruby
+scheme.launch_configuration = :debug
+```
+
+#### Profile Configuration
+
+Sets the configuration to use when profiling a target
+
+```ruby
+scheme.profile_configuration = :debug
+```
+
+#### Analyze Configuration
+
+Sets the configuration to use when analyzing a target
+
+```ruby
+scheme.analyze_configuration = :debug
+```
+
+#### Archive Configuration
+
+Sets the configuration to use when archiving
+
+```ruby
+scheme.archive_configuration = :debug
+```

data/docs/Xcode Project Support.md

@@ -32,18 +32,16 @@ This document describes the level of support Xcake has for the various aspects o
     - Copy Headerss
     - Shell Script
 
-## Configuration
+## Build Configuration
 
-- Set name for configuration (Used for name of build configuration created)
+- Set name for configuration
 - Specify build settings
-- Used to create build configuration for project and targets.
-- Used to create schemes for applications
-- Set XCConfig to inherit settings from.
+- Set XCConfig to inherit settings from
 
 ## Scheme
 
-- No manual control. For Application targets, xcake creates them based on the configurations for those targets (i.e "myApp-Debug". "myApp-Release")
-- Xcode auto-creates them currently for other target types.
+- Set name for scheme
+- Set build configuration for each action (Build, Launch, Archive etc.)
 
 ## Files
 

data/lib/xcake/context/xcodeproj_context.rb

@@ -17,8 +17,8 @@ module Xcake
         create_object_for_target(dsl_object)
       when Configuration
         create_object_for_configuration(dsl_object)
-      when Node
-        create_object_for_node(dsl_object)
+      when Scheme
+        create_object_for_scheme(dsl_object)
       end
     end
 
@@ -40,8 +40,8 @@ module Xcake
       @project.new_configuration(configuration)
     end
 
-    def create_object_for_node(node)
-      @project.new_group(node)
+    def create_object_for_scheme(scheme)
+      Xcode::Scheme.new
     end
 
     def file_reference_for_path(path)

data/lib/xcake/{configurable.rb → dsl/configurable.rb}

@@ -65,8 +65,7 @@ module Xcake
     # This either finds a release configuration
     # with the same name or creates one.
     #
-    # @deprecated Please use `configuration <name>, :debug` this
-    #             woll be removed in 0.7.0
+    # @deprecated Please use `configuration <name>, :debug`
     #
     # @return [Configuration] the new or existing debug configuration
     #
@@ -77,8 +76,7 @@ module Xcake
     # This either finds a release configuration
     # with the same name or creates one.
     #
-    # @deprecated Please use `configuration <name>, :release` this
-    #             woll be removed in 0.7.0
+    # @deprecated Please use `configuration <name>, :release`
     #
     # @return [Configuration] the new or existing release configuration
     #

data/lib/xcake/{configuration.rb → dsl/configuration.rb}

@@ -1,15 +1,10 @@
 module Xcake
-  # This class repesents configurations
-  # in a xcode project. This is an abstraction
-  # of Schemes and Build Configurations.
+  # This class represents a Build Configuration
+  # in a xcode project.
   #
   # This forms part of the DSL and is usally
   # stored in files named `Cakefile`.
   #
-  # It holds the build settings and defines
-  # how many schemes are created for each
-  # target.
-  #
   class Configuration
     include Visitable
 

data/lib/xcake/{project → dsl/project}/sugar.rb

@@ -89,6 +89,8 @@ module Xcake
     private
 
     def configure_test_target_for_host_target(test_target, host_target)
+      
+      test_target.target_dependencies << host_target
       test_target.platform = host_target.platform
       test_target.deployment_target = host_target.deployment_target
       test_target.language = host_target.language

data/lib/xcake/{project.rb → dsl/project.rb}

@@ -46,8 +46,8 @@ module Xcake
     #           end
     #
     def initialize(name = 'Project')
-      self.name = name
-      self.targets = []
+      @name = name
+      @targets = []
 
       yield(self) if block_given?
     end
@@ -63,7 +63,7 @@ module Xcake
     #         the newly created target
     #
     def target(&block)
-      target = Target.new(project, &block)
+      target = Target.new(&block)
       targets << target
       target
     end

data/lib/xcake/dsl/scheme.rb

@@ -0,0 +1,55 @@
+module Xcake
+  # This class is used to describe a scheme for a
+  # Xcode project; This forms part of the DSL
+  # and is usually stored in files named `Cakefile`.
+  #
+  class Scheme
+    include Visitable
+
+    # The name for the scheme
+    # 
+    attr_accessor :name
+
+    # The configuration to use when testing
+    #
+    # Defaults to "Debug"
+    # 
+    attr_accessor :test_configuration
+
+    # The configuration to use when launching
+    #
+    # Defaults to "Debug"
+    #
+    attr_accessor :launch_configuration
+
+    # The configuration to use when profiling
+    #
+    # Defaults to "Debug"
+    #
+    attr_accessor :profile_configuration
+
+    # The configuration to use when analyzing
+    #
+    # Defaults to "Debug"
+    #
+    attr_accessor :analyze_configuration
+
+    # The configuration to use when archving
+    #
+    # Defaults to "Release"
+    #
+    attr_accessor :archive_configuration
+
+    def initialize(name)
+
+      @name = name
+      @test_configuration = 'Debug'
+      @launch_configuration = 'Debug'
+      @profile_configuration = 'Debug'
+      @analyze_configuration = 'Debug'
+      @archive_configuration = 'Release'
+
+      yield(self) if block_given?
+    end
+  end
+end

data/lib/xcake/{target.rb → dsl/target.rb}

@@ -7,10 +7,6 @@ module Xcake
     include Configurable
     include Visitable
 
-    # @return [Project] the project for the target.
-    #
-    attr_accessor :project
-
     # @return [String] the name of the target.
     #
     attr_accessor :name
@@ -172,6 +168,10 @@ module Xcake
     #
     attr_accessor :linked_targets
 
+    # @return [Array<Scheme>] schemes for the target
+    #
+    attr_accessor :schemes
+
     # @param    [Proc] block
     #           an optional block that configures the target through the DSL.
     #
@@ -181,19 +181,34 @@ module Xcake
     #             t.name "test"
     #           end
     #
-    def initialize(project)
-      @project = project
-
+    def initialize
       @build_phases = []
       @exclude_files = []
       @linked_targets = []
       @system_libraries = []
       @target_dependencies = []
+      @schemes = []
 
       yield(self) if block_given?
     end
 
-    ## Getters
+    # @!group Working with a target
+
+    # Creates a new scheme for the target
+    #
+    # @param  [String] name
+    #         the name of the new scheme 
+    #
+    # @return [Scheme] the scheme
+    #         the newly created scheme
+    #
+    def scheme(name, &block)
+      scheme = Scheme.new(name, &block)
+      schemes << scheme
+      scheme
+    end
+
+    # @!group getters
 
     def include_files
       # Import files in folder with same name as target by default

data/lib/xcake/generator/configuration_generator.rb

@@ -6,7 +6,7 @@ module Xcake
   #
   class ConfigurationGenerator < Generator
     def self.dependencies
-      [TargetGenerator, ProjectStructureGenerator]
+      [TargetGenerator, DefaultProjectStructureGenerator]
     end
 
     def visit_project(project)

data/lib/xcake/generator/{project_structure_generator.rb → default_project_structure_generator.rb}

@@ -1,13 +1,13 @@
 module Xcake
-  # This class handles resolving the structure
+  # This class handles generating the default structure
   # of a project. Making sure that the structure of the
   # project is one Xcode can open and makes sense.
   #
-  # As part of this it will create default configurations
+  # It will create default configurations or schemes
   # if none are provided and will make sure both the project
   # and targets have all of the same configurations.
-  class ProjectStructureGenerator < Generator
-    attr_accessor :project
+  #
+  class DefaultProjectStructureGenerator < Generator
 
     def visit_project(project)
       EventHooks.run_hook :before_resolving_project_structure, project
@@ -23,6 +23,21 @@ module Xcake
       @project.all_configurations.each do |c|
         target.configuration(c.name, c.type)
       end
+
+      native_target = @context.native_object_for(target)
+
+      return if native_target.test_target_type?
+      return unless target.schemes.empty?
+
+      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
+        end
+      end
     end
 
     def leave_target(target)

data/lib/xcake/generator/scheme_generator.rb

@@ -1,25 +1,47 @@
 module Xcake
   class SchemeGenerator < Generator
     def self.dependencies
-      [TargetGenerator, ConfigurationGenerator]
+      [TargetGenerator, DefaultProjectStructureGenerator, ConfigurationGenerator]
     end
 
-    def visit_project(_project)
+    def visit_project(project)
       EventHooks.run_hook :before_adding_user_schemes
+      @project = project
     end
 
     def visit_target(target)
       scheme_list = @context.scheme_list
       native_target = @context.native_object_for(target)
 
-      scheme_list.create_schemes_for_target(native_target) unless native_target.test_target_type?
+      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
+
+          #TODO: Find multiple testing targets, move this into the DSL ?
+          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
+
+          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
+
+          scheme_list.schemes << native_scheme
+      end
     end
 
     def leave_project(project)
       scheme_list = @context.scheme_list
-      native_project = @context.native_object_for(project)
-
-      scheme_list.save(native_project.path)
+      scheme_list.save
     end
   end
 end

data/lib/xcake/generator/target_library_generator.rb

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

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.3'.freeze
 end

data/lib/xcake/xcode/scheme_list.rb

@@ -33,43 +33,20 @@ module Xcake
         }
       end
 
-      # Creates schemes based on a target.
+      # Adds target to add instructions
+      # to tell xcode not to autocreate scheme for target
       #
       # @param    [Target] target
-      #           target to create schemes for
+      #           target to supress autocreation for
       #
-      def create_schemes_for_target(target)
-        target.build_configurations.each do |c|
-          scheme = Scheme.new
-
-          scheme.name = "#{target.name}-#{c.name}"
-          @xcschememanagement['SuppressBuildableAutocreation'][target.uuid] = { 'primary' => true }
-
-          unit_test_target = project.find_unit_test_target_for_target(target)
-          scheme.configure_with_targets(target, unit_test_target)
-
-          scheme.test_action.build_configuration = c.name
-          scheme.launch_action.build_configuration = c.name
-          scheme.profile_action.build_configuration = c.name
-          scheme.analyze_action.build_configuration = c.name
-          scheme.archive_action.build_configuration = c.name
-
-          if unit_test_target
-            unit_test_target.add_dependency(target)
-            @xcschememanagement['SuppressBuildableAutocreation'][unit_test_target.uuid] = { 'primary' => true }
-          end
-
-          schemes << scheme
-        end
+      def supress_autocreation_of_target(target)
+        @xcschememanagement['SuppressBuildableAutocreation'][target.uuid] = { 'primary' => true }
       end
 
       # Writes scheme list data.
       #
-      # @param    [String] writing_path
-      #           path to write to.
-      #
-      def save(writing_path)
-        schemes_dir = Scheme.user_data_dir(writing_path)
+      def save
+        schemes_dir = Scheme.user_data_dir(@project.path)
 
         FileUtils.rm_rf(schemes_dir)
         FileUtils.mkdir_p(schemes_dir)

data/lib/xcake.rb

@@ -23,27 +23,31 @@ require 'xcake/plugin'
 require 'xcake/visitable'
 require 'xcake/visitor'
 require 'xcake/generator'
+require 'xcake/path_classifier'
 
 require 'xcake/context'
 require 'xcake/context/xcodeproj_context'
 
-require 'xcake/configuration'
-require 'xcake/configuration/sugar'
-require 'xcake/configuration/proxies/preproccessor_definitions_setting_proxy'
-require 'xcake/configurable'
+require 'xcake/dsl/configuration'
+require 'xcake/dsl/configuration/sugar'
+require 'xcake/dsl/configuration/proxies/preproccessor_definitions_setting_proxy'
+require 'xcake/dsl/configurable'
 
-require 'xcake/project'
-require 'xcake/project/sugar'
-require 'xcake/project/hooks'
-require 'xcake/path_classifier'
+require 'xcake/dsl/project'
+require 'xcake/dsl/project/sugar'
+require 'xcake/dsl/project/hooks'
+
+require 'xcake/dsl/scheme'
+
+require 'xcake/dsl/scheme'
 
-require 'xcake/target'
-require 'xcake/target/sugar'
-require 'xcake/target/configurable'
+require 'xcake/dsl/target'
+require 'xcake/dsl/target/sugar'
+require 'xcake/dsl/target/configurable'
 
-require 'xcake/build_phase'
-require 'xcake/build_phase/headers_build_phase'
-require 'xcake/build_phase/shell_script_build_phase'
+require 'xcake/dsl/build_phase'
+require 'xcake/dsl/build_phase/headers_build_phase'
+require 'xcake/dsl/build_phase/shell_script_build_phase'
 
 module Xcake
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -258,16 +258,9 @@ files:
 - gemfiles/Gemfile.xcodeproj-edge
 - hound.yml
 - lib/xcake.rb
-- lib/xcake/build_phase.rb
-- lib/xcake/build_phase/headers_build_phase.rb
-- lib/xcake/build_phase/shell_script_build_phase.rb
 - lib/xcake/command.rb
 - lib/xcake/command/init.rb
 - lib/xcake/command/make.rb
-- lib/xcake/configurable.rb
-- lib/xcake/configuration.rb
-- lib/xcake/configuration/proxies/preproccessor_definitions_setting_proxy.rb
-- lib/xcake/configuration/sugar.rb
 - lib/xcake/constants.rb
 - lib/xcake/context.rb
 - lib/xcake/context/xcodeproj_context.rb
@@ -276,12 +269,26 @@ files:
 - lib/xcake/core_ext/string.rb
 - lib/xcake/dependency.rb
 - lib/xcake/dependency_provider.rb
+- lib/xcake/dsl/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/configurable.rb
+- lib/xcake/dsl/configuration.rb
+- lib/xcake/dsl/configuration/proxies/preproccessor_definitions_setting_proxy.rb
+- lib/xcake/dsl/configuration/sugar.rb
+- lib/xcake/dsl/project.rb
+- lib/xcake/dsl/project/hooks.rb
+- lib/xcake/dsl/project/sugar.rb
+- lib/xcake/dsl/scheme.rb
+- lib/xcake/dsl/target.rb
+- lib/xcake/dsl/target/configurable.rb
+- lib/xcake/dsl/target/sugar.rb
 - lib/xcake/event_hooks.rb
 - lib/xcake/generator.rb
 - lib/xcake/generator/configuration_generator.rb
+- lib/xcake/generator/default_project_structure_generator.rb
 - lib/xcake/generator/project_generator.rb
 - lib/xcake/generator/project_metadata_generator.rb
-- lib/xcake/generator/project_structure_generator.rb
 - lib/xcake/generator/scheme_generator.rb
 - lib/xcake/generator/target_build_phase_generator.rb
 - lib/xcake/generator/target_dependency_generator.rb
@@ -294,13 +301,7 @@ files:
 - lib/xcake/modern_xcodeproj.rb
 - lib/xcake/path_classifier.rb
 - lib/xcake/plugin.rb
-- lib/xcake/project.rb
-- lib/xcake/project/hooks.rb
-- lib/xcake/project/sugar.rb
 - lib/xcake/resources/Cakefile
-- lib/xcake/target.rb
-- lib/xcake/target/configurable.rb
-- lib/xcake/target/sugar.rb
 - lib/xcake/ui.rb
 - lib/xcake/version.rb
 - lib/xcake/visitable.rb