cocoapods-check 0.1.0 → 0.1.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d464625d3eba53ea9ddf31b4ba57ebc0c37fcad2
-  data.tar.gz: fc987db227dccab588e97345a3c30e3ec3692f53
+  metadata.gz: 38dd0d306636bbbf15886d98e25b2d476693be3e
+  data.tar.gz: 6e4e8cef74676f758b7246e60932e67311883424
 SHA512:
-  metadata.gz: 4d55b9d5ab7d111d799954a6c119a30a49217035cba4158c7c377017967b80ae5fa478711444af103b7d6f47faacec596586f4758902cc778bd4875d3bef4875
-  data.tar.gz: 520e7086f606c0cbb03f51fa5cc28018af3fb1f34f103813bd8ad4ebf36d0c3f893f511cab0d1d1678a1534bfee97b00771325b192c5d1234d9fef4105d968b9
+  metadata.gz: c8c62dcbda488a41a8cb548e337f6701f00ad38f91cf8453f1929c359ba686bef4431857f8a9fe0e38c85e9977af7f5424473ac789cf56aa5bccb57d41e7dd83
+  data.tar.gz: 841188e28bab7332ebfdbfd590ceb127f5baf2c7d6cf720184a7949427e2d91b4fa1f1225e4cb389bff8adafb96f3c74ba31ccff32554a8d261ca2c459234028

data/CONTRIBUTING.md

@@ -0,0 +1,16 @@
+Contributing
+============
+
+If you would like to contribute code to cocoapods-check you can do so through GitHub by
+forking the repository and sending a pull request.
+
+When submitting code, please make every effort to follow existing conventions
+and style in order to keep the code as readable as possible. Please also make
+sure your code has tests.
+
+Before your code can be accepted into the project you must also sign the
+[Individual Contributor License Agreement (CLA)][1].
+
+
+ [1]: https://spreadsheets.google.com/spreadsheet/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1
+

data/Rakefile

@@ -3,4 +3,5 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec
+

data/cocoapods-check.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10.6'
+  spec.add_development_dependency 'bundler', '~> 1.0'
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'cocoapods', "~> 0.39.0"
+  spec.add_dependency 'cocoapods', '~> 1.0.0.beta.3'
 end

data/lib/cocoapods_check.rb

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

data/lib/pod/command/check.rb

@@ -62,13 +62,13 @@ module Pod
             manifest_version = nil
           end
 
-          # If this is a development Pod
-          if development_pods[spec_name] != nil
-            development_result(spec_name, development_pods[spec_name])
-
           # If this Pod is installed
-          elsif manifest_version
-            if locked_version != manifest_version
+          if manifest_version
+            if development_pods[spec_name] != nil
+              if is_development_pod_modified?(config, development_pods[spec_name])
+                changed_result(spec_name, manifest_version, locked_version)
+              end
+            elsif locked_version != manifest_version
               changed_result(spec_name, manifest_version, locked_version)
             end
 
@@ -79,11 +79,40 @@ module Pod
         end.compact
       end
 
-      def development_result(spec_name, external_source)
-        if @check_command_verbose
-          "#{spec_name} #{external_source}"
+      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)
+
+        # Gather all the dependencies used by the spec, across all platforms, and including subspecs.
+        all_files = [spec, spec.subspecs].flatten.map { |a_spec|
+          a_spec.available_platforms.map { |platform|
+            accessor = Sandbox::FileAccessor.new(Sandbox::PathList.new(Pathname.new(development_pod_dir)), a_spec.consumer(platform))
+            [
+                accessor.vendored_frameworks,
+                accessor.vendored_libraries,
+                accessor.resource_bundle_files,
+                accessor.license,
+                accessor.prefix_header,
+                accessor.preserve_paths,
+                accessor.readme,
+                accessor.resources,
+                accessor.source_files
+            ].compact
+          }
+        }.flatten
+
+        # Also check the podspec date
+        all_files.push(development_podspec_file)
+
+        latest_modified_file = all_files.max_by {|f| File.mtime(f)}
+
+        if latest_modified_file
+          pod_mtime = File.mtime(latest_modified_file)
+          manifest_mtime = File.mtime(config.lockfile.defined_in_file)
+          pod_mtime >= manifest_mtime
         else
-          "Δ#{spec_name}"
+          false
         end
       end
 

data/spec/check_spec.rb

@@ -1,4 +1,6 @@
 require 'cocoapods'
+require 'tempfile'
+
 require_relative '../lib/pod/command/check'
 
 describe Pod::Command::Check do
@@ -59,26 +61,56 @@ describe Pod::Command::Check do
     expect(results).to eq([ 'pod_three newly added', 'pod_two 2.0 -> 3.0' ])
   end
 
-  it 'handles development pods' do
+  it 'handles development pods with changes' do
     check = Pod::Command::Check.new(CLAide::ARGV.new([]))
 
-    config = create_config({ :pod_one => '1.0', :pod_two => nil }, { :pod_one => '1.0', :pod_two => nil })
+    config = create_config({ :pod_one => '1.0', :pod_two => '1.0' }, { :pod_one => '1.0', :pod_two => '1.0' })
 
-    development_pods = { :pod_two => 'source' }
-    results = check.find_differences(config, development_pods)
+    # Make an actual 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)
+
+    # Ensure development pod modified time is after lockfile modified time
+    sleep(1)
+
+    # Create a temp dir with a temp file and run the check in that context
+    Dir.mktmpdir('dev-pod-test-dir') do |dir|
+      source_file = Tempfile.new('some-pod-file', dir)
 
-    expect(results).to eq([ 'Δpod_two' ])
+      File.write("#{dir}/foo.podspec", "Pod::Spec.new do |s| s.source_files = '#{File.basename(source_file)}' end")
+      puts(File.read("#{dir}/foo.podspec"))
+
+      development_pods = { :pod_two => { :path => "#{dir}/foo.podspec" } }
+      results = check.find_differences(config, development_pods)
+
+      expect(results).to eq([ '~pod_two' ])
+    end
   end
 
-  it 'handles development pods with verbosity' do
-    check = Pod::Command::Check.new(CLAide::ARGV.new([ '--verbose' ]))
+  it 'handles development pods no changes reported' do
+    check = Pod::Command::Check.new(CLAide::ARGV.new([]))
 
-    config = create_config({ :pod_one => '1.0', :pod_two => nil }, { :pod_one => '1.0', :pod_two => nil })
+    config = create_config({ :pod_one => '1.0', :pod_two => '1.0' }, { :pod_one => '1.0', :pod_two => '1.0' })
 
-    development_pods = { :pod_two => 'source' }
-    results = check.find_differences(config, development_pods)
+    # Create a temp dir with a temp file and run the check in that context
+    Dir.mktmpdir('dev-pod-test-dir') do |dir|
+      Tempfile.new('some-pod-file', dir)
+
+      # Ensure lockfile modified time is after development pod modified time
+      sleep(1)
+
+      # Make an actual 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)
 
-    expect(results).to eq([ 'pod_two source' ])
+      puts("#{dir}/foo.podspec")
+      File.write("#{dir}/foo.podspec", "Pod::Spec.new do |s| s.source_files = 'ack' end")
+
+      development_pods = { :pod_two => { :path => "#{dir}/foo.podspec" } }
+      results = check.find_differences(config, development_pods)
+
+      expect(results).to eq([])
+    end
   end
 
   def create_config(lockfile_hash, manifest_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1.beta.1
 platform: ruby
 authors:
 - Matt Di Iorio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 1.0.0.beta.3
 description: "'check' plugin for CocoaPods"
 email:
 - doo@squareup.com
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -97,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6