cocoapods-packager 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c849b6abc14bda5bbe67353b6bb80761e86257e
-  data.tar.gz: bac5200f10d47f6d6ce3ff83eaa6ac1ead83a4b1
+  metadata.gz: 000570243f14d96b7675a8ba1807ff16f73211e7
+  data.tar.gz: 71846e4374dd39f08051e48986c7e75623211fad
 SHA512:
-  metadata.gz: 74c98ae789aad82d5beb092396f3c475277cd8f6f205ca7f6f1b65b6a70c5191d1093003b7cfd261e8907262197518c698925f628fad239f8a493eebac65cb72
-  data.tar.gz: f61e462a0a2040893f03a1bbf013d77984161a46342d2aee2efeb8f1c26dcf082f07d2f8f608fef29479d350198383ce711b35d4a9931f21c6f27c8d019bd958
+  metadata.gz: affc675c70cf6fbf4eb14974ae1f804bf96b2f6f8b05fa5f04dd19788b459168bcd79a305c00c22099514f053c9471c528c31f1dc852ed26f3210edb0ec982ab
+  data.tar.gz: 281f240dde0b63c45dc9691506eac825ea847d1406d8a5bfce4e6914d6a2dcef5b91e9cdfc13cb28c3e40c43d5c924265511a07b9105bcaa7ddc5a2ce838a4e0

data/Gemfile

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

data/Gemfile.lock

@@ -9,12 +9,12 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-packager (1.1.1)
+    cocoapods-packager (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -22,31 +22,30 @@ GEM
       tzinfo (~> 1.1)
     bacon (1.2.0)
     claide (0.8.1)
-    cocoapods (0.36.0)
+    cocoapods (0.37.1)
       activesupport (>= 3.2.15)
       claide (~> 0.8.1)
-      cocoapods-core (= 0.36.0)
-      cocoapods-downloader (~> 0.8.1)
-      cocoapods-plugins (~> 0.4.1)
+      cocoapods-core (= 0.37.1)
+      cocoapods-downloader (~> 0.9.0)
+      cocoapods-plugins (~> 0.4.2)
       cocoapods-trunk (~> 0.6.0)
-      cocoapods-try (~> 0.4.3)
+      cocoapods-try (~> 0.4.4)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.2.1)
+      molinillo (~> 0.2.3)
       nap (~> 0.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.23.0)
-    cocoapods-core (0.36.0)
+      xcodeproj (~> 0.24.1)
+    cocoapods-core (0.37.1)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
-    cocoapods-downloader (0.8.1)
-    cocoapods-plugins (0.4.1)
+    cocoapods-downloader (0.9.0)
+    cocoapods-plugins (0.4.2)
       nap
     cocoapods-trunk (0.6.0)
       nap (>= 0.8)
       netrc (= 0.7.8)
-    cocoapods-try (0.4.3)
+    cocoapods-try (0.4.4)
     colored (1.2)
     coveralls (0.7.2)
       multi_json (~> 1.3)
@@ -61,16 +60,15 @@ GEM
     json (1.8.2)
     metaclass (0.0.4)
     mime-types (2.4.3)
-    minitest (5.5.1)
+    minitest (5.6.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
-    molinillo (0.2.1)
+    molinillo (0.2.3)
     multi_json (1.10.1)
     nap (0.8.0)
     netrc (0.7.8)
-    open4 (1.3.4)
     rake (10.4.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -82,11 +80,11 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tins (0.13.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.23.0)
+    xcodeproj (0.24.1)
       activesupport (>= 3)
       colored (~> 1.2)
 
@@ -96,7 +94,7 @@ PLATFORMS
 DEPENDENCIES
   bacon
   bundler (~> 1.3)
-  cocoapods (>= 0.36.0)
+  cocoapods (>= 0.37.0)
   cocoapods-packager!
   coveralls
   mocha (~> 0.11.4)

data/lib/cocoapods-packager/builder.rb

@@ -78,6 +78,8 @@ module Pod
     def build_with_mangling(platform)
       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
@@ -89,6 +91,7 @@ module Pod
 
     def compile(platform)
       defines = "GCC_PREPROCESSOR_DEFINITIONS='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\""
@@ -107,9 +110,15 @@ 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, '')}` }
-
-      if File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
+          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.read(module_map_file) if Pathname(module_map_file).exist?
+      elsif File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
         module_map = <<MAP
 framework module #{@spec.name} {
   umbrella header "#{@spec.name}.h"
@@ -118,7 +127,9 @@ framework module #{@spec.name} {
   module * { export * }
 }
 MAP
+      end
 
+      unless module_map.nil?
         @fwk.module_map_path.mkpath unless @fwk.module_map_path.exist?
         File.write("#{@fwk.module_map_path}/module.modulemap", module_map)
       end
@@ -171,7 +182,19 @@ MAP
     end
 
     def xcodebuild(defines = '', args = '', build_dir = 'build')
-      `xcodebuild #{defines} CONFIGURATION_BUILD_DIR=#{build_dir} clean build #{args} -configuration Release -target Pods -project #{@sandbox_root}/Pods.xcodeproj 2>&1`
+      command = "xcodebuild #{defines} CONFIGURATION_BUILD_DIR=#{build_dir} clean build #{args} -configuration Release -target Pods -project #{@sandbox_root}/Pods.xcodeproj 2>&1"
+      output = `#{command}`.lines.to_a
+
+      if $?.exitstatus != 0
+        puts UI::BuildFailedReport.report(command, output)
+
+        # Note: We use `Process.exit` here because it fires a `SystemExit`
+        # exception, which gives the caller a chance to clean up before the
+        # process terminates.
+        #
+        # See http://ruby-doc.org/core-1.9.3/Process.html#method-c-exit
+        Process.exit
+      end
     end
   end
 end

data/lib/cocoapods-packager/user_interface/build_failed_report.rb

@@ -0,0 +1,15 @@
+module Pod
+  module UserInterface
+    module BuildFailedReport
+      class << self
+        def report(command, output)
+          <<-EOF
+Build command failed: #{command}
+Output:
+#{output.map { |line| "    #{line}" }.join}
+          EOF
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods_packager.rb

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

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,5 @@
 require 'pod/command/package'
+require 'cocoapods-packager/user_interface/build_failed_report'
 require 'cocoapods-packager/builder'
 require 'cocoapods-packager/framework'
 require 'cocoapods-packager/mangle'

data/lib/pod/command/package.rb

@@ -67,10 +67,13 @@ module Pod
 
         sandbox = install_pod(platform.name)
 
-        perform_build(platform, sandbox)
+        begin
+          perform_build(platform, sandbox)
 
-        Pathname.new(config.sandbox_root).rmtree
-        FileUtils.rm_f('Podfile.lock')
+        ensure # in case the build fails; see Builder#xcodebuild.
+          Pathname.new(config.sandbox_root).rmtree
+          FileUtils.rm_f('Podfile.lock')
+        end
       end
 
       def build_package

data/spec/command/package_spec.rb

@@ -8,6 +8,7 @@ module Pod
         Dir.glob("NikeKit-*").each { |dir| Pathname.new(dir).rmtree }
         Dir.glob("foo-bar-*").each { |dir| Pathname.new(dir).rmtree }
         Dir.glob("a-*").each { |dir| Pathname.new(dir).rmtree }
+        Dir.glob("FH-*").each { |dir| Pathname.new(dir).rmtree }
       end
 
       it 'registers itself' do
@@ -94,6 +95,24 @@ module Pod
         true.should == true  # To make the test pass without any shoulds
       end
 
+      it "it respects module_map directive" do
+        SourcesManager.stubs(:search).returns(nil)
+
+        command = Command.parse(%w{ package spec/fixtures/FH.podspec })
+        command.run
+
+        modulemap_contents = File.read(Dir.glob("FH-*/ios/FH.framework/Modules/module.modulemap").first)
+        module_map = <<MAP
+framework module FH {
+  umbrella header "FeedHenry.h"
+
+  export *
+  module * { export * }
+}
+MAP
+        modulemap_contents.should == module_map
+      end
+
       #it "runs with a spec in the master repository" do
       #  command = Command.parse(%w{ package KFData })
       #  command.run

data/spec/fixtures/Builder.podspec

@@ -11,11 +11,15 @@ Pod::Spec.new do |s|
   s.libraries               = 'xml2'
   s.requires_arc            = true
   s.xcconfig                = { 'OTHER_LDFLAGS' => '-lObjC' }
+  s.compiler_flag           = "-DBASE_FLAG"
 
   s.ios.frameworks          = 'Foundation'
   s.ios.deployment_target   = '8.0'
+  s.ios.compiler_flag       = "-DIOS_FLAG"
 
   s.osx.frameworks          = 'AppKit'
+  s.osx.deployment_target   = "10.8"
   s.osx.requires_arc        = false
   s.osx.xcconfig            = { 'CFLAGS' => '-I.' }
-end
+  s.osx.compiler_flag       = "-DOSX_FLAG"
+end

data/spec/fixtures/FH.podspec

@@ -0,0 +1,18 @@
+Pod::Spec.new do |s|
+  s.name         = 'FH'
+  s.version      = '2.2.8'
+  s.summary      = 'FeedHenry iOS Software Development Kit'
+  s.homepage     = 'https://www.feedhenry.com'
+  s.social_media_url = 'https://twitter.com/feedhenry'
+  s.license      = 'FeedHenry'
+  s.author       = 'Red Hat, Inc.'
+  s.source       = { :git => 'https://github.com/cvasilak/fh-ios-sdk.git', :branch => 'module_map' }
+  s.platform     = :ios, 7.0
+  s.source_files = 'fh-ios-sdk/**/*.{h,m}'
+  s.public_header_files =  'fh-ios-sdk/FeedHenry.h', 'fh-ios-sdk/FH.h', 'fh-ios-sdk/FHAct.h', 'fh-ios-sdk/FHActRequest.h', 'fh-ios-sdk/FHAuthRequest.h', 'fh-ios-sdk/FHCloudProps.h', 'fh-ios-sdk/FHCloudRequest.h', 'fh-ios-sdk/FHConfig.h', 'fh-ios-sdk/FHResponse.h', 'fh-ios-sdk/FHResponseDelegate.h', 'fh-ios-sdk/Sync/FHSyncClient.h', 'fh-ios-sdk/Sync/FHSyncConfig.h', 'fh-ios-sdk/Sync/FHSyncNotificationMessage.h', 'fh-ios-sdk/Sync/FHSyncDelegate.h', 'fh-ios-sdk/Categories/JSON/FHJSON.h', 'fh-ios-sdk/FHDataManager.h'
+  s.module_map = 'fh-ios-sdk/module.modulemap'
+  s.requires_arc = true
+  s.libraries = 'xml2', 'z'
+  s.dependency 'ASIHTTPRequest/Core', '1.8.2'
+  s.dependency 'Reachability', '3.2'
+end

data/spec/fixtures/PackagerTest/Podfile.lock

@@ -25,6 +25,6 @@ DEPENDENCIES:
   - AFNetworking
 
 SPEC CHECKSUMS:
-  AFNetworking: 6d7b76aa5d04c8c37daad3eef4b7e3f2a7620da3
+  AFNetworking: 05b9f6e3aa5ac45bc383b4bb108ef338080a26c7
 
-COCOAPODS: 0.36.0
+COCOAPODS: 0.37.1

data/spec/fixtures/Weakly.podspec

@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.source       = { :git => "https://github.com/neonichu/CPDColors.git", :tag => s.version }
   s.source_files = 'Code'
-  
-  s.dependency 'PromiseKit'
+
+  s.dependency 'PromiseKit', '~> 1.5'
 end

data/spec/specification/builder_spec.rb

@@ -1,56 +1,40 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 module Pod
-  describe SpecBuilder do
-    def compare_attributes(first_spec, second_spec, attribute_name)
-      first_spec.attributes_hash[attribute_name].should ==
-        second_spec.attributes_hash[attribute_name]
-
-      %w(ios osx).each do |platform|
-        first_spec.attributes_hash[platform][attribute_name].should ==
-          second_spec.attributes_hash[platform][attribute_name]
+  describe Builder do
+    describe 'Xcodebuild command' do
+      describe 'compiler flags' do
+        before do
+          @spec = Specification.from_file('spec/fixtures/Builder.podspec')
+          @builder = Builder.new(nil, nil, nil, @spec, nil, nil)
+        end
+
+        it "includes proper compiler flags for iOS" do
+          @builder.expects(:xcodebuild).with('GCC_PREPROCESSOR_DEFINITIONS=\'PodsDummy_Pods_Builder=PodsDummy_PodPackage_Builder\' -DBASE_FLAG -DIOS_FLAG ARCHS="x86_64 i386 arm64 armv7 armv7s"').returns(nil)
+          @builder.compile(Platform.new(:ios))
+        end
+
+        it "includes proper compiler flags for OSX" do
+          @builder.expects(:xcodebuild).with("GCC_PREPROCESSOR_DEFINITIONS='PodsDummy_Pods_Builder=PodsDummy_PodPackage_Builder' -DBASE_FLAG -DOSX_FLAG").returns(nil)
+          @builder.compile(Platform.new(:osx))
+        end
       end
-    end
 
-    def specification_from_builder(builder)
-      spec_string = builder.spec_metadata
-      spec_string += builder.spec_platform(Platform.ios)
-      spec_string += builder.spec_platform(Platform.osx)
-      spec_string += builder.spec_close
+      describe 'on build failure' do
+        before do
+          @spec = Specification.from_file('spec/fixtures/Builder.podspec')
+          @builder = Builder.new(nil, nil, nil, @spec, nil, nil)
+        end
 
-      return Specification.from_string(spec_string, 'Builder.podspec')
-    end
+        it 'dumps report and terminates' do
+          UI::BuildFailedReport.expects(:report).returns(nil)
 
-  	describe 'Preserve attributes from source specification' do
-      before do
-        @spec = Specification.from_file('spec/fixtures/Builder.podspec')
-        @builder = SpecBuilder.new(@spec, nil, false)
+          should.raise SystemExit do
+            # TODO: check that it dumps report
+            @builder.compile(Platform.new(:ios))
+          end
+        end
       end
-
-  		it "preserves platform.frameworks" do
-  			spec = specification_from_builder(@builder)
-        compare_attributes(spec, @spec, 'frameworks')
-  		end
-
-  		it "preserves platform.libraries" do
-  			spec = specification_from_builder(@builder)
-        compare_attributes(spec, @spec, 'libraries')
-  		end
-
-  		it "preserves platform.requires_arc" do
-  			spec = specification_from_builder(@builder)
-        compare_attributes(spec, @spec, 'requires_arc')
-  		end
-
-  		it "preserves platform.deployment_target" do
-  			spec = specification_from_builder(@builder)
-        compare_attributes(spec, @spec, 'deployment_target')
-  		end
-
-  		it "preserves platform.xcconfig" do
-  			spec = specification_from_builder(@builder)
-        compare_attributes(spec, @spec, 'xcconfig')
-  		end
-  	end
+    end
   end
 end

data/spec/specification/spec_builder_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe SpecBuilder do
+    def compare_attributes(first_spec, second_spec, attribute_name)
+      first_spec.attributes_hash[attribute_name].should ==
+        second_spec.attributes_hash[attribute_name]
+
+      %w(ios osx).each do |platform|
+        first_spec.attributes_hash[platform][attribute_name].should ==
+          second_spec.attributes_hash[platform][attribute_name]
+      end
+    end
+
+    def specification_from_builder(builder)
+      spec_string = builder.spec_metadata
+      spec_string += builder.spec_platform(Platform.ios)
+      spec_string += builder.spec_platform(Platform.osx)
+      spec_string += builder.spec_close
+
+      return Specification.from_string(spec_string, 'Builder.podspec')
+    end
+
+    describe 'Preserve attributes from source specification' do
+      before do
+        @spec = Specification.from_file('spec/fixtures/Builder.podspec')
+        @builder = SpecBuilder.new(@spec, nil, false)
+      end
+
+      it "preserves platform.frameworks" do
+        spec = specification_from_builder(@builder)
+        compare_attributes(spec, @spec, 'frameworks')
+      end
+
+      it "preserves platform.libraries" do
+        spec = specification_from_builder(@builder)
+        compare_attributes(spec, @spec, 'libraries')
+      end
+
+      it "preserves platform.requires_arc" do
+        spec = specification_from_builder(@builder)
+        compare_attributes(spec, @spec, 'requires_arc')
+      end
+
+      it "preserves platform.deployment_target" do
+        spec = specification_from_builder(@builder)
+        compare_attributes(spec, @spec, 'deployment_target')
+      end
+
+      it "preserves platform.xcconfig" do
+        spec = specification_from_builder(@builder)
+        compare_attributes(spec, @spec, 'xcconfig')
+      end
+    end
+  end
+end

data/spec/user_interface/build_failed_report_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  module UserInterface
+    describe BuildFailedReport do
+      it 'should format a report correctly' do
+        UI::BuildFailedReport.report('a', ['b']).should == "Build command failed: a\nOutput:\n    b\n"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - lib/cocoapods-packager/pod_utils.rb
 - lib/cocoapods-packager/spec_builder.rb
 - lib/cocoapods-packager/symbols.rb
+- lib/cocoapods-packager/user_interface/build_failed_report.rb
 - lib/cocoapods_packager.rb
 - lib/cocoapods_plugin.rb
 - lib/pod/command/package.rb
@@ -73,6 +74,7 @@ files:
 - spec/command/subspecs_spec.rb
 - spec/fixtures/Builder.podspec
 - spec/fixtures/CPDColors.podspec
+- spec/fixtures/FH.podspec
 - spec/fixtures/KFData.podspec
 - spec/fixtures/LibraryConsumerDemo/.gitignore
 - spec/fixtures/LibraryConsumerDemo/LibraryConsumer.xcodeproj/project.pbxproj
@@ -113,6 +115,8 @@ files:
 - spec/pod/utils_spec.rb
 - spec/spec_helper.rb
 - spec/specification/builder_spec.rb
+- spec/specification/spec_builder_spec.rb
+- spec/user_interface/build_failed_report_spec.rb
 homepage: https://github.com/CocoaPods/cocoapods-packager
 licenses:
 - MIT
@@ -144,6 +148,7 @@ test_files:
 - spec/command/subspecs_spec.rb
 - spec/fixtures/Builder.podspec
 - spec/fixtures/CPDColors.podspec
+- spec/fixtures/FH.podspec
 - spec/fixtures/KFData.podspec
 - spec/fixtures/LibraryConsumerDemo/.gitignore
 - spec/fixtures/LibraryConsumerDemo/LibraryConsumer.xcodeproj/project.pbxproj
@@ -184,4 +189,6 @@ test_files:
 - spec/pod/utils_spec.rb
 - spec/spec_helper.rb
 - spec/specification/builder_spec.rb
+- spec/specification/spec_builder_spec.rb
+- spec/user_interface/build_failed_report_spec.rb
 has_rdoc: