pod-builder 2.0.0.beta.19 → 2.0.0.beta.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06b4ecc3c8c722ab6166226bc5337951f42f97495a7fc6b0ba48e7c9c9a3079
-  data.tar.gz: b3f10ca75dcc9274897356e17960da284130edd7d883718a382a7846172db1b5
+  metadata.gz: 38b88a4295edaa11ff7dd4f13ee2bce7cdef29f01f7b1784b619d99e670bdc57
+  data.tar.gz: 07dff8cb7ef9f8ece6b484f3310d747ff379ca93763cac482c57a1bcfe17d493
 SHA512:
-  metadata.gz: 5d8b859e774be7793aba56f08e883d53ad5dddad9be6feed13330a0a047661e5de382afc439b9c5beb497a8f58c3859a3fc59863d52258dba41cdd43b1bcc55e
-  data.tar.gz: 68dc2d069a5e92357b23af3f01bbb419b44c04682600cd39c3b14445027fe49278f9f3c8f7387018f35478c5841edc16406bdb1fe56764462e0d5d194c71880d
+  metadata.gz: 3f7eae835712373a68c7ee54b12c8b3d7af9777abe4b96bdc179600c47d34f598c4d85c46e02f5af2da682953eb8766889e1cf2e7b86b8274ab73e8e0a617b50
+  data.tar.gz: c9e2c614bdd38c806f1818ed89e8371211ae5547eaab7cd07950a922397e13583c2df338d78c595f7ee316b1b3554bb38705e13110d6d898e07e5fcc5350d634

data/.gitignore

@@ -10,9 +10,9 @@ Gemfile.lock
 .vscode/
 .DS_Store
 Example/Pods
-Example/Frameworks/Rome
+Example/PodBuilder/Prebuilt
 
-Example/Frameworks/dSYM
+Example/PodBuilder/dSYM
 
 Example/PodBuilderExample.xcodeproj/xcuserdata/*.xcuserdatad
 Example/PodBuilderExample.xcworkspace/xcuserdata

data/Example/Podfile

@@ -1,5 +1,5 @@
 # Autogenerated by PodBuilder (https://github.com/Subito-it/PodBuilder)
-# Any change to this file should be done on Frameworks/Podfile
+# Any change to this file should be done on PodBuilder/Podfile
 
 platform :ios, '9.0'
 
@@ -7,35 +7,35 @@ target 'PodBuilderExample' do
   use_frameworks!
 
   # Pods for PodBuilderExample
-  pod 'Alamofire', :path => 'Frameworks/Rome' # pb<Alamofire>
-  pod 'AFNetworking', :path => 'Frameworks/Rome' # pb<AFNetworking>
-  pod 'Loop', :path => 'Frameworks/Rome' # pb<Loop>
-  pod 'ReactiveSwift', :path => 'Frameworks/Rome' # pb<Loop>
+  pod 'Alamofire', :path => 'PodBuilder/Prebuilt' # pb<Alamofire>
+  pod 'AFNetworking', :path => 'PodBuilder/Prebuilt' # pb<AFNetworking>
+  pod 'Loop', :path => 'PodBuilder/Prebuilt' # pb<Loop>
+  pod 'ReactiveSwift', :path => 'PodBuilder/Prebuilt' # pb<Loop>
 
   # Firebase
   pod 'Firebase'
-  pod 'FirebaseCore', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'GoogleUtilities', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'FirebaseCoreDiagnostics', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'PromisesObjC', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'GoogleDataTransport', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'nanopb', :path => 'Frameworks/Rome' # pb<FirebaseCore>
-  pod 'FirebaseDatabase', :path => 'Frameworks/Rome' # pb<FirebaseDatabase>
-  pod 'leveldb-library', :path => 'Frameworks/Rome' # pb<FirebaseDatabase>
-  pod 'GoogleUtilities', :path => 'Frameworks/Rome' # pb<FirebaseDatabase>
-  pod 'FirebaseAuth', :path => 'Frameworks/Rome' # pb<FirebaseAuth>
-  pod 'GoogleUtilities', :path => 'Frameworks/Rome' # pb<FirebaseAuth>
-  pod 'GTMSessionFetcher', :path => 'Frameworks/Rome' # pb<FirebaseAuth>
-  pod 'FirebaseFirestore', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
-  pod 'abseil', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
-  pod 'gRPC-C++', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
-  pod 'GoogleUtilities', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
-  pod 'gRPC-Core', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
-  pod 'BoringSSL-GRPC', :path => 'Frameworks/Rome' # pb<FirebaseFirestore>
+  pod 'FirebaseCore', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'GoogleUtilities', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'FirebaseCoreDiagnostics', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'PromisesObjC', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'GoogleDataTransport', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'nanopb', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCore>
+  pod 'FirebaseDatabase', :path => 'PodBuilder/Prebuilt' # pb<FirebaseDatabase>
+  pod 'leveldb-library', :path => 'PodBuilder/Prebuilt' # pb<FirebaseDatabase>
+  pod 'GoogleUtilities', :path => 'PodBuilder/Prebuilt' # pb<FirebaseDatabase>
+  pod 'FirebaseAuth', :path => 'PodBuilder/Prebuilt' # pb<FirebaseAuth>
+  pod 'GoogleUtilities', :path => 'PodBuilder/Prebuilt' # pb<FirebaseAuth>
+  pod 'GTMSessionFetcher', :path => 'PodBuilder/Prebuilt' # pb<FirebaseAuth>
+  pod 'FirebaseFirestore', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
+  pod 'abseil', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
+  pod 'gRPC-C++', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
+  pod 'GoogleUtilities', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
+  pod 'gRPC-Core', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
+  pod 'BoringSSL-GRPC', :path => 'PodBuilder/Prebuilt' # pb<FirebaseFirestore>
   pod 'FirebasePerformance'
-  pod 'FirebaseCrashlytics', :path => 'Frameworks/Rome' # pb<FirebaseCrashlytics>
-  pod 'FirebaseInstallations', :path => 'Frameworks/Rome' # pb<FirebaseCrashlytics>
-  pod 'GoogleUtilities', :path => 'Frameworks/Rome' # pb<FirebaseCrashlytics>
+  pod 'FirebaseCrashlytics', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCrashlytics>
+  pod 'FirebaseInstallations', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCrashlytics>
+  pod 'GoogleUtilities', :path => 'PodBuilder/Prebuilt' # pb<FirebaseCrashlytics>
 end
 
 pre_install do |installer|
@@ -45,7 +45,5 @@ end
 
 post_install do |installer|
   require 'pod_builder/podfile/post_actions'
-  PodBuilder::Podfile::remove_target_support_duplicate_entries
-  PodBuilder::Podfile::check_target_support_resource_collisions
-   
+  PodBuilder::Podfile::pod_builder_post_process   
 end

data/Example/Podfile.lock

@@ -320,29 +320,29 @@ PODS:
   - ReactiveSwift (6.3.0)
 
 DEPENDENCIES:
-  - abseil (from `Frameworks/Rome`)
-  - AFNetworking (from `Frameworks/Rome`)
-  - Alamofire (from `Frameworks/Rome`)
-  - BoringSSL-GRPC (from `Frameworks/Rome`)
+  - abseil (from `PodBuilder/Prebuilt`)
+  - AFNetworking (from `PodBuilder/Prebuilt`)
+  - Alamofire (from `PodBuilder/Prebuilt`)
+  - BoringSSL-GRPC (from `PodBuilder/Prebuilt`)
   - Firebase
-  - FirebaseAuth (from `Frameworks/Rome`)
-  - FirebaseCore (from `Frameworks/Rome`)
-  - FirebaseCoreDiagnostics (from `Frameworks/Rome`)
-  - FirebaseCrashlytics (from `Frameworks/Rome`)
-  - FirebaseDatabase (from `Frameworks/Rome`)
-  - FirebaseFirestore (from `Frameworks/Rome`)
-  - FirebaseInstallations (from `Frameworks/Rome`)
+  - FirebaseAuth (from `PodBuilder/Prebuilt`)
+  - FirebaseCore (from `PodBuilder/Prebuilt`)
+  - FirebaseCoreDiagnostics (from `PodBuilder/Prebuilt`)
+  - FirebaseCrashlytics (from `PodBuilder/Prebuilt`)
+  - FirebaseDatabase (from `PodBuilder/Prebuilt`)
+  - FirebaseFirestore (from `PodBuilder/Prebuilt`)
+  - FirebaseInstallations (from `PodBuilder/Prebuilt`)
   - FirebasePerformance
-  - GoogleDataTransport (from `Frameworks/Rome`)
-  - GoogleUtilities (from `Frameworks/Rome`)
-  - "gRPC-C++ (from `Frameworks/Rome`)"
-  - gRPC-Core (from `Frameworks/Rome`)
-  - GTMSessionFetcher (from `Frameworks/Rome`)
-  - leveldb-library (from `Frameworks/Rome`)
-  - Loop (from `Frameworks/Rome`)
-  - nanopb (from `Frameworks/Rome`)
-  - PromisesObjC (from `Frameworks/Rome`)
-  - ReactiveSwift (from `Frameworks/Rome`)
+  - GoogleDataTransport (from `PodBuilder/Prebuilt`)
+  - GoogleUtilities (from `PodBuilder/Prebuilt`)
+  - "gRPC-C++ (from `PodBuilder/Prebuilt`)"
+  - gRPC-Core (from `PodBuilder/Prebuilt`)
+  - GTMSessionFetcher (from `PodBuilder/Prebuilt`)
+  - leveldb-library (from `PodBuilder/Prebuilt`)
+  - Loop (from `PodBuilder/Prebuilt`)
+  - nanopb (from `PodBuilder/Prebuilt`)
+  - PromisesObjC (from `PodBuilder/Prebuilt`)
+  - ReactiveSwift (from `PodBuilder/Prebuilt`)
 
 SPEC REPOS:
   trunk:
@@ -357,47 +357,47 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   abseil:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   AFNetworking:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   Alamofire:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   BoringSSL-GRPC:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseAuth:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseCore:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseCoreDiagnostics:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseCrashlytics:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseDatabase:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseFirestore:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   FirebaseInstallations:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   GoogleDataTransport:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   GoogleUtilities:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   "gRPC-C++":
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   gRPC-Core:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   GTMSessionFetcher:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   leveldb-library:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   Loop:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   nanopb:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   PromisesObjC:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
   ReactiveSwift:
-    :path: Frameworks/Rome
+    :path: PodBuilder/Prebuilt
 
 SPEC CHECKSUMS:
   abseil: 38dd06f1a1c46a8077431abb08d5ee08e3c47ddb

data/README.md

@@ -19,7 +19,7 @@ You can the initialize your project to use the tool using the `init` command
     $ cd path-to-your-repo;
     $ pod_builder init
 
- This will add a _Frameworks_ folder which will contain all files needed and generated by the PodBuilder.
+ This will add a _PodBuilder_ folder which will contain all files needed and generated by the PodBuilder.
 
  To prebuild all dependencies run
 
@@ -35,7 +35,7 @@ Should PodBuilder not work the way you expect you can get rid of it by running
 
     $ pod_builder deintegrate
 
-Which will restore all changes that PodBUilder applied to the project (the Frameworks folder and the changes to the Podfile).
+Which will restore all changes that PodBUilder applied to the project (the PodBuilder folder and the changes to the Podfile).
 
 # Usage
 
@@ -43,7 +43,7 @@ Which will restore all changes that PodBUilder applied to the project (the Frame
 
 The workflow is very similar to the one you're used to with CocoaPods. The most significant difference is that PodBuilder relies on 3 Podfiles:
 
-### 1. Frameworks/Podfile (aka PodBuilder-Podfile)
+### 1. PodBuilder/Podfile (aka PodBuilder-Podfile)
 
 This is your original Podfile and remains your **master Podfile** that you will update as needed. It is used by PodBuilder to determine which versions and dependencies need to be compiled when prebuilding.
 
@@ -51,7 +51,7 @@ This is your original Podfile and remains your **master Podfile** that you will
 
 Based on the one above but will replace precompiled frameworks with references to the local PodBuilder podspec. **It is autogenerated and shouldn't be manually changed**
 
-### 3. Frameworks/Podfile.restore (aka Restore-Podfile)
+### 3. PodBuilder/Podfile.restore (aka Restore-Podfile)
 
 This acts as a sort of lockfile and reflects the current state of what is installed in the application, pinning pods to a particular tag or commit. This will be particularly useful until Swift reaches ABI stability, because when you check out an old revision of your code you won't be able to get your project running unless the Swift frameworks were compiled with a same version of Xcode you're currently using. This file is used internally by PodBuilder and shouldn't be manually changed. **It is autogenerated and shouldn't be manually changed**
 
@@ -79,8 +79,8 @@ This will sets up a project to use PodBuilder.
 
 The following will happen:
 
-- Create a _Frameworks_ folder in your repo's root.
-- Copy your original Podfile to _Frameworks/Podfile_ (PodBuilder-Podfile)
+- Create a _PodBuilder_ folder in your repo's root.
+- Copy your original Podfile to _PodBuilder/Podfile_ (PodBuilder-Podfile)
 - Add an initially empty _PodBuilder.json_ configuration file
 - Modify the original Podfile (Application-Podfile) with some minor customizations
 - Create/Update your Gemfile adding the `gem 'pod-builder'` entry
@@ -95,7 +95,7 @@ Running `pod_builder build [pod name]` will precompile the pod that should be in
 
 The following will happen:
 
-- Create one or more (if there are dependencies) _.framework_ file/s under _Frameworks/Rome_ along with its corresponding _dSYM_ files (if applicable) 
+- Create one or more (if there are dependencies) _.framework_ file/s under _PodBuilder/Prebuilt_ along with its corresponding _dSYM_ files (if applicable) 
 - Update the Application-Podfile replacing the pod definition with the precompiled ones
 - Update/create the Podfile.restore (Restore-Podfile)
 - Update/create PodBuilder.podspec which is a local podspec for your prebuilt frameworks (more on this later)
@@ -108,7 +108,7 @@ As `build` but will prebuild all pods defined in PodBuilder-Podfile.
 
 #### `update` command
 
-If you decide not to commit the _Rome_ and _dSYM_ folders you can use this command to rebuild all those frameworks that are out-of-sync with the Restore-Podfile or that were built with a different version of the Swift compiler.
+If you decide not to commit the _Prebuilt_ and _dSYM_ folders you can use this command to rebuild all those frameworks that are out-of-sync with the Restore-Podfile or that were built with a different version of the Swift compiler.
 
 #### `restore_all` command
 
@@ -116,7 +116,7 @@ Will recompile all pods to the versions defined in the Restore-Podfile. You woul
 
 #### `install_sources` command
 
-When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _Frameworks/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
+When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
 
 #### `update_lldbinit` command
 
@@ -139,7 +139,7 @@ Using the switch command you can choose to integrate it:
 - development. The _Development Pod_ used by CocoaPods
 - prebuilt. Use the prebuilt pod
 
-To support development pods you should specify the path(s) that contain the pods sources in _Frameworks/PodBuilderDevPodsPaths.json_ as follows
+To support development pods you should specify the path(s) that contain the pods sources in _PodBuilder/PodBuilderDevPodsPaths.json_ as follows
 
 ```json
 [
@@ -310,7 +310,7 @@ Normally when multiple subspecs are specified in a target a single framework is
 
 #### `lfs_update_gitattributes` 
 
-Adds a _.gitattributes_ to _Frameworks/Rome_ and _Frameworks/dSYM_ to exclude large files. If `lfs_include_pods_folder` is true it will add a the same _.gitattributes_ to the application's _Pods_ folder as well.
+Adds a _.gitattributes_ to _PodBuilder/Prebuilt_ and _PodBuilder/dSYM_ to exclude large files. If `lfs_include_pods_folder` is true it will add a the same _.gitattributes_ to the application's _Pods_ folder as well.
 
 
 #### `lfs_include_pods_folder`
@@ -329,7 +329,7 @@ If set to true built frameworks will include iPhone simulator slices for Apple s
 
 # Behind the scenes
 
-PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.com/CocoaPods/Rome) to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example xcconfig settings.
+PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.com/CocoaPods/Prebuilt) to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example xcconfig settings.
 
 # FAQ
 
@@ -365,7 +365,7 @@ Relaunch the build command passing `-d`, this won't delete the temporary _/tmp/p
 
 ### **Do I need to commit compiled frameworks?**
 
-No. If the size of compiled frameworks in your repo is a concern (and for whatever reason you can't use [Git-LFS](#git-lfs)) you can choose add the _Rome_ and _dSYM_ folder to .gitignore and run `pod_builder update` to rebuild all frameworks that need to be recompiled.
+No. If the size of compiled frameworks in your repo is a concern (and for whatever reason you can't use [Git-LFS](#git-lfs)) you can choose add the _Prebuilt_ and _dSYM_ folder to .gitignore and run `pod_builder update` to rebuild all frameworks that need to be recompiled.
 
 
 ### **I get an _'attempt to read non existent folder `/private/tmp/pod_builder/Pods/ podname'_ when building**

data/exe/pod_builder

@@ -36,15 +36,15 @@ Command:
     + deintegrate                    Deintegrate prebuild folders
     + build                          Build a specific pod declared in the PodBuilder-Podfile
     + build_all                      Build all pods declared in the PodBuilder-Podfile
-    + update                         Rebuild frameworks that are outdated
+    + update                         Rebuild items that are outdated
     + restore_all                    Rebuild all pods declared in the Restore-Podfile
-    + install_sources                Install sources of pods to debug into prebuilt frameworks
-    + update_lldbinit                Generate an lldbinit file with setting target.source-map to debug prebuilt frameworks
+    + install_sources                Install sources of pods to debug into prebuilt items
+    + update_lldbinit                Generate an lldbinit file with setting target.source-map to debug prebuilt items
     + clear_lldbinit                 Clear an lldbinit file from PodBuilder's customizations
     + switch                         Switch between prebuilt/development/standard pod in the Application-Podfile
-    + clean                          Remove prebuild frameworks, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
+    + clean                          Remove prebuild items, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
     + sync_podfile                   Update your Application-Podfile with all pods declared in the PodBuilder-Podfile
-    + info                           Print json-formatted informations about prebuilt frameworks
+    + info                           Print json-formatted informations about prebuilt items
 
 Options:
 "
@@ -71,7 +71,7 @@ Options:
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
-        opts.on("-f", "--force", "Rebuild frameworks evan if no code change is detected") do |o|
+        opts.on("-f", "--force", "Rebuild items even when no code change is detected") do |o|
           OPTIONS[:force_rebuild] = false
         end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
@@ -103,7 +103,7 @@ Options:
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
-        opts.on("-f", "--force", "Rebuild frameworks evan if no code change is detected") do |o|
+        opts.on("-f", "--force", "Rebuild items even when no code change is detected") do |o|
           OPTIONS[:force_rebuild] = false
         end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
@@ -125,7 +125,7 @@ Usage:
         
     $ pod_builder update [OPTIONS]
 
-      Rebuild frameworks that are outdated
+      Rebuild items that are outdated
         
 Options:
 "        
@@ -135,7 +135,7 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-r", "--dry", "Determine which frameworks need update") do |o|
+        opts.on("-r", "--dry", "Determine which items need to be updated") do |o|
           OPTIONS[:dry_run] = o
         end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
@@ -230,10 +230,13 @@ Usage:
         
     $ pod_builder clean
 
-      Remove unused framework, dSYM and source folders.
+      Remove unused prebuild data, dSYM and source folders.
         
 Options:
-"           
+"         
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
+        end
       end,
       :call => [        
         PodBuilder::Command::Clean
@@ -247,7 +250,7 @@ Usage:
         
     $ pod_builder install_sources
 
-      Install source of prebuilt pods to be able to step into and debug framework's code.
+      Install source of prebuilt pods to be able to step into and debug prebuilt's code.
 
 "         
       end,
@@ -264,9 +267,9 @@ Usage:
     $ pod_builder update_lldbinit <LLDBINIT_PATH> <PATH>
 
       Update LLDBINIT_PATH setting target.source-map in order to be able to step into 
-      and debug prebuilt framework's code.
+      and debug prebuilt prebuilt's code.
 
-      Specify the PATH of the folder containing the source code of prebuilt frameworks. PATH can be relative to PodBuilder's Framework folder.
+      Specify the PATH of the folder containing the source code of prebuilt items. PATH can be relative to PodBuilder's Prebuilt folder.
 
 "         
       end,
@@ -310,6 +313,9 @@ Options:
         opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
           OPTIONS[:switch_mode] = "default"
         end
+        opts.on("-a", "--all", "Include dependencies") do |o|
+          OPTIONS[:switch_all] = true
+        end
       end,
       :call => [        
         PodBuilder::Command::Switch
@@ -327,7 +333,12 @@ Usage:
       You may want to run this command when you add a new pod to the PodBuilder-Podfile 
       and you want to integrate it in the project without rebuilding it.
         
-"      end,
+Options:
+"       
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
+        end
+      end,
       :call => [        
         PodBuilder::Command::SyncPodfile
       ]
@@ -367,7 +378,7 @@ Usage:
 
     subcommand[:opts].order!    
     subcommand[:call].each do |k|
-      if (ret = k.call(OPTIONS)) && ret == -1
+      if (ret = k.call) && ret == -1
         puts subcommand[:opts].help
       end
     end