cocoapods-rome 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39349e3eb241f7f32fb8008ed923fb6418756b09
-  data.tar.gz: becffa42b45bec1b97229428dcf501a12cd7e9ff
+  metadata.gz: 3e700deed4bcc9ea660ae782275780ac0d20c3bb
+  data.tar.gz: 829d962a97796a8b962527312b972f0344d150ae
 SHA512:
-  metadata.gz: e7244588f9e6ff4ddadc748283eddbeb12960305e54d68b16bfe68f7e890373ad20494ce2f5eda799c2ddf59be14018e4e5c3c7cf93b6c0aac520636250cb578
-  data.tar.gz: 2072032d52cbb4545cdc936b817a24303e1661dc2e5af2ee4ba1b2d08ca53c1c46eb0d7fcbd902dfa979fa19f8dad8cf033e079824ed19b853b1f31a2ed56876
+  metadata.gz: fc1e27375402a40eb164c6c30066b5be370ea67e50ebf5f06ba47779fb7e8559a3b7825ea73b26b1bdbc97e26023cf8848222ebdb4e2c85a1b8115685c8dba96
+  data.tar.gz: 45607cf9440968a5835a64fe4fb49b8abbaac6ba3eab2d6f1088124e936eca21f0ab027c3e3e4d2abc8356dadac15ece87050c15e243ddb5c100317d2545952e

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cocoapods-rome (0.1.0)
-      cocoapods (>= 0.38.0.beta2)
+    cocoapods-rome (0.2.0)
+      cocoapods (>= 0.38.0)
 
 GEM
   remote: https://rubygems.org/
@@ -15,10 +15,10 @@ GEM
       tzinfo (~> 1.1)
     bacon (1.2.0)
     claide (0.9.1)
-    cocoapods (0.38.0.beta.2)
+    cocoapods (0.38.0)
       activesupport (>= 3.2.15)
       claide (~> 0.9.1)
-      cocoapods-core (= 0.38.0.beta.2)
+      cocoapods-core (= 0.38.0)
       cocoapods-downloader (~> 0.9.1)
       cocoapods-plugins (~> 0.4.2)
       cocoapods-stats (~> 0.5.3)
@@ -28,8 +28,8 @@ GEM
       escape (~> 0.0.4)
       molinillo (~> 0.3.0)
       nap (~> 0.8)
-      xcodeproj (~> 0.26.1)
-    cocoapods-core (0.38.0.beta.2)
+      xcodeproj (~> 0.26.2)
+    cocoapods-core (0.38.0)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
@@ -55,7 +55,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.26.1)
+    xcodeproj (0.26.2)
       activesupport (>= 3)
       claide (~> 0.9.1)
       colored (~> 1.2)

data/README.md

@@ -17,7 +17,6 @@ Write a simple Podfile like this:
 
 ```ruby
 platform :osx, '10.10'
-use_frameworks!
 
 plugin 'cocoapods-rome'
 
@@ -27,7 +26,7 @@ pod 'Alamofire'
 then run this:
 
 ```bash
-pod install --no-integrate
+pod install
 ```
 
 and you will end up with dynamic frameworks:

data/cocoapods-rome.gemspec

@@ -18,7 +18,7 @@ Xcode}
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "cocoapods", ">= 0.38.0.beta2"
+  spec.add_dependency "cocoapods", ">= 0.38.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/cocoapods-rome/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsRome
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/cocoapods-rome/post_install.rb

@@ -1,5 +1,9 @@
+CONFIGURATION = "Release"
+DEVICE = "iphoneos"
+SIMULATOR = "iphonesimulator"
+
 def xcodebuild(sandbox, target, sdk='macosx')
-  Pod::Executable.execute_command 'xcodebuild', %W(-project #{sandbox.project_path.basename} -scheme #{target} -configuration Release -sdk #{sdk}), true
+  Pod::Executable.execute_command 'xcodebuild', %W(-project #{sandbox.project_path.basename} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk}), true
 end
 
 Pod::HooksManager.register('cocoapods-rome', :post_install) do |installer_context|
@@ -15,32 +19,53 @@ Pod::HooksManager.register('cocoapods-rome', :post_install) do |installer_contex
   Dir.chdir(sandbox.project_path.dirname) do
     targets = installer_context.umbrella_targets.select { |t| t.specs.any? }
     targets.each do |target|
+      target_label = target.cocoapods_target_label
       if target.platform_name == :ios
-        xcodebuild(sandbox, target.cocoapods_target_label, 'iphoneos')
-        xcodebuild(sandbox, target.cocoapods_target_label, 'iphonesimulator')
+        xcodebuild(sandbox, target_label, DEVICE)
+        xcodebuild(sandbox, target_label, SIMULATOR)
+
+        spec_names = target.specs.map { |spec| spec.root.name }.uniq
+        spec_names.each do |root_name|
+          executable_path = "#{build_dir}/#{root_name}"
+          device_lib = "#{build_dir}/#{CONFIGURATION}-#{DEVICE}/#{target_label}/#{root_name}.framework/#{root_name}"
+          device_framework_lib = File.dirname(device_lib)
+          simulator_lib = "#{build_dir}/#{CONFIGURATION}-#{SIMULATOR}/#{target_label}/#{root_name}.framework/#{root_name}"
 
-        target.specs.each do |spec|
-          device_lib = "#{build_dir}/Release-iphoneos/#{spec.name}.framework/#{spec.name}"
-          simulator_lib = "#{build_dir}/Release-iphonesimulator/#{spec.name}.framework/#{spec.name}"
-          `lipo -create -output "#{build_dir}/#{spec.name}" #{device_lib} #{simulator_lib}`
+          next unless File.file?(device_lib) && File.file?(simulator_lib)
 
-          FileUtils.mv "#{build_dir}/#{spec.name}", device_lib
-          Pathname.new("#{build_dir}/Release-iphonesimulator/#{spec.name}.framework").rmtree
+          lipo_log = `lipo -create -output #{executable_path} #{device_lib} #{simulator_lib}`
+          puts lipo_log unless File.exist?(executable_path)
+
+          FileUtils.mv executable_path, device_lib
+          FileUtils.mv device_framework_lib, build_dir
         end
       else
-        xcodebuild(sandbox, target.cocoapods_target_label)
+        xcodebuild(sandbox, target_label)
       end
     end
   end
 
   raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
 
-  frameworks = Pathname.glob(build_dir + 'Release*/*.framework').reject { |f| f.to_s =~ /Pods*\.framework/ }
+  frameworks = Pathname.glob("#{build_dir}/**/*.framework").reject { |f| f.to_s =~ /Pods*\.framework/ }
 
   Pod::UI.puts "Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}"
-  Pod::UI.puts "Copying frameworks to `#{destination.relative_path_from Pathname.pwd}`"
 
   destination.rmtree if destination.directory?
+
+  installer_context.umbrella_targets.each do |umbrella|
+    umbrella.specs.each do |spec|
+      consumer = spec.consumer(umbrella.platform_name)
+      file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
+      frameworks += file_accessor.vendored_libraries
+      frameworks += file_accessor.vendored_frameworks
+    end
+  end
+  frameworks.uniq!
+
+  Pod::UI.puts "Copying #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)} " \
+    "to `#{destination.relative_path_from Pathname.pwd}`"
+
   frameworks.each do |framework|
     FileUtils.mkdir_p destination
     FileUtils.cp_r framework, destination, :remove_destination => true

data/lib/cocoapods-rome/pre_install.rb

@@ -0,0 +1,4 @@
+Pod::HooksManager.register('cocoapods-rome', :pre_install) do |installer_context|
+  installer_context.podfile.use_frameworks!
+  Pod::Config.instance.integrate_targets = false
+end

data/lib/cocoapods_plugin.rb

@@ -1 +1,2 @@
 require 'cocoapods-rome/post_install'
+require 'cocoapods-rome/pre_install'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-rome
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.38.0.beta2
+        version: 0.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.38.0.beta2
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +69,7 @@ files:
 - lib/cocoapods-rome.rb
 - lib/cocoapods-rome/gem_version.rb
 - lib/cocoapods-rome/post_install.rb
+- lib/cocoapods-rome/pre_install.rb
 - lib/cocoapods_plugin.rb
 - spec/spec_helper.rb
 - yolo.jpg