cocoapods-packager 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ded7fd8c41f11780560b66ca3ee8a8c98e76fc38
-  data.tar.gz: cb2268abe296f659ca6e5c0ad36199d7309cef55
+  metadata.gz: f68350cb77545ef11604ac7139398932e10ca6f8
+  data.tar.gz: 747890a043aeb9cdefb008c0e1c6142c798991fd
 SHA512:
-  metadata.gz: f834c2bdebc968c40451c9cf362cec3f2814dc96ff00ca79a6e9cb7f63e62e71654196dddca2d5fd868441839b9c8b7153064662052ca5401531fcf60f9cd5f0
-  data.tar.gz: a390c36b4fa38056ae7d8d844c5dd5b31245ab83b6aea3ed5cd3b8f73487962af158a163f08e5e75f6bf7b248ceab94078c0ad5a13dc4de00e0e17250f07fb39
+  metadata.gz: 33e98e575824bc64a7b46faaa6b73e5cf0cb54f96a0ea1efadbb6cfa5b9d550e57ec82e27a02d334ed9fe2d47006e5dcab06077175144106c4dffac01edfaba9
+  data.tar.gz: c7257bec6e11d1274f0b2e8319129d1e0ab17eb44a2f9121fded44b6b2b87ee093ae3f2881288ed8e73ec07a4f95d0536b9e6f9bfa762171f8e2ce22cf5ba447

data/Gemfile

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

data/Gemfile.lock

@@ -9,43 +9,44 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-packager (1.0.2)
+    cocoapods-packager (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
     activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     bacon (1.2.0)
-    claide (0.6.1)
-    cocoapods (0.33.1)
+    claide (0.7.0)
+    cocoapods (0.34.0)
       activesupport (>= 3.2.15, < 4)
-      claide (~> 0.6.1)
-      cocoapods-core (= 0.33.1)
-      cocoapods-downloader (~> 0.6.1)
-      cocoapods-plugins (~> 0.2.0)
-      cocoapods-trunk (~> 0.1.1)
-      cocoapods-try (~> 0.3.0)
+      claide (~> 0.7.0)
+      cocoapods-core (= 0.34.0)
+      cocoapods-downloader (~> 0.7.0)
+      cocoapods-plugins (~> 0.3.1)
+      cocoapods-trunk (~> 0.2.0)
+      cocoapods-try (~> 0.4.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.7)
+      nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.17.0)
-    cocoapods-core (0.33.1)
+      xcodeproj (~> 0.19.2)
+    cocoapods-core (0.34.0)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.5)
-    cocoapods-downloader (0.6.1)
-    cocoapods-plugins (0.2.0)
+      nap (~> 0.8.0)
+    cocoapods-downloader (0.7.0)
+    cocoapods-plugins (0.3.1)
       nap
-    cocoapods-trunk (0.1.4)
+    cocoapods-trunk (0.2.0)
       json_pure (~> 1.8)
-      nap (>= 0.6)
+      nap (>= 0.8)
       netrc
-    cocoapods-try (0.3.0)
+    cocoapods-try (0.4.0)
     colored (1.2)
     coveralls (0.7.1)
       multi_json (~> 1.3)
@@ -81,7 +82,8 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     tins (1.3.3)
-    xcodeproj (0.17.0)
+    xcodeproj (0.19.2)
+      CFPropertyList (~> 2.2)
       activesupport (~> 3.0)
       colored (~> 1.2)
 
@@ -91,7 +93,7 @@ PLATFORMS
 DEPENDENCIES
   bacon
   bundler (~> 1.3)
-  cocoapods (>= 0.33.0)
+  cocoapods (>= 0.34.0)
   cocoapods-packager!
   coveralls
   mocha (~> 0.11.4)

data/lib/cocoapods-packager/mangle.rb

@@ -9,7 +9,7 @@ module Symbols
   #
   def mangle_for_pod_dependencies(pod_name, sandbox_root)
     pod_libs = Dir.glob("#{sandbox_root}/build/libPods-*.a").select do
-      |file| file !~ /#{pod_name}/
+      |file| file !~ /libPods-#{pod_name}.a$/
     end
 
     dummy_alias = alias_symbol "PodsDummy_Pods_#{pod_name}", pod_name

data/lib/cocoapods-packager/pod_utils.rb

@@ -9,7 +9,9 @@ module Pod
           @spec.name,
           platform_name,
           @spec.deployment_target(platform_name),
-          @subspecs)
+          @subspecs,
+          @spec_sources,
+        )
 
         sandbox = Sandbox.new(config.sandbox_root)
         installer = Installer.new(sandbox, podfile)
@@ -18,8 +20,9 @@ module Pod
         sandbox
       end
 
-      def podfile_from_spec(path, spec_name, platform_name, deployment_target, subspecs)
+      def podfile_from_spec(path, spec_name, platform_name, deployment_target, subspecs, sources)
         Pod::Podfile.new do
+          sources.each { |s| source s }
           platform(platform_name, deployment_target)
           if path
             if subspecs

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/lib/pod/command/package.rb

@@ -4,7 +4,10 @@ module Pod
   class Command
     class Package < Command
       self.summary = 'Package a podspec into a static library.'
-      self.arguments = [['NAME', :required], ['SOURCE']]
+      self.arguments = [
+        CLAide::Argument.new('NAME', true),
+        CLAide::Argument.new('SOURCE', false),
+      ]
 
       def self.options
         [
@@ -12,7 +15,9 @@ module Pod
           ['--no-mangle', 'Do not mangle symbols of depedendant Pods.'],
           ['--embedded',  'Generate embedded frameworks.'],
           ['--library',   'Generate static libraries.'],
-          ['--subspecs',  'Only include the given subspecs']
+          ['--subspecs',  'Only include the given subspecs'],
+          ['--spec-sources=private,https://github.com/CocoaPods/Specs.git', 'The sources to pull dependant ' \
+            'pods from (defaults to https://github.com/CocoaPods/Specs.git)'],
         ]
       end
 
@@ -23,6 +28,7 @@ module Pod
         @mangle = argv.flag?('mangle', true)
         @name = argv.shift_argument
         @source = argv.shift_argument
+        @spec_sources = argv.option('spec-sources', 'https://github.com/CocoaPods/Specs.git').split(',')
 
         subspecs = argv.option('subspecs')
         @subspecs = subspecs.split(',') unless subspecs.nil?

data/spec/command/package_spec.rb

@@ -7,6 +7,7 @@ module Pod
         Dir.glob("KFData-*").each { |dir| Pathname.new(dir).rmtree }
         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 }
       end
 
       it 'registers itself' do
@@ -41,6 +42,18 @@ module Pod
                               BBUNikePlusTag }
       end
 
+      it "mangles symbols if the Pod has dependencies regardless of name" do
+        SourcesManager.stubs(:search).returns(nil)
+
+        command = Command.parse(%w{ package spec/fixtures/a.podspec })
+        command.run
+
+        lib = Dir.glob("a-*/ios/a.framework/a").first
+        symbols = Symbols.symbols_from_library(lib).uniq.sort.reject { |e| e =~ /Poda/ }
+        symbols.should == %w{ BBUNikePlusActivity BBUNikePlusSessionManager 
+                                BBUNikePlusTag }
+      end
+
       it "does not mangle symbols if option --no-mangle is specified" do
         SourcesManager.stubs(:search).returns(nil)
 

data/spec/fixtures/PackagerTest/Podfile

@@ -1,3 +1,5 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
 platform :ios, "6.0"
 
 target "PackagerTest" do

data/spec/fixtures/PackagerTest/Podfile.lock

@@ -27,4 +27,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   AFNetworking: 6d7b76aa5d04c8c37daad3eef4b7e3f2a7620da3
 
-COCOAPODS: 0.33.1
+COCOAPODS: 0.34.0

data/spec/fixtures/a.podspec

@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+  s.name         = 'a'
+  s.version      = '0.0.1'
+  s.summary      = 'Objective-C implementation of the Nike+ API.'
+  s.homepage     = 'https://github.com/neonichu/NikeKit'
+  s.license      = {:type => 'MIT', :file => 'LICENSE'}
+  s.authors      = { 'Boris Bügling' => 'http://buegling.com' }
+  s.source       = { :git => 'https://github.com/neonichu/NikeKit.git', :tag => s.version.to_s }
+  s.platform     = :ios, '6.0'
+  
+  s.public_header_files = '*.h'
+  s.source_files = '*.{h,m}'
+  s.frameworks = 'Foundation'
+  s.requires_arc = true
+
+  s.dependency 'AFNetworking'
+  s.dependency 'ISO8601DateFormatter'
+  s.dependency 'KZPropertyMapper'
+end

data/spec/pod/utils_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::Package do
+    it "uses additional spec repos passed on the command line" do
+      SourcesManager.stubs(:search).returns(nil)
+      nil::NilClass.any_instance.stubs(:install!)
+      Installer.expects(:new).with { 
+          |sandbox, podfile| podfile.sources == ['foo', 'bar'] 
+        }
+
+      command = Command.parse(%w{ package spec/fixtures/KFData.podspec --spec-sources=foo,bar})
+      command.send(:install_pod, :osx)
+    end
+
+    it "uses only the master repo if no spec repos were passed" do
+      SourcesManager.stubs(:search).returns(nil)
+      nil::NilClass.any_instance.stubs(:install!)
+      Installer.expects(:new).with { 
+          |sandbox, podfile| podfile.sources == ['https://github.com/CocoaPods/Specs.git'] 
+        }
+
+      command = Command.parse(%w{ package spec/fixtures/KFData.podspec })
+      command.send(:install_pod, :osx)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,9 +92,11 @@ files:
 - spec/fixtures/PackagerTest/PackagerTestTests/en.lproj/InfoPlist.strings
 - spec/fixtures/PackagerTest/Podfile
 - spec/fixtures/PackagerTest/Podfile.lock
+- spec/fixtures/a.podspec
 - spec/fixtures/foo-bar.podspec
 - spec/fixtures/layer-client-messaging-schema.podspec
 - spec/integration/project_spec.rb
+- spec/pod/utils_spec.rb
 - spec/spec_helper.rb
 - spec/specification/builder_spec.rb
 homepage: https://github.com/CocoaPods/cocoapods-packager
@@ -148,9 +150,11 @@ test_files:
 - spec/fixtures/PackagerTest/PackagerTestTests/en.lproj/InfoPlist.strings
 - spec/fixtures/PackagerTest/Podfile
 - spec/fixtures/PackagerTest/Podfile.lock
+- spec/fixtures/a.podspec
 - spec/fixtures/foo-bar.podspec
 - spec/fixtures/layer-client-messaging-schema.podspec
 - spec/integration/project_spec.rb
+- spec/pod/utils_spec.rb
 - spec/spec_helper.rb
 - spec/specification/builder_spec.rb
 has_rdoc: