xcake 0.6.25 → 0.7.0

data/lib/xcake/path_classifier.rb

@@ -0,0 +1,66 @@
+require 'pathname'
+
+module Xcake
+  # This class handles classifing the files and how Xcake should handle them.
+  #
+  class PathClassifier
+    EXTENSION_MAPPINGS = {
+      PBXFrameworksBuildPhase: %w{.a .dylib .so .framework}.freeze,
+      PBXHeadersBuildPhase: %w{.h .hpp}.freeze,
+      PBXSourcesBuildPhase: %w{.c .m .mm .cpp .swift .xcdatamodeld}.freeze,
+      PBXResourcesBuildPhase: %w{.xcassets}.freeze
+    }.freeze
+
+    # @note This should be overidden
+    # by subclasses.
+    #
+    # @param [String] the path
+    #
+    # @return [Boolean] true if classifier thinks the path should be included
+    # into the project
+    #
+    def self.should_include_path?(path)
+      return false if is_locale_container?(path)
+      return false if is_inside_classified_container?(path)
+      true
+    end
+
+    def self.classification_for_path(path)
+      classification = EXTENSION_MAPPINGS.detect do |_key, ext_group|
+        ext_group.any? {|ext| File.extname(path) == ext}
+      end
+
+      return :PBXResourcesBuildPhase if classification.nil?
+      classification.first
+    end
+
+    def self.should_create_build_phase_for_classification?(classification)
+      classification != :PBXHeadersBuildPhase
+    end
+
+    private_class_method
+
+    def self.is_locale_container?(path)
+      components = path.split('/')
+      File.extname(components.last) == '.lproj'
+    end
+
+    def self.is_inside_classified_container?(path)
+      components = path.split('/')
+
+      classified_component_index = components.index do |c|
+        is_classified?(c)
+      end
+
+      if !classified_component_index.nil?
+        classified_component_index < (components.length - 1)
+      else
+        false
+      end
+    end
+
+    def self.is_classified?(path)
+      EXTENSION_MAPPINGS.values.flatten.any? { |ext| File.extname(path) == ext }
+    end
+  end
+end

data/lib/xcake/project/sugar.rb

@@ -74,6 +74,32 @@ module Xcake
       end
     end
 
+    # Defines a extension target.
+    #
+    # @param  [Target] host target
+    #         host target for which the extension is for.
+    #
+    # @param  [Proc] block
+    #         an optional block that configures the target through the DSL.
+    #
+    # @return [Target] the extension target
+    #         the newly created extension target
+    #
+    def extension_for(host_target)
+      target = target do |t|
+        t.type = :app_extension
+        t.platform = host_target.platform
+        t.deployment_target = host_target.deployment_target
+        t.language = host_target.language
+      end
+
+      host_target.target_dependencies << target
+
+      yield(target) if block_given?
+
+      target
+    end
+
     # Defines targets for watch app.
     #
     # @param  [Target] watch app's compantion app

data/lib/xcake/project.rb

@@ -65,7 +65,6 @@ module Xcake
     #
     def target(&block)
       target = Target.new(project, &block)
-
       targets << target
       target
     end

data/lib/xcake/target/configurable.rb

@@ -0,0 +1,38 @@
+module Xcake
+  class Target
+    def parent_configurable
+      @project
+    end
+
+    # TODO: Move this to a constant, maybe Xcodeproj ones should be brought
+    # into here?
+    #
+    # Perhaps these could be made into a Gem itself?
+    def default_settings
+      {
+        'INFOPLIST_FILE' => "#{name}/Supporting Files/Info.plist"
+      }
+    end
+
+    def default_debug_settings
+      Xcodeproj::Project::ProjectHelper
+        .common_build_settings(:debug,
+                               platform,
+                               deployment_target.to_s,
+                               type,
+                               language)
+        .merge!(default_settings)
+        .merge('SWIFT_OPTIMIZATION_LEVEL' => '-Onone')
+    end
+
+    def default_release_settings
+      Xcodeproj::Project::ProjectHelper
+        .common_build_settings(:release,
+                               platform,
+                               deployment_target.to_s,
+                               type,
+                               language)
+        .merge!(default_settings)
+    end
+  end
+end

data/lib/xcake/target.rb

@@ -224,44 +224,5 @@ module Xcake
         abort 'Platform not supported!'
       end
     end
-
-    # Configurable
-
-    def parent_configurable
-      @project
-    end
-
-    # TODO: Move this to a constant, maybe Xcodeproj ones should be brought
-    # into here?
-    #
-    # Perhaps these could be made into a Gem itself?
-    def default_settings
-      {
-        'INFOPLIST_FILE' => "#{name}/Supporting Files/Info.plist"
-      }
-    end
-
-    def default_debug_settings
-      Xcodeproj::Project::ProjectHelper
-        .common_build_settings(:debug,
-                               platform,
-                               deployment_target.to_s,
-                               type,
-                               language)
-        .merge!(default_settings)
-        .merge({
-          'SWIFT_OPTIMIZATION_LEVEL' => '-Onone'
-          })
-    end
-
-    def default_release_settings
-      Xcodeproj::Project::ProjectHelper
-        .common_build_settings(:release,
-                               platform,
-                               deployment_target.to_s,
-                               type,
-                               language)
-        .merge!(default_settings)
-    end
   end
 end

data/lib/xcake/ui.rb

@@ -6,8 +6,7 @@ require 'cork'
 module Xcake
   class UI
     def self.register_ui_hooks
-
-      board = Cork::Board.new()
+      board = Cork::Board.new
 
       EventHooks.after_cakefile_init do
         board.notice 'Open Cakefile to edit and run xcake make to get your xcode project'
@@ -26,7 +25,7 @@ module Xcake
       end
 
       EventHooks.before_resolving_project_structure do
-        board.puts_indented "- Resolving Project"
+        board.puts_indented '- Resolving Project'
       end
 
       EventHooks.before_resolving_target_structure do |target|

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.6.25'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -114,66 +114,58 @@ module Xcake
         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
-      #
+      # Creates a new xcode file reference from the node
       #
-      # TODO: Simplify this method figure out more reliable rules for group
-      # generation - maybe part of the new file installer in 0.7.
+      # @param [Pathname] path
+      # =>                path of the file reference from the source root
       #
-      # As well as variant groups and other types of groups.
+      # @return [PBXFileReference] new xcode file refrence
       #
-      def new_group(node)
+      def file_reference_for_path(path)
+        group = group_for_file_reference_path(path)
+        group_path = Pathname.new group.dirname
 
-        parent = node.parent
-        return main_group unless parent
+        file_path = path.cleanpath.relative_path_from group_path
+        group.new_reference(file_path.to_s)
+      end
 
-        if parent.component.include?(".lproj")
+      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
+      end
 
-          group = main_group.find_subpath(parent.parent.path, true) unless group
+      private
 
-          variant_group = group[node.component]
+      def variant_group_for_path(path)
+        group_path = path.dirname.cleanpath
+        base_name = group_path.basename
 
-          unless variant_group
-            variant_group = group.project.new(PBXVariantGroup)
-            variant_group.name = node.component
-            variant_group.set_source_tree(:group)
-            group.children << variant_group
-          end
+        return nil unless base_name.to_s.include?('.lproj')
+        parent_group = group_for_path(group_path)
 
-          ensure_parent_path(group, parent.parent)
-          group = variant_group
-        else
-          group = main_group.find_subpath(parent.path, true) unless group
-          ensure_parent_path(group, parent)
+        group = parent_group[path.basename.to_s]
+
+        unless group
+          group = new(PBXVariantGroup)
+          group.name = path.basename.to_s
+          group.set_source_tree(:group)
+          parent_group.children << group
         end
 
         group
       end
 
-      # Creates a new xcode file reference from the node
-      #
-      # @param [String] path
-      # =>              path of the file reference from the source root
-      #
-      # @return [PBXFileReference] new xcode file refrence
-      #
-      def new_file_reference(path)
-        path_object = Pathname.new(path)
-        group = main_group.find_subpath(path_object.dirname.to_s, true)
-        group[path_object.basename.to_s] ||
-          group.new_reference(path_object.to_s)
-      end
+      def group_for_path(path)
+        group_path = path.dirname.cleanpath
 
-      def ensure_parent_path(group, node)
-        group.path = node.component
-        ensure_parent_path(group.parent, node.parent) unless node.parent.nil?
+        return main_group unless group_path.to_s != '.'
+        main_group.child_for_path(group_path.to_s)
       end
 
+      public
+
       # Finds a unit test target for a xcode target
       #
       # @param [Target] target

data/lib/xcake/xcodeproj_ext/PBXGroup.rb

@@ -0,0 +1,41 @@
+require 'Xcodeproj'
+
+module Xcodeproj
+  class Project
+    module Object
+      class PBXGroup
+        def child_for_path(path)
+          path = path.split('/').keep_if do |c|
+            c != '.'
+          end unless path.is_a?(Array)
+
+          child_name = path.shift
+          child = children.find { |c| c.display_name == child_name }
+
+          if child.nil?
+            child = new_group(child_name)
+            child.path = child_name
+          end
+
+          if path.empty?
+            child
+          else
+            child.child_for_path(path)
+          end
+       end
+
+        def dirname
+          return "." if parent.is_a? Xcake::Xcode::Project
+          return "." if parent.is_a? PBXProject
+          return parent.dirname.to_s if is_a? PBXVariantGroup
+
+          if display_name
+            "#{parent.dirname.to_s}/#{display_name}"
+          else
+            parent.dirname.to_s
+          end
+        end
+     end
+   end
+  end
+end

data/lib/xcake/xcodeproj_ext/PBXNativeTarget.rb

@@ -0,0 +1,14 @@
+require 'xcodeproj'
+
+module Xcodeproj
+  class Project
+    module Object
+      class PBXNativeTarget
+        #TODO: BDD
+        def build_phase_by_class(phase_class)
+          find_or_create_build_phase_by_class(phase_class)
+        end
+      end
+   end
+  end
+end

data/lib/xcake.rb

@@ -1,6 +1,8 @@
 require 'xcake/core_ext/array'
 require 'xcake/core_ext/object'
 require 'xcake/core_ext/string'
+require 'xcake/xcodeproj_ext/PBXGroup'
+require 'xcake/xcodeproj_ext/PBXNativeTarget'
 require 'xcake/modern_xcodeproj.rb'
 
 require 'xcake/version'
@@ -15,6 +17,7 @@ require 'xcake/plugin'
 require 'xcake/visitable'
 require 'xcake/visitor'
 require 'xcake/generator'
+
 require 'xcake/context'
 require 'xcake/context/xcodeproj_context'
 
@@ -26,11 +29,12 @@ require 'xcake/configurable'
 require 'xcake/project'
 require 'xcake/project/sugar'
 require 'xcake/project/hooks'
-require 'xcake/file_reference_installer'
-require 'xcake/node'
+require 'xcake/path_classifier'
 require 'xcake/shell_script_build_phase'
+
 require 'xcake/target'
 require 'xcake/target/sugar'
+require 'xcake/target/configurable'
 
 require 'xcake/xcode/project'
 require 'xcake/xcode/scheme'

data/xcake.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.executables = %w( xcake )
+  spec.executables = %w(xcake)
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.25
+  version: 0.7.0
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,15 +210,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- _hound.yml
-- _rubocop.yml
-- _rubocop_general.yml
 - bin/console
 - bin/setup
 - bin/xcake
 - docs/Cakefile.md
 - docs/Getting Started.md
 - docs/Hooks.md
+- docs/Sample/Cakefile
 - docs/Xcode Project Support.md
 - fastlane-plugin-xcake/Gemfile
 - fastlane-plugin-xcake/LICENSE
@@ -229,6 +227,7 @@ files:
 - fastlane-plugin-xcake/lib/fastlane/plugin/xcake/actions/xcake_action.rb
 - fastlane-plugin-xcake/lib/fastlane/plugin/xcake/version.rb
 - fastlane-plugin-xcake/spec/spec_helper.rb
+- hound.yml
 - lib/xcake.rb
 - lib/xcake/command.rb
 - lib/xcake/command/init.rb
@@ -245,13 +244,6 @@ files:
 - lib/xcake/dependency.rb
 - lib/xcake/dependency_provider.rb
 - lib/xcake/event_hooks.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/file_reference_installer/link_library_file_reference_installer.rb
 - lib/xcake/generator.rb
 - lib/xcake/generator/configuration_generator.rb
 - lib/xcake/generator/project_generator.rb
@@ -267,7 +259,7 @@ files:
 - lib/xcake/generator/target_library_generator.rb
 - lib/xcake/informative.rb
 - lib/xcake/modern_xcodeproj.rb
-- lib/xcake/node.rb
+- lib/xcake/path_classifier.rb
 - lib/xcake/plugin.rb
 - lib/xcake/project.rb
 - lib/xcake/project/hooks.rb
@@ -275,6 +267,7 @@ files:
 - lib/xcake/resources/Cakefile
 - lib/xcake/shell_script_build_phase.rb
 - lib/xcake/target.rb
+- lib/xcake/target/configurable.rb
 - lib/xcake/target/sugar.rb
 - lib/xcake/ui.rb
 - lib/xcake/version.rb
@@ -283,6 +276,10 @@ files:
 - lib/xcake/xcode/project.rb
 - lib/xcake/xcode/scheme.rb
 - lib/xcake/xcode/scheme_list.rb
+- lib/xcake/xcodeproj_ext/PBXGroup.rb
+- lib/xcake/xcodeproj_ext/PBXNativeTarget.rb
+- rubocop.yml
+- rubocop_general.yml
 - xcake.gemspec
 homepage: https://github.com/jcampbell05/xcake/
 licenses:
@@ -309,4 +306,3 @@ signing_key:
 specification_version: 4
 summary: DSL for Xcode Projects.
 test_files: []
-has_rdoc: 

data/lib/xcake/file_reference_installer/compile_source_file_reference_installer.rb

@@ -1,15 +0,0 @@
-module Xcake
-  # This build phase generator detects source
-  # files and adds them to the compile build phase.
-  #
-  class CompileSourceFileReferenceInstaller < FileReferenceInstaller
-    def self.can_install_node(node)
-      !File.directory?(node.path) &&
-        %w(.c .m .mm .cpp .swift).include?(File.extname(node.path))
-    end
-
-    def add_file_reference_to_target(file_reference, target)
-      target.source_build_phase.add_file_reference(file_reference, true)
-    end
-  end
-end

data/lib/xcake/file_reference_installer/compile_xcdatamodeld_file_reference_installer.rb

@@ -1,22 +0,0 @@
-module Xcake
-  # This build phase generator detects XCDataModeld bundles
-  # and adds them to the compile source phase.
-  #
-  class CompileXCDataModeldFileReferenceInstaller < CompileSourceFileReferenceInstaller
-    def self.dependencies
-      []
-    end
-
-    def self.can_install_node(node)
-      File.directory?(node.path) &&
-        ['.xcdatamodeld'].include?(File.extname(node.path))
-    end
-
-    def visit_node(node)
-      super
-
-      # Ignore all files inside of the XCDataModel
-      node.children = []
-    end
-  end
-end

data/lib/xcake/file_reference_installer/copy_resources_file_reference_installer.rb

@@ -1,25 +0,0 @@
-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
-      FileReferenceInstaller.descendants.select do |i|
-        i != self
-      end
-    end
-
-    def self.can_install_node(node)
-      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)
-      target.resources_build_phase.add_file_reference(file_reference, true)
-    end
-  end
-end

data/lib/xcake/file_reference_installer/copy_xcassets_file_reference_installer.rb

@@ -1,22 +0,0 @@
-module Xcake
-  # This build phase generator detects XCAsset bundles
-  # and adds them to the copy resources phase.
-  #
-  class CopyXCAssetsFileReferenceInstaller < CopyResourcesFileReferenceInstaller
-    def self.dependencies
-      []
-    end
-
-    def self.can_install_node(node)
-      File.directory?(node.path) &&
-        ['.xcassets'].include?(File.extname(node.path))
-    end
-
-    def visit_node(node)
-      super
-
-      # Ignore all files inside of the XCAssets
-      node.children = []
-    end
-  end
-end

data/lib/xcake/file_reference_installer/header_file_reference_installer.rb

@@ -1,11 +0,0 @@
-module Xcake
-  class HeaderFileReferenceInstaller < FileReferenceInstaller
-    # This build phase generator detects header files
-    # and ignores them.
-    #
-    def self.can_install_node(node)
-      !File.directory?(node.path) &&
-        %w(.h .hpp).include?(File.extname(node.path))
-    end
-  end
-end

data/lib/xcake/file_reference_installer/link_library_file_reference_installer.rb

@@ -1,21 +0,0 @@
-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)
-      %w(.a .dylib .so .framework).include?(File.extname(node.path))
-    end
-
-    def add_file_reference_to_target(file_reference, target)
-      target.frameworks_build_phases.add_file_reference(file_reference, true)
-    end
-
-    def visit_node(node)
-      super
-
-      # Ignore all files inside of libraries
-      node.children = []
-    end
-  end
-end