cocoapods 0.22.2 → 0.22.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/CHANGELOG.md +31 -0
  2. data/lib/cocoapods/command/lib.rb +2 -2
  3. data/lib/cocoapods/command/push.rb +10 -5
  4. data/lib/cocoapods/gem_version.rb +1 -1
  5. data/lib/cocoapods/generator/copy_resources_script.rb +7 -3
  6. data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb +6 -0
  7. data/lib/cocoapods/installer.rb +3 -2
  8. metadata +17 -17
data/CHANGELOG.md CHANGED
@@ -2,6 +2,37 @@
2
2
 
3
3
  To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
4
4
 
5
+ ## 0.22.3
6
+ [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.2...0.22.3)
7
+
8
+ ###### Enhancements
9
+
10
+ * Add support for .xcdatamodel resource files (in addition to .xcdatamodeld).
11
+ [#1201](https://github.com/CocoaPods/CocoaPods/pull/1201)
12
+
13
+ ###### Bug Fixes
14
+
15
+ * Always exlude `USE_HEADERMAP` from the user’s project.
16
+ [#1216](https://github.com/CocoaPods/CocoaPods/issues/1216)
17
+
18
+ * Use correct template repo when using the `pod lib create` command.
19
+ [#1214](https://github.com/CocoaPods/CocoaPods/issues/1214)
20
+
21
+ * Fixed issue with `pod push` failing when the podspec is unchanged. It will now
22
+ report `[No change] ExamplePod (0.1.0)` and continue to push other podspecs if
23
+ they exist. [#1199](https://github.com/CocoaPods/CocoaPods/pull/1199)
24
+
25
+ * Set STRIP_INSTALLED_PRODUCT = NO in the generated Pods project. This allows
26
+ Xcode to include symbols from CocoaPods in dSYMs during Archive builds.
27
+ [#1217](https://github.com/CocoaPods/CocoaPods/pull/1217)
28
+
29
+ * Ensure the resource script doesn’t fail due to the resources list file not
30
+ existing when trying to delete it.
31
+ [#1198](https://github.com/CocoaPods/CocoaPods/pull/1198)
32
+
33
+ * Fix handling of spaces in paths when compiling xcdatamodel(d) files.
34
+ [#1201](https://github.com/CocoaPods/CocoaPods/pull/1201)
35
+
5
36
 
6
37
  ## 0.22.2
7
38
  [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)
data/lib/cocoapods/command/lib.rb CHANGED
@@ -41,8 +41,8 @@ module Pod
41
41
  executable :git
42
42
  executable :ruby
43
43
 
44
- TEMPLATE_REPO = "https://github.com/CocoaPods/CocoaPods.git"
45
- TEMPLATE_INFO_URL = "https://github.com/CocoaPods/CocoaPods"
44
+ TEMPLATE_REPO = "https://github.com/CocoaPods/pod-template.git"
45
+ TEMPLATE_INFO_URL = "https://github.com/CocoaPods/pod-template"
46
46
 
47
47
  # Clones the template from the remote in the working directory using
48
48
  # the name of the Pod.
data/lib/cocoapods/command/push.rb CHANGED
@@ -8,7 +8,7 @@ module Pod
8
8
 
9
9
  self.description = <<-DESC
10
10
  Validates NAME.podspec or `*.podspec' in the current working dir, creates
11
- a directory and version folder for the pod in the local copy of
11
+ a directory and version folder for the pod in the local copy of
12
12
  REPO (~/.cocoapods/[REPO]), copies the podspec file into the version directory,
13
13
  and finally it pushes REPO to its remote.
14
14
  DESC
@@ -79,7 +79,7 @@ module Pod
79
79
  #
80
80
  # @todo Add specs for staged and unstaged files.
81
81
  #
82
- # @todo Gracefully handle the case where source is not under git
82
+ # @todo Gracefully handle the case where source is not under git
83
83
  # source control.
84
84
  #
85
85
  # @return [void]
@@ -117,13 +117,18 @@ module Pod
117
117
  else
118
118
  message = "[Add] #{spec}"
119
119
  end
120
- UI.puts " - #{message}"
121
120
 
122
121
  FileUtils.mkdir_p(output_path)
123
122
  FileUtils.cp(spec_file, output_path)
124
123
  Dir.chdir(repo_dir) do
125
- git!("add #{spec.name}")
126
- git!("commit --no-verify -m '#{message}'")
124
+ # only commit if modified
125
+ if git!("status --porcelain 2>&1") =~ /#{spec.name}/
126
+ UI.puts " - #{message}"
127
+ git!("add #{spec.name}")
128
+ git!("commit --no-verify -m '#{message}'")
129
+ else
130
+ UI.puts " - [No change] #{spec}"
131
+ end
127
132
  end
128
133
  end
129
134
  end
data/lib/cocoapods/gem_version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Pod
2
2
  # The version of the cocoapods command line tool.
3
3
  #
4
- VERSION = '0.22.2' unless defined? Pod::VERSION
4
+ VERSION = '0.22.3' unless defined? Pod::VERSION
5
5
  end
6
6
 
data/lib/cocoapods/generator/copy_resources_script.rb CHANGED
@@ -101,9 +101,13 @@ install_resource()
101
101
  echo "cp -fpR ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
102
102
  cp -fpR "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
103
103
  ;;
104
+ *.xcdatamodel)
105
+ echo xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom
106
+ xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom
107
+ ;;
104
108
  *.xcdatamodeld)
105
- echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
106
- xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
109
+ echo xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd
110
+ xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd
107
111
  ;;
108
112
  *)
109
113
  echo "${PODS_ROOT}/$1"
@@ -117,7 +121,7 @@ EOS
117
121
  RSYNC_CALL = <<EOS
118
122
 
119
123
  rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
120
- rm "$RESOURCES_TO_COPY"
124
+ rm -f "$RESOURCES_TO_COPY"
121
125
  EOS
122
126
 
123
127
  end
data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb CHANGED
@@ -28,6 +28,12 @@ module Pod
28
28
  end
29
29
  end
30
30
 
31
+ # TODO Need to decide how we are going to ensure settings like these
32
+ # are always excluded from the user's project.
33
+ #
34
+ # See https://github.com/CocoaPods/CocoaPods/issues/1216
35
+ @xcconfig.attributes.delete('USE_HEADERMAP')
36
+
31
37
  @xcconfig
32
38
  end
33
39
 
data/lib/cocoapods/installer.rb CHANGED
@@ -296,6 +296,7 @@ module Pod
296
296
  @pods_project.build_configurations.each do |build_configuration|
297
297
  build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
298
298
  build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
299
+ build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
299
300
  end
300
301
  end
301
302
  end
@@ -452,7 +453,7 @@ module Pod
452
453
  executed = false
453
454
  libraries_using_spec(spec).each do |lib|
454
455
  lib_representation = library_rep(lib)
455
- executed |= run_spec_pre_install_hook(spec, lib_representation)
456
+ executed ||= run_spec_pre_install_hook(spec, lib_representation)
456
457
  end
457
458
  UI.message "- #{spec.name}" if executed
458
459
  end
@@ -511,7 +512,7 @@ module Pod
511
512
  executed = false
512
513
  libraries_using_spec(spec).each do |lib|
513
514
  lib_representation = library_rep(lib)
514
- executed |= run_spec_post_install_hook(spec, lib_representation)
515
+ executed ||= run_spec_post_install_hook(spec, lib_representation)
515
516
  end
516
517
  UI.message "- #{spec.name}" if executed
517
518
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods
3
3
  version: !ruby/object:Gem::Version
4
- hash: 67
4
+ hash: 65
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 22
9
- - 2
10
- version: 0.22.2
9
+ - 3
10
+ version: 0.22.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Eloy Duran
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2013-07-11 00:00:00 Z
19
+ date: 2013-07-23 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: cocoapods-core
@@ -26,12 +26,12 @@ dependencies:
26
26
  requirements:
27
27
  - - "="
28
28
  - !ruby/object:Gem::Version
29
- hash: 67
29
+ hash: 65
30
30
  segments:
31
31
  - 0
32
32
  - 22
33
- - 2
34
- version: 0.22.2
33
+ - 3
34
+ version: 0.22.3
35
35
  type: :runtime
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
@@ -261,17 +261,17 @@ licenses:
261
261
  - MIT
262
262
  post_install_message: "\n\
263
263
  CHANGELOG:\n\n\
264
- ## 0.22.2\n\
265
- [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)\n\
266
- \xE2\x80\xA2 [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.1...0.22.2)\n\
267
- \xE2\x80\xA2 [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.0...0.8.1)\n\n\
264
+ ## 0.22.3\n\
265
+ [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.2...0.22.3)\n\n\
268
266
  ###### Enhancements\n\n\
269
- * The build settings of the Pods project and of its target have been updated to\n be in line with the new defaults of the future versions of Xcode.\n\n\
270
- ###### Bug fixes\n\n\
271
- * Specifications defining build setting with the `[*]` syntax are now properly\n handled.\n [#1171](https://github.com/CocoaPods/CocoaPods/issues/1171)\n\n\
272
- * The name of the files references are now properly set fixing a minor\n regression introduced by CocoaPods 0.22.1 and matching more closely Xcode\n behaviour.\n\n\
273
- * The validator now builds the Pods target instead of the first target actually\n performing the validation.\n\n\
274
- * Build settings defined through the `xcconfig` attribute of a `podspec` are now\n stripped of duplicate values when merged in an aggregate target.\n [#1189](https://github.com/CocoaPods/CocoaPods/issues/1189)\n\n\n"
267
+ * Add support for .xcdatamodel resource files (in addition to .xcdatamodeld).\n [#1201](https://github.com/CocoaPods/CocoaPods/pull/1201)\n\n\
268
+ ###### Bug Fixes\n\n\
269
+ * Always exlude `USE_HEADERMAP` from the user\xE2\x80\x99s project.\n [#1216](https://github.com/CocoaPods/CocoaPods/issues/1216)\n\n\
270
+ * Use correct template repo when using the `pod lib create` command.\n [#1214](https://github.com/CocoaPods/CocoaPods/issues/1214)\n\n\
271
+ * Fixed issue with `pod push` failing when the podspec is unchanged. It will now\n report `[No change] ExamplePod (0.1.0)` and continue to push other podspecs if\n they exist. [#1199](https://github.com/CocoaPods/CocoaPods/pull/1199)\n\n\
272
+ * Set STRIP_INSTALLED_PRODUCT = NO in the generated Pods project. This allows\n Xcode to include symbols from CocoaPods in dSYMs during Archive builds.\n [#1217](https://github.com/CocoaPods/CocoaPods/pull/1217)\n\n\
273
+ * Ensure the resource script doesn\xE2\x80\x99t fail due to the resources list file not\n existing when trying to delete it.\n [#1198](https://github.com/CocoaPods/CocoaPods/pull/1198)\n\n\
274
+ * Fix handling of spaces in paths when compiling xcdatamodel(d) files.\n [#1201](https://github.com/CocoaPods/CocoaPods/pull/1201)\n\n\n"
275
275
  rdoc_options: []
276
276
 
277
277
  require_paths: