cocoapods-packager 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68350cb77545ef11604ac7139398932e10ca6f8
-  data.tar.gz: 747890a043aeb9cdefb008c0e1c6142c798991fd
+  metadata.gz: 8c849b6abc14bda5bbe67353b6bb80761e86257e
+  data.tar.gz: bac5200f10d47f6d6ce3ff83eaa6ac1ead83a4b1
 SHA512:
-  metadata.gz: 33e98e575824bc64a7b46faaa6b73e5cf0cb54f96a0ea1efadbb6cfa5b9d550e57ec82e27a02d334ed9fe2d47006e5dcab06077175144106c4dffac01edfaba9
-  data.tar.gz: c7257bec6e11d1274f0b2e8319129d1e0ab17eb44a2f9121fded44b6b2b87ee093ae3f2881288ed8e73ec07a4f95d0536b9e6f9bfa762171f8e2ce22cf5ba447
+  metadata.gz: 74c98ae789aad82d5beb092396f3c475277cd8f6f205ca7f6f1b65b6a70c5191d1093003b7cfd261e8907262197518c698925f628fad239f8a493eebac65cb72
+  data.tar.gz: f61e462a0a2040893f03a1bbf013d77984161a46342d2aee2efeb8f1c26dcf082f07d2f8f608fef29479d350198383ce711b35d4a9931f21c6f27c8d019bd958

data/.travis.yml

@@ -1,4 +1,6 @@
 language: objective-c
 cache: bundler
-before_install: bundle install
+before_install:
+- bundle install
+- bundle exec pod repo update --silent
 script: bundle exec rake specs

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'cocoapods', '>= 0.34.0'
+  gem 'cocoapods', '>= 0.36.0'
   gem 'bacon'
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'

data/Gemfile.lock

@@ -9,82 +9,85 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-packager (1.1.0)
+    cocoapods-packager (1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     bacon (1.2.0)
-    claide (0.7.0)
-    cocoapods (0.34.0)
-      activesupport (>= 3.2.15, < 4)
-      claide (~> 0.7.0)
-      cocoapods-core (= 0.34.0)
-      cocoapods-downloader (~> 0.7.0)
-      cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.2.0)
-      cocoapods-try (~> 0.4.0)
+    claide (0.8.1)
+    cocoapods (0.36.0)
+      activesupport (>= 3.2.15)
+      claide (~> 0.8.1)
+      cocoapods-core (= 0.36.0)
+      cocoapods-downloader (~> 0.8.1)
+      cocoapods-plugins (~> 0.4.1)
+      cocoapods-trunk (~> 0.6.0)
+      cocoapods-try (~> 0.4.3)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      json_pure (~> 1.8)
+      molinillo (~> 0.2.1)
       nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.19.2)
-    cocoapods-core (0.34.0)
+      xcodeproj (~> 0.23.0)
+    cocoapods-core (0.36.0)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
-      json_pure (~> 1.8)
       nap (~> 0.8.0)
-    cocoapods-downloader (0.7.0)
-    cocoapods-plugins (0.3.1)
+    cocoapods-downloader (0.8.1)
+    cocoapods-plugins (0.4.1)
       nap
-    cocoapods-trunk (0.2.0)
-      json_pure (~> 1.8)
+    cocoapods-trunk (0.6.0)
       nap (>= 0.8)
-      netrc
-    cocoapods-try (0.4.0)
+      netrc (= 0.7.8)
+    cocoapods-try (0.4.3)
     colored (1.2)
-    coveralls (0.7.1)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     docile (1.1.5)
     escape (0.0.4)
     fuzzy_match (2.0.4)
-    i18n (0.6.11)
-    json_pure (1.8.1)
+    i18n (0.7.0)
+    json (1.8.2)
     metaclass (0.0.4)
-    mime-types (2.3)
+    mime-types (2.4.3)
+    minitest (5.5.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
+    molinillo (0.2.1)
     multi_json (1.10.1)
     nap (0.8.0)
-    netrc (0.7.7)
+    netrc (0.7.8)
     open4 (1.3.4)
-    rake (10.3.2)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    simplecov (0.9.0)
+    rake (10.4.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.3.3)
-    xcodeproj (0.19.2)
-      CFPropertyList (~> 2.2)
-      activesupport (~> 3.0)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    thread_safe (0.3.4)
+    tins (0.13.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.23.0)
+      activesupport (>= 3)
       colored (~> 1.2)
 
 PLATFORMS
@@ -93,7 +96,7 @@ PLATFORMS
 DEPENDENCIES
   bacon
   bundler (~> 1.3)
-  cocoapods (>= 0.34.0)
+  cocoapods (>= 0.36.0)
   cocoapods-packager!
   coveralls
   mocha (~> 0.11.4)

data/Podfile.lock

@@ -0,0 +1,14 @@
+PODS:
+  - LibraryDemo (1.0.0)
+
+DEPENDENCIES:
+  - LibraryDemo (from `LibraryDemo.podspec`)
+
+EXTERNAL SOURCES:
+  LibraryDemo:
+    :podspec: LibraryDemo.podspec
+
+SPEC CHECKSUMS:
+  LibraryDemo: 45c4165cee78755e6ac7952f1af2a3d85a6c5fc3
+
+COCOAPODS: 0.36.0

data/lib/cocoapods-packager/builder.rb

@@ -20,7 +20,7 @@ module Pod
     def build_static_library(platform)
       UI.puts('Building static library')
 
-      defines = compile
+      defines = compile(platform)
       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"))
@@ -29,7 +29,7 @@ module Pod
     def build_framework(platform)
       UI.puts('Building framework')
 
-      defines = compile
+      defines = compile(platform)
       create_framework(platform.name.to_s)
       copy_headers
       build_library(platform, defines, @fwk.versions_path + Pathname.new(@spec.name))
@@ -60,6 +60,7 @@ module Pod
     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(' ')}`
 
       xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
@@ -70,25 +71,36 @@ module Pod
     end
 
     def build_static_lib_for_mac(static_libs, output)
+      return if static_libs.count == 0
       `libtool -static -o #{output} #{static_libs.join(' ')}`
     end
 
-    def build_with_mangling
+    def build_with_mangling(platform)
       UI.puts 'Mangling symbols'
       defines = Symbols.mangle_for_pod_dependencies(@spec.name, @sandbox_root)
+      if platform.name == :ios
+        defines = "#{defines} ARCHS=\"x86_64 i386 arm64 armv7 armv7s\""
+      end
+
       UI.puts 'Building mangled framework'
       xcodebuild(defines)
       defines
     end
 
-    def compile
-      xcodebuild
+    def compile(platform)
+      defines = "GCC_PREPROCESSOR_DEFINITIONS='PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
+
+      if platform.name == :ios
+        defines = "#{defines} ARCHS=\"x86_64 i386 arm64 armv7 armv7s\""
+      end
+
+      xcodebuild(defines)
 
       if dependency_count > 0 && @mangle
-        return build_with_mangling
+        return build_with_mangling(platform)
       end
 
-      ''
+      defines
     end
 
     def copy_headers
@@ -96,12 +108,26 @@ module Pod
 
       Dir.glob("#{headers_source_root}/**/*.h").
         each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(headers_source_root, '')}` }
+
+      if File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
+        module_map = <<MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}.h"
+
+  export *
+  module * { export * }
+}
+MAP
+
+        @fwk.module_map_path.mkpath unless @fwk.module_map_path.exist?
+        File.write("#{@fwk.module_map_path}/module.modulemap", module_map)
+      end
     end
 
     def copy_license
-      license_file = @spec.license[:file]
-      license_file = 'LICENSE' unless license_file
-      `cp "#{@sandbox_root}/#{@spec.name}/#{license_file}" .`
+      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)

data/lib/cocoapods-packager/framework.rb

@@ -1,6 +1,7 @@
 module Framework
   class Tree
     attr_reader :headers_path
+    attr_reader :module_map_path
     attr_reader :resources_path
     attr_reader :root_path
     attr_reader :versions_path
@@ -38,6 +39,7 @@ module Framework
       @fwk_path = @root_path + Pathname.new(@name + '.framework')
       @fwk_path.mkdir unless @fwk_path.exist?
 
+      @module_map_path = @fwk_path + Pathname.new('Modules')
       @versions_path = @fwk_path + Pathname.new('Versions/A')
     end
 

data/lib/cocoapods-packager/pod_utils.rb

@@ -17,6 +17,15 @@ module Pod
         installer = Installer.new(sandbox, podfile)
         installer.install!
 
+        unless installer.nil?
+          installer.pods_project.targets.each do |target|
+            target.build_configurations.each do |config|
+              config.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+            end
+          end
+          installer.pods_project.save
+        end
+
         sandbox
       end
 

data/lib/cocoapods-packager/symbols.rb

@@ -1,6 +1,6 @@
 module Symbols
   def symbols_from_library(library)
-    syms = `nm -g #{library}`.split("\n")
+    syms = `nm -gU #{library}`.split("\n")
 
     result = classes_from_symbols(syms)
     result + constants_from_symbols(syms)
@@ -12,7 +12,6 @@ module Symbols
 
   def classes_from_symbols(syms)
     classes = syms.select { |klass| klass[/OBJC_CLASS_\$_/] }
-    classes = classes.select { |klass| klass !~ /_NS|_UI/ }
     classes = classes.uniq
     classes.map! { |klass| klass.gsub(/^.*\$_/, '') }
   end

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/lib/pod/command/package.rb

@@ -54,7 +54,7 @@ module Pod
         target_dir, work_dir = create_working_directory
         return if target_dir.nil?
         build_package
-        `mv #{work_dir} #{target_dir}`
+        `mv "#{work_dir}" "#{target_dir}"`
         Dir.chdir(@source_dir)
       end
 

data/spec/command/error_spec.rb

@@ -6,6 +6,7 @@ module Pod
         Dir.glob("CPDColors-*").each { |dir| Pathname.new(dir).rmtree }
         Dir.glob("layer-client-messaging-schema-*").each { |dir| Pathname.new(dir).rmtree }
         Dir.glob("OpenSans-*").each { |dir| Pathname.new(dir).rmtree }
+        Dir.glob("Weakly-*").each { |dir| Pathname.new(dir).rmtree }
       end
 
     it 'presents the help if a directory is provided' do
@@ -48,5 +49,12 @@ module Pod
       bundles = Dir.glob('OpenSans-*/ios/OpenSans.framework/Versions/A/Resources/*.bundle')
       bundles.count.should == 1
     end
+
+    it 'can package a podspec with weak frameworks without strong linking' do
+      command = Command.parse(%w{ package spec/fixtures/Weakly.podspec })
+      command.run
+
+      `otool -l Weakly-*/ios/Weakly.framework/Weakly`.should.not.match /AssetsLibrary/
+    end
   end
 end

data/spec/command/package_spec.rb

@@ -65,6 +65,17 @@ module Pod
         symbols.should == []
       end
 
+      it "includes the correct architectures when packaging an iOS Pod" do
+        SourcesManager.stubs(:search).returns(nil)
+
+        command = Command.parse(%w{ package spec/fixtures/NikeKit.podspec })
+        command.run
+
+        lib = Dir.glob("NikeKit-*/ios/NikeKit.framework/NikeKit").first
+        `lipo #{lib} -verify_arch armv7 armv7s arm64`
+        $?.success?.should == true
+      end
+
       it "does not fail when the pod name contains a dash" do
         SourcesManager.stubs(:search).returns(nil)
 

data/spec/fixtures/KFData.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'KFData'
-  s.version = '1.0.1'
+  s.version = '1.0.5'
   s.license = 'BSD'
   s.summary = 'Lightweight Core Data wrapper.'
   s.homepage = 'https://github.com/kylef/KFData'
@@ -17,10 +17,17 @@ Pod::Spec.new do |s|
   s.header_dir = 'KFData'
 
   s.subspec 'Attribute' do |attribute_spec|
+    attribute_spec.dependency 'QueryKit', '~> 0.8.3'
     attribute_spec.ios.source_files = 'KFData/Attribute/*.{h,m}'
     attribute_spec.osx.source_files = 'KFData/Attribute/*.{h,m}'
   end
 
+  s.subspec 'Manager' do |manager_spec|
+    manager_spec.dependency 'QueryKit', '~> 0.8.3'
+    manager_spec.ios.source_files = 'KFData/Manager/*.{h,m}'
+    manager_spec.osx.source_files = 'KFData/Manager/*.{h,m}'
+  end
+
   s.subspec 'Core' do |corespec|
     corespec.ios.frameworks = 'CoreData'
     corespec.ios.source_files = 'KFData/KFData.h', 'KFData/Core/*.{h,m}'
@@ -42,7 +49,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'UI' do |uispec|
-    uispec.dependency 'KFData/Essentials'
+    uispec.dependency 'KFData/Manager'
     uispec.platform = :ios
     uispec.ios.frameworks = 'UIKit'
     uispec.ios.source_files = 'KFData/UI/*.{h,m}'
@@ -52,11 +59,13 @@ Pod::Spec.new do |s|
    essentialsspec.dependency 'KFData/Core'
    essentialsspec.dependency 'KFData/Store'
    essentialsspec.dependency 'KFData/Attribute'
+   essentialsspec.dependency 'KFData/Manager'
    essentialsspec.ios.dependency 'KFData/UI'
   end
 
   s.subspec 'Compatibility' do |cspec|
     cspec.dependency 'KFData/Core'
+    cspec.dependency 'KFData/Manager'
     cspec.header_dir = 'KFData/Compatibility'
     cspec.source_files = 'KFData/Compatibility/*.{h,m}'
   end

data/spec/fixtures/LibraryConsumerDemo/.gitignore

@@ -0,0 +1,22 @@
+## CocoaPods
+
+Pods
+Podfile.lock
+LibraryConsumer.xcworkspace
+
+## Node
+
+node_modules
+
+## OS X
+
+.DS_Store
+
+## Other
+
+.pt
+
+## Xcode
+
+*.xccheckout
+xcuserdata