cocoapods-check 0.1.1.beta.1 → 0.2.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38dd0d306636bbbf15886d98e25b2d476693be3e
-  data.tar.gz: 6e4e8cef74676f758b7246e60932e67311883424
+  metadata.gz: 4bd9100e3179fd4bda1b6655bb182707243a6f97
+  data.tar.gz: cceff5a191e94566eae689e06a09ec7aada0d72d
 SHA512:
-  metadata.gz: c8c62dcbda488a41a8cb548e337f6701f00ad38f91cf8453f1929c359ba686bef4431857f8a9fe0e38c85e9977af7f5424473ac789cf56aa5bccb57d41e7dd83
-  data.tar.gz: 841188e28bab7332ebfdbfd590ceb127f5baf2c7d6cf720184a7949427e2d91b4fa1f1225e4cb389bff8adafb96f3c74ba31ccff32554a8d261ca2c459234028
+  metadata.gz: f90dd40da8e0c10a4a075317f2c5ba9c2d86bf00a689bea98595b1bf79e51d1044d96e62bf46e507e9ee52ad72b51d5c8ff3a4562a552a8af6f2f6a630d2024c
+  data.tar.gz: 8eddc0d33ced375998793d6f9892881f6f210b7f85b98d5c5bc916b03b7469cb9b4d1e0900958b1bc3dd9bc37dfcd1ed7d7cf3910280c0bbcc31e6db4b591bcb

data/README.md

@@ -13,19 +13,21 @@ cocoapods-check displays the differences between locked and installed Pods. It c
 `pod check` will display a list of Pods that will be installed by running `pod install`:
 
     $ pod check
-    ~SquareData, +SquareItems, ΔSquareTables
+    ~SquareData, +SquareItems, ~SquareTables
     [!] `pod install` will install 3 Pods.
 
-The symbol before each Pod name indicates the status of the Pod. A `~` indicates a version of a Pod exists locally, but the version specified in `Podfile.lock` is different. A `+` indicates no version of the Pod exists locally, while a `Δ` indicates the Pod is a development Pod. Development pods are always assumed to be 'dirty'. Pods that don't require an update will not be listed.
+The symbol before each Pod name indicates the status of the Pod. A `~` indicates a version of a Pod exists locally, but the version specified in `Podfile.lock` is different. A `+` indicates no version of the Pod exists locally. Pods that don't require an update will not be listed. For development pods the modified time of the Pod's files are checked against the modified time of the lockfile to determine whether the Pod needs installation.
 
 Verbose mode shows a bit more detail:
 
     $ pod check --verbose
     SquareData 1.2.1 -> 1.2.2
     SquareItems newly added
-    SquareTables {:path=>"/Users/doo/Code/SquareTables"}
+    SquareTables (SquareTables/SomeSource.m)
     [!] `pod install` will install 3 Pods.
 
+For development Pods verbose mode shows the files that are newer than the lockfile in parentheses.
+
 If no Pods are out of date, then the output looks like:
 
     $ pod check

data/cocoapods-check.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'cocoapods', '~> 1.0.0.beta.3'
+  spec.add_dependency 'cocoapods', '~> 1.0.0.beta'
 end

data/lib/cocoapods_check.rb

@@ -1,3 +1,3 @@
 module CocoapodsCheck
-  VERSION = '0.1.1.beta.1'
+  VERSION = '0.2.1.beta.1'
 end

data/lib/pod/command/check.rb

@@ -11,10 +11,8 @@ module Pod
       self.description = <<-DESC
           Compares the Pod lockfile with the manifest lockfile and shows
           any differences. In non-verbose mode, '~' indicates an existing Pod
-          will be updated to the version specified in Podfile.lock, '+'
-          indicates a missing Pod will be installed, and 'Δ' indicates a Pod
-          is a development Pod. Development Pods are always considered
-          to need installation.
+          will be updated to the version specified in Podfile.lock and '+'
+          indicates a missing Pod will be installed.
       DESC
 
       self.arguments = []
@@ -43,7 +41,7 @@ module Pod
       def find_development_pods(podfile)
         development_pods = {}
         podfile.dependencies.each do |dependency|
-          development_pods[dependency.name] = dependency.external_source if dependency.external?
+          development_pods[dependency.name] = dependency.external_source if dependency.local?
         end
         development_pods
       end
@@ -64,10 +62,13 @@ module Pod
 
           # If this Pod is installed
           if manifest_version
+            # If this is a development pod do a modified time check
             if development_pods[spec_name] != nil
-              if is_development_pod_modified?(config, development_pods[spec_name])
-                changed_result(spec_name, manifest_version, locked_version)
+              newer_files = get_files_newer_than_lockfile_for_podspec(config, development_pods[spec_name])
+              if newer_files.any?
+                changed_development_result(spec_name, newer_files)
               end
+            # Otherwise just compare versions
             elsif locked_version != manifest_version
               changed_result(spec_name, manifest_version, locked_version)
             end
@@ -79,10 +80,23 @@ module Pod
         end.compact
       end
 
-      def is_development_pod_modified?(config, development_pod)
-        development_podspec_file = development_pod[:path]
-        development_pod_dir = File.dirname(development_podspec_file)
-        spec = Specification.from_file(development_podspec_file)
+      def get_files_newer_than_lockfile_for_podspec(config, development_pod)
+        files_for_podspec = get_files_for_podspec(development_pod[:path])
+
+        lockfile_mtime = File.mtime(config.lockfile.defined_in_file)
+        podspec_file = get_podspec_for_file_or_path(development_pod[:path])
+        podspec_dir = Pathname.new(File.dirname(podspec_file))
+        files_for_podspec
+            .select {|f| File.mtime(f) >= lockfile_mtime}
+            .map {|f| Pathname.new(f).relative_path_from(podspec_dir).to_s}
+      end
+
+      # Returns an array of all files pointed to by the podspec
+      def get_files_for_podspec(podspec_file)
+        podspec_file = get_podspec_for_file_or_path(podspec_file)
+
+        development_pod_dir = File.dirname(podspec_file)
+        spec = Specification.from_file(podspec_file)
 
         # Gather all the dependencies used by the spec, across all platforms, and including subspecs.
         all_files = [spec, spec.subspecs].flatten.map { |a_spec|
@@ -102,17 +116,16 @@ module Pod
           }
         }.flatten
 
-        # Also check the podspec date
-        all_files.push(development_podspec_file)
-
-        latest_modified_file = all_files.max_by {|f| File.mtime(f)}
+        # Include the podspec files as well
+        all_files.push(podspec_file)
+      end
 
-        if latest_modified_file
-          pod_mtime = File.mtime(latest_modified_file)
-          manifest_mtime = File.mtime(config.lockfile.defined_in_file)
-          pod_mtime >= manifest_mtime
+      def get_podspec_for_file_or_path(podspec_file_or_path)
+        if File.basename(podspec_file_or_path).include?('.podspec')
+          podspec_file_or_path
         else
-          false
+          glob_pattern = podspec_file_or_path + '/*.podspec{,.json}'
+          Pathname.glob(glob_pattern).first
         end
       end
 
@@ -124,6 +137,19 @@ module Pod
         end
       end
 
+      def changed_development_result(spec_name, newer_files)
+        if @check_command_verbose
+           number_files_not_shown = newer_files.length - 2
+           newer_files = newer_files[0..1]
+           if number_files_not_shown > 0
+             newer_files.push("and #{number_files_not_shown} other#{'s' if number_files_not_shown > 1}")
+           end
+          "#{spec_name} (#{newer_files.join(', ')})"
+        else
+          "~#{spec_name}"
+        end
+      end
+
       def added_result(spec_name)
         if @check_command_verbose
           "#{spec_name} newly added"

data/spec/check_spec.rb

@@ -66,7 +66,7 @@ describe Pod::Command::Check do
 
     config = create_config({ :pod_one => '1.0', :pod_two => '1.0' }, { :pod_one => '1.0', :pod_two => '1.0' })
 
-    # Make an actual file because 'check' needs the modified time
+    # Make an actual lockfile file because 'check' needs the modified time
     lockfile_path = Tempfile.new('dev-pod-test-lockfile').path
     allow(config.lockfile).to receive(:defined_in_file).and_return(lockfile_path)
 
@@ -75,11 +75,14 @@ describe Pod::Command::Check do
 
     # Create a temp dir with a temp file and run the check in that context
     Dir.mktmpdir('dev-pod-test-dir') do |dir|
+
+      # Create a source file
       source_file = Tempfile.new('some-pod-file', dir)
 
+      # Write a podspec file pointing at the source file
       File.write("#{dir}/foo.podspec", "Pod::Spec.new do |s| s.source_files = '#{File.basename(source_file)}' end")
-      puts(File.read("#{dir}/foo.podspec"))
 
+      # Do the check
       development_pods = { :pod_two => { :path => "#{dir}/foo.podspec" } }
       results = check.find_differences(config, development_pods)
 
@@ -94,18 +97,21 @@ describe Pod::Command::Check do
 
     # Create a temp dir with a temp file and run the check in that context
     Dir.mktmpdir('dev-pod-test-dir') do |dir|
+
+      # Create a source file
       Tempfile.new('some-pod-file', dir)
 
+      # Write a podspec file pointing at the source file
+      File.write("#{dir}/foo.podspec", "Pod::Spec.new do |s| s.source_files = 'ack' end")
+
       # Ensure lockfile modified time is after development pod modified time
       sleep(1)
 
-      # Make an actual file because 'check' needs the modified time
+      # Make an actual lockfile file because 'check' needs the modified time
       lockfile_path = Tempfile.new('dev-pod-test-lockfile').path
       allow(config.lockfile).to receive(:defined_in_file).and_return(lockfile_path)
 
-      puts("#{dir}/foo.podspec")
-      File.write("#{dir}/foo.podspec", "Pod::Spec.new do |s| s.source_files = 'ack' end")
-
+      # Do the check
       development_pods = { :pod_two => { :path => "#{dir}/foo.podspec" } }
       results = check.find_differences(config, development_pods)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-check
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta.1
+  version: 0.2.1.beta.1
 platform: ruby
 authors:
 - Matt Di Iorio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta
 description: "'check' plugin for CocoaPods"
 email:
 - doo@squareup.com