cocoapods-packager 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b721f9ad9493eb807bfebfa9c505a3dbb0d27c
-  data.tar.gz: f6a90ea5358918fafde09f6e2fbdc1b6f794d91c
+  metadata.gz: 1d3535ba8d583c5ce95324d1e7ddef3a00006cb0
+  data.tar.gz: 006fdd96275923939dd7ead9c24a3f149a248174
 SHA512:
-  metadata.gz: 21a49fc9e21c0764850a9c01cf08b251c1a047ca9aed6320d52120433f7be46693f8648f5bf2d277418980b71a94181907487dc82f8ccdbed1dd670a918179ac
-  data.tar.gz: 3b94df361e45e15c39e33e1e7c0c1edd79424577664a3d1035ed6ffb20822c75216fbf9d06c504445a4d5acff22c665b9c66d55fa4ff922967190cceded55e70
+  metadata.gz: acd2466fd4d5ba6704b1cae1b1ceb374334115e67bf93ff4753a451e9630b7f6d84f4d525d12a0efc99af9d7aca2c48521b376e52f4bfa4bd52058efdec6eb30
+  data.tar.gz: fc61891a91651f0bc848e643245658c3ae9be10cc61b0fde27f27be5df7c6752d998745b8b644f0b803e8e081b963cf9930755429e12228e18a23516b8c8f4cf

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-packager (0.3.0)
+    cocoapods-packager (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -3,10 +3,37 @@
 [![Build Status](https://travis-ci.org/CocoaPods/cocoapods-packager.png?branch=master)](https://travis-ci.org/CocoaPods/cocoapods-packager)
 
 CocoaPods plugin which allows you to generate a framework or static library from a podspec.
-This is useful for distributing closed source libraries or for providing alternative integrations for people who do not use Pods.
+
+This plugin is for CocoaPods *developers*, who need to distribute their Pods not only via CocoaPods, but also as frameworks or static libraries for people who do not use Pods.
+
+## Why should I use Pods if I'm targeting developers who don't use Pods?
+
+There are still a number of advantages to developing against a `podspec`, even if your public distribution is closed-source:
+
+1. You can easily use the Pod in-house in an open-source style. This makes step-by-step debugging and multi-project development a breeze.
+2. You can pull in third-party dependencies using CocoaPods. (CocoaPods Packager is even capable of mangling symbols to improve compatibility with any symbols that might appear in the integrating app.)
+3. You can declaratively specify build settings (e.g. frameworks, compiler flags) in your `podspec`. This is easier to maintain and replicate than build settings embedded in your Xcode project.
+
+## Installation
+
+```sh
+$ gem install cocoapods-packager
+```
+
+or add a line to your Gemfile:
+
+```ruby
+gem "cocoapods-packager"
+```
+
+then run `bundle install`.
+
+This installs Packager as a CocoaPods plugin.
 
 ## Usage
 
 ```bash
 $ pod package KFData.podspec
 ```
+
+See also `pod --help`.

data/lib/{builder.rb → cocoapods-packager/builder.rb}

@@ -124,7 +124,7 @@ module Pod
     end
 
     def static_libs_in_sandbox(build_dir='build')
-      Dir.glob("#{@sandbox_root}/#{build_dir}/*.a").reject { |e| e =~ /libPods\.a$/ }
+      Dir.glob("#{@sandbox_root}/#{build_dir}/libPods-*.a")
     end
 
     def xcodebuild(defines = '', args = '', build_dir = 'build')

data/lib/{framework.rb → cocoapods-packager/framework.rb}

@@ -50,7 +50,7 @@ module Framework
       @root_path = Pathname.new(@platform)
 
       if @embedded
-        @root_path += Pathname.new(@name + '.embeddedframwork')
+        @root_path += Pathname.new(@name + '.embeddedframework')
       end
 
       @root_path.mkpath unless @root_path.exist?

data/lib/{mangle.rb → cocoapods-packager/mangle.rb}

@@ -8,19 +8,26 @@ module Symbols
   # 	- put defines into `GCC_PREPROCESSOR_DEFINITIONS` for passing to Xcode
   #
   def mangle_for_pod_dependencies(pod_name, sandbox_root)
+    pod_name = pod_name.gsub!('-', '_')
+
     pod_libs = Dir.glob("#{sandbox_root}/build/libPods-*.a").select do
       |file| file !~ /#{pod_name}/
     end
 
-    all_syms = []
+    dummy_alias = alias_symbol "PodsDummy_Pods_#{pod_name}", pod_name
+    all_syms = [dummy_alias]
 
     pod_libs.each do |pod_lib|
       syms = Symbols.symbols_from_library(pod_lib)
-      all_syms += syms.map! { |sym| sym + "=Pod#{pod_name}_" + sym }
+      all_syms += syms.map! { |sym| alias_symbol sym, pod_name }
     end
 
     "GCC_PREPROCESSOR_DEFINITIONS='${inherited} #{all_syms.uniq.join(' ')}'"
   end
 
-  module_function :mangle_for_pod_dependencies
+  def alias_symbol(sym, pod_name)
+    sym + "=Pod#{pod_name}_" + sym
+  end
+
+  module_function :mangle_for_pod_dependencies, :alias_symbol
 end

data/lib/{spec_builder.rb → cocoapods-packager/spec_builder.rb}

@@ -1,19 +1,41 @@
 module Pod
   class SpecBuilder
-    def initialize(spec, source)
+    def initialize(spec, source, embedded)
       @spec = spec
       @source = source.nil? ? '{}' : source
+      @embedded = embedded
+    end
+
+    def framework_path
+      if @embedded
+        @spec.name + '.embeddedframework' + '/' + @spec.name + '.framework'
+      else
+        @spec.name + '.framework'
+      end
     end
 
     def spec_platform(platform)
-      fwk_base = platform.name.to_s + '/' + @spec.name + '.framework'
-      <<SPEC
+
+      fwk_base = platform.name.to_s + '/' + framework_path
+      spec = <<SPEC
   s.#{platform.name}.platform             = :#{platform.symbolic_name}, '#{platform.deployment_target}'
   s.#{platform.name}.preserve_paths       = '#{fwk_base}'
   s.#{platform.name}.public_header_files  = '#{fwk_base}/Versions/A/Headers/*.h'
   s.#{platform.name}.resource             = '#{fwk_base}/Versions/A/Resources/**/*'
   s.#{platform.name}.vendored_frameworks  = '#{fwk_base}'
 SPEC
+
+      %w(frameworks libraries requires_arc xcconfig).each do |attribute|
+        attributes_hash = @spec.attributes_hash[platform.name.to_s]
+        next if attributes_hash.nil?
+        value = attributes_hash[attribute]
+        next if value.nil?
+
+        value = "'#{value}'" if value.class == String
+        spec += "  s.#{platform.name}.#{attribute} = #{value}\n"
+      end
+
+      spec
     end
 
     def spec_metadata
@@ -32,7 +54,8 @@ SPEC
       spec = "Pod::Spec.new do |s|\n"
 
       %w(name version summary license authors homepage description social_media_url
-         docset_url documentation_url screenshots).each do |attribute|
+         docset_url documentation_url screenshots frameworks libraries requires_arc
+         deployment_target xcconfig).each do |attribute|
         value = @spec.attributes_hash[attribute]
         next if value.nil?
 

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,7 +1,7 @@
 require 'pod/command/package'
-require 'builder'
-require 'framework'
-require 'mangle'
-require 'pod_utils'
-require 'spec_builder'
-require 'symbols'
+require 'cocoapods-packager/builder'
+require 'cocoapods-packager/framework'
+require 'cocoapods-packager/mangle'
+require 'cocoapods-packager/pod_utils'
+require 'cocoapods-packager/spec_builder'
+require 'cocoapods-packager/symbols'

data/lib/pod/command/package.rb

@@ -63,7 +63,7 @@ module Pod
       end
 
       def build_package
-        builder = SpecBuilder.new(@spec, @source)
+        builder = SpecBuilder.new(@spec, @source, @embedded)
         newspec = builder.spec_metadata
 
         @spec.available_platforms.each do |platform|

data/spec/command/package_spec.rb

@@ -37,7 +37,7 @@ module Pod
         lib = Dir.glob("NikeKit-*/ios/NikeKit.framework/NikeKit").first
         symbols = Symbols.symbols_from_library(lib).uniq.sort.reject { |e| e =~ /PodNikeKit/ }
         symbols.should == %w{ BBUNikePlusActivity BBUNikePlusSessionManager 
-                              BBUNikePlusTag PodsDummy_Pods_NikeKit }
+                              BBUNikePlusTag }
       end
 
       it "does not mangle symbols if option --no-mangle is specified" do

data/spec/fixtures/Builder.podspec

@@ -0,0 +1,21 @@
+Pod::Spec.new do |s|
+  s.name         = 'Builder'
+  s.version      = '0.0.1'
+  s.summary      = 'Yo'
+  s.homepage     = 'https://github.com/CocoaPods/cocoapods-packager'
+  s.license      = {:type => 'MIT'}
+  s.authors      = { 'Boris Bügling' => 'http://buegling.com' }
+  s.source       = { :git => 'https://github.com/CocoaPods/cocoapods-packager.git', 
+                     :tag => s.version.to_s }
+
+  s.libraries               = 'xml2'
+  s.requires_arc            = true
+  s.xcconfig                = { 'OTHER_LDFLAGS' => '-lObjC' }
+
+  s.ios.frameworks          = 'Foundation'
+  s.ios.deployment_target   = '8.0'
+
+  s.osx.frameworks          = 'AppKit'
+  s.osx.requires_arc        = false
+  s.osx.xcconfig            = { 'CFLAGS' => '-I.' }
+end

data/spec/specification/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kyle Fuller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,21 +54,23 @@ files:
 - README.md
 - Rakefile
 - cocoapods-packager.gemspec
-- lib/builder.rb
+- lib/cocoapods-packager/builder.rb
+- lib/cocoapods-packager/framework.rb
+- lib/cocoapods-packager/mangle.rb
+- lib/cocoapods-packager/pod_utils.rb
+- lib/cocoapods-packager/spec_builder.rb
+- lib/cocoapods-packager/symbols.rb
 - lib/cocoapods_packager.rb
 - lib/cocoapods_plugin.rb
-- lib/framework.rb
-- lib/mangle.rb
 - lib/pod/command/package.rb
-- lib/pod_utils.rb
-- lib/spec_builder.rb
-- lib/symbols.rb
 - scripts/lstconst.sh
 - scripts/lstsym.sh
 - spec/command/package_spec.rb
+- spec/fixtures/Builder.podspec
 - spec/fixtures/KFData.podspec
 - spec/fixtures/NikeKit.podspec
 - spec/spec_helper.rb
+- spec/specification/builder_spec.rb
 homepage: https://github.com/CocoaPods/cocoapods-packager
 licenses:
 - MIT
@@ -95,7 +97,9 @@ specification_version: 4
 summary: ''
 test_files:
 - spec/command/package_spec.rb
+- spec/fixtures/Builder.podspec
 - spec/fixtures/KFData.podspec
 - spec/fixtures/NikeKit.podspec
 - spec/spec_helper.rb
+- spec/specification/builder_spec.rb
 has_rdoc: