cocoapods-generate 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444c04f0d19618e1220c68828b385d2a5360b63f359f6d5c97840c92ec4c82f5
-  data.tar.gz: 953c104741ea87c0629466cd2db8e6b27f2a9d3b395b7a18b76b714fec8d926c
+  metadata.gz: ea3b44ab5fbc8842aebc11de2fc54cfc3767a27a5295495ddc4ee615a992ad08
+  data.tar.gz: 2e59a2c711cd98ee9c7ce4f6c25d80c88f4bc0a88ade7402fe67ebd0c241df7a
 SHA512:
-  metadata.gz: fdf382c8e04699dfb9c206fdc97fb892d39fd7b3d5403fa2118127c2caf92330bd7445b49bc38542ce67aae075002c412633ba09600a3682e20a797ae6d2bae5
-  data.tar.gz: 237a7ab95303b502f3f0e8b525a3c6f4f640031d55b5ceab88a963806b762f51b15c7197a23c779cae4fd39e54aecb5c47e9daa0a2e0f93b03f84fbaa26c05c7
+  metadata.gz: dae3e8cedabed45368ad1642409929363e101e25fb156d2e684ccf158fd01627381aa10558611e7a0f0380e924b83f681a571f742e7397be5f08304040fb2b86
+  data.tar.gz: 4acc9aa5dcba8768e7fe33f3c0c3cb564e088505d513f9692f2efd6a944a80d216e417409f91a13f6373fb1b1d0596fd395ea449559051f5418ae4ff1aac43af

data/VERSION

@@ -1 +1 @@
-1.6.0
+2.0.0

data/lib/cocoapods/command/gen.rb

@@ -86,10 +86,12 @@ module Pod
           path = dir + '.gen_config.yml'
           next unless path.file?
           Pod::Generate::Configuration.from_file(path)
-        end
+        end.compact
+
+        options.delete(:podspec_paths) if options[:podspec_paths].empty? && config_hashes.any? { |h| h.include?(:podspec_paths) }
 
         env = Generate::Configuration.from_env(ENV)
-        config_hashes.insert(-2, env)
+        config_hashes = [env] + config_hashes
         config_hashes << options
 
         configuration = config_hashes.compact.each_with_object({}) { |e, h| h.merge!(e) }

data/lib/cocoapods/generate/configuration.rb

@@ -316,6 +316,19 @@ module Pod
         !use_libraries?
       end
 
+      # @return [String] The project name to use for generating this workspace.
+      #
+      # @param [Specification] spec
+      #        the specification to generate project name for.
+      #
+      def project_name_for_spec(spec)
+        project_name = spec.name.dup
+        # When using multiple Xcode project the project name will collide with the actual .xcodeproj meant for the pod
+        # that we are generating the workspace for.
+        project_name << 'Sample' if generate_multiple_pod_projects?
+        project_name
+      end
+
       # @return [Array<Specification>] the podspecs found at the given paths.
       #         This method will download specs from URLs and traverse a directory's children.
       #
@@ -340,7 +353,7 @@ module Pod
           elsif path.directory?
             glob = Pathname.glob(path + '*.podspec{.json,}')
             next StandardError.new "no specs found in #{UI.path path}" if glob.empty?
-            glob.map { |f| Pod::Specification.from_file(f) }
+            glob.map { |f| Pod::Specification.from_file(f) }.sort_by(&:name)
           else
             Pod::Specification.from_file(path)
           end

data/lib/cocoapods/generate/installer.rb

@@ -51,7 +51,12 @@ module Pod
 
           installer = nil
           UI.section 'Installing...' do
-            configuration.pod_config.with_changes(installation_root: install_directory, podfile: podfile, lockfile: configuration.lockfile, sandbox: nil, sandbox_root: install_directory, podfile_path: podfile.defined_in_file, silent: !configuration.pod_config.verbose?, verbose: false, lockfile_path: nil) do
+            configuration.pod_config.with_changes(installation_root: install_directory, podfile: podfile,
+                                                  lockfile: configuration.lockfile, sandbox: nil,
+                                                  sandbox_root: install_directory + 'Pods',
+                                                  podfile_path: podfile.defined_in_file,
+                                                  silent: !configuration.pod_config.verbose?, verbose: false,
+                                                  lockfile_path: nil) do
               installer = ::Pod::Installer.new(configuration.pod_config.sandbox, podfile, configuration.lockfile)
               installer.use_default_plugins = configuration.use_default_plugins
               installer.install!
@@ -59,7 +64,12 @@ module Pod
           end
 
           UI.section 'Performing post-installation steps' do
-            perform_post_install_steps(open_app_project, installer)
+            should_perform_post_install = if installer.respond_to?(:generated_aggregate_targets) # CocoaPods 1.7.0
+                                            !installer.generated_aggregate_targets.empty?
+                                          else
+                                            true
+                                          end
+            perform_post_install_steps(open_app_project, installer) if should_perform_post_install
           end
 
           print_post_install_message
@@ -79,7 +89,7 @@ module Pod
       end
 
       def open_app_project(recreate: false)
-        app_project_path = install_directory.join("#{spec.name}.xcodeproj")
+        app_project_path = install_directory.join("#{configuration.project_name_for_spec(spec)}.xcodeproj")
         if !recreate && app_project_path.exist?
           Xcodeproj::Project.open(app_project_path)
         else
@@ -92,25 +102,29 @@ module Pod
       # @return [Xcodeproj::Project]
       #
       def create_app_project
-        app_project = open_app_project(recreate: true)
+        app_project = open_app_project(recreate: !configuration.incremental_installation?)
 
         spec_platforms = spec.available_platforms.flatten.reject do |platform|
           !configuration.platforms.nil? && !configuration.platforms.include?(platform.string_name.downcase)
         end
 
-        Pod::Command::Gen.help! Pod::StandardError.new "No available platforms in #{spec.name}.podspec match requested platforms: #{configuration.platforms}" if spec_platforms.empty?
+        if spec_platforms.empty?
+          Pod::Command::Gen.help! Pod::StandardError.new "No available platforms in #{spec.name}.podspec match requested platforms: #{configuration.platforms}"
+        end
 
         spec_platforms
           .map do |platform|
             consumer = spec.consumer(platform)
             target_name = "App-#{Platform.string_name(consumer.platform_name)}"
-            native_app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target(consumer), target_name)
+            next if app_project.targets.map(&:name).include? target_name
+            native_app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name,
+                                                                               deployment_target(consumer), target_name)
             # Temporarily set Swift version to pass validator checks for pods which do not specify Swift version.
             # It will then be re-set again within #perform_post_install_steps.
             Pod::Generator::AppTargetHelper.add_swift_version(native_app_target, Pod::Validator::DEFAULT_SWIFT_VERSION)
             native_app_target
           end
-          .tap do
+          .compact.tap do
             app_project.recreate_user_schemes do |scheme, target|
               installation_result = installation_result_from_target(target)
               next unless installation_result
@@ -139,7 +153,10 @@ module Pod
           remove_script_phase_from_target(native_app_target, 'Check Pods Manifest.lock')
 
           pod_target = installer.pod_targets.find { |pt| pt.platform.name == native_app_target.platform_name && pt.pod_name == spec.name }
-          raise "unable to find a pod target for #{native_app_target} / #{spec}" unless pod_target
+          raise "Unable to find a pod target for #{native_app_target} / #{spec}" unless pod_target
+
+          native_app_target.source_build_phase.clear
+          native_app_target.resources_build_phase.clear
 
           if (app_host_source_dir = configuration.app_host_source_dir)
             relative_app_host_source_dir = app_host_source_dir.relative_path_from(installer.sandbox.root)
@@ -173,9 +190,21 @@ module Pod
               native_app_target.add_file_references([source_file_ref])
             end
           elsif Pod::Generator::AppTargetHelper.method(:add_app_project_import).arity == -5 # CocoaPods >= 1.6
-            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target, pod_target.platform.name, native_app_target.name)
+            # If we are doing incremental installation then the file might already be there.
+            platform_name = Platform.string_name(native_app_target.platform_name)
+            group = group_for_platform_name(app_project, platform_name)
+            main_file_ref = group.files.find { |f| f.display_name == 'main.m' }
+            if main_file_ref.nil?
+              Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target,
+                                                                     pod_target.platform.name, native_app_target.name)
+            else
+              native_app_target.add_file_references([main_file_ref])
+            end
           else
-            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target, pod_target.platform.name, pod_target.requires_frameworks?, native_app_target.name)
+            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target,
+                                                                   pod_target.platform.name,
+                                                                   pod_target.requires_frameworks?,
+                                                                   native_app_target.name)
           end
 
           # Set `PRODUCT_BUNDLE_IDENTIFIER`
@@ -185,7 +214,7 @@ module Pod
 
           case native_app_target.platform_name
           when :ios
-            make_ios_app_launchable(installer, app_project, native_app_target)
+            make_ios_app_launchable(app_project, native_app_target)
           end
 
           Pod::Generator::AppTargetHelper.add_swift_version(native_app_target, pod_target.swift_version) unless pod_target.swift_version.blank?
@@ -239,9 +268,10 @@ module Pod
           .flat_map(&:test_native_targets)
           .group_by(&:platform_name)
 
+        workspace_path = install_directory + "#{spec.name}.xcworkspace"
         Xcodeproj::Plist.write_to_path(
           { 'IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded' => false },
-          app_project.path.sub_ext('.xcworkspace').join('xcshareddata').tap(&:mkpath).join('WorkspaceSettings.xcsettings')
+          workspace_path.join('xcshareddata').tap(&:mkpath).join('WorkspaceSettings.xcsettings')
         )
 
         test_native_targets.each do |platform_name, test_targets|
@@ -266,9 +296,9 @@ module Pod
         end
       end
 
-      def make_ios_app_launchable(installer, app_project, native_app_target)
+      def make_ios_app_launchable(app_project, native_app_target)
         platform_name = Platform.string_name(native_app_target.platform_name)
-        generated_source_dir = installer.sandbox.root.join('App', platform_name).tap(&:mkpath)
+        generated_source_dir = install_directory.join("App-#{platform_name}").tap(&:mkpath)
 
         # Add `LaunchScreen.storyboard`
         launch_storyboard = generated_source_dir.join('LaunchScreen.storyboard')
@@ -329,12 +359,17 @@ module Pod
         Xcodeproj::Plist.write_to_path(info_plist_contents, info_plist_path)
 
         native_app_target.build_configurations.each do |bc|
-          bc.build_settings['INFOPLIST_FILE'] = "${SRCROOT}/App/#{platform_name}/Info.plist"
+          bc.build_settings['INFOPLIST_FILE'] = "${SRCROOT}/App-#{platform_name}/Info.plist"
         end
 
-        group = app_project.main_group.find_subpath("App-#{platform_name}", true)
-        group.new_file(info_plist_path)
-        native_app_target.resources_build_phase.add_file_reference group.new_file(launch_storyboard)
+        group = group_for_platform_name(app_project, platform_name)
+        group.files.find { |f| f.display_name == 'Info.plist' } || group.new_file(info_plist_path)
+        launch_storyboard_file_ref = group.files.find { |f| f.display_name == 'LaunchScreen.storyboard' } || group.new_file(launch_storyboard)
+        native_app_target.resources_build_phase.add_file_reference(launch_storyboard_file_ref)
+      end
+
+      def group_for_platform_name(project, platform_name, should_create = true)
+        project.main_group.find_subpath("App-#{platform_name}", should_create)
       end
 
       def print_post_install_message

data/lib/cocoapods/generate/podfile_generator.rb

@@ -30,9 +30,10 @@ module Pod
       def podfile_for_spec(spec)
         generator = self
         dir = configuration.gen_dir_for_pod(spec.name)
+        project_name = configuration.project_name_for_spec(spec)
 
         Pod::Podfile.new do
-          project "#{spec.name}.xcodeproj"
+          project "#{project_name}.xcodeproj"
           workspace "#{spec.name}.xcworkspace"
 
           plugin 'cocoapods-generate'
@@ -43,7 +44,7 @@ module Pod
             plugin(*[name, options].compact)
           end
 
-          use_frameworks!(generator.configuration.use_frameworks?)
+          use_frameworks!(generator.use_frameworks_value)
 
           if (supported_swift_versions = generator.supported_swift_versions)
             supports_swift_versions(supported_swift_versions)
@@ -128,7 +129,7 @@ module Pod
 
           # Implement local-sources option to set up dependencies to podspecs in the local filesystem.
           next if generator.configuration.local_sources.empty?
-          generator.transitive_local_dependencies(spec, generator.configuration.local_sources).each do |dependency, podspec_file|
+          generator.transitive_local_dependencies(spec, generator.configuration.local_sources).sort_by(&:first).each do |dependency, podspec_file|
             pod_options = generator.dependency_compilation_kwargs(dependency.name)
             pod_options[:path] = if podspec_file[0] == '/' # absolute path
                                    podspec_file
@@ -140,26 +141,30 @@ module Pod
         end
       end
 
-      def transitive_local_dependencies(spec, paths)
-        dependencies = spec.dependencies
-        return_list = []
-        dependencies.each do |dependency|
+      def transitive_local_dependencies(spec, paths, found_podspecs: {}, include_non_library_subspecs: true)
+        if include_non_library_subspecs
+          non_library_specs = spec.recursive_subspecs.select do |ss|
+            ss.test_specification? || (ss.respond_to?(:app_specification?) && ss.app_specification?)
+          end
+          non_library_specs.each do |subspec|
+            transitive_local_dependencies(subspec, paths, found_podspecs: found_podspecs, include_non_library_subspecs: false)
+          end
+        end
+        spec.dependencies.each do |dependency|
+          next if found_podspecs.key?(dependency)
           found_podspec_file = nil
           name = dependency.name.split('/')[0]
           paths.each do |path|
-            podspec_file = path + '/' + name + '.podspec'
+            podspec_file = File.join(path, name + '.podspec')
             next unless File.file?(podspec_file)
             found_podspec_file = podspec_file
             break
           end
           next unless found_podspec_file
-          return_list << [dependency, found_podspec_file]
-          dep_spec = Pod::Specification.from_file(found_podspec_file)
-          dep_spec.dependencies.each do |d_dep|
-            dependencies << d_dep unless dependencies.include? d_dep
-          end
+          found_podspecs[dependency] = found_podspec_file.sub(%r{\A\./}, '')
+          transitive_local_dependencies(Pod::Specification.from_file(found_podspec_file), paths, found_podspecs: found_podspecs)
         end
-        return_list
+        found_podspecs
       end
 
       # @return [Boolean]
@@ -189,6 +194,27 @@ module Pod
         end
       end
 
+      # @return [Boolean, Hash]
+      #         the value to use for `use_frameworks!` DSL directive
+      #
+      def use_frameworks_value
+        return configuration.use_frameworks? unless configuration.use_podfile?
+        use_framework_values = target_definition_list.map do |target_definition|
+          if target_definition.respond_to?(:build_type) # CocoaPods >= 1.9
+            build_type = target_definition.build_type
+            if build_type.static_library?
+              false
+            else
+              { linkage: build_type == BuildType.dynamic_framework ? :dynamic : :static }
+            end
+          else
+            target_definition.uses_frameworks?
+          end
+        end.uniq
+        raise Informative, 'Multiple use_frameworks! values detected in user Podfile.' unless use_framework_values.count == 1
+        use_framework_values.first
+      end
+
       # @return [Hash]
       #         a hash with "compilation"-related dependency options for the `pod` DSL method
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-disable-podfile-validations
@@ -101,7 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.