cocoapods-diff 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20036a25e82e63e799afb07964c14862cd2eb431fb136d2c040acf196fc1753
-  data.tar.gz: afa96a35cb251272bcc29059b557a842479c165ba6ff82529fea261c42f6c1c3
+  metadata.gz: 7b5d0be0fabd5ac9f98da7c16ad1551f0d88055650f5d26ae6184222f1b6540f
+  data.tar.gz: 56b824d32444602b34a788a703ca406915503e074413f13810a68f3436f3c589
 SHA512:
-  metadata.gz: a8ea4f66e7bb77a9d3f8a3fa6fc98b30d9f2939967263315d9342939fc8353c5c697d949dc95031ee173c2be832a354264dfcef614902b62e4717dcf6370ac51
-  data.tar.gz: 2d127059340ba81f0d955e6663bdde22f50ae1ac0c2bb36554abcce58e2c06c39e1922f4c714da7036e6f8e905c26a5bc38a7900dbb4ed7d1587960d72ae103e
+  metadata.gz: ac146c4f9ed43e4d8d958dd532c4db5c2d687a469571233d2d1b240ecb417521f08c31f4023dfb24dc83d702346cf0ee72d45134f2af74aa70d4cef0a5913113
+  data.tar.gz: d53e168a1bd4f683a2a4108e912993fb613c6e7c0a66be94d2f47c0e8c6e7a2c362c163b8cc18ad284c817e3e1b9ac2a470d70b206c4cf9dbbd0bb5ce5d75b74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-diff (0.7.0)
+    cocoapods-diff (0.8.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/cocoapods-diff/command/diff.rb

@@ -82,31 +82,19 @@ module Pod
         older_spec = get_specification_for_version(@older_version)
         newer_spec = get_specification_for_version(@newer_version)
 
-        # Warn the user if there's no subspecs to compare.
-        if older_spec.subspecs.empty? && newer_spec.subspecs.empty?
+        # Warn the user if there's no subspecs or dependencies to compare.
+        if older_spec.subspecs.empty? && older_spec.dependencies.empty? && newer_spec.subspecs.empty? && newer_spec.dependencies.empty?
           return UI.warn "There's nothing to compare for #{@pod_name} #{@older_version} vs. #{@newer_version}"
         end
         
-        # Remove the default subspecs value to compare all the subspecs if any
-        older_spec.default_subspecs = []
-        newer_spec.default_subspecs = []
-
         # Get all the supported platforms without the OS version if no platforms are specified
         @platforms = (newer_spec.available_platforms.map(&:name) | older_spec.available_platforms.map(&:name)) if @platforms.empty?
         @platforms.map! { |platform| Pod::Platform.new(platform) }
 
-        # Split the subspecs per platform now as we can use them multiple times
-        @older_subspecs = {}
-        @newer_subspecs = {}
-        @platforms.each do |platform|
-          @older_subspecs[platform.name] = older_spec.subspecs.select { |s| s.supported_on_platform?(platform) }
-          @newer_subspecs[platform.name] = newer_spec.subspecs.select { |s| s.supported_on_platform?(platform) }
-        end
-
-        # Get the dependencies specs of this spec
-        get_dependencies_specs(@older_version, @older_subspecs) if @include_dependencies
-        get_dependencies_specs(@newer_version, @newer_subspecs) if @include_dependencies
-
+        # Let cocoapods resolve the dependencies for a spec
+        @older_specs = resolve_dependencies_for_spec(older_spec)
+        @newer_specs = resolve_dependencies_for_spec(newer_spec)
+        
         # If no markdown or podfile options are passed, just print the diff on console
         if @print_diff
           return UI.title "Calculating diff" do
@@ -122,13 +110,13 @@ module Pod
 
         if @newer_podfile_path
           UI.title "Generating the Podfile for #{newer_spec.name} #{newer_spec.version} at #{@newer_podfile_path}" do
-            generate_podfile_file(@newer_podfile_path, newer_spec.version, @newer_subspecs)
+            generate_podfile_file(newer_spec, @newer_specs, @newer_podfile_path)
           end
         end
 
         if @older_podfile_path
           UI.title "Generating the Podfile for #{older_spec.name} #{older_spec.version} at #{@older_podfile_path}" do
-            generate_podfile_file(@older_podfile_path, older_spec.version, @older_subspecs)
+            generate_podfile_file(older_spec, @older_specs, @older_podfile_path)
           end
         end
       end
@@ -140,18 +128,66 @@ module Pod
         query = @use_regex ? @pod_name : Regexp.escape(@pod_name)
         set = config.sources_manager.search_by_name(query).first
         spec_path = set.specification_paths_for_version(Pod::Version.new(version)).first
-        Pod::Specification.from_file(spec_path)
+        spec = Pod::Specification.from_file(spec_path)
+        
+        # Remove the default subspecs value to compare all the subspecs if any
+        spec.default_subspecs = []
+        spec
       end
 
-      # Get the dependencies specs of this spec
-      def get_dependencies_specs(version, subspecs)
-        podfile = podfile(version, subspecs)
-        specs = Pod::Installer::Analyzer.new(config.sandbox, podfile).analyze.specs_by_target
+      # Resolve all the dependencies specs needed for this spec
+      def resolve_dependencies_for_spec(spec)
+        # Get all the subspecs of the spec
+        specs_by_platform = {}
+        @platforms.each do |platform|
+          specs_by_platform[platform.name] = spec.recursive_subspecs.select { |s| s.supported_on_platform?(platform) }
+        end
+
+        podfile = podfile(spec, specs_by_platform)
+        resolved_specs = Pod::Installer::Analyzer.new(config.sandbox, podfile).analyze.specs_by_target
 
         @platforms.each do |platform|
-          key = specs.keys.find { |key| key.name.end_with?(platform.name.to_s) }
+          key = resolved_specs.keys.find { |key| key.name.end_with?(platform.name.to_s) }
           next if key.nil?
-          subspecs[platform.name] = specs[key]
+
+          if @include_dependencies
+            specs_by_platform[platform.name] = resolved_specs[key]
+          else
+            pod_names = [spec.name]
+            pod_names += spec.dependencies(platform).map(&:name)
+            pod_names += specs_by_platform[platform.name].map(&:name)
+            pod_names += specs_by_platform[platform.name].map { |spec| spec.dependencies(platform).map(&:name) }.flatten
+            pod_names = pod_names.uniq
+
+            specs_by_platform[platform.name] = resolved_specs[key].select { |spec| pod_names.include?(spec.name) }
+          end
+        end
+
+        specs_by_platform
+      end
+
+      def podfile(spec, specs_by_platform)
+        ps = @platforms
+        pod_name = spec.name
+        pod_version = spec.version.to_s
+        
+        Pod::Podfile.new do
+          install! 'cocoapods', integrate_targets: false
+          use_frameworks!
+
+          ps.each do |p|
+            next if not spec.supported_on_platform?(p)
+            
+            platform_version = [Pod::Version.new(spec.deployment_target(p.name) || "0")]
+            platform_version += specs_by_platform[p.name].map { |spec| Pod::Version.new(spec.deployment_target(p.name) || "0") }
+            platform_version = platform_version.max
+            
+            target "#{pod_name}_#{p.name}" do
+              platform p.name, platform_version
+              pod pod_name, pod_version
+              specs_by_platform[p.name].each { |spec| pod spec.name, spec.version } if not specs_by_platform[p.name].empty?
+            end
+          end
         end
       end
 
@@ -163,17 +199,17 @@ module Pod
 
         @platforms.each do |platform|
           # Get a hash with the needed data: { name: => minimum supported version }
-          older_subspecs_data = @older_subspecs[platform.name].each_with_object({}) { |subspec, hash| hash[subspec.name.to_sym] = subspec.deployment_target(platform.name) || "Not defined" }
-          newer_subspecs_data = @newer_subspecs[platform.name].each_with_object({}) { |subspec, hash| hash[subspec.name.to_sym] = subspec.deployment_target(platform.name) || "Not defined" }
+          older_specs_data = @older_specs[platform.name].each_with_object({}) { |subspec, hash| hash[subspec.name.to_sym] = subspec.deployment_target(platform.name) || "Not defined" }
+          newer_specs_data = @newer_specs[platform.name].each_with_object({}) { |subspec, hash| hash[subspec.name.to_sym] = subspec.deployment_target(platform.name) || "Not defined" }
           
-          all_names = (newer_subspecs_data.keys | older_subspecs_data.keys)
+          all_names = (newer_specs_data.keys | older_specs_data.keys)
           name_header = "Name"
           version_header = "Minimum Supported Version"
           
           # Calculate the cell length to print a pretty table
           name_cell_length = all_names.max_by(&:length).length
           name_cell_length = [name_cell_length, name_header.length].max
-          version_cell_length = (newer_subspecs_data.values | older_subspecs_data.values).max_by(&:length).length
+          version_cell_length = (newer_specs_data.values | older_specs_data.values).max_by(&:length).length
           version_cell_length = [version_cell_length, version_header.length].max
           
           # Build the table
@@ -183,10 +219,10 @@ module Pod
           
           # Table body
           all_names.each do |name|
-            older_name = older_subspecs_data.keys.include?(name) ? name.to_s : ""
-            older_version = older_subspecs_data[name] || ""
-            newer_name = newer_subspecs_data.keys.include?(name) ? name.to_s : ""
-            newer_version = newer_subspecs_data[name] || ""
+            older_name = older_specs_data.keys.include?(name) ? name.to_s : ""
+            older_version = older_specs_data[name] || ""
+            newer_name = newer_specs_data.keys.include?(name) ? name.to_s : ""
+            newer_version = newer_specs_data[name] || ""
 
             diff += "| #{older_name.ljust(name_cell_length)} | #{older_version.ljust(version_cell_length)} | #{newer_name.ljust(name_cell_length)} | #{newer_version.ljust(version_cell_length)} |\n"
           end
@@ -202,19 +238,20 @@ module Pod
         markdown_pathname.write(generate_diff_table)
       end
 
-      def generate_podfile_file(path, version, subspecs)
+      def generate_podfile_file(spec, specs_by_platform, path)
         podfile = "install! 'cocoapods', integrate_targets: false\n"
         podfile += "use_frameworks!\n"
 
         @platforms.each do |platform|
-          next if subspecs[platform.name].empty?
-          platform_version = subspecs[platform.name].map { |subspec| Pod::Version.new(subspec.deployment_target(platform.name) || "0") }.max
+          next if not spec.supported_on_platform?(platform)
+
+          platform_version = [Pod::Version.new(spec.deployment_target(platform.name) || "0")]
+          platform_version += specs_by_platform[platform.name].map { |spec| Pod::Version.new(spec.deployment_target(platform.name) || "0") }
+          platform_version = platform_version.max
 
           podfile += "\ntarget '#{@pod_name}_#{platform.name}' do\n"
           podfile += "\tplatform :#{platform.name}, '#{platform_version}'\n"
-          podfile += "\tpod '#{@pod_name}', '#{version}'\n"
-
-          subspecs[platform.name].each { |subspec| podfile += "\tpod '#{subspec.name}', '#{subspec.version}'\n" }
+          specs_by_platform[platform.name].each { |spec| podfile += "\tpod '#{spec.name}', '#{spec.version}'\n" } if not specs_by_platform[platform.name].empty?
           podfile += "end\n"
         end
         
@@ -222,28 +259,6 @@ module Pod
         podfile_pathname.dirname.mkpath
         podfile_pathname.write(podfile)
       end
-
-      def podfile(version, subspecs)
-        ps = @platforms
-        pod_name = @pod_name
-        
-        Pod::Podfile.new do
-          install! 'cocoapods', integrate_targets: false
-          use_frameworks!
-
-          ps.each do |p|
-            next if subspecs[p.name].empty?
-            platform_version = subspecs[p.name].map { |subspec| subspec.deployment_target(p.name) }.max
-            
-            target "#{pod_name}_#{p.name}" do
-              platform p.name, platform_version
-              pod pod_name, version
-              subspecs[p.name].each { |subspec| pod subspec.name, subspec.version }
-            end
-          end
-        end
-      end
-
     end
   end
 end

data/lib/cocoapods-diff/version.rb

@@ -1,6 +1,6 @@
 module CocoapodsDiff
   NAME = "cocoapods-diff"
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
   SUMMARY = "Shows the diff between two versions of a pod."
   DESCRIPTION = <<-DESC
     A Cocoapods plugin that shows the diff between two versions of a pod. 

data/spec/command/diff_spec.rb

@@ -2,49 +2,53 @@ require File.expand_path("../../spec_helper", __FILE__)
 require 'cocoapods-diff/version.rb'
 
 module Pod
+  POD_NAME = "Firebase"
+  OLDER_VERSION = "6.0.0"
+  NEWER_VERSION = "10.0.0"
+  
   describe Command::Diff do
     describe "CLAide" do
       it "registers it self" do
-        Command.parse(%w{ diff }).should.be.instance_of Command::Diff
+        Command.parse(%W{ diff }).should.be.instance_of Command::Diff
       end
 
       describe "Validate the command" do
         it "is well-formed" do
-          lambda { Command.parse(%w{ diff Firebase 9.0.0 10.0.0 }).validate! }
+          lambda { Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} }).validate! }
             .should.not.raise()
         end
 
         it "fails when a pod name is missing" do
-          lambda { Command.parse(%w{ diff }).validate! }
+          lambda { Command.parse(%W{ diff }).validate! }
             .should.raise(CLAide::Help)
             .message.should.match(/A Pod name is required./)
         end
   
         it "fails when a version is missing" do
-          lambda { Command.parse(%w{ diff Firebase }).validate! }
+          lambda { Command.parse(%W{ diff #{POD_NAME} }).validate! }
             .should.raise(CLAide::Help)
             .message.should.match(/An old Version is required./)
         end
   
         it "fails when a version to compare is missing" do
-          lambda { Command.parse(%w{ diff Firebase 10.0.0 }).validate! }
+          lambda { Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} }).validate! }
             .should.raise(CLAide::Help)
             .message.should.match(/A new Version is required./)
         end
 
         it "fails when versions are the same" do
-          lambda { Command.parse(%w{ diff Firebase 10.0.0 10.0.0 }).validate! }
+          lambda { Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{OLDER_VERSION} }).validate! }
             .should.raise(CLAide::Help)
             .message.should.match(/Versions should be different./)
         end
 
         it "fails when a non-existing version is passed" do
-          lambda { Command.parse(%w{ diff Firebase 10.0.0 1.0.0-beta1 }).validate! }
+          lambda { Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} 1.0.0-beta1 }).validate! }
             .should.raise(DiffInformative)
         end
 
         it "fails when a more than one pod is found" do
-          lambda { Command.parse(%w{ diff Fire 10.0.0 9.0.0 }).validate! }
+          lambda { Command.parse(%W{ diff Fire #{OLDER_VERSION} 9.0.0 }).validate! }
             .should.raise(DiffInformative)
         end
       end
@@ -57,7 +61,7 @@ module Pod
         end
 
         it "returns the diff as string" do
-          diff = Command.parse(%w{ diff Firebase 6.0.0 10.0.0 })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} })
           diff.validate!
           result = diff.run
           result.should.be.instance_of String
@@ -67,7 +71,7 @@ module Pod
         it "generates the diff as markdown" do
           require 'pathname'
           markdown_pathname = Pathname.new("spec/test/Firebase.md")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} })
           diff.validate!
           diff.run
           markdown_pathname.exist?.should.be.true?
@@ -77,7 +81,7 @@ module Pod
         it "generates the newer Podfile" do
           require 'pathname'
           podfile_pathname = Pathname.new("spec/test/Podfile_newer")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
           diff.validate!
           diff.run
           podfile_pathname.exist?.should.be.true?
@@ -87,7 +91,7 @@ module Pod
         it "generates the older Podfile" do
           require 'pathname'
           podfile_pathname = Pathname.new("spec/test/Podfile_older")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
           diff.validate!
           diff.run
           podfile_pathname.exist?.should.be.true?
@@ -98,7 +102,7 @@ module Pod
           require 'pathname'
           newer_podfile_pathname = Pathname.new("spec/test/Podfile_newer")
           older_podfile_pathname = Pathname.new("spec/test/Podfile_older")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{newer_podfile_pathname} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{older_podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{newer_podfile_pathname} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{older_podfile_pathname} })
           diff.validate!
           diff.run
           newer_podfile_pathname.exist?.should.be.true?
@@ -112,7 +116,7 @@ module Pod
           markdown_pathname = Pathname.new("spec/test/Firebase.md")
           newer_podfile_pathname = Pathname.new("spec/test/Podfile_newer")
           older_podfile_pathname = Pathname.new("spec/test/Podfile_older")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{newer_podfile_pathname} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{older_podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{newer_podfile_pathname} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{older_podfile_pathname} })
           diff.validate!
           diff.run
           markdown_pathname.exist?.should.be.true?
@@ -126,7 +130,7 @@ module Pod
         it "generates the diff with dependencies as markdown" do
           require 'pathname'
           markdown_pathname = Pathname.new("spec/test/Firebase_with_dependencies.md")
-          diff = Command.parse(%W{ diff Firebase 10.0.0 6.0.0 --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::MARKDOWN_OPTION_NAME}=#{markdown_pathname} })
           diff.validate!
           diff.run
           markdown_pathname.exist?.should.be.true?
@@ -136,7 +140,7 @@ module Pod
         it "generates the newer Podfile with dependencies" do
           require 'pathname'
           podfile_pathname = Pathname.new("spec/test/Podfile_newer_with_dependencies")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::NEWER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
           diff.validate!
           diff.run
           podfile_pathname.exist?.should.be.true?
@@ -146,7 +150,7 @@ module Pod
         it "generates the older Podfile with dependencies" do
           require 'pathname'
           podfile_pathname = Pathname.new("spec/test/Podfile_older_with_dependencies")
-          diff = Command.parse(%W{ diff Firebase 6.0.0 10.0.0 --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
+          diff = Command.parse(%W{ diff #{POD_NAME} #{OLDER_VERSION} #{NEWER_VERSION} --#{CocoapodsDiff::INCLUDE_DEPENDENCIES_FLAG_NAME} --#{CocoapodsDiff::OLDER_PODFILE_OPTION_NAME}=#{podfile_pathname} })
           diff.validate!
           diff.run
           podfile_pathname.exist?.should.be.true?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-diff
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Israel Soto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler