xcake 0.8.13 → 0.9.4

data/lib/xcake/generator/scheme_generator.rb

@@ -14,53 +14,51 @@ module Xcake
       native_target = @context.native_object_for(target)
 
       target.schemes.each do |scheme|
+        scheme_list.supress_autocreation_of_target(native_target)
 
-          scheme_list.supress_autocreation_of_target(native_target)
+        native_scheme = @context.native_object_for(scheme)
+        native_scheme.name = scheme.name
 
-          native_scheme = @context.native_object_for(scheme)
-          native_scheme.name = scheme.name
+        native_scheme.configure_with_targets(native_target, nil)
 
-          native_scheme.configure_with_targets(native_target, nil)
+        native_project = @context.native_object_for(@project)
+        native_unit_test_target = native_project.find_unit_test_target_for_target(target)
 
-          native_project = @context.native_object_for(@project)
-          native_unit_test_target = native_project.find_unit_test_target_for_target(target)
+        if native_unit_test_target
+          scheme_list.supress_autocreation_of_target(native_unit_test_target)
+          # native_scheme.add_build_target(native_unit_test_target, false)
+          native_scheme.add_test_target(native_unit_test_target)
+        end
 
-          if native_unit_test_target
-            scheme_list.supress_autocreation_of_target(native_unit_test_target)
-            # native_scheme.add_build_target(native_unit_test_target, false)
-            native_scheme.add_test_target(native_unit_test_target)
-          end
+        native_ui_test_target = native_project.find_ui_test_target_for_target(target)
 
-          native_ui_test_target = native_project.find_ui_test_target_for_target(target)
+        if native_ui_test_target
+          scheme_list.supress_autocreation_of_target(native_ui_test_target)
+          # native_scheme.add_build_target(native_ui_test_target, false)
+          native_scheme.add_test_target(native_ui_test_target)
+        end
 
-          if native_ui_test_target
-            scheme_list.supress_autocreation_of_target(native_ui_test_target)
-            # native_scheme.add_build_target(native_ui_test_target, false)
-            native_scheme.add_test_target(native_ui_test_target)
-          end
+        # # TODO: Spec
+        # if native_target.library_target_type?
+        #   build_action = native_scheme.build_action
 
-          # # TODO: Spec
-          # if native_target.library_target_type?
-          #   build_action = native_scheme.build_action
+        #   entry = Xcodeproj::XCScheme::BuildAction::Entry.initialize()
+        #   entry.build_for_running(true)
 
-          #   entry = Xcodeproj::XCScheme::BuildAction::Entry.initialize()
-          #   entry.build_for_running(true)
+        #   build_action.add_entry(entry)
+        # end
 
-          #   build_action.add_entry(entry)
-          # end
+        native_scheme.test_action.build_configuration = scheme.test_configuration
+        native_scheme.launch_action.build_configuration = scheme.launch_configuration
+        native_scheme.profile_action.build_configuration = scheme.profile_configuration
+        native_scheme.analyze_action.build_configuration = scheme.analyze_configuration
+        native_scheme.archive_action.build_configuration = scheme.archive_configuration
 
-          native_scheme.test_action.build_configuration = scheme.test_configuration
-          native_scheme.launch_action.build_configuration = scheme.launch_configuration
-          native_scheme.profile_action.build_configuration = scheme.profile_configuration
-          native_scheme.analyze_action.build_configuration = scheme.analyze_configuration
-          native_scheme.archive_action.build_configuration = scheme.archive_configuration
-
-          scheme_list.schemes << native_scheme
+        scheme_list.schemes << native_scheme
       end
     end
 
-
-    def leave_project(project)
+    def leave_project(_project)
       scheme_list = @context.scheme_list
       scheme_list.save
     end

data/lib/xcake/generator/target_file_reference_generator.rb

@@ -19,12 +19,12 @@ module Xcake
       paths_without_directories = Dir.glob(reg_exp).reject do |f|
         file_ext = File.extname(f)
         disallowed_extensions = [
-          ".xcdatamodeld",
-          ".xcassets",
-          ".framework",
-          ".bundle"
+          '.xcdatamodeld',
+          '.xcassets',
+          '.framework',
+          '.bundle'
         ]
-        
+
         File.directory?(f) && !disallowed_extensions.include?(file_ext)
       end
       paths = paths_without_directories.map do |f|
@@ -51,11 +51,12 @@ module Xcake
 
       build_phase_symbol = PathClassifier.classification_for_path(path)
 
-      if PathClassifier.should_create_build_phase_for_classification?(build_phase_symbol)
-        build_phase_class = Xcodeproj::Project::Object.const_get(build_phase_symbol)
-        build_phase = native_target.build_phase_by_class(build_phase_class)
-        build_phase.add_file_reference(file_reference)
-      end
+      return unless PathClassifier.should_create_build_phase_for_classification?(build_phase_symbol)
+      return if target.info_plist_paths.include?(path)
+
+      build_phase_class = Xcodeproj::Project::Object.const_get(build_phase_symbol)
+      build_phase = native_target.build_phase_by_class(build_phase_class)
+      build_phase.add_file_reference(file_reference)
     end
   end
 end

data/lib/xcake/generator/target_framework_generator.rb

@@ -5,14 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-      unless target.system_frameworks.nil?
-        EventHooks.run_hook :before_adding_system_framework, target
+      return if target.system_frameworks.nil?
 
-        native_target = @context.native_object_for(target)
+      EventHooks.run_hook :before_adding_system_framework, target
 
-        system_frameworks = target.system_frameworks
-        native_target.add_system_frameworks(system_frameworks)
-      end
+      native_target = @context.native_object_for(target)
+
+      system_frameworks = target.system_frameworks
+      native_target.add_system_frameworks(system_frameworks)
     end
   end
 end

data/lib/xcake/generator/target_library_generator.rb

@@ -5,15 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-
       system_libraries = target.system_libraries.to_a
 
-      unless system_libraries.empty?
-        EventHooks.run_hook :before_adding_system_library, target
+      return if system_libraries.empty?
+
+      EventHooks.run_hook :before_adding_system_library, target
 
-        native_target = @context.native_object_for(target)
-        native_target.add_system_libraries(system_libraries)
-      end
+      native_target = @context.native_object_for(target)
+      native_target.add_system_libraries(system_libraries)
     end
   end
 end

data/lib/xcake/path_classifier.rb

@@ -20,8 +20,9 @@ module Xcake
     # into the project
     #
     def self.should_include_path?(path)
-      return false if is_locale_container?(path)
-      return false if is_inside_classified_container?(path)
+      return false if locale_container?(path)
+      return false if inside_classified_container?(path)
+
       true
     end
 
@@ -31,6 +32,7 @@ module Xcake
       end
 
       return :PBXResourcesBuildPhase if classification.nil?
+
       classification.first
     end
 
@@ -38,29 +40,31 @@ module Xcake
       classification != :PBXHeadersBuildPhase
     end
 
-    private_class_method
+    class << self
+      private
 
-    def self.is_locale_container?(path)
-      components = path.split('/')
-      File.extname(components.last) == '.lproj'
-    end
+      def locale_container?(path)
+        components = path.split('/')
+        File.extname(components.last) == '.lproj'
+      end
 
-    def self.is_inside_classified_container?(path)
-      components = path.split('/')
+      def inside_classified_container?(path)
+        components = path.split('/')
 
-      classified_component_index = components.index do |c|
-        is_classified?(c)
-      end
+        classified_component_index = components.index do |c|
+          classified?(c)
+        end
 
-      if !classified_component_index.nil?
-        classified_component_index < (components.length - 1)
-      else
-        false
+        if !classified_component_index.nil?
+          classified_component_index < (components.length - 1)
+        else
+          false
+        end
       end
-    end
 
-    def self.is_classified?(path)
-      EXTENSION_MAPPINGS.values.flatten.any? { |ext| File.extname(path) == ext }
+      def classified?(path)
+        EXTENSION_MAPPINGS.values.flatten.any? { |ext| File.extname(path) == ext }
+      end
     end
   end
 end

data/lib/xcake/ui.rb

@@ -38,7 +38,7 @@ module Xcake
       end
 
       EventHooks.before_attaching_xcconfig do |configuration|
-        board.puts_indented "- Attaching XCConfig #{configuration.configuration_file} to build configuration #{configuration.name}"
+        board.puts_indented "- Attaching XCConfig #{configuration.configuration_file} to build configuration #{configuration.name}" # rubocop:disable Metrics/LineLength
       end
 
       EventHooks.before_adding_system_library do |target|

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.8.13'.freeze
+  VERSION = '0.9.4'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -140,9 +140,8 @@ module Xcake
       # @return [PBXGroup] existing or new xcode group
       #
       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 ||= group_for_path(path)
         group
       end
 
@@ -163,6 +162,7 @@ module Xcake
         base_name = group_path.basename
 
         return nil unless base_name.to_s.include?('.lproj')
+
         parent_group = group_for_path(group_path)
 
         group = parent_group[path.basename.to_s]
@@ -181,6 +181,7 @@ module Xcake
         group_path = path.dirname.cleanpath
 
         return main_group unless group_path.to_s != '.'
+
         main_group.child_for_path(group_path.to_s)
       end
 

data/lib/xcake/xcode/scheme_list.rb

@@ -18,8 +18,6 @@ module Xcake
       #
       attr_accessor :xcschememanagement
 
-      public
-
       # @param    [Project] project
       #           project to create scheme list for.
       #

data/lib/xcake/xcodeproj_ext/PBXGroup.rb

@@ -1,13 +1,15 @@
-require 'Xcodeproj'
+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)
+          unless path.kind_of?(Array)
+            path = path.split('/').keep_if do |c|
+              c != '.'
+            end
+          end
 
           child_name = path.shift
           child = children.find { |c| c.display_name == child_name }
@@ -22,12 +24,12 @@ module Xcodeproj
           else
             child.child_for_path(path)
           end
-       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
+          return '.' if parent.kind_of? Xcake::Xcode::Project
+          return '.' if parent.kind_of? PBXProject
+          return parent.dirname.to_s if kind_of? PBXVariantGroup
 
           if display_name
             "#{parent.dirname}/#{display_name}"
@@ -35,7 +37,7 @@ module Xcodeproj
             parent.dirname.to_s
           end
         end
-     end
-   end
+      end
+    end
   end
 end

data/lib/xcake/xcodeproj_ext/PBXNativeTarget.rb

@@ -10,13 +10,13 @@ module Xcodeproj
 
         def library_target_type?
           case symbol_type
-          when :framework, :dynamic_library, :static_library 
+          when :framework, :dynamic_library, :static_library
             true
           else
             false
           end
         end
       end
-   end
+    end
   end
 end

metadata

@@ -1,241 +1,290 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.9.4
 platform: ruby
 authors:
+- Igor Makarov
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: cork
   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'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  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'
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
+        version: '1.10'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.64.0
 - !ruby/object:Gem::Dependency
   name: rubocop-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-description: Create your Xcode projects automatically using a stupid simple DSL.
+        version: '0.9'
+description: "Cakefile — A Podfile for your main project. \U0001F370Describe Xcode
+  projects in a human readable format and (re)generate one on demand."
 email:
-- james@supmenow.com
+- igormaka@gmail.com
 executables:
 - xcake
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitattributes
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
 - bin/xcake
-- fastlane-plugin-xcake/Gemfile
-- fastlane-plugin-xcake/LICENSE
-- fastlane-plugin-xcake/README.md
-- fastlane-plugin-xcake/Rakefile
-- fastlane-plugin-xcake/fastlane-plugin-xcake.gemspec
-- fastlane-plugin-xcake/lib/fastlane/plugin/xcake.rb
-- 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
@@ -243,8 +292,7 @@ files:
 - lib/xcake/constants.rb
 - lib/xcake/context.rb
 - lib/xcake/context/xcodeproj_context.rb
-- lib/xcake/core_ext/array.rb
-- lib/xcake/core_ext/object.rb
+- lib/xcake/core_ext/class.rb
 - lib/xcake/core_ext/string.rb
 - lib/xcake/dependency.rb
 - lib/xcake/dependency_provider.rb
@@ -293,10 +341,7 @@ files:
 - 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/
+homepage: https://github.com/igor-makarov/xcake/
 licenses:
 - MIT
 metadata: {}
@@ -306,18 +351,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: DSL for Xcode Projects.
+summary: Generate Xcode Projects
 test_files: []