cocoapods-packager 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724330a00e775b6a876548b7163b4fd578ac247f
-  data.tar.gz: 0d6073a5069e1f2943f5bad83ea610dc575a73df
+  metadata.gz: e8df03ad86ad928333cc4578359f12d6c612fd87
+  data.tar.gz: 5f4c6f64a84f37bd46b0d040c39a5a296a451e40
 SHA512:
-  metadata.gz: 09cff1c8012595848b4e3fa270cf34e6e634774e8236cbf987339218e624edf4ec944bc977f2fdb11fdb2d1c55b389ddd93df3962e231b4caa6596722889e190
-  data.tar.gz: 273ba43f82ae0d9807c45455db9db0c37ca699ed93a45d56db2d9075b56d2ec6e856df95df35ea67007c3ae2604740e0bada22a10fd64e158776884622fe6d75
+  metadata.gz: 1ed207f02e0bbb29cb420425f8ac495f1a0c2f90eab3ddccbc7c5a3b35bc87c7d6caeef4d00215265c66da4503f691fc307bf65c4111fd901601f0baf74d29c6
+  data.tar.gz: 9169c857cca5088618398fb56f0a7004eb685ac2792ecc0b84b887948d8906e7dc864f6e4e98b38ed147a34daf1f45ec0168334e4908794d6312021c4b78a608

data/.travis.yml

@@ -1,11 +1,4 @@
 language: objective-c
-env:
-  # This is what 10.8.x comes with and we want to support that.
-  - RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
-  - RVM_RUBY_VERSION=2.0.0-p247 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
-before_install:
-  - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
-  - sudo gem install bundler
-install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
+cache: bundler
+before_install: bundle install
 script: bundle exec rake specs

data/Gemfile.lock

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

data/LICENSE

@@ -1,6 +1,6 @@
-Copyright (c) 2014 Kyle Fuller
+This project is licensed under the MIT license.
 
-MIT License
+Copyright (c) 2014 Kyle Fuller, Boris Bügling and CocoaPods Dev Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,16 +2,11 @@
 
 [![Build Status](https://travis-ci.org/CocoaPods/cocoapods-packager.png?branch=master)](https://travis-ci.org/CocoaPods/cocoapods-packager)
 
-:warning::warning: This isn't ready for consumption just yet, follow [this
-issue](https://github.com/CocoaPods/cocoapods-packager/issues/1) to keep an
-eye on the status. :warning::warning:
-
-CocoaPods plugin which allows you to generate a static library from a podspec.
-This is useful for distributing your podspec as a static library.
+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.
 
 ## Usage
 
 ```bash
-$ pod package KFData
+$ pod package KFData.podspec
 ```
-

data/lib/builder.rb

@@ -0,0 +1,134 @@
+module Pod
+  class Builder
+    def initialize(source_dir, sandbox_root, public_headers_root, spec, embedded, mangle)
+      @source_dir = source_dir
+      @sandbox_root = sandbox_root
+      @public_headers_root = public_headers_root
+      @spec = spec
+      @embedded = embedded
+      @mangle = mangle
+    end
+
+    def build(platform, library)
+      if library
+        build_static_library(platform)
+      else
+        build_framework(platform)
+      end
+    end
+
+    def build_static_library(platform)
+      UI.puts('Building static library')
+
+      defines = compile
+      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')
+
+      defines = compile
+      create_framework(platform.name.to_s)
+      copy_headers
+      build_library(platform, defines, @fwk.versions_path + Pathname.new(@spec.name))
+      copy_license
+      copy_resources(platform)
+    end
+
+    def link_embedded_resources
+      target_path = @fwk.root_path + Pathname.new('Resources')
+      target_path.mkdir unless target_path.exist?
+
+      Dir.glob(@fwk.resources_path.to_s + '/*').each do |resource|
+        resource = Pathname.new(resource).relative_path_from(target_path)
+        `ln -sf #{resource} #{target_path}`
+      end
+    end
+
+    :private
+
+    def build_library(platform, defines, output)
+      static_libs = static_libs_in_sandbox
+
+      if platform.name == :ios
+        build_static_lib_for_ios(static_libs, defines, output)
+      else
+        build_static_lib_for_mac(static_libs, output)
+      end
+    end
+
+    def build_static_lib_for_ios(static_libs, defines, output)
+      `libtool -static -o #{@sandbox_root}/build/package.a #{static_libs.join(' ')}`
+
+      xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
+      sim_libs = static_libs.map { |path| "#{@sandbox_root}/build-sim/#{File.basename(path)}" }
+      `libtool -static -o #{@sandbox_root}/build-sim/package.a #{sim_libs.join(' ')}`
+
+      `lipo #{@sandbox_root}/build/package.a #{@sandbox_root}/build-sim/libPods.a -create -output #{output}`
+    end
+
+    def build_static_lib_for_mac(static_libs, output)
+      `libtool -static -o #{output} #{static_libs.join(' ')}`
+    end
+
+    def build_with_mangling
+      UI.puts 'Mangling symbols'
+      defines = Symbols.mangle_for_pod_dependencies(@spec.name, @sandbox_root)
+      UI.puts 'Building mangled framework'
+      xcodebuild(defines)
+      return defines
+    end
+
+    def compile
+      xcodebuild
+
+      if @spec.dependencies.count > 0 && @mangle
+        return build_with_mangling
+      end
+
+      ''
+    end
+
+    def copy_headers
+      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, '')}` }
+    end
+
+    def copy_license
+      license_file = @spec.license[:file]
+      license_file = 'LICENSE' unless license_file
+      `cp "#{@sandbox_root}/#{@spec.name}/#{license_file}" .`
+    end
+
+    def copy_resources(platform)
+      `cp -rp #{@sandbox_root}/build/*.bundle #{@fwk.resources_path} 2>&1`
+
+      resources = expand_paths(@spec.consumer(platform).resources)
+      return if resources.count == 0
+      `cp -rp #{resources.join(' ')} #{@fwk.resources_path}`
+    end
+
+    def create_framework(platform)
+      @fwk = Framework::Tree.new(@spec.name, platform, @embedded)
+      @fwk.make
+    end
+
+    def expand_paths(path_specs)
+      path_specs.map do |path_spec|
+        Dir.glob(File.join(@source_dir, path_spec))
+      end
+    end
+
+    def static_libs_in_sandbox
+      Dir.glob("#{@sandbox_root}/build/*.a").reject { |e| e =~ /libPods\.a$/ }
+    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`
+    end
+  end
+end

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/cocoapods_plugin.rb

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

data/lib/framework.rb

@@ -0,0 +1,59 @@
+module Framework
+  class Tree
+    attr_reader :headers_path
+    attr_reader :resources_path
+    attr_reader :root_path
+    attr_reader :versions_path
+
+    def initialize(name, platform, embedded)
+      @name = name
+      @platform = platform
+      @embedded = embedded
+    end
+
+    def make
+      make_root
+      make_framework
+      make_headers
+      make_resources
+      make_current_version
+    end
+
+    :private
+
+    def make_current_version
+      current_version_path = @versions_path + Pathname.new('../Current')
+      `ln -sf A #{current_version_path}`
+      `ln -sf Versions/Current/Headers #{@fwk_path}/`
+      `ln -sf Versions/Current/Resources #{@fwk_path}/`
+      `ln -sf Versions/Current/#{@name} #{@fwk_path}/`
+    end
+
+    def make_framework
+      @fwk_path = @root_path + Pathname.new(@name + '.framework')
+      @fwk_path.mkdir unless @fwk_path.exist?
+
+      @versions_path = @fwk_path + Pathname.new('Versions/A')
+    end
+
+    def make_headers
+      @headers_path = @versions_path + Pathname.new('Headers')
+      @headers_path.mkpath unless @headers_path.exist?
+    end
+
+    def make_resources
+      @resources_path = @versions_path + Pathname.new('Resources')
+      @resources_path.mkpath unless @resources_path.exist?
+    end
+
+    def make_root
+      @root_path = Pathname.new(@platform)
+
+      if @embedded
+        @root_path += Pathname.new(@name + '.embeddedframwork')
+      end
+
+      @root_path.mkpath unless @root_path.exist?
+    end
+  end
+end

data/lib/pod/command/package.rb

@@ -8,15 +8,22 @@ module Pod
 
       def self.options
         [
-          ['--force',  'Overwrite existing files.']
+          ['--force',     'Overwrite existing files.'],
+          ['--no-mangle', 'Do not mangle symbols of depedendant Pods.'],
+          ['--embedded',  'Generate embedded frameworks.'],
+          ['--library',  'Generate static libraries.']
         ]
       end
 
       def initialize(argv)
+        @embedded = argv.flag?('embedded')
         @force = argv.flag?('force')
+        @library = argv.flag?('library')
+        @mangle = argv.flag?('mangle', true)
         @name = argv.shift_argument
         @source = argv.shift_argument
 
+        @source_dir = Dir.pwd
         @spec = spec_with_path(@name)
         @spec = spec_with_name(@name) unless @spec
         super
@@ -28,58 +35,18 @@ module Pod
       end
 
       def run
-        if @spec
-          target_dir = "#{Dir.pwd}/#{@spec.name}-#{@spec.version}"
-          if File.exist? target_dir
-            if @force
-              Pathname.new(target_dir).rmtree
-            else
-              UI.puts "Target directory '#{target_dir}' already exists."
-              return
-            end
-          end
-
-          work_dir = Dir.tmpdir + '/cocoapods-' + Array.new(8) { rand(36).to_s(36) }.join
-
-          UI.puts 'Using build directory ' + work_dir
-          Pathname.new(work_dir).mkdir
-          `cp #{@path} #{work_dir}`
-          Dir.chdir(work_dir)
-
-          builder = SpecBuilder.new(@spec, @source)
-          newspec = builder.spec_metadata
-
-          @spec.available_platforms.each do |platform|
-            build_in_sandbox(platform)
-
-            newspec += builder.spec_platform(platform)
-          end
-
-          newspec += builder.spec_close
-          File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
-
-          `mv #{work_dir} #{target_dir}`
-        else
+        if @path.nil? || @spec.nil?
           help! 'Unable to find a podspec with path or name.'
+          return
         end
-      end
-
-      def spec_with_name(name)
-        return unless !name.nil?
 
-        set = SourcesManager.search(Dependency.new(name))
-
-        if set
-          set.specification.root
-        end
+        target_dir, work_dir = create_working_directory
+        return if target_dir.nil?
+        build_package
+        `mv #{work_dir} #{target_dir}`
       end
 
-      def spec_with_path(path)
-        if !path.nil? && Pathname.new(path).exist?
-          @path = path
-          Specification.from_file(path)
-        end
-      end
+      :private
 
       def build_in_sandbox(platform)
         config.sandbox_root       = 'Pods'
@@ -88,90 +55,64 @@ module Pod
 
         sandbox = install_pod(platform.name)
 
-        UI.puts 'Building framework'
-        xcodebuild
-        UI.puts 'Mangling symbols'
-        defines = Symbols.mangle_for_pod_dependencies(@spec.name, config.sandbox_root)
-        UI.puts 'Building mangled framework'
-        xcodebuild(defines)
-
-        versions_path, headers_path, resources_path = create_framework_tree(platform.name.to_s)
-        headers_source_root = "#{sandbox.public_headers.root}/#{@spec.name}"
-        Dir.glob("#{headers_source_root}/**/*.h").
-          each { |h| `ditto #{h} #{headers_path}/#{h.sub(headers_source_root, '')}` }
-        `cp -rp #{config.sandbox_root}/build/*.bundle #{resources_path} 2>&1`
-
-        static_libs = Dir.glob("#{config.sandbox_root}/build/*.a").reject { |e| e =~ /libPods\.a$/ }
-
-        if platform.name == :ios
-          `libtool -static -o #{config.sandbox_root}/build/package.a #{static_libs.join(' ')}`
-
-          xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
-          sim_libs = static_libs.map { |path| "#{config.sandbox_root}/build-sim/#{File.basename(path)}" }
-          `libtool -static -o #{config.sandbox_root}/build-sim/package.a #{sim_libs.join(' ')}`
-
-          `lipo #{config.sandbox_root}/build/package.a #{config.sandbox_root}/build-sim/libPods.a -create -output #{versions_path}/#{@spec.name}`
-        else
-          `libtool -static -o #{versions_path}/#{@spec.name} #{static_libs.join(' ')}`
-        end
-
-        #bundle_path = resources_path + Pathname.new("#{spec.name}.bundle")
-        #bundle_path.mkpath unless bundle_path.exist?
-
-        license_file = @spec.license[:file]
-        license_file = 'LICENSE' unless license_file
-        `cp "#{config.sandbox_root}/#{@spec.name}/#{license_file}" .`
+        perform_build(platform, sandbox)
 
         Pathname.new(config.sandbox_root).rmtree
         Pathname.new('Podfile.lock').delete
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build')
-        `xcodebuild #{defines} CONFIGURATION_BUILD_DIR=#{build_dir} clean build #{args} -configuration Release -target Pods -project #{config.sandbox_root}/Pods.xcodeproj 2>&1`
-      end
-
-      def create_framework_tree(platform)
-        Pathname.new(platform).mkdir
-        root_path = Pathname.new(platform + '/' + @spec.name + '.framework')
-        root_path.mkdir unless root_path.exist?
+      def build_package
+        builder = SpecBuilder.new(@spec, @source)
+        newspec = builder.spec_metadata
 
-        versions_path = root_path + Pathname.new('Versions/A')
+        @spec.available_platforms.each do |platform|
+          build_in_sandbox(platform)
 
-        headers_path = versions_path + Pathname.new('Headers')
-        headers_path.mkpath unless headers_path.exist?
-
-        resources_path = versions_path + Pathname.new('Resources')
-        resources_path.mkpath unless resources_path.exist?
-
-        current_version_path = versions_path + Pathname.new('../Current')
-        `ln -sf A #{current_version_path}`
-        `ln -sf Versions/Current/Headers #{root_path}/`
-        `ln -sf Versions/Current/#{@spec.name} #{root_path}/`
+          newspec += builder.spec_platform(platform)
+        end
 
-        return versions_path, headers_path, resources_path
+        newspec += builder.spec_close
+        File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
       end
 
-      def podfile_from_spec(platform_name, deployment_target)
-        name     = @spec.name
-        path     = @path
-        podfile  = Pod::Podfile.new do
-          platform(platform_name, deployment_target)
-          if path
-            pod name, :podspec => path
+      def create_target_directory
+        target_dir = "#{@source_dir}/#{@spec.name}-#{@spec.version}"
+        if File.exist? target_dir
+          if @force
+            Pathname.new(target_dir).rmtree
           else
-            pod name, :path => '.'
+            UI.puts "Target directory '#{target_dir}' already exists."
+            return nil
           end
         end
-        podfile
+        target_dir
+      end
+
+      def create_working_directory
+        target_dir = create_target_directory
+        return if target_dir.nil?
+
+        work_dir = Dir.tmpdir + '/cocoapods-' + Array.new(8) { rand(36).to_s(36) }.join
+        Pathname.new(work_dir).mkdir
+        `cp #{@path} #{work_dir}`
+        Dir.chdir(work_dir)
+
+        [target_dir, work_dir]
       end
 
-      def install_pod(platform_name)
-        podfile = podfile_from_spec(platform_name, @spec.deployment_target(platform_name))
-        sandbox = Sandbox.new(config.sandbox_root)
-        installer = Installer.new(sandbox, podfile)
-        installer.install!
+      def perform_build(platform, sandbox)
+        builder = Pod::Builder.new(
+          @source_dir,
+          config.sandbox_root,
+          sandbox.public_headers.root,
+          @spec,
+          @embedded,
+          @mangle)
+
+        builder.build(platform, @library)
 
-        sandbox
+        return unless @embedded
+        builder.link_embedded_resources
       end
     end
   end

data/lib/pod_utils.rb

@@ -0,0 +1,48 @@
+module Pod
+  class Command
+    class Package < Command
+      :private
+
+      def install_pod(platform_name)
+        podfile = podfile_from_spec(
+          File.basename(@path),
+          @spec.name,
+          platform_name,
+          @spec.deployment_target(platform_name))
+
+        sandbox = Sandbox.new(config.sandbox_root)
+        installer = Installer.new(sandbox, podfile)
+        installer.install!
+
+        sandbox
+      end
+
+      def podfile_from_spec(path, spec_name, platform_name, deployment_target)
+        Pod::Podfile.new do
+          platform(platform_name, deployment_target)
+          if path
+            pod spec_name, :podspec => path
+          else
+            pod spec_name, :path => '.'
+          end
+        end
+      end
+
+      def spec_with_name(name)
+        return if name.nil?
+
+        set = SourcesManager.search(Dependency.new(name))
+        return nil if set.nil?
+
+        set.specification.root
+      end
+
+      def spec_with_path(path)
+        return if path.nil? || !Pathname.new(path).exist?
+
+        @path = path
+        Specification.from_file(path)
+      end
+    end
+  end
+end

data/lib/spec_builder.rb

@@ -11,39 +11,46 @@ module Pod
   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/*.bundle'
+  s.#{platform.name}.resource             = '#{fwk_base}/Versions/A/Resources/**/*'
   s.#{platform.name}.vendored_frameworks  = '#{fwk_base}'
-
 SPEC
     end
 
     def spec_metadata
-      spec = <<SPEC
-Pod::Spec.new do |s|
-  s.name          = "#{@spec.name}"
-  s.version       = "#{@spec.version}"
-  s.summary       = "#{@spec.summary}"
-  s.license       = #{@spec.license}
-  s.authors       = #{@spec.authors}
-  s.homepage      = "#{@spec.homepage}"
-  s.source        = #{@source}
+      spec = spec_header
+      spec += spec_single_platform_fix
+      spec
+    end
 
-SPEC
+    def spec_close
+      "end\n"
+    end
 
-      if @spec.available_platforms.length == 1
-        platform = @spec.available_platforms.first
+    :private
 
-        spec += <<SPEC
-  s.platform      = :#{platform.symbolic_name}, '#{platform.deployment_target}'
+    def spec_header
+      spec = "Pod::Spec.new do |s|\n"
 
-SPEC
+      %w(name version summary license authors homepage description social_media_url
+         docset_url documentation_url screenshots).each do |attribute|
+        value = @spec.attributes_hash[attribute]
+        next if value.nil?
+
+        value = "'#{value}'" if value.class == String
+        spec += "  s.#{attribute} = #{value}\n"
       end
 
-      spec
+      spec + "  s.source = '#{@source}'\n\n"
     end
 
-    def spec_close
-      'end'
+    def spec_single_platform_fix
+      return '' if @spec.available_platforms.length > 1
+
+      platform = @spec.available_platforms.first
+
+      <<SPEC
+  s.platform = :#{platform.symbolic_name}, '#{platform.deployment_target}'
+SPEC
     end
   end
 end

data/spec/command/package_spec.rb

@@ -7,7 +7,7 @@ module Pod
         Command.parse(%w{ package }).should.be.instance_of Command::Package
       end
 
-      it 'presents the help if no spec is provide' do
+      it 'presents the help if no spec is provided' do
         command = Command.parse(%w{ package })
         should.raise CLAide::Help do
           command.validate!
@@ -32,12 +32,12 @@ module Pod
         true.should == true  # To make the test pass without any shoulds
       end
 
-      it "runs with a spec in the master repository" do
-        command = Command.parse(%w{ package KFData })
-        command.run
+      #it "runs with a spec in the master repository" do
+      #  command = Command.parse(%w{ package KFData })
+      #  command.run
 
-        true.should == true  # To make the test pass without any shoulds
-      end
+      #  true.should == true  # To make the test pass without any shoulds
+      #end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kyle Fuller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,12 +53,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - cocoapods-packager.gemspec
+- lib/builder.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

data/TODO.md

@@ -1,6 +0,0 @@
-[ ] Handle license file in generated podspec
-[ ] Handle resources
-[ ] Write tests
-[ ] Implement various commandline options
-[ ] Make symbol aliasing configurable
-