xcake 0.6.19 → 0.6.20

data/lib/xcake/core_ext/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def to_h
+    Hash[*flatten(1)]
+  end
+end

data/lib/xcake/core_ext/object.rb

@@ -0,0 +1,7 @@
+class Object
+  # Returns all descendants of a class
+  #
+  def self.descendants
+    ObjectSpace.each_object(Class).select { |klass| klass < self }
+  end
+end

data/lib/xcake/core_ext/string.rb

@@ -14,8 +14,8 @@ class String
   # Strips heredoc indents
   #
   def strip_heredoc
-    indent = self.scan(/^[ \t]*(?=\S)/).min
-    indent_len = (indent || "").length
-    self.gsub(/^[ \t]{#{indent_len}}/, "")
+    indent = scan(/^[ \t]*(?=\S)/).min
+    indent_len = (indent || '').length
+    gsub(/^[ \t]{#{indent_len}}/, '')
   end
 end

data/lib/xcake/dependency.rb

@@ -1,12 +1,11 @@
 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
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
     module ClassMethods
       def name
         self
@@ -16,9 +15,5 @@ module Xcake
         []
       end
     end
-
-    def self.included(klass)
-      klass.extend ClassMethods  # Somewhat controversial
-    end
   end
 end

data/lib/xcake/dependency_provider.rb

@@ -1,28 +1,23 @@
-require 'molinillo'
+require 'tsort'
 
 module Xcake
   class DependencyProvider
+    include TSort
 
-    include Molinillo::SpecificationProvider
+    def initialize(dependency_class)
+      plugins = dependency_class.load_plugins
 
-    attr_accessor :repository
-
-    def initialize(repository)
-      @repository = repository
-    end
-
-    def name_for(dependency)
-      dependency
+      @dependency_graph = plugins.map do |p|
+        [p, p.dependencies]
+      end.to_h
     end
 
-    def search_for(dependency)
-      @repository.select do |g|
-        g == dependency
-      end
+    def tsort_each_node(&block)
+      @dependency_graph.each_key(&block)
     end
 
-    def dependencies_for(specification)
-      specification.dependencies
+    def tsort_each_child(node, &block)
+      @dependency_graph[node].each(&block)
     end
   end
 end

data/lib/xcake/file_reference_installer/compile_source_file_reference_installer.rb

@@ -3,14 +3,13 @@ module Xcake
   # 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)
+      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

@@ -2,15 +2,14 @@ module Xcake
   # This build phase generator detects XCDataModeld bundles
   # and adds them to the compile source phase.
   #
-  class CompileXCDataModeldFileReferenceInstaller< CompileSourceFileReferenceInstaller
-
+  class CompileXCDataModeldFileReferenceInstaller < CompileSourceFileReferenceInstaller
     def self.dependencies
       []
     end
 
     def self.can_install_node(node)
       File.directory?(node.path) &&
-        [".xcdatamodeld"].include?(File.extname(node.path))
+        ['.xcdatamodeld'].include?(File.extname(node.path))
     end
 
     def visit_node(node)
@@ -21,5 +20,3 @@ module Xcake
     end
   end
 end
-
-Xcake::FileReferenceInstaller.register_plugin(Xcake::CompileXCDataModeldFileReferenceInstaller)

data/lib/xcake/file_reference_installer/copy_resources_file_reference_installer.rb

@@ -4,9 +4,8 @@ module Xcake
   #
   # Note: This installer is always the last to be executed.
   class CopyResourcesFileReferenceInstaller < FileReferenceInstaller
-
     def self.dependencies
-      FileReferenceInstaller.repository.select do |i|
+      FileReferenceInstaller.descendants.select do |i|
         i != self
       end
     end
@@ -15,12 +14,12 @@ module Xcake
       extension = File.extname(node.path)
       (!File.directory?(node.path) ||
         (File.directory?(node.path) &&
-            ![".xcassets", ".xcdatamodeld", ".lproj"].include?(extension) &&
+            !['.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)
+      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

@@ -3,23 +3,20 @@ module Xcake
   # 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))
+        ['.xcassets'].include?(File.extname(node.path))
     end
 
     def visit_node(node)
       super
 
-      #Ignore all files inside of the XCAssets
+      # Ignore all files inside of the XCAssets
       node.children = []
     end
   end
 end
-
-Xcake::FileReferenceInstaller.register_plugin(Xcake::CopyXCAssetsFileReferenceInstaller)

data/lib/xcake/file_reference_installer/link_library_file_reference_installer.rb

@@ -4,12 +4,18 @@ module Xcake
   #
   class LinkLibraryFileReferenceInstaller < FileReferenceInstaller
     def self.can_install_node(node)
-      !File.directory?(node.path) &&
-        %w(.a .dylib .so).include?(File.extname(node.path))
+      %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)
+      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

data/lib/xcake/file_reference_installer.rb

@@ -4,7 +4,6 @@ module Xcake
   # for it.
   #
   class FileReferenceInstaller
-
     include Dependency
     include Plugin
     include Visitor
@@ -15,6 +14,10 @@ module Xcake
       @context = context
     end
 
+    def self.plugins_location
+      "#{File.dirname(__FILE__)}/file_reference_installer/*.rb"
+    end
+
     # This should be overidden
     # by subclasses.
     #
@@ -22,7 +25,7 @@ module Xcake
     #
     # @return [Boolean] true if build phase can handle the node.
     #
-    def self.can_install_node(node)
+    def self.can_install_node(_node)
       true
     end
 
@@ -44,10 +47,11 @@ module Xcake
     def visit_node(node)
       native_group = @context.native_object_for(node)
 
-      file_reference = native_group.new_reference(node.path)
+      file_reference = native_group[node.component] ||
+                       native_group.new_reference(node.component)
 
       node.targets.each do |t|
-         add_file_reference_to_target(file_reference, t)
+        add_file_reference_to_target(file_reference, t)
       end
     end
   end

data/lib/xcake/generator/configuration_generator.rb

@@ -5,9 +5,8 @@ module Xcake
   # and creates xcode build configurations.
   #
   class ConfigurationGenerator < Generator
-
     def self.dependencies
-      [TargetGenerator, ProjectStructureGenerator]
+      [TargetGenerator, ProjectStructureGenerator, TargetFileReferenceGenerator]
     end
 
     def visit_project(project)
@@ -28,22 +27,14 @@ module Xcake
         build_configuration.name = configuration.name
         build_configuration.build_settings = configuration.settings
 
+        configuration_file = configuration.configuration_file
+        file_reference = @context.file_reference_for_path(configuration_file)
+
+        build_configuration.base_configuration_reference = file_reference
+
         native_configuration_object = @context.native_object_for(configuration_object)
         native_configuration_object.build_configurations << build_configuration
-
-        if configuration.configuration_file != nil
-          xcconfig = install_xcconfig(configuration)
-          native_configuration_object.base_configuration_reference = xcconfig
-        end
       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/project_generator.rb

@@ -1,8 +1,7 @@
 module Xcake
   class ProjectGenerator < Generator
-
     def self.dependencies
-      Generator.repository.select do |g|
+      Generator.descendants.select do |g|
         g != self
       end
     end
@@ -11,7 +10,7 @@ module Xcake
       native_project = @context.native_object_for(project)
       native_project.save
       project.run_hook :after_save
-      puts "Done!"
+      puts 'Done!'
     end
   end
 end

data/lib/xcake/generator/project_metadata_generator.rb

@@ -1,7 +1,7 @@
 module Xcake
   class ProjectMetadataGenerator < Generator
     def visit_project(project)
-      puts "Creating Project..."
+      puts 'Creating Project...'
 
       native_project = @context.native_object_for(project)
       native_project.class_prefix = project.class_prefix if project.class_prefix

data/lib/xcake/generator/project_structure_generator.rb

@@ -7,25 +7,19 @@ module Xcake
   # 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
 
     def visit_project(project)
-
-      puts "Resolving Project..."
+      puts 'Resolving Project...'
 
       @project = project
-
-      @project.configuration :Debug, :debug if @project.configurations_of_type(:debug).count == 0
-      @project.configuration :Release, :release if @project.configurations_of_type(:release).count == 0
     end
 
     def leave_project(project)
     end
 
     def visit_target(target)
-
-      puts "Resolving target #{target.name}..."
+      puts "Resolving target #{target}..."
 
       @project.all_configurations.each do |c|
         target.configuration(c.name, c.type)

data/lib/xcake/generator/scheme_generator.rb

@@ -1,13 +1,11 @@
 module Xcake
   class SchemeGenerator < Generator
-
     def self.dependencies
       [TargetGenerator, ConfigurationGenerator]
     end
 
     def visit_project(project)
-
-      puts "Creating User Schemes..."
+      puts 'Creating User Schemes...'
 
       native_project = @context.native_object_for(project)
       native_project.recreate_user_schemes

data/lib/xcake/generator/target_build_phase_generator.rb

@@ -1,16 +1,13 @@
 module Xcake
-
   # TODO: In future this should just infer extra targets and add it to the DSL
   # we should then implement a 2nd pass generator which turns that DSL into
   # build phases
   class TargetBuildPhaseGenerator < Generator
-
     def self.dependencies
       [TargetGenerator, TargetDependencyGenerator]
     end
 
     def visit_target(target)
-
       puts "Generating build phases for #{target}..."
 
       native_target = @context.native_object_for(target)
@@ -28,21 +25,22 @@ module Xcake
     end
 
     def create_embed_watchapp_phase(native_target, native_watchapp_target)
-      puts "Generating embed watch app phase..."
+      puts 'Generating embed watch app phase...'
 
-      phase = native_target.new_copy_files_build_phase("Embed Watch Content")
-      phase.dst_path = "$(CONTENTS_FOLDER_PATH)/Watch"
+      phase = native_target.new_copy_files_build_phase('Embed Watch Content')
+      phase.dst_path = '$(CONTENTS_FOLDER_PATH)/Watch'
       phase.symbol_dst_subfolder_spec = :products_directory
-      phase.add_file_reference(native_watchapp_target.product_reference)
+      phase.add_file_reference(native_watchapp_target.product_reference, true)
       phase
     end
 
     def create_embed_watchapp_extension_phase(native_target, native_watchapp_extension_target)
-      puts "Generating embed watch app extension phase..."
+      puts 'Generating embed watch app extension phase...'
+      product_reference = native_watchapp_extension_target.product_reference
 
-      phase = native_target.new_copy_files_build_phase("Embed App Extensions")
+      phase = native_target.new_copy_files_build_phase('Embed App Extensions')
       phase.symbol_dst_subfolder_spec = :plug_ins
-      phase.add_file_reference(native_watchapp_extension_target.product_reference)
+      phase.add_file_reference(product_reference, true)
       phase
     end
   end

data/lib/xcake/generator/target_custom_build_phase_generator.rb

@@ -1,6 +1,5 @@
 module Xcake
   class TargetCustomBuildPhaseGenerator < Generator
-
     def self.dependencies
       [TargetGenerator]
     end

data/lib/xcake/generator/target_file_reference_generator.rb

@@ -1,18 +1,13 @@
 module Xcake
   class TargetFileReferenceGenerator < Generator
     attr_accessor :root_node
-    attr_accessor :installer_resolution
+    attr_accessor :dependency_provider
 
     def initialize(context)
       @context = context
       @root_node = Node.new
 
-      repository = FileReferenceInstaller.repository
-      puts "Registered Generators #{repository}"
-
-      dependency_provider = DependencyProvider.new(repository)
-      resolver = Molinillo::Resolver.new(dependency_provider, UI.new)
-      @installer_resolution = resolver.resolve(repository)
+      @dependency_provider = DependencyProvider.new(FileReferenceInstaller)
     end
 
     def self.dependencies
@@ -43,15 +38,12 @@ module Xcake
       return unless node.path
       puts "Adding #{node.path}..."
 
-      #TODO: Don't use class as name
-      #TODO: Filter and first generator
-      #TODO: Debug logs for generator
-      installer_class = @installer_resolution.tsort.detect do |i|
-        i.name.can_install_node(node)
+      installer_class = @dependency_provider.tsort.detect do |i|
+        i.can_install_node(node)
       end
 
-      if installer_class != nil then
-        installer = installer_class.name.new(context)
+      unless installer_class.nil?
+        installer = installer_class.new(context)
         node.accept(installer)
       end
     end

data/lib/xcake/generator/target_framework_generator.rb

@@ -8,7 +8,9 @@ module Xcake
       puts "Integrating System Frameworks for #{target}..."
 
       native_target = @context.native_object_for(target)
-      native_target.add_system_frameworks(target.system_frameworks) if target.system_frameworks
+
+      system_frameworks = target.system_frameworks
+      native_target.add_system_frameworks(system_frameworks) if system_frameworks
     end
   end
 end

data/lib/xcake/generator/target_library_generator.rb

@@ -8,9 +8,9 @@ module Xcake
       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
+
+      system_libraries = target.system_libraries
+      native_target.add_system_libraries(system_libraries) if system_libraries
     end
   end
 end

data/lib/xcake/generator.rb

@@ -1,8 +1,5 @@
-require 'molinillo'
-
 module Xcake
   class Generator
-
     include Dependency
     include Plugin
     include Visitor
@@ -12,5 +9,9 @@ module Xcake
     def initialize(context)
       self.context = context
     end
+
+    def self.plugins_location
+      "#{File.dirname(__FILE__)}/generator/*.rb"
+    end
   end
 end

data/lib/xcake/informative.rb

@@ -1,5 +1,5 @@
-require "claide"
-require "tty"
+require 'claide'
+require 'colored'
 
 # Indicates an user error.
 #
@@ -10,8 +10,7 @@ module Xcake
     include CLAide::InformativeError
 
     def message
-      pastel = Pastel.new
-      pastel.red "[!] #{super}"
+      "[!] #{super}".red
     end
   end
 end

data/lib/xcake/node.rb

@@ -7,7 +7,6 @@ module Xcake
   # This tracks which target the node should be
   # added to.
   class Node
-
     include Visitable
 
     # @return [String] the component of this node in the path.
@@ -45,9 +44,8 @@ module Xcake
     #                          target to add for the child nodes
     #
     def create_children_with_path(path, target)
-
       components = path.split('/').keep_if do |c|
-        c != "."
+        c != '.'
       end
 
       create_children_with_components(components, target)
@@ -63,9 +61,8 @@ module Xcake
     #                          target to remove for child nodes
     #
     def remove_children_with_path(path, target)
-
       components = path.split('/').keep_if do |c|
-        c != "."
+        c != '.'
       end
 
       remove_children_with_components(components, target)
@@ -74,23 +71,22 @@ module Xcake
     protected
 
     def create_children_with_components(components, target)
-
       component = components.shift
       child = children.find do |c|
         c.component == component
       end
 
-      if child == nil
+      if child.nil?
 
         child = Node.new
 
         child.component = component
 
-        if self.path
-          child.path = "#{self.path}/#{component}"
-        else
-          child.path = "#{component}"
-        end
+        child.path = if path
+                       "#{path}/#{component}"
+                     else
+                       component.to_s
+                     end
 
         child.parent = self
 
@@ -105,14 +101,13 @@ module Xcake
     end
 
     def remove_children_with_components(components, target)
-
       component = components.shift
 
       child = children.find do |c|
         c.component == component
       end
 
-      if child != nil
+      unless child.nil?
 
         child.remove_children_with_components(components, target)
 
@@ -122,8 +117,8 @@ module Xcake
 
         children.keep_if do |c|
           c != child ||
-          c.children.count > 0 ||
-          c.targets.count > 0
+            c.children.count > 0 ||
+            c.targets.count > 0
         end
       end
     end
@@ -131,7 +126,6 @@ module Xcake
     public
 
     def accept(visitor)
-
       visitor.visit(self)
 
       children.each do |c|

data/lib/xcake/plugin.rb

@@ -1,25 +1,17 @@
-# TODO: Figure out a more robust Plugin system
-# - Needs to handle subclass of subclass.....
-# - Needs to have better mixin hiearchy
-
 module Xcake
   module Plugin
-    module ClassMethods
-      def repository
-        @repository ||= []
-      end
+    def self.included(base)
+      base.extend ClassMethods
+    end
 
-      def inherited(klass)
-        repository << klass
+    module ClassMethods
+      def load_plugins
+        Dir[plugins_location].each { |file| require file }
+        descendants
       end
 
-      def register_plugin(klass)
-        repository << klass
+      def plugins_location
       end
     end
-
-    def self.included(klass)
-      klass.extend ClassMethods # Somewhat controversial
-    end
   end
 end

data/lib/xcake/project/hooks.rb

@@ -1,4 +1,4 @@
-require "hooks"
+require 'hooks'
 
 module Xcake
   class Project