cocoapods-blacklist 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d4092555d1dd6c64432973ec0bc77206167694
-  data.tar.gz: 4ccbdab73ef08de63ff4c9bb1c0709a632c5f82d
+  metadata.gz: a536f7b97996715a0804fa4a12e9d8b00053d3db
+  data.tar.gz: 436cc27ed236ec60e3e7c999eb9c6a37724b9970
 SHA512:
-  metadata.gz: e4de412d70290d74e79bcb6d9e2e271eae0b4cc0dde6fdf536efb1410aac0b88b5ea35165c0ff7d58f661b1fc615de25f859eb40a5d85cfc340198fe62727da3
-  data.tar.gz: c054c4f152acb557b64a9f0765ddc1240c23bb8683d3b7f6499c98accb2d6e237f47990836883f8ef2e2ab2acf3726b5fe9784470189a0c92fd302accfb25295
+  metadata.gz: 708bd2d18a49e3874e955b468fdba82c0431e7a362eca8502a4e05ec79e280448254f35d42f0760e01e2885db5e03a46d222b800fec4a242b73edfb06103da56
+  data.tar.gz: 70454add6b1f3be2f8f342bc183082d3f5c78a7ff0c9b2263396485eea9112a4957815aa14613f2704c19767f92c059adfce50cb523dc9805056033e0e3ee5b9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+# 0.1.2
+  - More idiomatic CLAide usage (@segiddins 11/16/2015)
+
+# 0.1.1
+  - Updated Pod metadata (@clarkda 8/14/2015)
+
 # 0.1.0
   - Public release (@dbgrandi 5/18/2015)
 

data/Gemfile

@@ -6,6 +6,6 @@ gemspec
 group :development do
   gem 'cocoapods'
   gem 'bacon'
+  gem 'prettybacon'
   gem 'webmock'
 end
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-blacklist (0.1.0)
+    cocoapods-blacklist (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -52,6 +52,8 @@ GEM
     nap (0.8.0)
     netrc (0.7.8)
     open4 (1.3.4)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
     rake (10.4.2)
     safe_yaml (1.0.4)
     thread_safe (0.3.5)
@@ -72,5 +74,9 @@ DEPENDENCIES
   bundler (~> 1.3)
   cocoapods
   cocoapods-blacklist!
+  prettybacon
   rake
   webmock
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -44,6 +44,7 @@ The blacklist config file is a JSON file that has an array of pods, each one con
 ## Contributors
 
 - David Grandinetti ([@dbgrandi](https://twitter.com/dbgrandi))
+- Samuel E. Giddins ([@segiddins](https://twitter.com/segiddins))
 
 ## License
 

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

@@ -13,7 +13,7 @@ module Pod
       self.description = <<-DESC
         Validate a project against a list of banned pods. Requires a lockfile
         and a config file (JSON).
-        
+
         example:
         $ pod blacklist --config blacklist.json
       DESC
@@ -21,7 +21,7 @@ module Pod
       self.arguments = [
         CLAide::Argument.new('LOCKFILE', false),
       ]
-      
+
       def self.options
         [
           ['--config=CONFIG', 'Config file or URL for the blacklist'],
@@ -31,32 +31,32 @@ module Pod
 
       def initialize(argv)
         @blacklist = argv.option('config')
-        @warn = argv.flag?('warn') || false
-        @lockfile_name = argv.shift_argument || "./Podfile.lock"
+        @warn = argv.flag?('warn')
+        @lockfile_path = argv.shift_argument
         super
       end
 
       def validate!
         super
-        unless File.exists?(@lockfile_name)
-          help! 'A lockfile and blacklist file are needed.'
-        end
+
+        @lockfile = @lockfile_path ? Lockfile.from_file(Pathname(@lockfile_path)) : config.lockfile
+        help! 'A lockfile is needed.' unless lockfile
+        help! 'A blacklist file is needed.' unless @blacklist
       end
 
       def run
-        lockfile = Pod::Lockfile.from_file(Pathname.new(@lockfile_name))
         open(@blacklist) do |f|
           @blacklist_file = JSON.parse(f.read)
         end
 
         warned = false
         failed_pods = {}
-        
+
         @blacklist_file['pods'].each do |pod|
           name = pod['name']
           if lockfile.pod_names.include? name
-            version = Pod::Version.new(lockfile.version(name))
-            if Pod::Requirement.create(pod['versions']).satisfied_by?(version)
+            version = Version.new(lockfile.version(name))
+            if Requirement.create(pod['versions']).satisfied_by?(version)
               UI.puts "[!] Validation error: Use of #{name} #{version} for reason: #{pod['reason']}".yellow
               failed_pods[name] = version
               warned = true
@@ -64,7 +64,7 @@ module Pod
           end
         end
         if !warned
-          UI.puts "#{@lockfile_name} passed blacklist validation".green
+          UI.puts "#{UI.path lockfile.defined_in_file.expand_path} passed blacklist validation".green
         else
           failed_pod_string = failed_pods.map { |name, version| "#{name} (#{version})"}.join(", ")
           unless @warn
@@ -72,7 +72,10 @@ module Pod
           end
         end
       end
-      
+
+      private
+
+      attr_reader :lockfile
     end
   end
 end

data/lib/cocoapods-blacklist/gem_version.rb

@@ -3,5 +3,5 @@
 #  Licensed under the terms of the MIT License. See LICENSE file in the project root.
 
 module CocoapodsBlacklist
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ $:.unshift((ROOT + 'spec').to_s)
 
 require 'bundler/setup'
 require 'bacon'
+require 'pretty_bacon'
 require 'cocoapods'
 
 require 'webmock'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-blacklist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Grandinetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,4 +97,3 @@ test_files:
 - spec/fixtures/GoodPodfile.lock
 - spec/fixtures/blacklist.json
 - spec/spec_helper.rb
-has_rdoc: