cocoapods-acknowledgements 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab57b2637b279669a7dd0b4db49d6998da1ed244
-  data.tar.gz: e982c6d053c1cc0b24c73bf96fde9b49054377d6
+  metadata.gz: 54435c0fb7730f387d1438481a57423e2413bc33
+  data.tar.gz: e569eaa1915a1ee46c297cb6f4c9900f642df897
 SHA512:
-  metadata.gz: 25e5b279dcb470db443765d10eb684ad2b65f5952dbc410ee82eaafb7eee06f6641ce64d4050d10f7a2c59181f3d8c69c51c46515ed104bb78c2cf0daedf61b0
-  data.tar.gz: e3c1fdead333ccd712641ca6f0209f7c89ab2bc4be92afa75a03d77f4e9c31d563a0f9e8a49ea8e07aeee06ae973e3933dbc7c9b5b87ac74d207544e33a11742
+  metadata.gz: 2917315ce1ad58239938d975d2e60647c5e07052be09878e9a7eaa90358b34611a2db36c3def382afa47dc5ce46d8353d0865abda526351aa91098c780f9e0b2
+  data.tar.gz: 7c689a4794cc670e1e26412f485575c4e3364ee8e8d446fefea90cc45fe1cd77f429ad32e0513e76a3edcb65d7968f08b9661c48f9ddb2999bb5c652141748bf

data/.travis.yml

@@ -1,10 +1,24 @@
+# Sets Travis to run the Ruby specs on OS X machines to be as close as possible
+# to the user environment.
+#
 language: objective-c
+addons:
+ code_climate:
+   repo_token: 2926ae7ea0b2a6ced8b0d67efa235769ab85de1d9c9f6702f40d80bacec3c9c4
+
 env:
-  # This is what 10.8.x comes with and we want to support that.
-  - RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
-  - RVM_RUBY_VERSION=2.0.0-p247 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
+  - RVM_RUBY_VERSION=system
+  # - RVM_RUBY_VERSION=1.8.7-p358
+
 before_install:
+  - export LANG=en_US.UTF-8
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
-install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
-script: bundle exec rake spec:ci
+  - source ~/.rvm/scripts/rvm
+  - if [[ $RVM_RUBY_VERSION != 'system' ]]; then rvm install $RVM_RUBY_VERSION; fi
+  - rvm use $RVM_RUBY_VERSION
+  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem install bundler --no-ri --no-rdoc; else gem install bundler --no-ri --no-rdoc; fi
+
+install:
+  - sudo bundle install --without=documentation
+
+script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,9 +1,41 @@
-# CocoaPods::Metadata Changelog
+# CocoaPods Acknowledgements Changelog
 
 ## Master
 
 ##### Enhancements
 
+* None.  
+
+##### Bug Fixes
+
+* None.  
+
+
+## 1.1.0 (2016-03-08)
+
+##### Enhancements
+
+* Exclude certain Pods from Acknowledgements.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#16](https://github.com/CocoaPods/cocoapods-acknowledgements/issues/16)
+
+##### Bug Fixes
+
+* Supporting CocoaPods 1.0.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+
+* Fix adding same file multiple times to group.   
+  [Marcelo Fabri](https://github.com/marcelofabri)
+
+* Fix settings bundle style plists generation.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#20](https://github.com/CocoaPods/cocoapods-acknowledgements/issues/20)
+
+
+## 1.0
+
+##### Enhancements
+
 * Support Settings bundle style plists.  
   [Marcelo Fabri](https://github.com/marcelofabri)
 

data/Gemfile

@@ -7,6 +7,5 @@ group :development do
   gem 'bacon'
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'
-  gem 'rake'
-  gem 'prettybacon', :git => 'https://github.com/irrationalfab/PrettyBacon.git', :branch => 'master'
+  gem 'prettybacon'
 end

data/README.md

@@ -1,6 +1,6 @@
 # CocoaPods Acknowledgements
 
-A CocoaPods plugin that generates a plist which includes the installation metadata. It supports generating two styles of dependency information. 
+A CocoaPods plugin that generates a plist which includes the installation metadata. It supports generating two styles of dependency information.
 
 * **Settings.bundle compatible plist** - This format is supported by a [large amount of pods](https://cocoapods.org/?q=acknow) and works with Apple's Settings.app.
 
@@ -27,10 +27,18 @@ plugin 'cocoapods-acknowledgements', :settings_bundle => true
 With a Settings.bundle compatible plist, offering the chance to run post-processing on the plist ( to add non-CocoaPods dependencies for example )
 
 ``` ruby
-plugin 'cocoapods-acknowledgements', :settings_bundle => true , :settings_post_process => Proc.new { |settings_plist_path, umbrella_target| 
-  puts settings_plist_path 
+plugin 'cocoapods-acknowledgements', :settings_bundle => true , :settings_post_process => Proc.new { |settings_plist_path, umbrella_target|
+  puts settings_plist_path
   puts umbrella_target.cocoapods_target_label
 }
 ```
 
-The plugin will search through the first two levels of your project to find a `Settings.bundle` file, and add the file to the bundle. If this is not enough for you, we'd love a PR. 
+The plugin will search through the first two levels of your project to find a `Settings.bundle` file, and add the file to the bundle. If this is not enough for you, we'd love a PR.
+
+You can also exclude some dependencies so they won't be added to the generated plists. This is useful when you don't want to add private dependencies.
+
+```ruby
+plugin 'cocoapods-acknowledgements', :settings_bundle => true, :exclude => 'PrivateKit'
+
+plugin 'cocoapods-acknowledgements', :settings_bundle => true, :exclude => ['PrivateKit', 'SecretLib']
+```

data/lib/cocoapods_acknowledgements.rb

@@ -3,7 +3,11 @@ module CocoaPodsAcknowledgements
   require 'cocoapods_acknowledgements/settings_plist_generator'
 
   def self.save_metadata(metadata, plist_path, project, sandbox, user_target_uuid)
-    Xcodeproj.write_plist(metadata, plist_path)
+    if defined? Xcodeproj::Plist.write_to_path
+      Xcodeproj::Plist.write_to_path(metadata, plist_path)
+    else
+      Xcodeproj.write_plist(metadata, plist_path)
+    end
 
     # Find a root folder in the users Xcode Project called Pods, or make one
     cocoapods_group = project.main_group["Pods"]
@@ -12,7 +16,8 @@ module CocoaPodsAcknowledgements
     end
 
     # Add the example plist to the found CocoaPods group
-    file_ref = cocoapods_group.files.find { |file| file.real_path == plist_path }
+    plist_pathname = Pathname.new(File.expand_path(plist_path))
+    file_ref = cocoapods_group.files.find { |file| file.real_path == plist_pathname }
     unless file_ref
       file_ref = cocoapods_group.new_file(plist_path)
     end
@@ -26,73 +31,73 @@ module CocoaPodsAcknowledgements
     project.save
 
   end
-  
+
   # TODO: Code golf this
   def self.settings_bundle_in_project
     Dir.glob("**/*Settings.bundle").first
   end
-  
+
   Pod::HooksManager.register('cocoapods-acknowledgements', :post_install) do |context, user_options|
     require 'cocoapods'
-    
+    require 'set'
+
     # Until CocoaPods provides a HashWithIndifferentAccess, normalize the hash keys here.
     # See https://github.com/CocoaPods/CocoaPods/issues/3354
-    
+
     user_options.inject({}) do |normalized_hash, (key, value)|
       normalized_hash[key.to_s] = value
       normalized_hash
     end
-    
+
     Pod::UI.section 'Adding Acknowledgements' do
 
       should_include_settings = user_options["settings_bundle"] != nil
+      excluded_pods = Set.new(user_options["exclude"])
 
       sandbox = context.sandbox if defined? context.sandbox
       sandbox ||= Pod::Sandbox.new(context.sandbox_root)
 
       context.umbrella_targets.each do |umbrella_target|
         project = Xcodeproj::Project.open(umbrella_target.user_project_path)
-        
+
         umbrella_target.user_target_uuids.each do |user_target_uuid|
-          
+
           # Generate a plist representing all of the podspecs
-          metadata = PlistGenerator.generate(umbrella_target, sandbox)
-          
+          metadata = PlistGenerator.generate(umbrella_target, sandbox, excluded_pods)
+
           next unless metadata
-          
+
           plist_path = sandbox.root + "#{umbrella_target.cocoapods_target_label}-metadata.plist"
           save_metadata(metadata, plist_path, project, sandbox, user_target_uuid)
-          
+
           if should_include_settings
             # Generate a plist in Settings format
-            settings_metadata = SettingsPlistGenerator.generate(umbrella_target, sandbox)
+            settings_metadata = SettingsPlistGenerator.generate(umbrella_target, sandbox, excluded_pods)
 
             # We need to look for a Settings.bundle
             # and add this to the root of the bundle
-            
+
             settings_bundle = settings_bundle_in_project
             if settings_bundle == nil
               Pod::UI.warn "Could not find a Settings.bundle to add the Pod Settings Plist to."
             else
               settings_plist_path = settings_bundle + "/#{umbrella_target.cocoapods_target_label}-settings-metadata.plist"
-              FileUtils.cp(plist_path, settings_plist_path)
+              save_metadata(settings_metadata, settings_plist_path, project, sandbox, user_target_uuid)
               Pod::UI.info "Added Pod info to Settings.bundle for target #{umbrella_target.cocoapods_target_label}"
-              
+
               # Support a callback for the key :settings_post_process
               if user_options["settings_post_process"]
-                user_options["settings_post_process"].call(settings_plist_path, umbrella_target)
+                user_options["settings_post_process"].call(settings_plist_path, umbrella_target, excluded_pods)
               end
-              
+
             end
           end
 
         end
-        
+
       end
-      
+
     end
-    
+
   end
 end
-
-

data/lib/cocoapods_acknowledgements/plist_generator.rb

@@ -8,8 +8,8 @@ module CocoaPodsAcknowledgements
         @markdown_parser ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
       end
 
-      def generate(target_description, sandbox)
-        root_specs = target_description.specs.map(&:root).uniq
+      def generate(target_description, sandbox, excluded)
+        root_specs = target_description.specs.map(&:root).uniq.reject { |spec| excluded.include?(spec.name) }
 
         return nil if root_specs.empty?
 
@@ -84,4 +84,3 @@ module CocoaPodsAcknowledgements
     end
   end
 end
-

data/lib/cocoapods_acknowledgements/settings_plist_generator.rb

@@ -4,8 +4,8 @@ module CocoaPodsAcknowledgements
   class SettingsPlistGenerator < PlistGenerator
     class << self
 
-      def generate(target_description, sandbox)
-        root_specs = target_description.specs.map(&:root).uniq
+      def generate(target_description, sandbox, excluded)
+        root_specs = target_description.specs.map(&:root).uniq.reject { |spec| excluded.include?(spec.name) }
 
         return nil if root_specs.empty?
 
@@ -40,7 +40,7 @@ module CocoaPodsAcknowledgements
           "Type" => "PSGroupSpecifier"
         }
       end
-			
+
       def footer
         footer = {
           "FooterText" => "Generated by CocoaPods - http://cocoapods.org",
@@ -51,4 +51,3 @@ module CocoaPodsAcknowledgements
     end
   end
 end
-

data/lib/cocoapods_acknowledgements/version.rb

@@ -1,3 +1,3 @@
 module CocoaPodsAcknowledgements
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/cocoapods_plugin.rb

@@ -1,2 +1 @@
 require 'cocoapods_acknowledgements'
-

data/spec/acknowledgement_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+describe CocoaPodsAcknowledgements do
+
+end

data/spec/plist_generator_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+describe CocoaPodsAcknowledgements::PlistGenerator do
+
+end

data/spec/settings_plist_generator_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+describe CocoaPodsAcknowledgements::SettingsPlistGenerator do
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-acknowledgements
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Pelosin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -73,6 +73,9 @@ files:
 - lib/cocoapods_acknowledgements/settings_plist_generator.rb
 - lib/cocoapods_acknowledgements/version.rb
 - lib/cocoapods_plugin.rb
+- spec/acknowledgement_spec.rb
+- spec/plist_generator_spec.rb
+- spec/settings_plist_generator_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/CocoaPods/cocoapods-acknowledgements
 licenses:
@@ -94,11 +97,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin that generates an acknowledgements plist to make it easy
   to create tools to use in apps.
 test_files:
+- spec/acknowledgement_spec.rb
+- spec/plist_generator_spec.rb
+- spec/settings_plist_generator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: