xcake 0.5.3 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1e0bee85a73559a786f161dae75f8338c95118
-  data.tar.gz: 0910e7d9739e35d6bc942b2d452820f9ad7767d0
+  metadata.gz: 7d1395ab449d68f8c6752ab847f68c2e792c4a5f
+  data.tar.gz: 4ddc2a92892c9b3055afe502e32a74dea9a0b091
 SHA512:
-  metadata.gz: 04fa237a1b45cc38f949866c0b7132b38ea3178b7b783bbe9af2569d1b5bc76c01dbfb07620cd72abc1a97a5a871c97b7dcdc2082eda227fda231be6bd72299e
-  data.tar.gz: 3f069a48e5aea5d89fe04c3b0dc1af43d136f1e699756fbe360fa4c654cd6851260145dafc88c20be976786dcd3a2e3bc8fb5f75d126ae110b8ac091ac916382
+  metadata.gz: 0f78ec259d2c68355f7683dc155b8c62ec49dfd89fc25c15f4c8a92e361fe628ad53acdbe5e9be99cd6b2facbc4b477fdef32fd9237ec4e2efbcf581006c6cf6
+  data.tar.gz: 392069628c7ebe6816cfdf4a8c67e13e584329a40392b35860782f9b8e7dbb3e324518a4cb4f9f6dec12da0677b32aa9f20ac9ebbf99302067112acafd5248e3

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+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.
+
+v0.6.1
+======
+- Reduces gem file-size
+
+v0.6.0
+======
+- Correctly 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).

data/Gemfile.lock

@@ -1,47 +1,42 @@
 PATH
   remote: .
   specs:
-    xcake (0.5.3)
+    xcake (0.6.2)
       claide (~> 0.9.1)
       hooks (~> 0.4.1)
+      molinillo
       tty (~> 0.3.2)
       xcodeproj (~> 0.28)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (0.9.1)
-    coderay (1.1.0)
+    coderay (1.1.1)
     colored (1.2)
-    coveralls (0.8.10)
+    coveralls (0.8.11)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
     hooks (0.4.1)
       uber (~> 0.0.14)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (2.99)
-    minitest (5.8.3)
+    minitest (5.8.4)
+    molinillo (0.4.3)
     necromancer (0.3.0)
-    netrc (0.11.0)
     pastel (0.5.3)
       equatable (~> 0.5.0)
       tty-screen (~> 0.4.3)
@@ -49,25 +44,21 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
+    rspec-core (3.4.3)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    simplecov (0.11.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -115,9 +106,6 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.15)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
     unicode_utils (1.4.0)
     verse (0.4.0)
       unicode_utils (~> 1.4.0)

data/lib/xcake.rb

@@ -1,42 +1,58 @@
 require "xcake/core_ext/string"
 
-require "xcake/visitable"
-require "xcake/visitor"
 require "xcake/version"
-
+require "xcake/ui"
 require "xcake/informative"
-
 require "xcake/command"
 
+require "xcake/dependency"
+require "xcake/dependency_provider"
+require "xcake/plugin"
+require "xcake/visitable"
+require "xcake/visitor"
+require "xcake/generator"
+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/generator/build_phase"
-require "xcake/generator/build_phase/compile_source_build_phase"
-require "xcake/generator/build_phase/compile_xcdatamodeld_build_phase"
-require "xcake/generator/build_phase/copy_resources_build_phase"
-require "xcake/generator/build_phase/copy_xcassets_build_phase"
-require "xcake/generator/build_phase/header_file_build_phase"
-require "xcake/generator/build_phase_registry"
-
-require "xcake/generator/configuration"
-require "xcake/generator/path"
-require "xcake/generator/project"
-require "xcake/generator/target"
-
 require "xcake/project"
 require "xcake/project/sugar"
 require "xcake/project/hooks"
-require "xcake/project_structure_resolver"
+require "xcake/file_reference_installer"
 require "xcake/node"
+require "xcake/shell_script_build_phase"
 require "xcake/target"
+require "xcake/target/sugar"
 
 require "xcake/xcode/project"
 require "xcake/xcode/scheme"
 require "xcake/xcode/scheme_list"
 
+# TODO: Autoload these
+require "xcake/generator/project_generator"
+require "xcake/generator/project_metadata_generator"
+require "xcake/generator/project_structure_generator"
+require "xcake/generator/scheme_generator"
+require "xcake/generator/target_generator"
+require "xcake/generator/target_dependency_generator"
+require "xcake/generator/target_framework_generator"
+require "xcake/generator/target_build_phase_generator"
+
+# TODO: Merge these into one target build phase generator
+require "xcake/generator/target_file_reference_generator"
+require "xcake/generator/target_custom_build_phase_generator"
+require "xcake/generator/configuration_generator"
+
+require "xcake/file_reference_installer/compile_source_file_reference_installer"
+require "xcake/file_reference_installer/compile_xcdatamodeld_file_reference_installer"
+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"
+
 module Xcake
 
 end

data/lib/xcake/command/init.rb

@@ -9,7 +9,7 @@ module Xcake
         cakefile_contents = File.read(cakefile_path)
         File.write("Cakefile", cakefile_contents)
 
-        puts "Open Cakefile to edit and run xcake bake to get your xcode project"
+        puts "Open Cakefile to edit and run xcake make to get your xcode project"
       end
     end
   end

data/lib/xcake/command/make.rb

@@ -1,3 +1,6 @@
+require 'molinillo'
+
+#TODO: Reduce lines of code here :)
 module Xcake
   class Command
     class Make < Command
@@ -17,11 +20,21 @@ module Xcake
         project = Project.new
         project.instance_eval(file_contents)
 
-        resolver = ProjectStructureResolver.new
-        project.accept(resolver)
+        context = XcodeprojContext.new
+
+        #TODO: Debug logs for generator
+        repository = Generator.repository
+        #puts "Registered Generators #{repository}"
 
-        generator = Generator::Project.new
-        project.accept(generator)
+        #TODO: Don't use class as name
+        dependency_provider = DependencyProvider.new(repository)
+        resolver = Molinillo::Resolver.new(dependency_provider, UI.new)
+        resolution = resolver.resolve(Generator.repository)
+        resolution.tsort.map do |g|
+          #puts "Running #{g.name}..."
+          generator = g.name.new(context)
+          project.accept(generator)
+        end
       end
     end
   end

data/lib/xcake/configurable.rb

@@ -112,6 +112,10 @@ module Xcake
       end
 
       if configuration.nil?
+        if name.nil?
+          name = method.to_s[0].upcase + method.to_s[1..-1]
+        end
+
         configuration = Configuration.new(name) do |b|
           block.call(b) if block_given?
         end

data/lib/xcake/context.rb

@@ -0,0 +1,15 @@
+require 'xcodeproj'
+
+module Xcake
+  module Context
+    attr_accessor :object_hash
+
+    def object_hash
+      @object_hash ||= {}
+    end
+
+    def native_object_for(dsl_object)
+      object_hash[dsl_object] ||= create_object_for(dsl_object)
+    end
+  end
+end

data/lib/xcake/context/xcodeproj_context.rb

@@ -0,0 +1,49 @@
+require "xcodeproj"
+
+module Xcake
+  class XcodeprojContext
+
+    include Context
+
+    attr_accessor :project
+
+    def create_object_for(dsl_object)
+      case dsl_object
+      when Project
+        create_object_for_project(dsl_object)
+      when Target
+        create_object_for_target(dsl_object)
+      when Configuration
+        create_object_for_configuration(dsl_object)
+      when Node
+        create_object_for_node(dsl_object)
+      else
+        abort "DSL Object not recognized!"
+      end
+    end
+
+    def create_object_for_project(project)
+      puts "Creating Project..."
+
+      # TODO: Make setup of project testable
+      @project = Xcode::Project.new("./#{project.name}.xcodeproj", true)
+      @project.setup_for_xcake
+      @project
+    end
+
+    def create_object_for_target(target)
+      puts "Creating Target..."
+      @project.new_target(target)
+    end
+
+    def create_object_for_configuration(configuration)
+      puts "Creating Configuration..."
+      @project.new_configuration(configuration)
+    end
+
+    def create_object_for_node(node)
+      puts "Creating Group..."
+      @project.new_group(node)
+    end
+  end
+end

data/lib/xcake/core_ext/string.rb

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

data/lib/xcake/dependency.rb

@@ -0,0 +1,23 @@
+require 'xcodeproj'
+
+#TODO: Figure out a more robust Dependency system
+# - Needs to handle subclass of subclass.....
+# - Needs to have better mixin hiearchy
+
+module Xcake
+  module Dependency
+    module ClassMethods
+      def name
+        self
+      end
+
+      def dependencies
+        []
+      end
+    end
+
+    def self.included(klass)
+      klass.extend ClassMethods  # Somewhat controversial
+    end
+  end
+end

data/lib/xcake/dependency_provider.rb

@@ -0,0 +1,28 @@
+require 'molinillo'
+
+module Xcake
+  class DependencyProvider
+
+    include Molinillo::SpecificationProvider
+
+    attr_accessor :repository
+
+    def initialize(repository)
+      @repository = repository
+    end
+
+    def name_for(dependency)
+      dependency
+    end
+
+    def search_for(dependency)
+      @repository.select do |g|
+        g == dependency
+      end
+    end
+
+    def dependencies_for(specification)
+      specification.dependencies
+    end
+  end
+end

data/lib/xcake/file_reference_installer.rb

@@ -0,0 +1,54 @@
+module Xcake
+  # This generator handles adding nodes
+  # to the project and creating a build phase
+  # for it.
+  #
+  class FileReferenceInstaller
+
+    include Dependency
+    include Plugin
+    include Visitor
+
+    attr_accessor :context
+
+    def initialize(context)
+      @context = context
+    end
+
+    # This should be overidden
+    # by subclasses.
+    #
+    # @param [Node] the node
+    #
+    # @return [Boolean] true if build phase can handle the node.
+    #
+    def self.can_install_node(node)
+      true
+    end
+
+    # Adds file reference to the target.
+    #
+    # This should be overidden in subclasses
+    # to add the file reference the correct
+    # build phase.
+    #
+    # @param [PBXFileReference] the file reference
+    #
+    # @param [PBXTarget] the xcode target
+    #
+    def add_file_reference_to_target(_file_reference, _target)
+    end
+
+    # @!group Visitable
+
+    def visit_node(node)
+      native_group = @context.native_object_for(node)
+
+      file_reference = native_group.new_reference(node.path)
+
+      node.targets.each do |t|
+         add_file_reference_to_target(file_reference, t)
+      end
+    end
+  end
+end