cocoapods-whitelist 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 750058d7d825d9b61916a46ea50350581cfe3518
-  data.tar.gz: 270b1db1faf90555f31e4c43c655b1d7494ce650
+  metadata.gz: ce25eb9c894a1f5f04f16af8a0a1dd3212fd2edf
+  data.tar.gz: f1ceb015b74b141a5a84b97480802867791836c7
 SHA512:
-  metadata.gz: 63a7cdc92b231d590dcc66ccbd8e41f1c167da2147c7c041f009bc3da783c76f5ce6f892300c4d90b3b918ffeca0ed63d57214da7ccf1dfd6e7cc9489ee8f418
-  data.tar.gz: 2b4debab422c070ed134a2eddaa366b36004eeb2c1b2354007922070bb0864aede76215580ffd7da0923dc84ca07a94929879aa464a5a1a6b3c887cf887783d7
+  metadata.gz: 4ee82f3510cac178323a75c79ae7b052e46be7b0b3becc78f2c4f4898ab2b2c3bd54c9d689e77e564c2e3218cf0f720f2ac8eb6a9048f5c7878949a5ebd9842f
+  data.tar.gz: 7f2846c8fb55f5486db44615c4d448a4832b9cb6892c99aaa76786ee65276b2d04c5bf973aa62260ecbc9316dd41a03cdc1252f131044848ab8cffc35e36156f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.8
+- Add `outfile` parameter
+
 ## 0.0.7
 - Add `outfile` parameter
 

data/Gemfile.lock

@@ -1,87 +1,91 @@
 PATH
   remote: .
   specs:
-    cocoapods-whitelist (0.0.6)
+    cocoapods-whitelist (0.0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
-    activesupport (4.2.8)
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    atomos (0.1.3)
     bacon (1.2.0)
-    claide (1.0.1)
-    cocoapods (1.2.1)
+    claide (1.0.2)
+    cocoapods (1.7.3)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.4.4, < 2.0)
-    cocoapods-core (1.2.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.3)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
+    concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    i18n (0.8.4)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     metaclass (0.0.4)
-    minitest (5.10.2)
-    mocha (1.2.1)
+    minitest (5.11.3)
+    mocha (1.9.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
-    molinillo (0.5.7)
-    nanaimo (0.2.3)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    netrc (0.7.8)
+    netrc (0.11.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rake (12.0.0)
-    ruby-macho (1.1.0)
+    rake (12.3.2)
+    ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.4.4)
-      CFPropertyList (~> 2.3.3)
-      claide (>= 1.0.1, < 2.0)
+    xcodeproj (1.10.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bacon
-  bundler (~> 1.3)
+  bundler (~> 2.0)
   cocoapods
   cocoapods-whitelist!
   mocha
@@ -90,4 +94,4 @@ DEPENDENCIES
   rake (~> 12.0)
 
 BUNDLED WITH
-   1.14.6
+   2.0.1

data/README.md

@@ -10,7 +10,7 @@ Validate Podspec's dependencies against a whitelist of pods.
 
 - As a command
 ```
-$ pod whitelist [--podspec=PODSPEC] [--config=WHITELIST_FILE_OR_URL] [--fail-on-error]
+$ pod whitelist [--podspec=PODSPEC] [--config=WHITELIST_FILE_OR_URL] [--outfile=PATH] [--fail-on-error]
 ```
 
 - As plugin, add into the Podfile of your tests app

data/cocoapods-whitelist.gemspec

@@ -18,6 +18,6 @@ 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.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'
 end

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

@@ -5,9 +5,19 @@ DEFAULT_WHITELIST_URL = "https://raw.githubusercontent.com/mercadolibre/mobile-d
 class AllowedDependency
   attr_accessor :name
   attr_accessor :version
-  def initialize(name, version)
+  attr_accessor :expire
+  def initialize(name, version, expire)
     @name = name
     @version = version
+    @expire = expire
+ end
+
+ def expire?
+   if @expire != nil
+     expire = DateTime.parse(@expire,"%Y-%m-%d")
+     return expire < DateTime.now
+   end
+   return false
  end
 end
 
@@ -84,7 +94,14 @@ module Pod
           next if parentName && name.start_with?("#{parentName}/")
 
           allowedDependency = whitelist.select { |item|
-             /#{item.name}/ =~ name && (versions.empty? || !item.version || versions.grep(/#{item.version}/).any?)
+            item.name == name && (versions.empty? || !item.version || versions.grep(/#{item.version}/).any?)
+          }
+
+          # Checks if any of the allowed dependencies are expired, if so, fail with error
+          allowedDependency.each { |dependency|
+            if dependency.expire?
+              not_allowed.push("#{name} (Expired)")
+            end
           }
 
           if allowedDependency.empty?
@@ -125,7 +142,7 @@ module Pod
       def parse_whitelist(raw_whitelist)
         json = JSON.parse(raw_whitelist)
         return json["whitelist"].map { |dependencyJson|
-          AllowedDependency.new(dependencyJson["name"], dependencyJson["version"])
+          AllowedDependency.new(dependencyJson["name"], dependencyJson["version"], dependencyJson["expire"])
         }
       end
 
@@ -146,7 +163,7 @@ module Pod
         return podspecs.map { |path|  Pod::Specification.from_file(path) }
       end
 
-      def show_error_message(message)     
+      def show_error_message(message)
         unless @outfile == nil
           IO.write(@outfile, "#{message}\n", mode: 'a')
         end

data/lib/cocoapods-whitelist/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsWhitelist
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/mocks/bad_name.podspec

@@ -0,0 +1,13 @@
+Pod::Spec.new do |s|
+  s.name         = "MLSearch"
+  s.version      = "3.17.0"
+  s.summary      = "Componente de search"
+  s.homepage     = "http://www.mercadolibre.com.ar"
+  s.license      = "none"
+  s.author       = { "Mobile team" => "mobile@mercadolibre.com" }
+  s.platform     = :ios, "7.0"
+  s.source       = { :git => "git@github.com:mercadolibre/search-ios.git", :tag => s.version.to_s }
+  s.requires_arc = true
+  s.dependency 'Meli', '~>5.1'
+
+end

data/spec/mocks/whitelist.json

@@ -1,9 +1,19 @@
 {
-	"whitelist": [{
-		"name": "MeliSDK",
-		"version": "^~>5.[0-9]+$"
-	}, {
-		"name": "MLRecommendations",
-		"version": null
-	}]
+	"whitelist": [
+		{
+			"name": "MeliSDK",
+			"version": "^~>5.[0-9]+$"
+		}, {
+			"name": "MLRecommendations",
+			"version": null
+		}, {
+		 "name": "MLBilling",
+		 "version": null,
+		 "expire" : "2100-11-15"
+	 }, {
+		"name": "MLOnDemandResources",
+		"version": "^~>5.[0-9]+$",
+		"expire" : "2016-11-15"
+		}
+	]
 }

data/spec/mocks/whitelist_with_expired_dependencies.json

@@ -0,0 +1,24 @@
+{
+	"whitelist": [{
+		"name": "MeliSDK",
+		"version": "^~>5.[0-9]+$"
+	}, {
+		"name": "MLRecommendations",
+		"version": null
+	}, {
+    "name": "CHTCollectionViewWaterfallLayout2",
+    "version": "^~>\\s?0.[0-9]+$",
+    "expire": "2017-11-01"
+  },
+  {
+    "name": "CHTCollectionViewWaterfallLayout3",
+    "version": "^~>\\s?0.[0-9]+$",
+    "expire" : "2017-12-01"
+  },
+  {
+    "name": "CHTCollectionViewWaterfallLayout4",
+    "version": "^~>\\s?0.[0-9]+$",
+    "expire" : "2017-11-01"
+  }
+  ]
+}

data/spec/mocks/with_expired_dependencies.podspec

@@ -0,0 +1,12 @@
+Pod::Spec.new do |s|
+  s.name         = "MLSearch"
+  s.version      = "3.17.0"
+  s.summary      = "Componente de search"
+  s.homepage     = "http://www.mercadolibre.com.ar"
+  s.license      = "none"
+  s.author       = { "Mobile team" => "mobile@mercadolibre.com" }
+  s.platform     = :ios, "7.0"
+  s.source       = { :git => "git@github.com:mercadolibre/search-ios.git", :tag => s.version.to_s }
+  s.requires_arc = true
+  s.dependency 'MLOnDemandResources', '~>5.8'
+end

data/spec/mocks/with_not_yet_expired_dependencies.podspec

@@ -0,0 +1,12 @@
+Pod::Spec.new do |s|
+  s.name         = "MLSearch"
+  s.version      = "3.17.0"
+  s.summary      = "Componente de search"
+  s.homepage     = "http://www.mercadolibre.com.ar"
+  s.license      = "none"
+  s.author       = { "Mobile team" => "mobile@mercadolibre.com" }
+  s.platform     = :ios, "7.0"
+  s.source       = { :git => "git@github.com:mercadolibre/search-ios.git", :tag => s.version.to_s }
+  s.requires_arc = true
+  s.dependency 'MLBilling', '~>5.8'
+end

data/spec/whitelist_spec.rb

@@ -12,7 +12,7 @@ module Pod
       it 'parse whitelist json' do
         command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}"])
         dependencies = command.get_whitelist
-        dependencies.size.should.equal 2
+        dependencies.size.should.equal 4
       end
     end
 
@@ -33,23 +33,45 @@ module Pod
         lambda { command.run }.should.not.raise
       end
 
+      it 'dependency with incorrect name should not be valid' do
+        # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('Meli', '~>5.0')
+        command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
+        specification = Pod::Specification.from_file('./spec/mocks/bad_name.podspec')
+        command.expects(:get_podspec_specifications).returns([specification])
+        lambda { command.run }.should.raise Informative
+      end
+
       it 'not allowed dependency should not be valid' do
-        # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('AFNetworking')
         command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
         specification = Pod::Specification.from_file('./spec/mocks/not_allowed.podspec')
         command.expects(:get_podspec_specifications).returns([specification])
         lambda { command.run }.should.raise Informative
       end
 
-      it 'dependency with not allowed version should not be valid' do
-        # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('AFNetworking')
+      it 'dependency with not allowed version should be valid' do
         command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
         specification = Pod::Specification.from_file('./spec/mocks/with_fixed_version.podspec')
         command.expects(:get_podspec_specifications).returns([specification])
         lambda { command.run }.should.raise Informative
       end
 
-      it 'dependency with two versions rquieremnt should not be valid' do
+      it 'expired dependency should not be valid' do
+        # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('AFNetworking')
+        command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
+        specification = Pod::Specification.from_file('./spec/mocks/with_expired_dependencies.podspec')
+        command.expects(:get_podspec_specifications).returns([specification])
+        lambda { command.run }.should.raise Informative
+      end
+
+      it 'not yet expired dependency should be valid' do
+        # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('AFNetworking')
+        command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
+        specification = Pod::Specification.from_file('./spec/mocks/with_not_yet_expired_dependencies.podspec')
+        command.expects(:get_podspec_specifications).returns([specification])
+        lambda { command.run }.should.not.raise Informative
+      end
+
+      it 'dependency with two versions requierement should not be valid' do
         # Whitelist: ('MeliSDK', '~>5.*') | Podspec: ('AFNetworking')
         command = Command.parse(['whitelist', "--config=#{WHITELIST_FILE}", "--fail-on-error"])
         specification = Pod::Specification.from_file('./spec/mocks/with_two_requirement.podspec')

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-whitelist
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mobile Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
 description: A short description of cocoapods-whitelist.
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -58,13 +58,17 @@ files:
 - lib/cocoapods-whitelist/command/whitelist.rb
 - lib/cocoapods-whitelist/gem_version.rb
 - lib/cocoapods_plugin.rb
+- spec/mocks/bad_name.podspec
 - spec/mocks/free_version.podspec
 - spec/mocks/major_version_fixed.podspec
 - spec/mocks/not_allowed.podspec
 - spec/mocks/whitelist.json
+- spec/mocks/whitelist_with_expired_dependencies.json
 - spec/mocks/with_allowed_in_subspec.podspec
+- spec/mocks/with_expired_dependencies.podspec
 - spec/mocks/with_fixed_version.podspec
 - spec/mocks/with_not_allowed_in_subspec.podspec
+- spec/mocks/with_not_yet_expired_dependencies.podspec
 - spec/mocks/with_two_requirement.podspec
 - spec/mocks/without_dependencies.podspec
 - spec/mocks/without_version.podspec
@@ -80,28 +84,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-whitelist.
 test_files:
+- spec/mocks/bad_name.podspec
 - spec/mocks/free_version.podspec
 - spec/mocks/major_version_fixed.podspec
 - spec/mocks/not_allowed.podspec
 - spec/mocks/whitelist.json
+- spec/mocks/whitelist_with_expired_dependencies.json
 - spec/mocks/with_allowed_in_subspec.podspec
+- spec/mocks/with_expired_dependencies.podspec
 - spec/mocks/with_fixed_version.podspec
 - spec/mocks/with_not_allowed_in_subspec.podspec
+- spec/mocks/with_not_yet_expired_dependencies.podspec
 - spec/mocks/with_two_requirement.podspec
 - spec/mocks/without_dependencies.podspec
 - spec/mocks/without_version.podspec