cocoapods 0.36.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34422801dcfb63c977b484dcc025841634e7b6f5
-  data.tar.gz: 8f5b38874ef893eeef31ed34415ad7368038ca06
+  metadata.gz: a9aeeba66625dc74540d9657422a5c529e46f083
+  data.tar.gz: f6035889f19066bc24792903ab16849cc694ca68
 SHA512:
-  metadata.gz: 71b28d6e75360c4ae1537bcb79c4b15bfe67463c4d394ae50026403a013db908a9f27fdc4817a4181e3e46bacef62b185df6a922060a89cc0a4e19bbbc15cec8
-  data.tar.gz: b21f3d2eb6b8adaf3a5008fdcede49338d8f935c63adfd321977aadf2b5a331045a6ee509881d74fd20bec67ab1002232e0ee2a41280cea5553b0e673759e3d4
+  metadata.gz: 4c9e00a4e8d4546059a1b8a00dbc29259357e88de39f6f3980961e29cae0eef4db3909563636b6f09fc98846d4e7b529e672ed6b8abbc1df1ea736a03ac24ccc
+  data.tar.gz: f160e5318d25d6d3639bea7a03a23d68cf43e3f064cd57133f0112779dcd3c477de4935a0db3fbde55d5f1a4158b67252b1fa2bb008dcd4cded8b3615cd299b6

data/CHANGELOG.md

@@ -4,10 +4,35 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.36.1
+
+[Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.23.0...0.23.1)
+
+##### Bug Fixes
+
+* Workarounds(✻) for the resource script's handling of `.xcasset` files.  
+  [sodas](https://github.com/sodastsai)
+  [Tony Li](https://github.com/crazytonyli)
+  [Chongyu Zhu](https://github.com/lembacon)
+  [#3247](https://github.com/CocoaPods/CocoaPods/issues/3247)
+  [#3303](https://github.com/CocoaPods/CocoaPods/issues/3303)
+
+* Fix the sanitization of configuration names in the generated target
+  environment header.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3301](https://github.com/CocoaPods/CocoaPods/issues/3301)
+
+> _(✻) Note: these fixes are only temporary to avoid overriding the user project's `xcassets`.
+  We are aware that these workarounds are "too greedy" and thus user projects having different
+  `xcassets` for different targets will still have issues; we ([@AliSoftware](https://github.com/AliSoftware))
+  are working on a deeper fix ([#3263](https://github.com/CocoaPods/CocoaPods/issues/3263)) for the next release._
+
 ## 0.36.0
 
 [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.22.0...0.23.0)
 
+For more details, see 📝 [CocoaPods 0.36](http://blog.cocoapods.org/CocoaPods-0.36/) on our blog.
+
 ##### Enhancements
 
 * Allows Swift pods to have a deployment target under iOS 8.0 if they use
@@ -362,7 +387,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.19.4...0.20.2)
 • [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.7.2...0.8.0)
 
-For more details, see :memo: [CocoaPods 0.35](http://blog.cocoapods.org/CocoaPods-0.35/) on our blog.
+For more details, see 📝 [CocoaPods 0.35](http://blog.cocoapods.org/CocoaPods-0.35/) on our blog.
 
 ##### Enhancements
 
@@ -689,7 +714,7 @@ For more details, see :memo: [CocoaPods 0.35](http://blog.cocoapods.org/CocoaPod
 
 ## 0.34.0
 
-For more details, see :memo: [CocoaPods 0.34](http://blog.cocoapods.org/CocoaPods-0.34/) on our blog.
+For more details, see 📝 [CocoaPods 0.34](http://blog.cocoapods.org/CocoaPods-0.34/) on our blog.
 
 ##### Breaking
 
@@ -952,7 +977,7 @@ For more details, see :memo: [CocoaPods 0.34](http://blog.cocoapods.org/CocoaPod
 
 ## 0.33.0
 
-For more details, see :memo: [CocoaPods 0.33](http://blog.cocoapods.org/CocoaPods-0.33/) on our blog.
+For more details, see 📝 [CocoaPods 0.33](http://blog.cocoapods.org/CocoaPods-0.33/) on our blog.
 
 ##### Breaking
 
@@ -1056,7 +1081,7 @@ For more details, see :memo: [CocoaPods 0.33](http://blog.cocoapods.org/CocoaPod
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.31.1...0.32.0)
 • [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/0.31.1...0.32.0)
 
-For more details, see :memo: [CocoaPods 0.32](http://blog.cocoapods.org/CocoaPods-0.32/) on our blog.
+For more details, see 📝 [CocoaPods 0.32](http://blog.cocoapods.org/CocoaPods-0.32/) on our blog.
 
 ##### Enhancements
 
@@ -1173,7 +1198,7 @@ For more details, see :memo: [CocoaPods 0.32](http://blog.cocoapods.org/CocoaPod
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.30.0...0.31.0)
 • [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/0.30.0...0.31.0)
 
-For more details, see :memo: [CocoaPods 0.31](http://blog.cocoapods.org/CocoaPods-0.31/) on our blog.
+For more details, see 📝 [CocoaPods 0.31](http://blog.cocoapods.org/CocoaPods-0.31/) on our blog.
 
 ##### Enhancements
 
@@ -1271,7 +1296,7 @@ For more details, see :memo: [CocoaPods 0.31](http://blog.cocoapods.org/CocoaPod
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.29.0...0.30.0)
 
-For more details, see :memo: [CocoaPods 0.30](http://blog.cocoapods.org/CocoaPods-0.30/) on our blog.
+For more details, see 📝 [CocoaPods 0.30](http://blog.cocoapods.org/CocoaPods-0.30/) on our blog.
 
 ###### Enhancements
 
@@ -1309,7 +1334,7 @@ For more details, see :memo: [CocoaPods 0.30](http://blog.cocoapods.org/CocoaPod
 • [CocoaPods-core](https://github.com/CocoaPods/Core/compare/0.28.0...0.29.0)
 • [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.2.0...0.3.0)
 
-For more details, see :memo: [CocoaPods 0.29](http://blog.cocoapods.org/CocoaPods-0.29/) on our blog.
+For more details, see 📝 [CocoaPods 0.29](http://blog.cocoapods.org/CocoaPods-0.29/) on our blog.
 
 ###### Breaking
 
@@ -1437,7 +1462,7 @@ For more details, see :memo: [CocoaPods 0.29](http://blog.cocoapods.org/CocoaPod
 • [CocoaPods-core](https://github.com/CocoaPods/Core/compare/0.27.1...0.28.0)
 • [CLAide](https://github.com/CocoaPods/CLAide/compare/0.3.2...0.4.0)
 
-For more details, see :memo: [CocoaPods 0.28](http://blog.cocoapods.org/CocoaPods-0.28/) on our blog.
+For more details, see 📝 [CocoaPods 0.28](http://blog.cocoapods.org/CocoaPods-0.28/) on our blog.
 
 ###### Enhancements
 
@@ -1511,7 +1536,7 @@ For more details, see :memo: [CocoaPods 0.28](http://blog.cocoapods.org/CocoaPod
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.26.2...0.27.1)
 • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.13.0...0.14.0)
 
-For more details, see :memo: [CocoaPods 0.27 and improved installation UX](http://blog.cocoapods.org/CocoaPods-0.27-and-improved-installation-UX/) on our blog.
+For more details, see 📝 [CocoaPods 0.27 and improved installation UX](http://blog.cocoapods.org/CocoaPods-0.27-and-improved-installation-UX/) on our blog.
 
 ###### Enhancements
 
@@ -1592,7 +1617,7 @@ For more details, see :memo: [CocoaPods 0.27 and improved installation UX](http:
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.25.0...0.26.1)
 • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.11.1...0.12.0)
 
-For more details, see :memo: [CocoaPods 0.26](http://blog.cocoapods.org/CocoaPods-0.26/) on our blog.
+For more details, see 📝 [CocoaPods 0.26](http://blog.cocoapods.org/CocoaPods-0.26/) on our blog.
 
 ###### Enhancements
 

data/README.md

@@ -22,14 +22,13 @@ guide](http://guides.cocoapods.org/using/getting-started.html#installation) and
 
 ## Sponsors
 
-Lovingly sponsored by [Fingertips](http://www.fngtps.com),
-[Hipbyte](http://www.hipbyte.com), [Artsy](http://artsy.net) and
-[Sauspiel](https://www.sauspiel.de).
+Lovingly sponsored by a collection of companies, see the footer of [CocoaPods.org](http://cocoapods.org) for an up-to-date list. 
 
 ## Collaborate
 
 All CocoaPods development happens on GitHub. Contributions make for good karma and
-we welcome new contributors with joy.
+we [welcome new](http://blog.cocoapods.org/starting-open-source/) contributors with joy. We take contributors seriously, and thus have a 
+contributor [code of conduct](CODE_OF_CONDUCT.md).
 
 ## Links
 
@@ -42,6 +41,7 @@ we welcome new contributors with joy.
 [Guides](http://guides.cocoapods.org) | Everything you want to know about CocoaPods.
 [Changelog](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md) | See the changes introduced in each CocoaPods version.
 [New Pods RSS](http://feeds.cocoapods.org/new-pods.rss) | Don't miss any new Pods.
+[Code of Conduct](CODE_OF_CONDUCT.md) | Find out the standards we hold ourselves to.
 
 ## Projects
 

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.36.0' unless defined? Pod::VERSION
+  VERSION = '0.36.1' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -128,7 +128,7 @@ install_resource()
       xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      XCASSET_FILES="$XCASSET_FILES '$1'"
+      XCASSET_FILES="$XCASSET_FILES '${PODS_ROOT}/$1'"
       ;;
     /*)
       echo "$1"
@@ -153,7 +153,7 @@ EOS
 
       XCASSETS_COMPILE = <<EOS
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n $XCASSET_FILES ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
   case "${TARGETED_DEVICE_FAMILY}" in
     1,2)
@@ -169,6 +169,7 @@ then
       TARGET_DEVICE_ARGS="--target-device mac"
       ;;
   esac
+  while read line; do XCASSET_FILES="$XCASSET_FILES '$line'"; done <<<$(find "$PWD" -name "*.xcassets" | egrep -v "^$PODS_ROOT")
   echo $XCASSET_FILES | xargs actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
 EOS

data/lib/cocoapods/generator/prefix_header.rb

@@ -47,11 +47,10 @@ module Pod
           result << "\n"
         end
 
-        file_accessors.each do |file_accessor|
-          if prefix_header = file_accessor.prefix_header
-            result << Pathname(prefix_header).read
-          end
+        file_accessors.map(&:prefix_header).compact.uniq.each do |prefix_header|
+          result << Pathname(prefix_header).read
         end
+
         result
       end
 

data/lib/cocoapods/generator/target_environment_header.rb

@@ -46,10 +46,12 @@ module Pod
         common_specs = common_specs(specs_by_configuration)
         common_specs.each { |spec| result << spec_defines(spec) }
 
+        c99ext_identifier_method = Target.new.method(:c99ext_identifier)
+
         specs_by_config = specs_scoped_by_configuration(common_specs, specs_by_configuration)
         specs_by_config.each do |config, specs|
           result << "// #{config} build configuration\n"
-          result << "#ifdef #{config.gsub(/[^a-zA-Z0-9_]/, '_').upcase}\n\n"
+          result << "#ifdef #{c99ext_identifier_method[config].upcase}\n\n"
           specs.each { |spec| result << spec_defines(spec, 1) }
           result << "#endif\n"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.36.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.36.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.36.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement