cocoapods-packager 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d954896203895e6ec38e5a01f5d0155248fc895
-  data.tar.gz: d8d67f9905eeb4e34be93f7d99e09ae95687075b
+  metadata.gz: 15cde4b2c4092c26aa0abbc1f1953b2b657829f9
+  data.tar.gz: 784ba7406652d2a6b60ad355172179e97671f58d
 SHA512:
-  metadata.gz: e0376f8996c3547760864624c32bc963c2d0f06252e46b5d22155bbe3d60966a7a6d828f0754699c02ccde6a7c1ef8bb9e572e9b8372cf9c4ee734ca9ea2d5e4
-  data.tar.gz: f13d44da50492ab6a0872ccfdf5acaecba626fa893f3af2fe24cb56216002663e7ea5f9e5db924ab41ca202e67ae023e70f9180d1633d9094a7c4afba902c6c9
+  metadata.gz: 4ae712975ce0b4a95f2e2dfab7ed2725b3996b20edec01a847cd24dbe6db54fe5c18dc6b6bb94158f1148873196d5a23081b96e6c79bf471e62ad40ea16be8b9
+  data.tar.gz: 025a25756bfb11ded60b81d13000b93e6368c02aa537d6c0ecac77a6d172aebbfdd657f120fe126b095e0e21c60ce0d193b04cc3b473bb1a275110f39329c0f0

data/.rubocop-cocoapods.yml

@@ -5,6 +5,7 @@ AllCops:
     - ./*.gemspec
   Exclude:
     - spec/fixtures/**/*
+    - vendor/**/*
 
 # At the moment not ready to be used
 # https://github.com/bbatsov/rubocop/issues/947

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   Exclude:
     - spec/**/*
     - spec/fixtures/**/*
+    - vendor/**/*
 
 Style/Tab:
   Enabled: false
@@ -14,3 +15,21 @@ Style/Tab:
 LineLength:
   Enabled: false
 
+ClassLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  EnforcedStyle: use_perl_names
+

data/.travis.yml

@@ -1,6 +1,9 @@
+osx_image: xcode7.3
 language: objective-c
 cache: bundler
 before_install:
 - bundle install
 - bundle exec pod repo update --silent
-script: bundle exec rake specs
+script:
+- bundle exec rake spec
+- bundle exec rubocop

data/Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem 'bacon'
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'
-  gem 'prettybacon', :git => 'https://github.com/irrationalfab/PrettyBacon.git', :branch => 'master'
+  gem 'prettybacon'
   gem 'coveralls', :require => false
+  gem 'rubocop'
 end

data/Gemfile.lock

@@ -1,55 +1,52 @@
-GIT
-  remote: https://github.com/irrationalfab/PrettyBacon.git
-  revision: 1eeb06f7d381acd65414b86b42fdf3538faae01c
-  branch: master
-  specs:
-    prettybacon (0.0.2)
-      bacon (~> 1.2)
-
 PATH
   remote: .
   specs:
-    cocoapods-packager (1.3.0)
-      cocoapods (>= 0.38.2)
+    cocoapods-packager (1.4.0)
+      cocoapods (>= 1.0.0, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ast (2.2.0)
     bacon (1.2.0)
-    claide (0.9.1)
-    cocoapods (0.38.2)
-      activesupport (>= 3.2.15)
-      claide (~> 0.9.1)
-      cocoapods-core (= 0.38.2)
-      cocoapods-downloader (~> 0.9.1)
-      cocoapods-plugins (~> 0.4.2)
-      cocoapods-stats (~> 0.5.3)
-      cocoapods-trunk (~> 0.6.1)
-      cocoapods-try (~> 0.4.5)
+    claide (1.0.0)
+    cocoapods (1.0.1)
+      activesupport (>= 4.0.2)
+      claide (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.0.1)
+      cocoapods-deintegrate (>= 1.0.0, < 2.0)
+      cocoapods-downloader (>= 1.0.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.0.0, < 2.0)
+      cocoapods-try (>= 1.0.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.3.1)
-      nap (~> 0.8)
-      xcodeproj (~> 0.26.3)
-    cocoapods-core (0.38.2)
-      activesupport (>= 3.2.15)
+      fourflusher (~> 0.3.0)
+      molinillo (~> 0.4.5)
+      nap (~> 1.0)
+      xcodeproj (>= 1.1.0, < 2.0)
+    cocoapods-core (1.0.1)
+      activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
-      nap (~> 0.8.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-plugins (0.4.2)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.0)
+    cocoapods-downloader (1.0.0)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-stats (0.5.3)
-      nap (~> 0.8)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.0.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.4.5)
+    cocoapods-try (1.0.0)
     colored (1.2)
     coveralls (0.8.2)
       json (~> 1.8)
@@ -61,26 +58,40 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     escape (0.0.4)
+    fourflusher (0.3.1)
     fuzzy_match (2.0.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     metaclass (0.0.4)
-    mime-types (2.6.1)
-    minitest (5.8.0)
+    mime-types (2.6.2)
+    minitest (5.9.0)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
-    molinillo (0.3.1)
-    nap (0.8.0)
+    molinillo (0.4.5)
+    nap (1.1.0)
     netrc (0.7.8)
+    parser (2.3.1.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
+    rainbow (2.1.0)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -96,9 +107,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    xcodeproj (0.26.3)
+    unicode-display_width (1.0.5)
+    xcodeproj (1.1.0)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
 
 PLATFORMS
@@ -111,8 +123,9 @@ DEPENDENCIES
   coveralls
   mocha (~> 0.11.4)
   mocha-on-bacon
-  prettybacon!
+  prettybacon
   rake
+  rubocop
 
 BUNDLED WITH
-   1.10.5
+   1.12.5

data/Rakefile

@@ -5,8 +5,8 @@ def specs(dir)
 end
 
 desc 'Runs all the specs'
-task :specs do
+task :spec do
   sh "bundle exec bacon #{specs('**')}"
 end
 
-task :default => :specs
+task :default => :spec

data/cocoapods-packager.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "cocoapods", ">= 0.38.2"
+  spec.add_dependency "cocoapods", '>= 1.0.0', '< 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/cocoapods-packager/builder.rb

@@ -1,12 +1,16 @@
 module Pod
   class Builder
-    def initialize(source_dir, sandbox_root, public_headers_root, spec, embedded, mangle)
+    def initialize(source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, exclude_deps)
       @source_dir = source_dir
-      @sandbox_root = sandbox_root
+      @static_sandbox_root = static_sandbox_root
+      @dynamic_sandbox_root = dynamic_sandbox_root
       @public_headers_root = public_headers_root
       @spec = spec
       @embedded = embedded
       @mangle = mangle
+      @dynamic = dynamic
+      @config = config
+      @exclude_deps = exclude_deps
     end
 
     def build(platform, library)
@@ -18,22 +22,31 @@ module Pod
     end
 
     def build_static_library(platform)
-      UI.puts('Building static library')
+      UI.puts("Building static library #{@spec} with configuration #{@config}")
 
       defines = compile(platform)
+      build_sim_libraries(platform, defines)
+
       platform_path = Pathname.new(platform.name.to_s)
       platform_path.mkdir unless platform_path.exist?
       build_library(platform, defines, platform_path + Pathname.new("lib#{@spec.name}.a"))
     end
 
     def build_framework(platform)
-      UI.puts('Building framework')
+      UI.puts("Building framework #{@spec} with configuration #{@config}")
 
       defines = compile(platform)
-      create_framework(platform.name.to_s)
-      copy_headers
-      build_library(platform, defines, @fwk.versions_path + Pathname.new(@spec.name))
-      copy_license
+      build_sim_libraries(platform, defines)
+
+      if @dynamic
+        build_dynamic_framework(platform, defines, "#{@dynamic_sandbox_root}/build/#{@spec.name}.framework/#{@spec.name}")
+      else
+        create_framework(platform.name.to_s)
+        build_library(platform, defines, @fwk.versions_path + Pathname.new(@spec.name))
+        copy_headers
+        copy_license
+      end
+
       copy_resources(platform)
     end
 
@@ -47,7 +60,18 @@ module Pod
       end
     end
 
-    :private
+    private
+
+    def build_dynamic_framework(platform, defines, output)
+      UI.puts("Building dynamic Framework #{@spec} with configuration #{@config}")
+
+      clean_directory_for_dynamic_build
+      if platform.name == :ios
+        build_dynamic_framework_for_ios(platform, defines, output)
+      else
+        build_dynamic_framework_for_mac(platform, defines, output)
+      end
+    end
 
     def build_library(platform, defines, output)
       static_libs = static_libs_in_sandbox
@@ -59,15 +83,53 @@ module Pod
       end
     end
 
-    def build_static_lib_for_ios(static_libs, defines, output)
+    def build_dynamic_framework_for_ios(platform, defines, output)
+      # Specify frameworks to link and search paths
+      linker_flags = static_linker_flags_in_sandbox
+      defines = "#{defines} OTHER_LDFLAGS='$(inherited) #{linker_flags.join(' ')}'"
+
+      # Build Target Dynamic Framework for both device and Simulator
+      device_defines = "#{defines} LIBRARY_SEARCH_PATHS=\"#{Dir.pwd}/#{@static_sandbox_root}/build\""
+      device_options = ios_build_options << ' -sdk iphoneos'
+      xcodebuild(device_defines, device_options, 'build', @spec.name.to_s, @dynamic_sandbox_root.to_s)
+
+      sim_defines = "#{defines} LIBRARY_SEARCH_PATHS=\"#{Dir.pwd}/#{@static_sandbox_root}/build-sim\" ONLY_ACTIVE_ARCH=NO"
+      xcodebuild(sim_defines, '-sdk iphonesimulator', 'build-sim', @spec.name.to_s, @dynamic_sandbox_root.to_s)
+
+      # Combine architectures
+      `lipo #{@dynamic_sandbox_root}/build/#{@spec.name}.framework/#{@spec.name} #{@dynamic_sandbox_root}/build-sim/#{@spec.name}.framework/#{@spec.name} -create -output #{output}`
+
+      FileUtils.mkdir(platform.name.to_s)
+      `mv #{@dynamic_sandbox_root}/build/#{@spec.name}.framework #{platform.name}`
+    end
+
+    def build_dynamic_framework_for_mac(platform, defines, _output)
+      # Specify frameworks to link and search paths
+      linker_flags = static_linker_flags_in_sandbox
+      defines = "#{defines} OTHER_LDFLAGS=\"#{linker_flags.join(' ')}\""
+
+      # Build Target Dynamic Framework for osx
+      defines = "#{defines} LIBRARY_SEARCH_PATHS=\"#{Dir.pwd}/#{@static_sandbox_root}/build\""
+      xcodebuild(defines, nil, 'build', @spec.name.to_s, @dynamic_sandbox_root.to_s)
+
+      FileUtils.mkdir(platform.name.to_s)
+      `mv #{@dynamic_sandbox_root}/build/#{@spec.name}.framework #{platform.name}`
+    end
+
+    def build_sim_libraries(platform, defines)
+      if platform.name == :ios
+        xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
+      end
+    end
+
+    def build_static_lib_for_ios(static_libs, _defines, output)
       return if static_libs.count == 0
-      `libtool -static -o #{@sandbox_root}/build/package.a #{static_libs.join(' ')}`
+      `libtool -static -o #{@static_sandbox_root}/build/package.a #{static_libs.join(' ')}`
 
-      xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
       sim_libs = static_libs_in_sandbox('build-sim')
-      `libtool -static -o #{@sandbox_root}/build-sim/package.a #{sim_libs.join(' ')}`
+      `libtool -static -o #{@static_sandbox_root}/build-sim/package.a #{sim_libs.join(' ')}`
 
-      `lipo #{@sandbox_root}/build/package.a #{@sandbox_root}/build-sim/package.a -create -output #{output}`
+      `lipo #{@static_sandbox_root}/build/package.a #{@static_sandbox_root}/build-sim/package.a -create -output #{output}`
     end
 
     def build_static_lib_for_mac(static_libs, output)
@@ -75,32 +137,37 @@ module Pod
       `libtool -static -o #{output} #{static_libs.join(' ')}`
     end
 
-    def build_with_mangling(platform)
+    def build_with_mangling(platform, options)
       UI.puts 'Mangling symbols'
-      defines = Symbols.mangle_for_pod_dependencies(@spec.name, @sandbox_root)
-      defines << " " << @spec.consumer(platform).compiler_flags.join(' ')
-
-      if platform.name == :ios
-        defines = "#{defines} ARCHS=\"x86_64 i386 arm64 armv7 armv7s\""
-      end
+      defines = Symbols.mangle_for_pod_dependencies(@spec.name, @static_sandbox_root)
+      defines << ' ' << @spec.consumer(platform).compiler_flags.join(' ')
 
       UI.puts 'Building mangled framework'
-      xcodebuild(defines)
+      xcodebuild(defines, options)
       defines
     end
 
+    def clean_directory_for_dynamic_build
+      # Remove static headers to avoid duplicate declaration conflicts
+      FileUtils.rm_rf("#{@static_sandbox_root}/Headers/Public/#{@spec.name}")
+      FileUtils.rm_rf("#{@static_sandbox_root}/Headers/Private/#{@spec.name}")
+
+      # Equivalent to removing derrived data
+      FileUtils.rm_rf('Pods/build')
+    end
+
     def compile(platform)
-      defines = "GCC_PREPROCESSOR_DEFINITIONS='PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
-      defines << " " << @spec.consumer(platform).compiler_flags.join(' ')
+      defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
+      defines << ' ' << @spec.consumer(platform).compiler_flags.join(' ')
 
       if platform.name == :ios
-        defines = "#{defines} ARCHS=\"x86_64 i386 arm64 armv7 armv7s\""
+        options = ios_build_options
       end
 
-      xcodebuild(defines)
+      xcodebuild(defines, options)
 
       if @mangle
-        return build_with_mangling(platform)
+        return build_with_mangling(platform, options)
       end
 
       defines
@@ -110,13 +177,13 @@ module Pod
       headers_source_root = "#{@public_headers_root}/#{@spec.name}"
 
       Dir.glob("#{headers_source_root}/**/*.h").
-          each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(headers_source_root, '')}` }
+        each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(headers_source_root, '')}` }
 
       # If custom 'module_map' is specified add it to the framework distribution
       # otherwise check if a header exists that is equal to 'spec.name', if so
       # create a default 'module_map' one using it.
       if !@spec.module_map.nil?
-        module_map_file = "#{@sandbox_root}/#{@spec.name}/#{@spec.module_map}"
+        module_map_file = "#{@static_sandbox_root}/#{@spec.name}/#{@spec.module_map}"
         module_map = File.read(module_map_file) if Pathname(module_map_file).exist?
       elsif File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
         module_map = <<MAP
@@ -137,22 +204,24 @@ MAP
 
     def copy_license
       license_file = @spec.license[:file] || 'LICENSE'
-      license_file = "#{@sandbox_root}/#{@spec.name}/#{license_file}"
       `cp "#{license_file}" .` if Pathname(license_file).exist?
     end
 
     def copy_resources(platform)
-      bundles = Dir.glob("#{@sandbox_root}/build/*.bundle")
-      `cp -rp #{@sandbox_root}/build/*.bundle #{@fwk.resources_path} 2>&1`
-
-      resources = expand_paths(@spec.consumer(platform).resources)
-      if resources.count == 0 && bundles.count == 0
-        @fwk.delete_resources
-        return
-      end
-
-      if resources.count > 0
-        `cp -rp #{resources.join(' ')} #{@fwk.resources_path}`
+      bundles = Dir.glob("#{@static_sandbox_root}/build/*.bundle")
+      if @dynamic
+        resources_path = "ios/#{@spec.name}.framework"
+        `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
+      else
+        `cp -rp #{@static_sandbox_root}/build/*.bundle #{@fwk.resources_path} 2>&1`
+        resources = expand_paths(@spec.consumer(platform).resources)
+        if resources.count == 0 && bundles.count == 0
+          @fwk.delete_resources
+          return
+        end
+        if resources.count > 0
+          `cp -rp #{resources.join(' ')} #{@fwk.resources_path}`
+        end
       end
     end
 
@@ -178,11 +247,33 @@ MAP
     end
 
     def static_libs_in_sandbox(build_dir = 'build')
-      Dir.glob("#{@sandbox_root}/#{build_dir}/lib*.a")
+      if @exclude_deps
+        UI.puts 'Excluding dependencies'
+        Dir.glob("#{@static_sandbox_root}/#{build_dir}/lib#{@spec.name}.a")
+      else
+        Dir.glob("#{@static_sandbox_root}/#{build_dir}/lib*.a")
+      end
     end
 
-    def xcodebuild(defines = '', args = '', build_dir = 'build')
-      command = "xcodebuild #{defines} CONFIGURATION_BUILD_DIR=#{build_dir} clean build #{args} -configuration Release -target Pods -project #{@sandbox_root}/Pods.xcodeproj 2>&1"
+    def static_linker_flags_in_sandbox
+      linker_flags = static_libs_in_sandbox.map do |lib|
+        lib.slice!('lib')
+        lib_flag = lib.chomp('.a').split('/').last
+        "-l#{lib_flag}"
+      end
+      linker_flags.reject { |e| e == "-l#{@spec.name}" || e == '-lPods-packager' }
+    end
+
+    def ios_build_options
+      "ARCHS=\'x86_64 i386 arm64 armv7 armv7s\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
+    end
+
+    def xcodebuild(defines = '', args = '', build_dir = 'build', target = 'Pods-packager', project_root = @static_sandbox_root, config = @config)
+      if defined?(Pod::DONT_CODESIGN)
+        args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
+      end
+
+      command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
       output = `#{command}`.lines.to_a
 
       if $?.exitstatus != 0