cocoapods-generate 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd88f4c2670ce0ca90f7f0d797f04b55a469bfc469c8b37362c06776f85ba6e
-  data.tar.gz: 984fb36533b3d9f66cbed561f1d70caa1799844345966ba07809afbcc6a52345
+  metadata.gz: 52f85405e2e27e0c197fac736a0f1c3d61f47e601238737f6082aa6913512c7c
+  data.tar.gz: 2fe15ee1fd79bd155bf94140fbe0a7bfbd2f318d355c43bac59b743e42da738e
 SHA512:
-  metadata.gz: b9a7d8cd37b494c7cab267b360af65690b9a05639b91ad13d101fe9d16b8658d8fd84c60f4b3c7b575810d39fe8c6db80e650596b389ced553df3df5e1d70f19
-  data.tar.gz: 1734bb0083d74411e3ac6e7bcbb5ace9d38100c2284f92e697cb6ef6d17a40909e149087a6a65e8e1785cd2a8e11e2f83c2dabf58d143d167b35e0fb4f976e7f
+  metadata.gz: db80754352a3a07467f11099713f58788fd1a342e54c7fd75e975b3bd73f3230980c07f271de56102a696d3e6663b29a1a21ed4efc38f8ca2bc7a5a62c06f600
+  data.tar.gz: 64c521033f329de4ad9d232ce147b33d25b885c70a020175e27e65c3ce639144d2cd27c6f864a08381b0b0d05b25488693b345b62ac641ad1a88483e70eb2fe3

data/LICENSE.md

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2019
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -62,6 +62,8 @@ Options:
                                            be used
     --use-libraries                        Whether to use libraries instead of
                                            frameworks
+    --generate-multiple-pod-projects       Whether to generate multiple Xcode projects
+    --incremental-installation             Whether to use incremental installation
     --gen-directory=PATH                   Path to generate workspaces in
     --auto-open                            Whether to automatically open the generated
                                            workspaces
@@ -69,11 +71,14 @@ Options:
                                            before generating
     --app-host-source-dir=DIR              A directory containing sources to use for
                                            the app host
-    --sources=SOURCE1,SOURCE2              The sources from which to pull dependant
+    --sources=SOURCE1,SOURCE2              The sources from which to pull dependent
                                            pods (defaults to all repos in the podfile
                                            if using the podfile, else all available
                                            repos). Can be a repo name or URL. Multiple
                                            sources must be comma-delimited.
+    --local-sources=SOURCE1,SOURCE2        Paths from which to find local podspecs for
+                                           transitive dependencies. Multiple
+                                           local-sources must be comma-delimited.
     --repo-update                          Force running `pod repo update` before
                                            install
     --use-default-plugins                  Whether installation should activate

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/lib/cocoapods/generate/configuration.rb

@@ -178,10 +178,16 @@ module Pod
       # installer options
       option :sources, ArrayOf.new(String),
              'if use_podfile && podfile then ::Pod::Installer::Analyzer.new(:sandbox, podfile).sources.map(&:url) else pod_config.sources_manager.all.map(&:url) end',
-             'The sources from which to pull dependant pods (defaults to all repos in the podfile if using the podfile, else all available repos). Can be a repo name or URL. Multiple sources must be comma-delimited.',
+             'The sources from which to pull dependent pods (defaults to all repos in the podfile if using the podfile, else all available repos). Can be a repo name or URL. Multiple sources must be comma-delimited.',
              'SOURCE1,SOURCE2',
              ->(_) { nil },
              ->(sources) { Array(sources).flat_map { |s| s.split(',') } }
+      option :local_sources, ArrayOf.new(String),
+             [],
+             'Paths from which to find local podspecs for transitive dependencies. Multiple local-sources must be comma-delimited.',
+             'SOURCE1,SOURCE2',
+             ->(_) { nil },
+             ->(local_sources) { Array(local_sources).flat_map { |s| s.split(',') } }
       option :repo_update, BOOLEAN, 'false', 'Force running `pod repo update` before install', nil, nil, coerce_to_bool
       option :use_default_plugins, BOOLEAN, 'false', 'Whether installation should activate default plugins', nil, nil, coerce_to_bool
       option :deterministic_uuids, BOOLEAN, 'false', 'Whether installation should use deterministic UUIDs for pods projects', nil, nil, coerce_to_bool

data/lib/cocoapods/generate/installer.rb

@@ -4,18 +4,6 @@ module Pod
     # given a configuration and a generated podfile.
     #
     class Installer
-      # A subclass of the CocoaPods installer that vends analyzer classes
-      # that skip validating podfiles
-      #
-      class InstallerNoValidatePodfile < ::Pod::Installer
-        def create_analyzer(*)
-          super.tap do |analyzer|
-            def analyzer.validate_podfile!; end
-          end
-        end
-      end
-      private_constant :InstallerNoValidatePodfile
-
       # @return [Configuration]
       #         the configuration to use when installing
       #
@@ -64,7 +52,7 @@ 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
-              installer = InstallerNoValidatePodfile.new(configuration.pod_config.sandbox, podfile, configuration.lockfile)
+              installer = ::Pod::Installer.new(configuration.pod_config.sandbox, podfile, configuration.lockfile)
               installer.use_default_plugins = configuration.use_default_plugins
               installer.install!
             end
@@ -164,6 +152,14 @@ module Pod
                   end
 
                 next
+              elsif file.to_s.end_with?('-Bridging-Header.h')
+                native_app_target.build_configurations.each do |bc|
+                  if (old_bridging_header = bc.build_settings['SWIFT_OBJC_BRIDGING_HEADER'])
+                    raise Informative, "Conflicting Swift ObjC bridging headers specified, got #{old_bridging_header} and #{relative_path}. Only one `-Bridging-Header.h` file may be specified in the app host source dir."
+                  end
+
+                  bc.build_settings['SWIFT_OBJC_BRIDGING_HEADER'] = relative_path.to_s
+                end
               end
 
               group = groups[relative_path.dirname]

data/lib/cocoapods/generate/podfile_generator.rb

@@ -39,7 +39,7 @@ module Pod
 
           install! 'cocoapods', generator.installation_options
 
-          generator.configuration.podfile_plugins.each do |name, options|
+          generator.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
           end
 
@@ -54,7 +54,7 @@ module Pod
             source(source_url)
           end
 
-          self.defined_in_file = dir.join('Podfile.yaml')
+          self.defined_in_file = dir.join('CocoaPods.podfile.yaml')
 
           test_specs = spec.recursive_subspecs.select(&:test_specification?)
           app_specs = if spec.respond_to?(:app_specification?)
@@ -121,7 +121,41 @@ module Pod
           end
 
           pod spec.name, **pod_options
+
+          # 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|
+            pod_options = generator.dependency_compilation_kwargs(dependency.name)
+            pod_options[:path] = if podspec_file[0] == '/' # absolute path
+                                   podspec_file
+                                 else
+                                   '../../' + podspec_file
+                                 end
+            pod dependency.name, **pod_options
+          end
+        end
+      end
+
+      def transitive_local_dependencies(spec, paths)
+        dependencies = spec.dependencies
+        return_list = []
+        dependencies.each do |dependency|
+          found_podspec_file = nil
+          name = dependency.name.split('/')[0]
+          paths.each do |path|
+            podspec_file = 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
         end
+        return_list
       end
 
       # @return [Boolean]
@@ -276,6 +310,12 @@ module Pod
         installation_options
       end
 
+      def podfile_plugins
+        configuration.podfile_plugins.merge('cocoapods-disable-podfile-validations' => { 'no_abstract_only_pods' => true }) do |_key, old_value, new_value|
+          old_value.merge(new_value)
+        end
+      end
+
       private
 
       # @return [Array<Podfile::TargetDefinition>]

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocoapods-disable-podfile-validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CODE_OF_CONDUCT.md
+- LICENSE.md
 - README.md
 - VERSION
 - lib/cocoapods/command/gen.rb
@@ -68,7 +83,8 @@ files:
 - lib/cocoapods/generate/podfile_generator.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/square/cocoapods-generate
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []