cocoapods-packager 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe83f612365b4245d11ad2f1590e5bbe9ca7e41
-  data.tar.gz: e81a6d18d6b3e1fee1bf5858ea33821c45822f5f
+  metadata.gz: 724330a00e775b6a876548b7163b4fd578ac247f
+  data.tar.gz: 0d6073a5069e1f2943f5bad83ea610dc575a73df
 SHA512:
-  metadata.gz: c9d4ed1a0bdf51c68394d7ceab1903a3c2b89377a78d962ea60f7cfce7de99a60ac76e28411ca388fe6278645334f302ca185d5164617a5b5cdf613bc6ac2559
-  data.tar.gz: 50099b6e992d865d6ca0b017a075ec40864fa4216add39620909301d487865ec41450f63e14e51d6859204eb8b1c9aca521636ff56d30cfa9a555fbd41efbccc
+  metadata.gz: 09cff1c8012595848b4e3fa270cf34e6e634774e8236cbf987339218e624edf4ec944bc977f2fdb11fdb2d1c55b389ddd93df3962e231b4caa6596722889e190
+  data.tar.gz: 273ba43f82ae0d9807c45455db9db0c37ca699ed93a45d56db2d9075b56d2ec6e856df95df35ea67007c3ae2604740e0bada22a10fd64e158776884622fe6d75

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/irrationalfab/PrettyBacon.git
-  revision: eaf7e6c786fd5ccc6fb88e943bf7c5e6c27569a3
+  revision: 1eeb06f7d381acd65414b86b42fdf3538faae01c
   branch: master
   specs:
-    prettybacon (0.0.1)
+    prettybacon (0.0.2)
       bacon (~> 1.2)
 
 PATH
@@ -14,48 +14,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     bacon (1.2.0)
-    claide (0.4.0)
-    cocoapods (0.29.0)
+    claide (0.6.1)
+    cocoapods (0.33.1)
       activesupport (>= 3.2.15, < 4)
-      claide (~> 0.4.0)
-      cocoapods-core (= 0.29.0)
-      cocoapods-downloader (~> 0.3.0)
-      cocoapods-try-release-fix (~> 0.1.1)
+      claide (~> 0.6.1)
+      cocoapods-core (= 0.33.1)
+      cocoapods-downloader (~> 0.6.1)
+      cocoapods-plugins (~> 0.2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.5)
+      nap (~> 0.7)
       open4 (~> 1.3)
-      xcodeproj (~> 0.14.1)
-    cocoapods-core (0.29.0)
-      activesupport (>= 3.2.15, < 4)
+      xcodeproj (~> 0.17.0)
+    cocoapods-core (0.33.1)
+      activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       json_pure (~> 1.8)
       nap (~> 0.5)
-    cocoapods-downloader (0.3.0)
-    cocoapods-try-release-fix (0.1.1)
+    cocoapods-downloader (0.6.1)
+    cocoapods-plugins (0.2.0)
+      nap
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json_pure (1.8.1)
-    metaclass (0.0.2)
+    metaclass (0.0.4)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
-    multi_json (1.8.4)
-    nap (0.6.0)
-    open4 (1.3.0)
-    rake (10.1.1)
-    xcodeproj (0.14.1)
+    multi_json (1.10.1)
+    nap (0.8.0)
+    open4 (1.3.4)
+    rake (10.3.2)
+    xcodeproj (0.17.0)
       activesupport (~> 3.0)
       colored (~> 1.2)
-      rake
 
 PLATFORMS
   ruby

data/TODO.md

@@ -1,8 +1,6 @@
 [ ] Handle license file in generated podspec
-[ ] Handle frameworks in generated podspec
 [ ] Handle resources
 [ ] Write tests
 [ ] Implement various commandline options
 [ ] Make symbol aliasing configurable
-[ ] Pods with only one platform lead to lint errors
 

data/lib/cocoapods_packager.rb

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

data/lib/mangle.rb

@@ -19,7 +19,7 @@ module Symbols
       all_syms += syms.map! { |sym| sym + "=Pod#{pod_name}_" + sym }
     end
 
-    "GCC_PREPROCESSOR_DEFINITIONS='${inherited} #{all_syms.join(' ')}'"
+    "GCC_PREPROCESSOR_DEFINITIONS='${inherited} #{all_syms.uniq.join(' ')}'"
   end
 
   module_function :mangle_for_pod_dependencies

data/lib/pod/command/package.rb

@@ -1,11 +1,22 @@
+require 'tmpdir'
+
 module Pod
   class Command
     class Package < Command
       self.summary = 'Package a podspec into a static library.'
-      self.arguments = [['NAME', :required]]
+      self.arguments = [['NAME', :required], ['SOURCE']]
+
+      def self.options
+        [
+          ['--force',  'Overwrite existing files.']
+        ]
+      end
 
       def initialize(argv)
+        @force = argv.flag?('force')
         @name = argv.shift_argument
+        @source = argv.shift_argument
+
         @spec = spec_with_path(@name)
         @spec = spec_with_name(@name) unless @spec
         super
@@ -18,7 +29,24 @@ module Pod
 
       def run
         if @spec
-          builder = SpecBuilder.new(@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|
@@ -29,6 +57,8 @@ module Pod
 
           newspec += builder.spec_close
           File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
+
+          `mv #{work_dir} #{target_dir}`
         else
           help! 'Unable to find a podspec with path or name.'
         end
@@ -60,29 +90,49 @@ module Pod
 
         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 = create_framework_tree(platform.name.to_s)
-        `cp #{sandbox.public_headers.root}/#{@spec.name}/*.h #{headers_path}`
+        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')
-          `lipo #{config.sandbox_root}/build/libPods.a #{config.sandbox_root}/build-sim/libPods.a -create -output #{versions_path}/#{@spec.name}`
+          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
-          `cp #{config.sandbox_root}/build/libPods.a #{versions_path}/#{@spec.name}`
+          `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}" .`
+
         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} -project #{config.sandbox_root}/Pods.xcodeproj 2>&1`
+        `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)
-        root_path = Pathname.new(@spec.name + '-' + platform + '.framework')
+        Pathname.new(platform).mkdir
+        root_path = Pathname.new(platform + '/' + @spec.name + '.framework')
         root_path.mkdir unless root_path.exist?
 
         versions_path = root_path + Pathname.new('Versions/A')
@@ -90,12 +140,15 @@ module Pod
         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}/`
 
-        return versions_path, headers_path
+        return versions_path, headers_path, resources_path
       end
 
       def podfile_from_spec(platform_name, deployment_target)

data/lib/spec_builder.rb

@@ -1,23 +1,24 @@
 module Pod
   class SpecBuilder
-    def initialize(spec)
+    def initialize(spec, source)
       @spec = spec
+      @source = source.nil? ? '{}' : source
     end
 
     def spec_platform(platform)
-      fwk_base = @spec.name + '-' + platform.name.to_s + '.framework'
+      fwk_base = platform.name.to_s + '/' + @spec.name + '.framework'
       <<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/#{fwk_base}.bundle'
+  s.#{platform.name}.resource             = '#{fwk_base}/Versions/A/Resources/*.bundle'
   s.#{platform.name}.vendored_frameworks  = '#{fwk_base}'
 
 SPEC
     end
 
     def spec_metadata
-      <<SPEC
+      spec = <<SPEC
 Pod::Spec.new do |s|
   s.name          = "#{@spec.name}"
   s.version       = "#{@spec.version}"
@@ -25,9 +26,20 @@ Pod::Spec.new do |s|
   s.license       = #{@spec.license}
   s.authors       = #{@spec.authors}
   s.homepage      = "#{@spec.homepage}"
-  s.source        = #{@spec.source}
+  s.source        = #{@source}
+
+SPEC
+
+      if @spec.available_platforms.length == 1
+        platform = @spec.available_platforms.first
+
+        spec += <<SPEC
+  s.platform      = :#{platform.symbolic_name}, '#{platform.deployment_target}'
 
 SPEC
+      end
+
+      spec
     end
 
     def spec_close

data/lib/symbols.rb

@@ -1,6 +1,6 @@
 module Symbols
   def symbols_from_library(library)
-    syms = `nm #{library}`.split("\n")
+    syms = `nm -g #{library}`.split("\n")
 
     result = classes_from_symbols(syms)
     result + constants_from_symbols(syms)
@@ -21,11 +21,11 @@ module Symbols
     consts = syms.select { |const| const[/ S /] }
     consts = consts.select { |const| const !~ /OBJC|\.eh/ }
     consts = consts.uniq
-    consts = consts.map! { |const| const.gsub(/^.*_/, '') }
+    consts = consts.map! { |const| const.gsub(/^.* _/, '') }
 
     other_consts = syms.select { |const| const[/ T /] }
     other_consts = other_consts.uniq
-    other_consts = other_consts.map! { |const| const.gsub(/^.*_/, '') }
+    other_consts = other_consts.map! { |const| const.gsub(/^.* _/, '') }
 
     consts + other_consts
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kyle Fuller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler