xcake 0.5.3 → 0.6.2

data/lib/xcake/project.rb

@@ -14,10 +14,11 @@ module Xcake
 
     # @!group Configuring a project
 
+    # TODO: Rename to name
     # @return [String] the name of the project file. This is used as
     #                  the filename.
     #
-    attr_accessor :project_name
+    attr_accessor :name
 
     # @return [String] the prefix used for Objective-C Classes. This is
     #                  used by xcode when creating new files.
@@ -48,7 +49,7 @@ module Xcake
     #
     def initialize(name="Project", &block)
 
-      self.project_name = name
+      self.name = name
       self.targets = []
 
       block.call(self) if block_given?
@@ -71,15 +72,17 @@ module Xcake
       target
     end
 
-    # Visitable
+    # @!group Conversion
+
+    def to_s
+      "Project<#{name}>"
+    end
+
+    # @!group Visitable
+
     def accept(visitor)
       visitor.visit(self)
 
-      flatten_configurations.each do |c|
-        visitor.visit(c)
-        visitor.leave(c)
-      end
-
       targets.each do |t|
         visitor.visit(t)
         visitor.leave(t)
@@ -90,7 +93,8 @@ module Xcake
 
     protected
 
-    # Configurable
+    # @!group Configurable
+
     def default_settings
       common_settings = Xcodeproj::Constants::PROJECT_DEFAULT_BUILD_SETTINGS
       settings = Xcodeproj::Project::ProjectHelper.deep_dup(common_settings[:all])

data/lib/xcake/project/sugar.rb

@@ -99,9 +99,8 @@ module Xcake
         t.language = language
       end
 
-      #Xcake needs to add dependencies in generation phase.
-      #target.add_dependency(watch_app_target)
-      #watch_app_target.add_dependency(watch_extension_target)
+      host_target.target_dependencies << watch_app_target
+      watch_app_target.target_dependencies << watch_extension_target
 
       block.call(watch_app_target, watch_extension_target) if block_given?
 

data/lib/xcake/shell_script_build_phase.rb

@@ -0,0 +1,15 @@
+module Xcake
+  # This class is used to hold a shell script build phase name
+  # and script contents
+  #
+  class ShellScriptBuildPhase
+    attr_accessor :name
+    attr_accessor :script
+
+    def generate_native_build_phase(target)
+      phase = target.new_shell_script_build_phase(name)
+      phase.shell_script = script
+      phase
+    end
+  end
+end

data/lib/xcake/target.rb

@@ -32,6 +32,15 @@ module Xcake
     #
     attr_accessor :language
 
+    # @return [Target] the test target for this target
+    #
+    attr_accessor :test_target
+
+    # @return [Array<Xcodeproj::Project::Object::AbstractBuildPhase>] the list
+    #                  of custom build phases for the project.
+    #
+    attr_accessor :build_phases
+
     # @!group File patterns
 
     #
@@ -141,6 +150,10 @@ module Xcake
     #
     attr_accessor :system_frameworks
 
+    # @return [Array<Target>] targets to use as dependencies
+    #
+    attr_accessor :target_dependencies
+
     # @param    [Proc] block
     #           an optional block that configures the project through the DSL.
     #
@@ -151,6 +164,7 @@ module Xcake
     #           end
     #
     def initialize(&block)
+      self.build_phases = []
       block.call(self) if block_given?
     end
 
@@ -166,6 +180,16 @@ module Xcake
       @system_frameworks ||= default_system_frameworks_for self.platform
     end
 
+    def target_dependencies
+      @target_dependencies ||= []
+    end
+
+    # @!group Conversion
+
+    def to_s
+      "Target<#{name}>"
+    end
+
     protected
 
     def default_system_frameworks_for(platform)
@@ -208,20 +232,5 @@ module Xcake
                               type,
                               language).merge!(default_settings)
     end
-
-    #Visitable
-
-    public
-
-    def accept(visitor)
-      visitor.visit(self)
-
-      flatten_configurations.each do |c|
-        visitor.visit(c)
-        visitor.leave(c)
-      end
-
-      visitor.leave(self)
-    end
   end
 end

data/lib/xcake/target/sugar.rb

@@ -0,0 +1,13 @@
+require "xcodeproj"
+
+module Xcake
+  class Target
+    def shell_script_build_phase(name, script)
+      phase = ShellScriptBuildPhase.new
+      phase.name = name
+      phase.script = script.strip_heredoc
+      build_phases << phase
+      phase
+    end
+  end
+end

data/lib/xcake/ui.rb

@@ -0,0 +1,7 @@
+require "molinillo"
+
+module Xcake
+  class UI
+    include Molinillo::UI
+  end
+end

data/lib/xcake/version.rb

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

data/lib/xcake/visitor.rb

@@ -43,7 +43,7 @@ module Xcake
       item_name = item_name(item)
 
       method = "visit_#{item_name}"
-      send(method, item)
+      send(method, item) if respond_to? method
     end
 
     # This is called when a visitor is leaving a
@@ -61,7 +61,7 @@ module Xcake
       item_name = item_name(item)
 
       method = "leave_#{item_name}"
-      send(method, item)
+      send(method, item) if respond_to? method
     end
 
     private

data/lib/xcake/xcode/project.rb

@@ -86,7 +86,7 @@ module Xcake
         # @return [Target] new xcode target
         #
         def new_target(target)
-          native_target = self.new(Xcodeproj::Project::Object::PBXNativeTarget)
+          native_target = new(Xcodeproj::Project::Object::PBXNativeTarget)
           native_target.name = target.name
           native_target.product_name = target.name
 
@@ -97,7 +97,7 @@ module Xcake
             native_target.product_type = target.type
           end
 
-          native_target.build_configuration_list = self.new(Xcodeproj::Project::Object::XCConfigurationList)
+          native_target.build_configuration_list = new(Xcodeproj::Project::Object::XCConfigurationList)
 
           product = self.products_group.new_product_ref_for_target(native_target.product_name, native_target.product_type)
           native_target.product_reference = product
@@ -106,6 +106,29 @@ module Xcake
           native_target
         end
 
+        # Creates a new xcode configuration from the configuration DSL
+        #
+        # @param [Configurarion] configuration
+        #                 configuration DSL to create target from
+        #
+        # @return [Configurarion] new xcode configuration
+        #
+        def new_configuration(configuration)
+          new(Xcodeproj::Project::Object::XCBuildConfiguration)
+        end
+
+        # Creates a new xcode group from the node
+        #
+        # @param [Node]   node
+        #                 configuration DSL to create target from
+        #
+        # @return [Group] new xcode group
+        #
+        def new_group(node)
+          return main_group unless node.parent
+          main_group.find_subpath(node.parent.path, true)
+        end
+
         # Finds a unit test target for a xcode target
         #
         # @param [Target] target

data/xcake.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hooks", "~> 0.4.1"
   spec.add_dependency "xcodeproj", "~> 0.28"
   spec.add_dependency "tty", "~> 0.3.2"
+  spec.add_dependency "molinillo"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.2
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: molinillo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create your Xcode projects automatically using a stupid simple DSL.
 email:
 - james@supmenow.com
@@ -167,7 +181,6 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -181,7 +194,6 @@ files:
 - docs/Getting Started.md
 - docs/Hooks.md
 - docs/Xcode Project Support.md
-- lib/fastlane_plugin.rb
 - lib/xcake.rb
 - lib/xcake/command.rb
 - lib/xcake/command/init.rb
@@ -190,27 +202,41 @@ files:
 - lib/xcake/configuration.rb
 - lib/xcake/configuration/proxies/preproccessor_definitions_setting_proxy.rb
 - lib/xcake/configuration/sugar.rb
+- lib/xcake/context.rb
+- lib/xcake/context/xcodeproj_context.rb
 - lib/xcake/core_ext/string.rb
+- lib/xcake/dependency.rb
+- lib/xcake/dependency_provider.rb
 - lib/xcake/fastlane/xcake.rb
-- lib/xcake/generator/build_phase.rb
-- lib/xcake/generator/build_phase/compile_source_build_phase.rb
-- lib/xcake/generator/build_phase/compile_xcdatamodeld_build_phase.rb
-- lib/xcake/generator/build_phase/copy_resources_build_phase.rb
-- lib/xcake/generator/build_phase/copy_xcassets_build_phase.rb
-- lib/xcake/generator/build_phase/header_file_build_phase.rb
-- lib/xcake/generator/build_phase_registry.rb
-- lib/xcake/generator/configuration.rb
-- lib/xcake/generator/path.rb
-- lib/xcake/generator/project.rb
-- lib/xcake/generator/target.rb
+- lib/xcake/file_reference_installer.rb
+- lib/xcake/file_reference_installer/compile_source_file_reference_installer.rb
+- lib/xcake/file_reference_installer/compile_xcdatamodeld_file_reference_installer.rb
+- 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/generator.rb
+- lib/xcake/generator/configuration_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_custom_build_phase_generator.rb
+- lib/xcake/generator/target_dependency_generator.rb
+- lib/xcake/generator/target_file_reference_generator.rb
+- lib/xcake/generator/target_framework_generator.rb
+- lib/xcake/generator/target_generator.rb
 - lib/xcake/informative.rb
 - lib/xcake/node.rb
+- lib/xcake/plugin.rb
 - lib/xcake/project.rb
 - lib/xcake/project/hooks.rb
 - lib/xcake/project/sugar.rb
-- lib/xcake/project_structure_resolver.rb
 - lib/xcake/resources/Cakefile
+- lib/xcake/shell_script_build_phase.rb
 - lib/xcake/target.rb
+- lib/xcake/target/sugar.rb
+- lib/xcake/ui.rb
 - lib/xcake/version.rb
 - lib/xcake/visitable.rb
 - lib/xcake/visitor.rb
@@ -238,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: DSL for Xcode Projects.

data/LICENSE

@@ -1,201 +0,0 @@
-               The Artistic License 2.0
-
-           Copyright (c) 2015 James Campbell
-
-     Everyone is permitted to copy and distribute verbatim copies
-      of this license document, but changing it is not allowed.
-
-Preamble
-
-This license establishes the terms under which a given free software
-Package may be copied, modified, distributed, and/or redistributed.
-The intent is that the Copyright Holder maintains some artistic
-control over the development of that Package while still keeping the
-Package available as open source and free software.
-
-You are always permitted to make arrangements wholly outside of this
-license directly with the Copyright Holder of a given Package.  If the
-terms of this license do not permit the full use that you propose to
-make of the Package, you should contact the Copyright Holder and seek
-a different licensing arrangement.
-
-Definitions
-
-    "Copyright Holder" means the individual(s) or organization(s)
-    named in the copyright notice for the entire Package.
-
-    "Contributor" means any party that has contributed code or other
-    material to the Package, in accordance with the Copyright Holder's
-    procedures.
-
-    "You" and "your" means any person who would like to copy,
-    distribute, or modify the Package.
-
-    "Package" means the collection of files distributed by the
-    Copyright Holder, and derivatives of that collection and/or of
-    those files. A given Package may consist of either the Standard
-    Version, or a Modified Version.
-
-    "Distribute" means providing a copy of the Package or making it
-    accessible to anyone else, or in the case of a company or
-    organization, to others outside of your company or organization.
-
-    "Distributor Fee" means any fee that you charge for Distributing
-    this Package or providing support for this Package to another
-    party.  It does not mean licensing fees.
-
-    "Standard Version" refers to the Package if it has not been
-    modified, or has been modified only in ways explicitly requested
-    by the Copyright Holder.
-
-    "Modified Version" means the Package, if it has been changed, and
-    such changes were not explicitly requested by the Copyright
-    Holder.
-
-    "Original License" means this Artistic License as Distributed with
-    the Standard Version of the Package, in its current version or as
-    it may be modified by The Perl Foundation in the future.
-
-    "Source" form means the source code, documentation source, and
-    configuration files for the Package.
-
-    "Compiled" form means the compiled bytecode, object code, binary,
-    or any other form resulting from mechanical transformation or
-    translation of the Source form.
-
-
-Permission for Use and Modification Without Distribution
-
-(1)  You are permitted to use the Standard Version and create and use
-Modified Versions for any purpose without restriction, provided that
-you do not Distribute the Modified Version.
-
-
-Permissions for Redistribution of the Standard Version
-
-(2)  You may Distribute verbatim copies of the Source form of the
-Standard Version of this Package in any medium without restriction,
-either gratis or for a Distributor Fee, provided that you duplicate
-all of the original copyright notices and associated disclaimers.  At
-your discretion, such verbatim copies may or may not include a
-Compiled form of the Package.
-
-(3)  You may apply any bug fixes, portability changes, and other
-modifications made available from the Copyright Holder.  The resulting
-Package will still be considered the Standard Version, and as such
-will be subject to the Original License.
-
-
-Distribution of Modified Versions of the Package as Source
-
-(4)  You may Distribute your Modified Version as Source (either gratis
-or for a Distributor Fee, and with or without a Compiled form of the
-Modified Version) provided that you clearly document how it differs
-from the Standard Version, including, but not limited to, documenting
-any non-standard features, executables, or modules, and provided that
-you do at least ONE of the following:
-
-    (a)  make the Modified Version available to the Copyright Holder
-    of the Standard Version, under the Original License, so that the
-    Copyright Holder may include your modifications in the Standard
-    Version.
-
-    (b)  ensure that installation of your Modified Version does not
-    prevent the user installing or running the Standard Version. In
-    addition, the Modified Version must bear a name that is different
-    from the name of the Standard Version.
-
-    (c)  allow anyone who receives a copy of the Modified Version to
-    make the Source form of the Modified Version available to others
-    under
-
-    (i)  the Original License or
-
-    (ii)  a license that permits the licensee to freely copy,
-    modify and redistribute the Modified Version using the same
-    licensing terms that apply to the copy that the licensee
-    received, and requires that the Source form of the Modified
-    Version, and of any works derived from it, be made freely
-    available in that license fees are prohibited but Distributor
-    Fees are allowed.
-
-
-Distribution of Compiled Forms of the Standard Version
-or Modified Versions without the Source
-
-(5)  You may Distribute Compiled forms of the Standard Version without
-the Source, provided that you include complete instructions on how to
-get the Source of the Standard Version.  Such instructions must be
-valid at the time of your distribution.  If these instructions, at any
-time while you are carrying out such distribution, become invalid, you
-must provide new instructions on demand or cease further distribution.
-If you provide valid instructions or cease distribution within thirty
-days after you become aware that the instructions are invalid, then
-you do not forfeit any of your rights under this license.
-
-(6)  You may Distribute a Modified Version in Compiled form without
-the Source, provided that you comply with Section 4 with respect to
-the Source of the Modified Version.
-
-
-Aggregating or Linking the Package
-
-(7)  You may aggregate the Package (either the Standard Version or
-Modified Version) with other packages and Distribute the resulting
-aggregation provided that you do not charge a licensing fee for the
-Package.  Distributor Fees are permitted, and licensing fees for other
-components in the aggregation are permitted. The terms of this license
-apply to the use and Distribution of the Standard or Modified Versions
-as included in the aggregation.
-
-(8) You are permitted to link Modified and Standard Versions with
-other works, to embed the Package in a larger work of your own, or to
-build stand-alone binary or bytecode versions of applications that
-include the Package, and Distribute the result without restriction,
-provided the result does not expose a direct interface to the Package.
-
-
-Items That are Not Considered Part of a Modified Version
-
-(9) Works (including, but not limited to, modules and scripts) that
-merely extend or make use of the Package, do not, by themselves, cause
-the Package to be a Modified Version.  In addition, such works are not
-considered parts of the Package itself, and are not subject to the
-terms of this license.
-
-
-General Provisions
-
-(10)  Any use, modification, and distribution of the Standard or
-Modified Versions is governed by this Artistic License. By using,
-modifying or distributing the Package, you accept this license. Do not
-use, modify, or distribute the Package, if you do not accept this
-license.
-
-(11)  If your Modified Version has been derived from a Modified
-Version made by someone other than you, you are nevertheless required
-to ensure that your Modified Version complies with the requirements of
-this license.
-
-(12)  This license does not grant you the right to use any trademark,
-service mark, tradename, or logo of the Copyright Holder.
-
-(13)  This license includes the non-exclusive, worldwide,
-free-of-charge patent license to make, have made, use, offer to sell,
-sell, import and otherwise transfer the Package with respect to any
-patent claims licensable by the Copyright Holder that are necessarily
-infringed by the Package. If you institute patent litigation
-(including a cross-claim or counterclaim) against any party alleging
-that the Package constitutes direct or contributory patent
-infringement, then this Artistic License to you shall terminate on the
-date that such litigation is filed.
-
-(14)  Disclaimer of Warranty:
-THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
-IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
-LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.