cocoapods-deintegrate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93e7480d54a9d5920c8f432f10cae8fc370ec89
-  data.tar.gz: 0d364b937714604d1a17ccf0992e2d6a120ba9f4
+  metadata.gz: 7113f2f12c2b623ba3d86cfec1abbbfe1bab4dc1
+  data.tar.gz: aeed50beacc14d4683ba2a94ef7a6a35822b74c3
 SHA512:
-  metadata.gz: 86c94958c7255c9c904f02acd600e81a2ed4e955933104a3a71db1a17160e3b667339fba1865f97a809fcb081e33c29a6d08725284bc7c0f4899995c85a7c22d
-  data.tar.gz: 89280f7f1df0844667e9aba3234e131682d278b5f42c3b881f6ac2ba00bf3cf9ae8c47b33d5e3f763af4f414d10dfa4bc568259a7741c6a9681be1f257ed917f
+  metadata.gz: 294ee6637d1b09376ffd5c41ea3ff33dabb68b52066685d859b9dddf4cf5488a7aabb94d1bd4ce50b26813a627d5da00d7046d4f0ff627e4d9daaaf29379f790
+  data.tar.gz: f9627ceb0f90bdbaf76a91fe14a5bad565fc9a26f38305f9763cfcca421c4aad9f6c4f4eb9f2f46dfd01f19d9143597b10547332988ce7665073ba1934fffff9

data/Gemfile.lock

@@ -1,45 +1,43 @@
 PATH
   remote: .
   specs:
-    cocoapods-deintegrate (0.1.0)
-      cocoapods
+    cocoapods-deintegrate (0.1.1)
+      cocoapods (~> 0.34)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    activesupport (3.2.19)
+    activesupport (3.2.20)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     bacon (1.2.0)
     claide (0.7.0)
-    cocoapods (0.34.1)
+    cocoapods (0.34.4)
       activesupport (>= 3.2.15, < 4)
       claide (~> 0.7.0)
-      cocoapods-core (= 0.34.1)
-      cocoapods-downloader (~> 0.7.1)
+      cocoapods-core (= 0.34.4)
+      cocoapods-downloader (~> 0.7.2)
       cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.2.0)
+      cocoapods-trunk (~> 0.3.1)
       cocoapods-try (~> 0.4.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
       nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.19.2)
-    cocoapods-core (0.34.1)
+      xcodeproj (~> 0.19.4)
+    cocoapods-core (0.34.4)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
-      json_pure (~> 1.8)
       nap (~> 0.8.0)
-    cocoapods-downloader (0.7.1)
-    cocoapods-plugins (0.3.1)
+    cocoapods-downloader (0.7.2)
+    cocoapods-plugins (0.3.2)
       nap
-    cocoapods-trunk (0.2.0)
+    cocoapods-trunk (0.3.1)
       json_pure (~> 1.8)
       nap (>= 0.8)
-      netrc
-    cocoapods-try (0.4.1)
+      netrc (= 0.7.8)
+    cocoapods-try (0.4.2)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
@@ -52,11 +50,10 @@ GEM
       mocha (>= 0.13.0)
     multi_json (1.10.1)
     nap (0.8.0)
-    netrc (0.7.7)
+    netrc (0.7.8)
     open4 (1.3.4)
     rake (10.3.2)
-    xcodeproj (0.19.2)
-      CFPropertyList (~> 2.2)
+    xcodeproj (0.19.4)
       activesupport (~> 3.0)
       colored (~> 1.2)
 

data/cocoapods_deintegrate.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'cocoapods'
+  spec.add_dependency 'cocoapods', '~> 0.34'
 end
 

data/lib/cocoapods_deintegrate.rb

@@ -1,4 +1,4 @@
 module CocoapodsDeintegrate
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end
 

data/lib/pod/command/deintegrate.rb

@@ -43,9 +43,9 @@ module Pod
         deintegrate_project(project)
         project.save()
 
-        pods_directory = Pathname.new('Pods')
+        pods_directory = config.sandbox.root
         if pods_directory.exist?
-          UI.puts('Removing `Pods/` directory.')
+          UI.puts("Removing `#{pods_directory.relative_path_from(Pathname.new(Dir.pwd))}` directory.")
           pods_directory.rmtree()
         end
 
@@ -55,9 +55,15 @@ module Pod
       end
 
     private
+    
+      def native_targets(project)
+        project.targets.reject do |target|
+          target.is_a? Xcodeproj::Project::Object::PBXAggregateTarget
+        end
+      end
 
       def deintegrate_project(project)
-        project.targets.each do |target|
+        native_targets(project).each do |target|
           UI.section("Deintegrating target #{target.name}") do
             deintegrate_target(target)
           end
@@ -75,7 +81,8 @@ module Pod
 
         pod_files = groups.map do |group|
           group.files.select do |obj|
-            obj.name =~ /^Pods.*\.xcconfig$/i or obj.path =~ /^libPods.*\.a$/i
+            obj.name =~ /^Pods.*\.xcconfig$/i or
+                obj.path =~ /^(libPods.*\.a)|(Pods_.*\.framework)$/i
           end
         end.flatten
 
@@ -88,20 +95,15 @@ module Pod
           end
         end
 
-        # Delete empty `Pods` directory if exists
-        pod_groups = project.main_group.recursive_children_groups.select do |group|
-          group.name == 'Pods' && group.children.empty?
-        end
-
-        unless pod_groups.empty?
-          pod_groups.each(&:remove_from_project)
-          UI.puts "Deleted #{pod_groups.count} `Pod` groups from project."
-        end
+        # Delete empty `Pods` group if exists
+        delete_empty_group(project, 'Pods')
+        delete_empty_group(project, 'Frameworks')
       end
 
       def deintegrate_target(target)
         deintegrate_shell_script_phase(target, 'Copy Pods Resources')
         deintegrate_shell_script_phase(target, 'Check Pods Manifest.lock')
+        deintegrate_shell_script_phase(target, 'Embed Pods Frameworks')
         deintegrate_pods_libraries(target)
       end
 
@@ -109,7 +111,7 @@ module Pod
         frameworks_build_phase = target.frameworks_build_phase
 
         pods_build_files = frameworks_build_phase.files.select do |build_file|
-          build_file.display_name =~ /^libPods.*\.a$/i
+          build_file.display_name =~ /^(libPods.*\.a)|(Pods_.*\.framework)$/i
         end
 
         unless pods_build_files.empty?
@@ -135,7 +137,17 @@ module Pod
           UI.puts("Deleted #{phases.count} '#{phase_name}' build phases.")
         end
       end
+
+      def delete_empty_group(project, group_name)
+        groups = project.main_group.recursive_children_groups.select do |group|
+          group.name == group_name && group.children.empty?
+        end
+
+        unless groups.empty?
+          groups.each(&:remove_from_project)
+          UI.puts "Deleted #{groups.count} empty `#{group_name}` groups from project."
+        end
+      end
     end
   end
 end
-

data/spec/command/deintegrate_spec.rb

@@ -1,5 +1,38 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
+def fixture_project(named)
+  ROOT + "spec/fixtures/Project/#{named}"
+end
+
+def temporary_directory
+  ROOT + 'tmp'
+end
+
+def deintegrate(directory)
+  Dir.chdir(directory) do
+    command = Pod::Command.parse(['deintegrate'])
+    command.config.sandbox.stubs(:root).returns(directory + 'Pods')
+    command.validate!
+    command.run
+  end
+end
+
+def deintegrate_project(named)
+  path = fixture_project(named)
+  `rsync -r #{path}/ #{temporary_directory}`
+
+  deintegrate(temporary_directory)
+
+  (temporary_directory + 'TestProject.xcworkspace').rmtree
+  (temporary_directory + 'Podfile').delete
+  (temporary_directory + 'Podfile.lock').delete
+
+  output = `diff -r #{fixture_project('None')} #{temporary_directory}`
+  puts(output) unless $?.success?
+
+  $?.success?.should == true
+end
+
 module Pod
   describe Command::Deintegrate do
     describe 'CLAide' do
@@ -9,7 +42,20 @@ module Pod
     end
 
     before do
-      @command = Command.parse(['deintegrate'])
+      temporary_directory.rmtree if temporary_directory.exist?
+      temporary_directory.mkdir
+    end
+
+    after do
+      temporary_directory.rmtree
+    end
+
+    it 'deintegrates a static library integrated project' do
+      deintegrate_project('StaticLibraries')
+    end
+
+    it 'deintegrates a framework integrated project' do
+      deintegrate_project('Frameworks')
     end
   end
 end

data/spec/fixtures/Project/Frameworks/Podfile

@@ -0,0 +1,12 @@
+platform :ios, '8.0'
+
+use_frameworks!(true)
+
+target 'TestProject' do
+  pod 'QueryKit'
+end
+
+target 'TestProjectTests' do
+  pod 'Quick'
+end
+

data/spec/fixtures/Project/Frameworks/Podfile.lock

@@ -0,0 +1,42 @@
+PODS:
+  - QueryKit (0.9.1):
+    - QueryKit/Attribute (= 0.9.1)
+    - QueryKit/ObjectiveC (= 0.9.1)
+    - QueryKit/QuerySet (= 0.9.1)
+    - QueryKit/Swift (= 0.9.1)
+  - QueryKit/Attribute (0.9.1):
+    - QueryKit/Attribute/Bridge (= 0.9.1)
+    - QueryKit/Attribute/ObjectiveC (= 0.9.1)
+    - QueryKit/Attribute/Swift (= 0.9.1)
+  - QueryKit/Attribute/Bridge (0.9.1):
+    - QueryKit/Attribute/ObjectiveC
+    - QueryKit/Attribute/Swift
+  - QueryKit/Attribute/ObjectiveC (0.9.1)
+  - QueryKit/Attribute/Swift (0.9.1):
+    - QueryKit/QuerySet/Swift
+  - QueryKit/ObjectiveC (0.9.1):
+    - QueryKit/Attribute/ObjectiveC
+    - QueryKit/QuerySet/ObjectiveC
+  - QueryKit/QuerySet (0.9.1):
+    - QueryKit/QuerySet/Bridge (= 0.9.1)
+    - QueryKit/QuerySet/ObjectiveC (= 0.9.1)
+    - QueryKit/QuerySet/Swift (= 0.9.1)
+  - QueryKit/QuerySet/Bridge (0.9.1):
+    - QueryKit/QuerySet/ObjectiveC
+    - QueryKit/QuerySet/Swift
+  - QueryKit/QuerySet/ObjectiveC (0.9.1)
+  - QueryKit/QuerySet/Swift (0.9.1)
+  - QueryKit/Swift (0.9.1):
+    - QueryKit/Attribute/Swift
+    - QueryKit/QuerySet/Swift
+  - Quick (0.2.2)
+
+DEPENDENCIES:
+  - QueryKit
+  - Quick
+
+SPEC CHECKSUMS:
+  QueryKit: c2ded7784aa57d182a1998e06381633da178443d
+  Quick: 7b89ff625e72ef931c2a9ef2f25ac3a9d2457763
+
+COCOAPODS: 0.36.0.beta.2

data/spec/fixtures/Project/Frameworks/Pods/Headers/Private/QueryKit/QKAttribute.h

@@ -0,0 +1,210 @@
+//
+//  QKAttribute.h
+//  QueryKit
+//
+//  Created by Kyle Fuller on 30/04/2013.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+/** A helper class to generate predicates and sort descriptors for attributes
+ on a managed object.
+ */
+@interface QKAttribute : NSObject <NSSecureCoding, NSCopying>
+
+@property (nonatomic, strong, readonly) NSString *name;
+
+/// Initialized the attribute from multiple other attributes
+- (instancetype)initWithAttributes:(QKAttribute *)attribute, ... NS_REQUIRES_NIL_TERMINATION;
+
+/// Initialized the attribute with the given name
+- (instancetype)initWithName:(NSString *)name __attribute((nonnull));
+
+/** Returns a Boolean value that indicates whether a given attribute is equal to the receiver
+ @param attribute The attribute to compare against the receiver
+ @return YES if attribute is equivalent to the receiver
+ */
+- (BOOL)isEqualToAttribute:(QKAttribute *)attribute;
+
+/** Returns an expression for the attributes key-value path */
+- (NSExpression *)expression;
+
+@end
+
+@interface QKAttribute (Predicate)
+
+/** Returns a predicate for an equality comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see equal:
+ */
+- (NSPredicate *)equal:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for an equality comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see equal:options:
+ */
+- (NSPredicate *)equal:(id)value;
+
+/** Returns a predicate for an unequal comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see notEqual:
+ */
+- (NSPredicate *)notEqual:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for an unequal comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see notEqual:options:
+ */
+- (NSPredicate *)notEqual:(id)value;
+
+/** Returns a predicate for a like comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see like:
+ */
+- (NSPredicate *)like:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for a like comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see like:options:
+ */
+- (NSPredicate *)like:(id)value;
+
+/** Returns a predicate for a matches comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see like:
+ */
+- (NSPredicate *)matches:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for a matches comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see like:options:
+ */
+- (NSPredicate *)matches:(id)value;
+
+/** Returns a predicate for a begins with comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see like:
+ */
+- (NSPredicate *)beginsWith:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for a begins with comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see like:options:
+ */
+- (NSPredicate *)beginsWith:(id)value;
+
+/** Returns a predicate for a ends with comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see like:
+ */
+- (NSPredicate *)endsWith:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for a ends with comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see like:options:
+ */
+- (NSPredicate *)endsWith:(id)value;
+
+/** Returns a predicate for greater than the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see greaterThanOrEqualTo:
+ */
+- (NSPredicate *)greaterThan:(id)value;
+
+/** Returns a predicate for greater than or equal to the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see greaterThan:
+ */
+- (NSPredicate *)greaterThanOrEqualTo:(id)value;
+
+/** Returns a predicate for less than the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see lessThanOrEqualTo:
+ */
+- (NSPredicate *)lessThan:(id)value;
+
+/** Returns a predicate for less than or equal to the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see lessThan:
+ */
+- (NSPredicate *)lessThanOrEqualTo:(id)value;
+
+/** Returns a predicate for attribute being between two values
+ @param minimumValue
+ @param maximumValue
+ @return The predicate for this comparison
+ */
+- (NSPredicate *)between:(id)minimumValue and:(id)maxiumValue;
+
+/** Returns an IN predicate for attribute
+ @param set An enumerable object containing a set ob objects
+ @return The predicate for this comparison
+ */
+- (NSPredicate *)in:(id<NSFastEnumeration>)set;
+
+/** Returns a predicate for a contains with comparison against the supplied value
+ @param value To compare against the attribute
+ @param options NSComparisonPredicateOptions to apply to the comparison
+ @return The predicate for this comparison
+ @see contains:
+ */
+- (NSPredicate *)contains:(id)value options:(NSComparisonPredicateOptions)options;
+
+/** Returns a predicate for a contains with comparison against the supplied value
+ @param value To compare against the attribute
+ @return The predicate for this comparison
+ @see contains:options:
+ */
+- (NSPredicate *)contains:(id)value;
+
+/** Returns a predicate for if the attribute being equal to nil
+ @return The predicate for the attribute being nil.
+ */
+- (NSPredicate *)isNil;
+
+/** Returns a predicate for if the attribute being equal to YES
+ @return The predicate for the attribute being YES.
+ @see isNO
+ */
+- (NSPredicate *)isYes;
+
+/** Returns a predicate for if the attribute being equal to NO
+ @return The predicate for the attribute being NO.
+ @see isYes
+ */
+- (NSPredicate *)isNo;
+
+@end
+
+@interface QKAttribute (Sorting)
+
+/** Returns an ascending sort descriptor for this attribute */
+- (NSSortDescriptor *)ascending;
+
+/** Returns a descending sort descriptor for this attribute */
+- (NSSortDescriptor *)descending;
+
+@end