cocoapods 0.35.0 → 0.36.0.beta.1

data/README.md

@@ -1,6 +1,6 @@
 ![CocoaPods Logo](https://raw.github.com/CocoaPods/shared_resources/master/assets/cocoapods-banner-readme.png)
 
-### CocoaPods: The Objective-C dependency manager
+### CocoaPods: The Cocoa dependency manager
 
 [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CocoaPods)
 [![Gem Version](http://img.shields.io/gem/v/cocoapods.svg?style=flat)](http://badge.fury.io/rb/cocoapods)

data/lib/cocoapods.rb

@@ -56,9 +56,13 @@ module Pod
     autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
+    autoload :EmbedFrameworksScript,   'cocoapods/generator/embed_frameworks_script'
     autoload :Header,                  'cocoapods/generator/header'
+    autoload :InfoPlistFile,           'cocoapods/generator/info_plist_file'
+    autoload :ModuleMap,               'cocoapods/generator/module_map'
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :TargetEnvironmentHeader, 'cocoapods/generator/target_environment_header'
+    autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
   end
 

data/lib/cocoapods/command.rb

@@ -28,8 +28,8 @@ module Pod
     self.abstract_command = true
     self.command = 'pod'
     self.version = VERSION
-    self.description = 'CocoaPods, the Objective-C library package manager.'
-    self.plugin_prefix = 'cocoapods'
+    self.description = 'CocoaPods, the Cocoa library package manager.'
+    self.plugin_prefixes = %w(claide cocoapods)
 
     [Install, Update, Outdated, IPC::Podfile, IPC::Repl].each { |c| c.send(:include, ProjectDirectory) }
 

data/lib/cocoapods/command/inter_process_communication.rb

@@ -30,7 +30,7 @@ module Pod
         def run
           require 'json'
           spec = Specification.from_file(@path)
-          output_pipe.puts(JSON.pretty_generate(spec))
+          output_pipe.puts(spec.to_pretty_json)
         end
       end
 

data/lib/cocoapods/command/lib.rb

@@ -113,6 +113,7 @@ module Pod
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+           ['--use-frameworks', 'Lint uses frameworks to install the spec'],
            ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
@@ -124,6 +125,7 @@ module Pod
           @clean           = argv.flag?('clean', true)
           @subspecs        = argv.flag?('subspecs', true)
           @only_subspec    = argv.option('subspec')
+          @use_frameworks  = argv.flag?('use-frameworks')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @podspecs_paths  = argv.arguments!
           super
@@ -144,6 +146,7 @@ module Pod
             validator.allow_warnings = @allow_warnings
             validator.no_subspecs    = !@subspecs || @only_subspec
             validator.only_subspec   = @only_subspec
+            validator.use_frameworks = @use_frameworks
             validator.validate
 
             unless @clean

data/lib/cocoapods/command/list.rb

@@ -34,41 +34,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
-      class New < List
-        self.summary = 'Lists pods introduced in the master spec-repo since the last check'
-
-        def run
-          update_if_necessary!
-
-          days = [1, 2, 3, 5, 8]
-          dates, groups = {}, {}
-          days.each { |d| dates[d] = Time.now - 60 * 60 * 24 * d }
-          sets = SourcesManager.aggregate.all_sets
-          statistics_provider = Config.instance.spec_statistics_provider
-          creation_dates = statistics_provider.creation_dates(sets)
-
-          sets.each do |set|
-            set_date = creation_dates[set.name]
-            days.each do |d|
-              if set_date >= dates[d]
-                groups[d] = [] unless groups[d]
-                groups[d] << set
-                break
-              end
-            end
-          end
-          days.reverse.each do |d|
-            sets = groups[d]
-            next unless sets
-            UI.section("\nPods added in the last #{'day'.pluralize(d)}".yellow) do
-              sorted = sets.sort_by { |s| creation_dates[s.name] }
-              mode = @stats ? :stats : :name
-              sorted.each { |set| UI.pod(set, mode, statistics_provider) }
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/cocoapods/command/search.rb

@@ -84,11 +84,10 @@ module Pod
           sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:osx) }
         end
 
-        statistics_provider = Config.instance.spec_statistics_provider
         sets.each do |set|
           begin
             if @stats
-              UI.pod(set, :stats, statistics_provider)
+              UI.pod(set, :stats)
             else
               UI.pod(set, :normal)
             end

data/lib/cocoapods/command/spec.rb

@@ -68,6 +68,7 @@ module Pod
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+           ['--use-frameworks', 'Lint uses frameworks to install the spec'],
            ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
@@ -79,6 +80,7 @@ module Pod
           @clean           = argv.flag?('clean', true)
           @subspecs        = argv.flag?('subspecs', true)
           @only_subspec    = argv.option('subspec')
+          @use_frameworks  = argv.flag?('use-frameworks')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @podspecs_paths = argv.arguments!
           super
@@ -94,6 +96,7 @@ module Pod
             validator.allow_warnings = @allow_warnings
             validator.no_subspecs    = !@subspecs || @only_subspec
             validator.only_subspec   = @only_subspec
+            validator.use_frameworks = @use_frameworks
             validator.validate
             invalid_count += 1 unless validator.validated?
 
@@ -432,7 +435,7 @@ module Pod
 
       #--------------------------------------#
 
-      # Templates and github information retrieval for spec create
+      # Templates and GitHub information retrieval for spec create
       #
       # @todo It would be nice to have a template class that accepts options
       #       and uses the default ones if not provided.
@@ -580,8 +583,8 @@ Pod::Spec.new do |s|
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
   #  CocoaPods is smart about how it includes source code. For source files
-  #  giving a folder will include any h, m, mm, c & cpp files. For header
-  #  files it will include any header in the folder.
+  #  giving a folder will include any swift, h, m, mm, c & cpp files.
+  #  For header files it will include any header in the folder.
   #  Not including the public_header_files will make all headers public.
   #
 

data/lib/cocoapods/config.rb

@@ -225,31 +225,12 @@ module Pod
       @default_test_podfile_path ||= templates_dir + 'Podfile.test'
     end
 
-    # @return [Pathname] The file to use a cache of the statistics provider.
-    #
-    def statistics_cache_file
-      cache_root + 'statistics.yml'
-    end
-
     # @return [Pathname] The file to use to cache the search data.
     #
     def search_index_file
       cache_root + 'search_index.yaml'
     end
 
-    public
-
-    #-------------------------------------------------------------------------#
-
-    # @!group Dependency Injection
-
-    # @return [Specification::Set::Statistics] The statistic provider to use
-    #         for specifications.
-    #
-    def spec_statistics_provider
-      Specification::Set::Statistics.new(statistics_cache_file)
-    end
-
     private
 
     #-------------------------------------------------------------------------#
@@ -283,7 +264,7 @@ module Pod
       'CocoaPods.podfile.yaml',
       'CocoaPods.podfile',
       'Podfile',
-    ]
+    ].freeze
 
     public
 

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -138,6 +138,10 @@ module Pod
       # @return [void]
       #
       def store_podspec(sandbox, spec, json = false)
+        if spec.is_a? Pathname
+          spec = Specification.from_file(spec).to_pretty_json
+          json = true
+        end
         sandbox.store_podspec(name, spec, true, json)
       end
     end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -0,0 +1,107 @@
+module Pod
+  module Generator
+    class EmbedFrameworksScript
+      # @return [TargetDefinition] The target definition, whose label will be
+      #         used to locate the target-specific build products.
+      #
+      attr_reader :target_definition
+
+      # @return [Hash{String, Array{String}] Multiple lists of frameworks per
+      #         configuration.
+      #
+      attr_reader :frameworks_by_config
+
+      # @param  [TargetDefinition] target_definition
+      #         @see #target_definition
+      #
+      # @param  [Hash{String, Array{String}] frameworks_by_config
+      #         @see #frameworks_by_config
+      #
+      def initialize(target_definition, frameworks_by_config)
+        @target_definition = target_definition
+        @frameworks_by_config = frameworks_by_config
+      end
+
+      # Saves the resource script to the given pathname.
+      #
+      # @param  [Pathname] pathname
+      #         The path where the embed frameworks script should be saved.
+      #
+      # @return [void]
+      #
+      def save_as(pathname)
+        pathname.open('w') do |file|
+          file.puts(script)
+        end
+        File.chmod(0755, pathname.to_s)
+      end
+
+      private
+
+      # @!group Private Helpers
+
+      # @return [String] The contents of the embed frameworks script.
+      #
+      def script
+        script = <<-eos.strip_heredoc
+          #!/bin/sh
+          set -e
+
+          echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+          mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+          SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+
+          install_framework()
+          {
+            local source="${BUILT_PRODUCTS_DIR}/#{target_definition.label}/$1"
+            local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+            if [ -L ${source} ]; then
+                echo "Symlinked..."
+                source=$(readlink "${source}")
+            fi
+
+            # use filter instead of exclude so missing patterns dont' throw errors
+            echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers/\" --filter \"- PrivateHeaders/\" ${source} ${destination}"
+            rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" "${source}" "${destination}"
+            # Resign the code if required by the build settings to avoid unstable apps
+            if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
+                code_sign "${destination}/$1"
+            fi
+
+            # Embed linked Swift runtime libraries
+            local basename
+            basename=$(echo $1 | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]})
+            local swift_runtime_libs
+            swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+            for lib in $swift_runtime_libs; do
+              echo "rsync -av \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
+              rsync -av "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+            done
+          }
+
+          # Signs a framework with the provided identity
+          code_sign() {
+            # Use the current code_sign_identitiy
+            echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+            echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
+            /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+          }
+
+        eos
+        script += "\n" unless frameworks_by_config.values.all?(&:empty?)
+        frameworks_by_config.each do |config, frameworks|
+          unless frameworks.empty?
+            script += %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
+            frameworks.each do |framework|
+              script += "  install_framework '#{framework}'\n"
+            end
+            script += "fi\n"
+          end
+        end
+        script
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/header.rb

@@ -13,7 +13,11 @@ module Pod
 
       # @return [Array<String>] The list of the headers to import.
       #
-      attr_reader :imports
+      attr_accessor :imports
+
+      # @return [Array<String>] The list of the modules to import.
+      #
+      attr_accessor :module_imports
 
       # @param  [Symbol] platform
       #         @see platform
@@ -21,6 +25,7 @@ module Pod
       def initialize(platform)
         @platform = platform
         @imports = []
+        @module_imports = []
       end
 
       # Generates the contents of the header according to the platform.
@@ -41,6 +46,13 @@ module Pod
           result << %|#import "#{import}"\n|
         end
 
+        unless module_imports.empty?
+          module_imports.each do |import|
+            result << %|\n@import #{import}|
+          end
+          result << "\n"
+        end
+
         result
       end
 

data/lib/cocoapods/generator/info_plist_file.rb

@@ -0,0 +1,84 @@
+module Pod
+  module Generator
+    # Generates Info.plist files. A Info.plist file is generated for each
+    # Pod and for each Pod target definition, that requires to be built as
+    # framework. It states public attributes.
+    #
+    class InfoPlistFile
+      # @return [Target] the target represented by this Info.plist.
+      #
+      attr_reader :target
+
+      # @param  [Target] target @see target
+      #
+      def initialize(target)
+        @target = target
+      end
+
+      # Generates and saves the Info.plist to the given path.
+      #
+      # @param  [Pathname] path
+      #         the path where the prefix header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        contents = generate
+        path.open('w') do |f|
+          f.write(contents)
+        end
+      end
+
+      # The version associated with the current target
+      #
+      # @note Will return 1.0.0 for the AggregateTarget
+      #
+      # @return [String]
+      #
+      def target_version
+        if target && target.respond_to?(:root_spec)
+          target.root_spec.version.to_s
+        else
+          '1.0.0'
+        end
+      end
+
+      # Generates the contents of the Info.plist
+      #
+      # @return [String]
+      #
+      def generate
+        FILE_CONTENTS.sub('${CURRENT_PROJECT_VERSION_STRING}', target_version)
+      end
+
+      FILE_CONTENTS = <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>${CURRENT_PROJECT_VERSION_STRING}</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
+      EOS
+    end
+  end
+end