xcake 0.6.19 → 0.6.20

data/lib/xcake/project/sugar.rb

@@ -1,8 +1,7 @@
-require "xcodeproj"
+require 'xcodeproj'
 
 module Xcake
   class Project
-
     # Passes the project instance to a block. This is used to easily modify the
     # properties of the project in the DSL.
     #
@@ -10,8 +9,8 @@ module Xcake
     # @param  [Proc] block
     #         an optional block that configures the project through the DSL.
     #
-    def project(&block)
-      block.call(self) if block_given?
+    def project
+      yield(self) if block_given?
       self
     end
 
@@ -32,14 +31,14 @@ module Xcake
     # @return [Target] the application target
     #         the newly created application target
     #
-    def application_for(platform, deployment_target, language = :objc, &block)
+    def application_for(platform, deployment_target, language = :objc)
       target do |t|
         t.type = :application
         t.platform = platform
         t.deployment_target = deployment_target
         t.language = language
 
-        block.call(t) if block_given?
+        yield(t) if block_given?
       end
     end
 
@@ -54,7 +53,7 @@ module Xcake
     # @return [Target] the unit test target
     #         the newly created unit test target
     #
-    def unit_tests_for(host_target, &block)
+    def unit_tests_for(host_target)
       target do |t|
         t.name = "#{host_target.name}Tests"
 
@@ -65,13 +64,13 @@ module Xcake
 
         host_path = "#{host_target.name}.app/#{host_target.name}"
         t.all_configurations.each do |c|
-          c.settings["TEST_HOST"] = "$(BUILT_PRODUCTS_DIR)/#{host_path}"
+          c.settings['TEST_HOST'] = "$(BUILT_PRODUCTS_DIR)/#{host_path}"
         end
         t.all_configurations.each do |c|
-          c.settings["BUNDLE_LOADER"] = "$(TEST_HOST)"
+          c.settings['BUNDLE_LOADER'] = '$(TEST_HOST)'
         end
 
-        block.call(t) if block_given?
+        yield(t) if block_given?
       end
     end
 
@@ -85,7 +84,7 @@ module Xcake
     #
     # @return Void
     #
-    def watch_app_for(host_target, deployment_target, language = :objc, &block)
+    def watch_app_for(host_target, deployment_target, language = :objc)
       watch_app_target = target do |t|
         t.name = "#{host_target.name}-Watch"
 
@@ -107,9 +106,9 @@ module Xcake
       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?
+      yield(watch_app_target, watch_extension_target) if block_given?
 
-      return nil
+      nil
     end
   end
 end

data/lib/xcake/project.rb

@@ -8,7 +8,6 @@ module Xcake
   # The Project creates a hiearchy of targets and configurations
   # necessary to generate a xcode project.
   class Project
-
     include Configurable
     include Visitable
 
@@ -47,12 +46,11 @@ module Xcake
     #             c.application_for :ios, 8.0
     #           end
     #
-    def initialize(name="Project", &block)
-
+    def initialize(name = 'Project')
       self.name = name
       self.targets = []
 
-      block.call(self) if block_given?
+      yield(self) if block_given?
     end
 
     # @!group Working with a project
@@ -68,7 +66,7 @@ module Xcake
     def target(&block)
       target = Target.new(project, &block)
 
-      self.targets << target
+      targets << target
       target
     end
 

data/lib/xcake/resources/Cakefile

@@ -1,5 +1,5 @@
 # Change this to set a different Project file name
-#project.project_name = "Project"
+#project.name = "Project"
 
 # Replace this with your class prefix for Objective-C files.
 project.class_prefix = "APP"
@@ -24,7 +24,7 @@ application_for :ios, 8.0 do |target|
     #
     # File patterns can be seen here https://guides.cocoapods.org/syntax/podspec.html#group_file_patterns
     #
-    #target.all_configurations.each { |c| .supported_devices = :iphone_only}
+    #target.all_configurations.each { |c| c.supported_devices = :iphone_only}
 
     # Uncomment this to include additional files
     #

data/lib/xcake/target/sugar.rb

@@ -1,4 +1,4 @@
-require "xcodeproj"
+require 'xcodeproj'
 
 module Xcake
   class Target

data/lib/xcake/target.rb

@@ -175,12 +175,11 @@ module Xcake
     #             t.name "test"
     #           end
     #
-    def initialize(project, &block)
-
+    def initialize(project)
       @project = project
       @build_phases = []
 
-      block.call(self) if block_given?
+      yield(self) if block_given?
     end
 
     def include_files
@@ -192,7 +191,7 @@ module Xcake
     end
 
     def system_frameworks
-      @system_frameworks ||= default_system_frameworks_for self.platform
+      @system_frameworks ||= default_system_frameworks_for platform
     end
 
     def system_libraries
@@ -214,19 +213,19 @@ module Xcake
     def default_system_frameworks_for(platform)
       case platform
       when :ios
-        ['Foundation', 'UIKit']
+        %w(Foundation UIKit)
       when :osx
         ['Cocoa']
       when :tvos
-        ['Foundation', 'UIKit']
+        %w(Foundation UIKit)
       when :watchos
-        ['Foundation', 'UIKit', 'WatchKit']
+        %w(Foundation UIKit WatchKit)
       else
-        abort "Platform not supported!"
+        abort 'Platform not supported!'
       end
     end
 
-    #Configurable
+    # Configurable
 
     def parent_configurable
       @project
@@ -236,27 +235,27 @@ module Xcake
     # into here?
     def default_settings
       {
-        "INFOPLIST_FILE" => "#{name}/Supporting Files/Info.plist"
+        '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)
+      Xcodeproj::Project::ProjectHelper
+        .common_build_settings(:debug,
+                               platform,
+                               deployment_target.to_s,
+                               type,
+                               language).merge!(default_settings)
     end
 
     def default_release_settings
-      Xcodeproj::Project::ProjectHelper.
-        common_build_settings(:release,
-                              platform,
-                              deployment_target.to_s,
-                              type,
-                              language).
-                              merge!(default_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

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

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = "0.6.19".freeze
+  VERSION = '0.6.20'.freeze
 end

data/lib/xcake/visitor.rb

@@ -27,7 +27,6 @@ module Xcake
   #          end
   #
   module Visitor
-
     # This is called when a visitor is visiting a
     # visitable item.
     #

data/lib/xcake/xcode/project.rb

@@ -3,144 +3,171 @@ require 'xcodeproj'
 module Xcake
   module Xcode
     class Project < Xcodeproj::Project
-
-        # @return [Hash] the attributes of
-        #                the project
-        #
-        def attributes
-          root_object.attributes
-        end
-
-        # @return [String] the class name for the project
-        #
-        def class_prefix
-          attributes["CLASSPREFIX"]
-        end
-
-        # Sets the class prefix for the project
-        #
-        # @param [String] value to set
-        #
-        # @return [String] the class name for the project
-        #
-        def class_prefix=(class_prefix)
-          attributes["CLASSPREFIX"] = class_prefix
-        end
-
-        # @return [String] the organization for the project
-        #
-        def organization
-          attributes["ORGANIZATIONNAME"]
-        end
-
-        # Sets the organization for the project
-        #
-        # @param [String] value to set
-        #
-        # @return [SchemeList] the organization for the project
-        #
-        def organization=(organization)
-          attributes["ORGANIZATIONNAME"] = organization
-        end
-
-        # @return [SchemeList] the scheme list
-        #
-        def scheme_list
-          @scheme_list ||= SchemeList.new(self)
-        end
-
-        def object_version
-          Xcodeproj::Constants::DEFAULT_OBJECT_VERSION.to_s
-        end
-
-        def recreate_user_schemes(*)
-          puts "Creating Schemes..."
-
-          scheme_list.recreate_schemes
-          scheme_list.save(path)
-        end
-
-        # Configures the Project for use with Xcake.
-        # This makes sure we have sensible defaults and
-        # it as clean as possible.
-        #
-        def setup_for_xcake
-          root_object.remove_referrer(self) if root_object
-          root_object = new(Project::Object::PBXProject)
-          root_object.add_referrer(self)
-
-          config_list = new(XCConfigurationList)
-          root_object.build_configuration_list = config_list
-
-          root_object.main_group = new(PBXGroup)
-          root_object.product_ref_group = root_object.main_group.new_group('Products')
-
-          @root_object = root_object
-        end
-
-        # Creates a new xcode target from the target DSL
-        #
-        # @param [Target] target
-        #                 target DSL to create target from
-        #
-        # @return [Target] new xcode target
-        #
-        def new_target(target)
-          native_target = new(Xcodeproj::Project::Object::PBXNativeTarget)
-          native_target.name = target.name
-          native_target.product_name = target.name
-
-          case target.type
-          when Symbol
-            native_target.product_type = Xcodeproj::Constants::PRODUCT_TYPE_UTI[target.type]
-          when String
-            native_target.product_type = target.type
-          end
-
-          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
-
-          self.targets << native_target
-          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)
+      # @return [Hash] the attributes of
+      #                the project
+      #
+      def attributes
+        root_object.attributes
+      end
+
+      # @return [String] the class name for the project
+      #
+      def class_prefix
+        attributes['CLASSPREFIX']
+      end
+
+      # Sets the class prefix for the project
+      #
+      # @param [String] value to set
+      #
+      # @return [String] the class name for the project
+      #
+      def class_prefix=(class_prefix)
+        attributes['CLASSPREFIX'] = class_prefix
+      end
+
+      # @return [String] the organization for the project
+      #
+      def organization
+        attributes['ORGANIZATIONNAME']
+      end
+
+      # Sets the organization for the project
+      #
+      # @param [String] value to set
+      #
+      # @return [SchemeList] the organization for the project
+      #
+      def organization=(organization)
+        attributes['ORGANIZATIONNAME'] = organization
+      end
+
+      # @return [SchemeList] the scheme list
+      #
+      def scheme_list
+        @scheme_list ||= SchemeList.new(self)
+      end
+
+      def object_version
+        Xcodeproj::Constants::DEFAULT_OBJECT_VERSION.to_s
+      end
+
+      def recreate_user_schemes(*)
+        puts 'Creating Schemes...'
+
+        scheme_list.recreate_schemes
+        scheme_list.save(path)
+      end
+
+      # Configures the Project for use with Xcake.
+      # This makes sure we have sensible defaults and
+      # it as clean as possible.
+      #
+      def setup_for_xcake
+        root_object.remove_referrer(self) if root_object
+        root_object = new(Project::Object::PBXProject)
+        root_object.add_referrer(self)
+
+        config_list = new(XCConfigurationList)
+        root_object.build_configuration_list = config_list
+
+        root_object.main_group = new(PBXGroup)
+        root_object.product_ref_group = root_object.main_group.new_group('Products')
+
+        @root_object = root_object
+      end
+
+      # Creates a new xcode target from the target DSL
+      #
+      # @param [Target] target
+      #                 target DSL to create target from
+      #
+      # @return [Target] new xcode target
+      #
+      def new_target(target)
+        native_target = new(Xcodeproj::Project::Object::PBXNativeTarget)
+        native_target.name = target.name
+        native_target.product_name = target.name
+
+        case target.type
+        when Symbol
+          native_target.product_type = Xcodeproj::Constants::PRODUCT_TYPE_UTI[target.type]
+        when String
+          native_target.product_type = target.type
         end
 
-        # Finds a unit test target for a xcode target
-        #
-        # @param [Target] target
-        #                 target to find a xcode target for.
-        #
-        # @return [Target] unit test target
-        #
-        def find_unit_test_target_for_target(target)
-          targets.find do |t|
-            t.name == "#{target.name}Tests"
-          end
+        native_target.build_configuration_list = new(Xcodeproj::Project::Object::XCConfigurationList)
+
+        product = products_group.new_product_ref_for_target(native_target.product_name, native_target.product_type)
+        native_target.product_reference = product
+
+        targets << native_target
+        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
+      #
+      #
+      # TODO: Simplify this method figure out more reliable rules for group
+      # generation - maybe part of the new file installer in 0.7.
+      #
+      def new_group(node)
+        return main_group unless node.parent
+
+        group = main_group unless node.parent
+        group = main_group.find_subpath(node.parent.path, true) unless group
+        ensure_parent_path(group, node.parent)
+
+        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 ensure_parent_path(group, node)
+        group.path = node.component
+        ensure_parent_path(group.parent, node.parent) unless node.parent.nil?
+      end
+
+      # Finds a unit test target for a xcode target
+      #
+      # @param [Target] target
+      #                 target to find a xcode target for.
+      #
+      # @return [Target] unit test target
+      #
+      def find_unit_test_target_for_target(target)
+        targets.find do |t|
+          t.name == "#{target.name}Tests"
         end
+      end
     end
   end
 end

data/lib/xcake/xcode/scheme_list.rb

@@ -48,8 +48,8 @@ module Xcake
       #
       def create_schemes_for_target(target)
         case target.product_type
-          when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
-              create_schemes_for_application(target)
+        when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
+          create_schemes_for_application(target)
         end
       end
 
@@ -63,7 +63,7 @@ module Xcake
           scheme = Scheme.new
 
           scheme.name = "#{target.name}-#{c.name}"
-          @xcschememanagement['SuppressBuildableAutocreation'][target.uuid] = {"primary" => true}
+          @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)
@@ -74,10 +74,10 @@ module Xcake
           scheme.analyze_action.build_configuration = c.name
           scheme.archive_action.build_configuration = c.name
 
-          #TODO: We should structure this stuff out
-          if unit_test_target then
-             unit_test_target.add_dependency(target)
-             @xcschememanagement['SuppressBuildableAutocreation'][unit_test_target.uuid] = {"primary" => true}
+          # TODO: We should structure this stuff out
+          if unit_test_target
+            unit_test_target.add_dependency(target)
+            @xcschememanagement['SuppressBuildableAutocreation'][unit_test_target.uuid] = { 'primary' => true }
           end
 
           schemes << scheme
@@ -90,23 +90,21 @@ module Xcake
       #           path to write to.
       #
       def save(writing_path)
-
         schemes_dir = Scheme.user_data_dir(writing_path)
 
         FileUtils.rm_rf(schemes_dir)
         FileUtils.mkdir_p(schemes_dir)
 
         schemes.each do |s|
-
           puts "Saving Scheme #{s.name}..."
           s.save_as(@project.path, s.name, true)
 
           @xcschememanagement['SchemeUserState']["#{s.name}.xcscheme_^#shared#^_"] = {
-            "isShown" => true
+            'isShown' => true
           }
         end
 
-        puts "Saving Scheme List..."
+        puts 'Saving Scheme List...'
 
         xcschememanagement_path = schemes_dir + 'xcschememanagement.plist'
         write_plist(xcschememanagement_path)