cocoapods 0.36.1 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9aeeba66625dc74540d9657422a5c529e46f083
-  data.tar.gz: f6035889f19066bc24792903ab16849cc694ca68
+  metadata.gz: e7a811de61a0cb07082df81c3b11e58efec0c870
+  data.tar.gz: b5e9bf412a02e0c460c7fd77ff950c30b6fc43bb
 SHA512:
-  metadata.gz: 4c9e00a4e8d4546059a1b8a00dbc29259357e88de39f6f3980961e29cae0eef4db3909563636b6f09fc98846d4e7b529e672ed6b8abbc1df1ea736a03ac24ccc
-  data.tar.gz: f160e5318d25d6d3639bea7a03a23d68cf43e3f064cd57133f0112779dcd3c477de4935a0db3fbde55d5f1a4158b67252b1fa2bb008dcd4cded8b3615cd299b6
+  metadata.gz: 7b4a2f0a05152944bf72762cadf41d49f6ea55cc7e84d4412020943b1ca0992795ef68843cf5a4237576cf5324dd24f28fbb7e46b72a27d8af3a2b8d78499c63
+  data.tar.gz: eb7c3e2ef80c3c9ae9b142a46d3bb0023b18fad79458124fcb5e7e81fc9534918bbaa915b25693d966f744f136902389878595debc2f19173234a1bc5500a266

data/CHANGELOG.md

@@ -4,6 +4,24 @@ 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.2
+
+[Core](https://github.com/CocoaPods/Core/compare/0.36.1...0.36.2)
+
+#### Bug Fixes
+
+* Unique resources passed to the script generator.  
+  [Diego Torres](https://github.com/dtorres)
+  [#3315](https://github.com/CocoaPods/CocoaPods/issues/3315)
+  [#3327](https://github.com/CocoaPods/CocoaPods/issues/3327)
+
+* Update the `Manifest.lock` when migrating local podspecs to JSON. This fixes
+  running `pod install` after upgrading to `0.36`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3292](https://github.com/CocoaPods/CocoaPods/issues/3292)
+  [#3299](https://github.com/CocoaPods/CocoaPods/issues/3299)
+
+
 ## 0.36.1
 
 [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.23.0...0.23.1)

data/lib/cocoapods/command/lib.rb

@@ -60,7 +60,7 @@ module Pod
         #
         def clone_template
           UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
-            git! "clone '#{template_repo_url}' #{@name}"
+            git! ['clone', template_repo_url, @name]
           end
         end
 

data/lib/cocoapods/command/repo/add.rb

@@ -39,11 +39,11 @@ module Pod
           UI.section("#{prefix} spec repo `#{@name}` from `#{@url}`#{" (branch `#{@branch}`)" if @branch}") do
             config.repos_dir.mkpath
             Dir.chdir(config.repos_dir) do
-              command = "clone '#{@url}' #{@name}"
-              command << ' --depth=1' if @shallow
+              command = ['clone', @url, @name]
+              command << '--depth=1' if @shallow
               git!(command)
             end
-            Dir.chdir(dir) { git!("checkout #{@branch}") } if @branch
+            Dir.chdir(dir) { git!('checkout', @branch) } if @branch
             SourcesManager.check_version_information(dir)
           end
         end

data/lib/cocoapods/command/repo/push.rb

@@ -146,10 +146,10 @@ module Pod
             FileUtils.cp(spec_file, output_path)
             Dir.chdir(repo_dir) do
               # only commit if modified
-              if git!('status --porcelain 2>&1').include?(spec.name)
+              if git!('status', '--porcelain').include?(spec.name)
                 UI.puts " - #{message}"
-                git!("add #{spec.name}")
-                git!("commit --no-verify -m '#{message}'")
+                git!('add', spec.name)
+                git!('commit', '--no-verify', '-m', message)
               else
                 UI.puts " - [No change] #{spec}"
               end

data/lib/cocoapods/command/setup.rb

@@ -70,7 +70,7 @@ module Pod
       #
       def set_master_repo_url
         Dir.chdir(master_repo_dir) do
-          git("remote set-url origin '#{url}'")
+          git('remote', 'set-url', 'origin', url)
         end
       end
 
@@ -101,7 +101,7 @@ module Pod
       #
       def set_master_repo_branch
         Dir.chdir(master_repo_dir) do
-          git('checkout master')
+          git %w(checkout master)
         end
       end
 

data/lib/cocoapods/executable.rb

@@ -19,12 +19,12 @@ module Pod
     # @return [void]
     #
     def executable(name)
-      define_method(name) do |command|
-        Executable.execute_command(name, command, false)
+      define_method(name) do |*command|
+        Executable.execute_command(name, Array(command).flatten, false)
       end
 
-      define_method(name.to_s + '!') do |command|
-        Executable.execute_command(name, command, true)
+      define_method(name.to_s + '!') do |*command|
+        Executable.execute_command(name, Array(command).flatten, true)
       end
     end
 
@@ -33,7 +33,7 @@ module Pod
     # @param  [String] bin
     #         The binary to use.
     #
-    # @param  [String] command
+    # @param  [Array<#to_s>] command
     #         The command to send to the binary.
     #
     # @param  [Bool] raise_on_failure
@@ -54,7 +54,8 @@ module Pod
       require 'open4'
       require 'shellwords'
 
-      full_command = "#{bin.shellescape} #{command}"
+      command = command.map(&:to_s)
+      full_command = "#{bin.shellescape} #{command.map(&:shellescape).join(' ')}"
 
       if Config.instance.verbose?
         UI.message("$ #{full_command}")
@@ -64,7 +65,7 @@ module Pod
       end
 
       options = { :stdout => stdout, :stderr => stderr, :status => true }
-      status  = Open4.spawn(full_command, options)
+      status  = Open4.spawn(bin, command, options)
       output  = stdout.join("\n") + stderr.join("\n")
       unless status.success?
         if raise_on_failure

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/bridge_support.rb

@@ -15,7 +15,7 @@ module Pod
       end
 
       def save_as(pathname)
-        gen_bridge_metadata %(-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}')
+        gen_bridge_metadata('-c', search_paths.join(' '), '-o', pathname, *headers)
       end
     end
   end

data/lib/cocoapods/installer/migrator.rb

@@ -53,13 +53,17 @@ module Pod
           UI.message('Migrating to CocoaPods 0.36') do
             move(sandbox.root + 'Headers/Build', sandbox.root + 'Headers/Private')
 
+            lockfile = sandbox.manifest.to_hash
             sandbox.specifications_root.children.each do |child|
               next unless child.basename.to_s =~ /\.podspec$/
               spec = Specification.from_file(child)
               child.delete
               child = Pathname("#{child}.json")
               File.open(child, 'w') { |f| f.write spec.to_pretty_json }
+              lockfile['SPEC CHECKSUMS'][spec.name] = Specification.from_file(child).checksum
             end
+            sandbox.manifest = Lockfile.new(lockfile)
+            File.open(sandbox.manifest_path, 'w') { |f| f.write sandbox.manifest.to_yaml }
           end
         end
 

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -124,7 +124,7 @@ module Pod
             ENV.delete('CDPATH')
             prepare_command = root_spec.prepare_command.strip_heredoc.chomp
             full_command = "\nset -e\n" + prepare_command
-            bash!(full_command)
+            bash!('-c', full_command)
           end
         end
       end

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -102,16 +102,11 @@ module Pod
         end
       end
 
-      # Creates a script that copies the resources to the bundle of the client
-      # target.
-      #
-      # @note   The bridge support file needs to be created before the prefix
-      #         header, otherwise it will not be added to the resources script.
+      # Uniqued Resources grouped by config
       #
-      # @return [void]
+      # @return [Hash{ Symbol => Array<Pathname> }]
       #
-      def create_copy_resources_script
-        path = target.copy_resources_script_path
+      def resources_by_config
         library_targets = target.pod_targets.reject do |pod_target|
           pod_target.should_build? && pod_target.requires_frameworks?
         end
@@ -120,9 +115,22 @@ module Pod
           file_accessors = library_targets.select { |t| t.include_in_build_config?(config) }.flat_map(&:file_accessors)
           resource_paths = file_accessors.flat_map { |accessor| accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) } }
           resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name.shellescape}.bundle" } }
-          resources_by_config[config] = resource_paths + resource_bundles
+          resources_by_config[config] = (resource_paths + resource_bundles).uniq
           resources_by_config[config] << bridge_support_file if bridge_support_file
         end
+        resources_by_config
+      end
+
+      # Creates a script that copies the resources to the bundle of the client
+      # target.
+      #
+      # @note   The bridge support file needs to be created before the prefix
+      #         header, otherwise it will not be added to the resources script.
+      #
+      # @return [void]
+      #
+      def create_copy_resources_script
+        path = target.copy_resources_script_path
         generator = Generator::CopyResourcesScript.new(resources_by_config, target.platform)
         generator.save_as(path)
         add_file_to_support_group(path)

data/lib/cocoapods/sources_manager.rb

@@ -210,7 +210,7 @@ module Pod
           UI.section "Updating spec repo `#{source.name}`" do
             Dir.chdir(source.repo) do
               begin
-                output = git!('pull --ff-only')
+                output = git! %w(pull --ff-only)
                 UI.puts output if show_output && !config.verbose?
               rescue Informative
                 UI.warn 'CocoaPods was not able to update the ' \
@@ -232,7 +232,7 @@ module Pod
       # @return [Bool] Whether the given source is a GIT repo.
       #
       def git_repo?(dir)
-        Dir.chdir(dir) { git('rev-parse  >/dev/null 2>&1') }
+        Dir.chdir(dir) { `git rev-parse >/dev/null 2>&1` }
         $?.success?
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.36.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,222 +17,222 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.36.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.36.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -250,40 +250,46 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- bin/pod
+- bin/sandbox-pod
+- lib/cocoapods.rb
+- lib/cocoapods/command.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/project.rb
+- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/repo/add.rb
 - lib/cocoapods/command/repo/lint.rb
 - lib/cocoapods/command/repo/list.rb
 - lib/cocoapods/command/repo/push.rb
 - lib/cocoapods/command/repo/remove.rb
 - lib/cocoapods/command/repo/update.rb
-- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
+- lib/cocoapods/command/spec.rb
 - lib/cocoapods/command/spec/cat.rb
 - lib/cocoapods/command/spec/create.rb
 - lib/cocoapods/command/spec/edit.rb
 - lib/cocoapods/command/spec/lint.rb
 - lib/cocoapods/command/spec/which.rb
-- lib/cocoapods/command/spec.rb
-- lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
+- lib/cocoapods/external_sources.rb
 - lib/cocoapods/external_sources/abstract_external_source.rb
 - lib/cocoapods/external_sources/downloader_source.rb
 - lib/cocoapods/external_sources/path_source.rb
 - lib/cocoapods/external_sources/podspec_source.rb
-- lib/cocoapods/external_sources.rb
 - lib/cocoapods/gem_version.rb
+- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/acknowledgements/markdown.rb
 - lib/cocoapods/generator/acknowledgements/plist.rb
-- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
@@ -294,50 +300,44 @@ files:
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/target_environment_header.rb
 - lib/cocoapods/generator/umbrella_header.rb
+- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
-- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/hooks/installer_representation.rb
 - lib/cocoapods/hooks/library_representation.rb
 - lib/cocoapods/hooks/pod_representation.rb
 - lib/cocoapods/hooks_manager.rb
+- lib/cocoapods/installer.rb
+- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
-- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/file_references_installer.rb
 - lib/cocoapods/installer/hooks_context.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
+- lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb
-- lib/cocoapods/installer/target_installer.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
 - lib/cocoapods/installer/user_project_integrator.rb
-- lib/cocoapods/installer.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/project.rb
-- lib/cocoapods/resolver/lazy_specification.rb
 - lib/cocoapods/resolver.rb
+- lib/cocoapods/resolver/lazy_specification.rb
+- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
 - lib/cocoapods/sandbox/path_list.rb
-- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sources_manager.rb
+- lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/pod_target.rb
-- lib/cocoapods/target.rb
-- lib/cocoapods/user_interface/error_report.rb
 - lib/cocoapods/user_interface.rb
+- lib/cocoapods/user_interface/error_report.rb
 - lib/cocoapods/validator.rb
-- lib/cocoapods.rb
-- bin/pod
-- bin/sandbox-pod
-- README.md
-- LICENSE
-- CHANGELOG.md
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -348,17 +348,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.