cocoapods 0.36.0.beta.1 → 0.36.0.beta.2

data/lib/cocoapods/installer/target_installer.rb

@@ -48,7 +48,7 @@ module Pod
         product.path = product_name
 
         target.user_build_configurations.each do |bc_name, type|
-          configuration = @native_target.add_build_configuration(bc_name, type)
+          @native_target.add_build_configuration(bc_name, type)
         end
 
         @native_target.build_configurations.each do |configuration|

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

@@ -114,14 +114,15 @@ module Pod
         library_targets = target.pod_targets.reject do |pod_target|
           pod_target.should_build? && pod_target.requires_frameworks?
         end
-        file_accessors = library_targets.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}.bundle" } }
-        resources = []
-        resources.concat(resource_paths)
-        resources.concat(resource_bundles)
-        resources << bridge_support_file if bridge_support_file
-        generator = Generator::CopyResourcesScript.new(resources, target.platform)
+        resources_by_config = {}
+        target.user_build_configurations.keys.each do |config|
+          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}.bundle" } }
+          resources_by_config[config] = resource_paths + resource_bundles
+          resources_by_config[config] << bridge_support_file if bridge_support_file
+        end
+        generator = Generator::CopyResourcesScript.new(resources_by_config, target.platform)
         generator.save_as(path)
         add_file_to_support_group(path)
       end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -38,7 +38,7 @@ module Pod
                 add_copy_resources_script_phase
                 add_check_manifest_lock_script_phase
                 true
-              end
+              end,
             ].any?
 
             if project_is_dirty
@@ -179,7 +179,7 @@ module Pod
         def add_copy_resources_script_phase
           phase_name = 'Copy Pods Resources'
           native_targets_to_integrate.each do |native_target|
-            phase = native_target.shell_script_build_phases.select { |bp| bp.name == phase_name }.first
+            phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
             phase ||= native_target.new_shell_script_build_phase(phase_name)
             script_path = target.copy_resources_script_relative_path
             phase.shell_script = %("#{script_path}"\n)

data/lib/cocoapods/sandbox.rb

@@ -231,8 +231,6 @@ module Pod
         path = specifications_root + "#{name}.podspec.json"
         if path.exist?
           path
-        else
-          nil
         end
       end
     end

data/lib/cocoapods/sandbox/headers_store.rb

@@ -96,7 +96,7 @@ module Pod
       # @return [void]
       #
       def add_search_path(path, platform)
-        @search_paths << {:platform => platform, :path => (Pathname.new(@relative_path) + path) }
+        @search_paths << { :platform => platform, :path => (Pathname.new(@relative_path) + path) }
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/sources_manager.rb

@@ -44,7 +44,7 @@ module Pod
             argv = [name, url]
             argv << '--shallow' if name =~ /^master(-\d+)?$/
             Command::Repo::Add.new(CLAide::ARGV.new(argv)).run
-          rescue Informative => e
+          rescue Informative
             raise Informative, "Unable to add a source with url `#{url}` " \
               "named `#{name}`.\nYou can try adding it manually in " \
               '`~/.cocoapods/repos` or via `pod repo add`.'
@@ -144,6 +144,7 @@ module Pod
       def updated_search_index
         unless @updated_search_index
           if search_index_path.exist?
+            require 'yaml'
             stored_index = YAML.load(search_index_path.read)
             if stored_index && stored_index.is_a?(Hash)
               search_index = aggregate.update_search_index(stored_index)
@@ -197,7 +198,7 @@ module Pod
               begin
                 output = git!('pull --ff-only')
                 UI.puts output if show_output && !config.verbose?
-              rescue Informative => e
+              rescue Informative
                 UI.warn 'CocoaPods was not able to update the ' \
                   "`#{source.name}` repo. If this is an unexpected issue " \
                   'and persists you can inspect it running ' \
@@ -314,7 +315,7 @@ module Pod
         return {} unless yaml_file.exist?
         begin
           YAMLHelper.load_file(yaml_file)
-        rescue Informative => e
+        rescue Informative
           raise Informative, "There was an error reading '#{yaml_file}'.\n" \
             'Please consult http://blog.cocoapods.org/' \
             'Repairing-Our-Broken-Specs-Repository/ ' \
@@ -415,7 +416,7 @@ module Pod
       #            # sourceforge-artsy-specs
       #
       # @example A file URL
-      # 
+      #
       #           name_for_url('file:///Artsy/Specs.git')
       #             # artsy-specs
       #
@@ -432,8 +433,8 @@ module Pod
           else
             base = ''
           end
-          base += path.gsub(/.git$/, '').gsub(/^\//, '').
-            split('/').join('-')
+
+          base + path.gsub(/.git$/, '').gsub(/^\//, '').split('/').join('-')
         end
 
         case url.to_s.downcase
@@ -441,7 +442,7 @@ module Pod
           base = 'master'
         when %r{github.com[:/]+(.+)/(.+)}
           base = Regexp.last_match[1]
-        when %r{^\S+@(\S+)[:/]+(.+)$}
+        when /^\S+@(\S+)[:\/]+(.+)$/
           host, path = Regexp.last_match.captures
           base = base_from_host_and_path[host, path]
         when URI.regexp

data/lib/cocoapods/target.rb

@@ -195,7 +195,7 @@ module Pod
     # @return [Pathname] the absolute path of the Info.plist file.
     #
     def info_plist_path
-      support_files_dir + "Info.plist"
+      support_files_dir + 'Info.plist'
     end
 
     # @return [Pathname] the path of the dummy source generated by CocoaPods

data/lib/cocoapods/target/aggregate_target.rb

@@ -55,6 +55,7 @@ module Pod
     #         will be integrated by this target.
     #
     def user_targets(project = nil)
+      return [] unless user_project_path
       project ||= Xcodeproj::Project.open(user_project_path)
       user_target_uuids.map do |uuid|
         native_target = project.objects_by_uuid[uuid]

data/lib/cocoapods/target/pod_target.rb

@@ -66,7 +66,7 @@ module Pod
     #
     def uses_swift?
       file_accessors.any? do |file_accessor|
-        file_accessor.source_files.any? { |sf| sf.extname == ".swift" }
+        file_accessor.source_files.any? { |sf| sf.extname == '.swift' }
       end
     end
 

data/lib/cocoapods/user_interface/error_report.rb

@@ -12,6 +12,12 @@ module Pod
 
 #{'――― MARKDOWN TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}
 
+### Command
+
+```
+#{original_command}
+```
+
 ### Report
 
 * What did you do?
@@ -137,6 +143,10 @@ EOS
             end
           end
         end
+
+        def original_command
+          "#{$PROGRAM_NAME} #{ARGV.join(' ')}"
+        end
       end
     end
   end

data/lib/cocoapods/validator.rb

@@ -167,7 +167,8 @@ module Pod
       types = results.map(&:type).uniq
       if    types.include?(:error)   then :error
       elsif types.include?(:warning) then :warning
-      else  :note end
+      else  :note
+      end
     end
 
     # @return [Symbol]
@@ -344,8 +345,10 @@ module Pod
               next
             end
 
-            if message.include?('error: ')
+            if message =~ /\S+:\d+:\d+: error:/
               error('xcodebuild', message)
+            elsif message =~ /\S+:\d+:\d+: warning:/
+              warning('xcodebuild', message)
             else
               note('xcodebuild', message)
             end
@@ -507,7 +510,7 @@ module Pod
           l.include?('note: ') && (l !~ /expanded from macro/)
       end
       selected_lines.map do |l|
-        new = l.gsub(/\/tmp\/CocoaPods\/Lint\/Pods\//, '')
+        new = l.gsub(%r{/tmp/CocoaPods/Lint/Pods/}, '')
         new.gsub!(/^ */, ' ')
       end
     end
@@ -517,7 +520,15 @@ module Pod
     #
     def xcodebuild
       UI.puts 'xcodebuild clean build -target Pods' if config.verbose?
-      `xcodebuild clean build -target Pods 2>&1`
+      output = `xcodebuild clean build -target Pods 2>&1`
+
+      unless $?.success?
+        message = 'Returned a unsuccessful exit code.'
+        message += ' You can use `--verbose` for more information.' unless config.verbose?
+        error('xcodebuild', message)
+      end
+
+      output
     end
 
     #-------------------------------------------------------------------------#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.36.0.beta.1
+  version: 0.36.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-01-28 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.beta.1
+        version: 0.36.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0.beta.1
+        version: 0.36.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -256,10 +256,20 @@ files:
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/project.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/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
@@ -353,3 +363,4 @@ signing_key:
 specification_version: 3
 summary: The Cocoa library package manager.
 test_files: []
+has_rdoc: