pod-builder 0.1.8.beta → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 883d322c0c5ffd3cf34a85d76a055f3a1200400243ae03b109cb93fd3d3fd8be
-  data.tar.gz: b0237ad432feae58f2b222c4ece477c580425cdd4986ebf148106d3b272a0e3b
+  metadata.gz: 2a2b5d6848e10cdd2554d29689b00cbe7a9b8fa7566583143bc3f66aaab1b25e
+  data.tar.gz: f971ef9f6e5de1a05167baae0122f6f87466c96a7f98b037df6fd8f4a11bd4b8
 SHA512:
-  metadata.gz: 7443c790eb55db4a7565cb846d53a9aea7cdb26e5077f9407c1eddcaa8e217beee1851888ad688b6d683ea65c6274a0abd9cca701b7e21575118fcf479a37013
-  data.tar.gz: 2b455b666c9a690ef3682b810810e7fdf952c6d67846d193a8bead5b41402aa4afebaf24f3407dbb935461a5a14c1a15322a8a341bb992f15074195dc78e6947
+  metadata.gz: 5c496ac0b857343cb573230bcf3304fa83893000109bb5834df80c23c5c48a122d96476fef335c9073d94eb4a57b44b8a5c42aae8989ebfb488bc88cd372d1c5
+  data.tar.gz: c6a4109417bbabc92466a8e6f9d815de3caf206b403d2fe72647c2ae73dd06ac05defbfecb069137683dc89f57fcf0431f4a8f2ec73ff930c237da4d856ee310

data/.vscode/launch.json

@@ -8,33 +8,33 @@
             "name": "No Command",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
             "pathToRDebugIDE": "/usr/bin/rdebug-ide",
             "args": [
-                
+                "-v"
             ]
         },
         {
             "name": "Init",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
             "pathToRDebugIDE": "/usr/bin/rdebug-ide",
             "args": [
-                "init",
+                "init"
             ]
         },
         {
             "name": "Deintegrate",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
@@ -47,7 +47,7 @@
             "name": "Build",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
@@ -55,28 +55,29 @@
             "args": [
                 "build",
                 "-d",
-                "AppNexusSDK/GoogleAdapterThatDependsOnGooglePod",
+                "ADvantage",
             ]
         },
         {
             "name": "Build All",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
             "pathToRDebugIDE": "/usr/bin/rdebug-ide",
             "args": [
                 "build_all",
-                "-d"
+                "-d",
+                "--allow-warnings"
             ]
         },
         {
             "name": "Restore All",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
@@ -90,7 +91,7 @@
             "name": "Clean",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
@@ -103,7 +104,7 @@
             "name": "Install sources",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "/Users/tomas/Documents/Xcode/Subito4",
+            "cwd": "~/Desktop",
             "useBundler": true,
             "program": "${workspaceRoot}/exe/pod_builder",
             "showDebuggerOutput": true,
@@ -111,6 +112,60 @@
             "args": [
                 "install_sources"
             ]
+        },
+        {
+            "name": "Generate podspec",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "~/Desktop",
+            "useBundler": true,
+            "program": "${workspaceRoot}/exe/pod_builder",
+            "showDebuggerOutput": true,
+            "pathToRDebugIDE": "/usr/bin/rdebug-ide",
+            "args": [
+                "generate_podspec"
+            ]
+        },
+        {
+            "name": "Switch pod",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "~/Desktop",
+            "useBundler": true,
+            "program": "${workspaceRoot}/exe/pod_builder",
+            "showDebuggerOutput": true,
+            "pathToRDebugIDE": "/usr/bin/rdebug-ide",
+            "args": [
+                "switch",
+                "-p",
+                "AFNetworking",                
+            ]
+        },
+        {
+            "name": "Update LFS",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "~/Desktop",
+            "useBundler": true,
+            "program": "${workspaceRoot}/exe/pod_builder",
+            "showDebuggerOutput": true,
+            "pathToRDebugIDE": "/usr/bin/rdebug-ide",
+            "args": [
+                "update_lfs",
+            ]
+        },
+        {
+            "name": "Synch Podfile",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "~/Desktop",
+            "useBundler": true,
+            "program": "${workspaceRoot}/exe/pod_builder",
+            "showDebuggerOutput": true,
+            "pathToRDebugIDE": "/usr/bin/rdebug-ide",
+            "args": [
+                "synch_podfile",
+            ]
         }
     ]
 }

data/README.md

@@ -1,45 +1,43 @@
 ## Beta tool: distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
-# PodBuilder
+# What is PodBuilder
 
-PodBuilder is a complementary tool to [CocoaPods](https://github.com/CocoaPods/CocoaPods) that allows to prebuild pods into frameworks which can then be included into a project’s repo. Instead of committing pod’s source code you add its compiled counterpart. While there is a size penalty in doing so, and some may argue that git isn’t designed to handle large binaries files (check [Git LFS](https://git-lfs.github.com) to overcome that), compilation times will decrease significantly because pod's source files no longer need to be recompiled _very often_. Additionally frameworks contain all architecture so they’re ready to be used both on any device and simulator.
+PodBuilder is a complementary tool to [CocoaPods](https://github.com/CocoaPods/CocoaPods) that allows to prebuild pods into frameworks which can then be included into a project’s repo. Instead of committing pod’s source code you add its compiled counterpart. While there is a size penalty in doing so, which can be overcome by using [Git-LFS](#git-lfs), compilation times will decrease significantly because pod's source files no longer need to be recompiled _very often_. Additionally frameworks contain all architecture so they’re ready to be used both on any device and simulator.
 
-Depending on the size of the project and number of pods this can translate in a significant reduction of compilation times (for a large project we designed this tool for we saw a 5x improvement, but YMMV).
+Depending on the size of the project and number of pods this can translate in a significant reduction of compilation times (for a large project we designed this tool for we saw a 50% faster compile times, but YMMV).
 
-## Installation
+# Installation
 
-Add this line to your application's Gemfile:
+Like CocoaPods PodBuilder is built with Ruby and will be installable with default version of Ruby available on macOS.
 
-```ruby
-gem 'pod-builder'
-```
+Unless you're using a Ruby version manager you should generally install using `sudo` as follows
 
-And then execute:
+    $ sudo gem install pod-builder
 
-    $ bundle
+You can the initialize your project to use the tool using the `init` command
 
-Or install it yourself as:
+    $ cd path-to-your-repo;
+    $ pod_builder init
 
-    $ gem install pod-builder
+ This will add a _Frameworks_ folder which will contain all files needed and generated by the PodBuilder.
 
-## Usage
+## Podfile
 
-The tool relies on 3 Podfiles
+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): this is your original Podfile. This is still your master Podfile that you will update as needed and is used by PodBuilder to determine which versions and dependencies need to be compiled when prebuilding.
-2. _Podfile_ (aka Application-Podfile): this one is based on the one above but will replace precompiled frameworks with references to the local PodBuilder podspec. It is the Podfile used by your app.
-3. _Frameworks/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.
+### 1. Frameworks/Podfile (aka PodBuilder-Podfile)
 
-The nice thing of this setup is that you can quickly switch between the precompiled and the source code version of a pod. In the Application-Podfile the tool will automatically reference to the local podspec for a precompiled pod but will also leave the original source commented. When you need to get source code version you just switch the 2 comments and run `pod install`, for example when you need to debug a pod's internal implementation.
+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.
 
-As an example these are the 2 lines that are automatically added to the Application-Podfile:
+### 2. Podfile (aka Application-Podfile)
 
-```ruby
-  pod 'PodBuilder/AFNetworking', :path => '../Frameworks'
-  # pod 'AFNetworking'
-```
+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**
 
-### Commands
+### 3. Frameworks/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**
+
+## Commands
 
 Podbuilder comes with a set of commands:
 
@@ -47,9 +45,11 @@ Podbuilder comes with a set of commands:
 - `deintegrate`: deintegrates PodBuilder's initialization
 - `build`: prebuilts a specific pod declared in the PodBuilder-Podfile
 - `build_all`: prebuilts all pods declared in the PodBuilder-Podfile
-- `restore_all`: rebuilts all pods declared in the Framework/Podfile.restore file
+- `restore_all`: rebuilts all pods declared in the Restore-Podfile file
 - `install_sources`: installs sources of pods to debug into prebuild frameworks
+- `switch`: switch between prebuilt, development or standard pod in the Application-Podfile
 - `clean`: removes unused prebuilt frameworks, dSYMs and source files added by install_sources
+- `synch_podfile`: updates the Application with all pods declared in the PodBuilder-Podfile file
 
 Commands can be run from anywhere in your project's repo that is **required to be under git**. 
 
@@ -63,10 +63,11 @@ The following will happen:
 - Copy your original Podfile to _Frameworks/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
 
 #### `deintegrate` command
 
-This will revert `init`'s changes
+This will revert `init`'s changes.
 
 #### `build` command
 
@@ -85,16 +86,31 @@ As `build` but will prebuild all pods defined in PodBuilder-Podfile.
 
 #### `restore_all` command
 
-Will recompile all pods to the versions defined in the Restore-Podfile.
+Will recompile all pods to the versions defined in the Restore-Podfile. You would typically use this when checking out an older revision of your project that might need to rebuild frameworks (e.g. You're using a different version of the Swift compiler) to the exact same version at the time of the commit.
 
 #### `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 step into the pods code. 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.
 
+#### `switch` command
+
+Once you prebuild a framework you can change the way it is integrated in your project.
+
+Using the switch command you can choose to integrate it:
+
+- standard. Reverts to the default one used by CocoaPods
+- development. The _Development Pod_ used by CocoaPods
+- prebuilt. Use the prebuilt pod
+
 #### `clean` command
 
 Deletes all unused files by PodBuilder, including .frameworks, .dSYMs and _Source_ repos.
 
+#### `synch_podfile` command
+
+Updates the Application with all pods declared in the PodBuilder-Podfile file. This can come in handy when adding a new pod to the PodBuilder-Podfile file you don't won't to prebuild straight away.
+
+
 # Configuration file
 
 _PodBuilder.json_ allows some advanced customizations.
@@ -119,17 +135,31 @@ As an example here we're setting `module_name` in Google's Advertising SDK:
 }
 ```
 
+### `skip_pods`
+
+You may want to skip some pods to be prebuilt, you can do that as follows:
+
+```json
+{
+    "skip_pods": [
+        "PodA"
+        ]
+}
+```
+  
+
 #### `build_settings`
 
 Xcode build settings to use. You can override the default values which are:
 
 ```json
 {
-    "ENABLE_BITCODE": "NO",
-    "CLANG_ENABLE_MODULE_DEBUGGING": "NO",
-    "GCC_OPTIMIZATION_LEVEL": "s",
-    "SWIFT_OPTIMIZATION_LEVEL": "-Osize",
-    "SWIFT_COMPILATION_MODE": "singlefile"
+    "build_settings": {
+        "ENABLE_BITCODE": "NO",
+        "GCC_OPTIMIZATION_LEVEL": "s",
+        "SWIFT_OPTIMIZATION_LEVEL": "-Osize",
+        "SWIFT_COMPILATION_MODE": "singlefile"
+    }
 } 
 ```
 
@@ -154,7 +184,7 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Legacy`.
 
-#### `license_file_name`
+#### `license_filename`
 
 PodBuilder will create two license files a plist and a markdown file which contains the licenses of each pod specified in the PodBuilder-Podfile. Defailt value: `Pods-acknowledgements`(plist|md).
 
@@ -168,20 +198,60 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 }
 ```
 
+#### `subspecs_to_split`
+
+Normally when multiple subspecs are specified in a target a single framework is produced. There are rare cases where you specify different subspecs in different targets: a typical case is subspec specifically designed for app extensions, where you want to use a subspec in the main app and another one in the app extension. 
 
-# Under the hood
+**Warning**: This will work properly only for static frameworks (_static_framework = true_ specified in the podspec). See [issue](https://github.com/CocoaPods/CocoaPods/issues/5708) and [issue](https://github.com/CocoaPods/CocoaPods/issues/5643)
+
+```json
+{
+    "subspecs_to_split": ["Podname1/Subspec1", "Podname1/Subspec2", "Podname2/Subspec1", "Podname2/Subspec1"]
+}
+```
+
+#### `update_lfs_gitattributes` 
+
+Adds files bigger than [`lfs_min_file_size_kb`](#lfs_min_file_size_kb) to _.gitattributes_ when using [Git-LFS](#git-lfs).
+
+
+#### `lfs_min_file_size_kb`
+
+Change the minimum file size to add files to _.gitattributes_ when using [Git-LFS](#git-lfs).
+
+# 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.
 
 # FAQ
 
+### **After prebuilding my project no longer compiles**
+
+A common problem you may encounter is with Objective-C imports. You should verify that you're properly importing all the headers of your pods with the angle bracket notation `#import <FrameworkName/HeaderFile.h>` instead of directly importing `#import "HeaderFile.h"`.
+
+How to proceed in these cases?
+1. Rebuild all frameworks with PodBuilder
+2. Switch all your pods (use switch command or manually edit your Application-Podfile) back to the standard integration
+3. One-by-one switch your pods back to prebuilt, verifying everytime that your Project still compiles.
+
+
 ### **Build failed with longish output to the stdout, what should I do next?**
 
 Relaunch the build command passing `-d`, this won't delete the temporary _/tmp/pod_builder_ folder on failure. Open _/tmp/pod_builder/Pods/Pods.xcproject_, make the Pods-DummyTarget target visible by clicking on _Show_ under _Product->Scheme->Manage shemes..._ and build from within Xcode. This will help you understand what went wrong. Remeber to verify that you're building the _Release_ build configuration.
 
 ### **Do I need to commit compiled frameworks?**
 
-No. If the size of compiled frameworks in your repo is a concern you can choose add the _Rome_ and _dSYM_ folder to .gitignore and re-run `pod_builder build_all` locally on every machine.
+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 re-run `pod_builder build_all` locally on every machine.
+
+### **I get an _'attempt to read non existent folder `/private/tmp/pod_builder/Pods/ podname'_ when building**
+
+Please open an issue here. You may also add the name of the pod to the [`skip_pods`](#skip_pods) key in the configuration file and try rebuilding again.
+
+# Git LFS
+
+PodBuilder integrates with [Git Large File Storage](https://git-lfs.github.com) to move large files, like the prebuilt frameworks, out of your git repo. This allows to benefit from the compilation speed ups of the precompiled frameworks without impacting on your repo overall size.
+
+When [`update_lfs_gitattributes = true`](#update_lfs_gitattributes) PodBuilder will automatically update the _.gitattributes_ with the files generated by PodBuilder when building pods.
 
 # Try it out!
 

data/exe/pod_builder

@@ -20,18 +20,20 @@ def parse_commandline()
         opts.banner = "
 Usage:
         
-    $ pod_builder COMMAND 
+    $ pod_builder COMMAND [OPTIONS]
 
       Prebuild CocoaPods pods
         
 Command:
     + init                           Initialize prebuild folders
     + deintegrate                    Deintegrate prebuild folders
-    + build                          Build a specific pod declared in your Frameworks/Podfile
-    + build_all                      Build all pods declared in your Frameworks/Podfile
-    + restore_all                    Rebuild all pods declared in the Frameworks/Podfile.restore    
+    + build                          Build a specific pod declared in the PodBuilder-Podfile
+    + build_all                      Build all pods declared in the PodBuilder-Podfile
+    + restore_all                    Rebuild all pods declared in the Restore-Podfile
     + install_sources                Install sources of pods to debug into prebuild frameworks
+    + switch                         Switch between prebuilt/development/standard pod in the Application-Podfile
     + clean                          Remove prebuild frameworks, dSYMs and source files added by install_sources no longer in Frameworks/Podfile
+    + synch_podfile                  Update your Application-Podfile with all pods declared in the PodBuilder-Podfile
 
 Options:
 "
@@ -49,15 +51,18 @@ Options:
         opts.banner = "
 Usage:
         
-    $ pod_builder build <PODNAME...>
+    $ pod_builder build [OPTIONS] <PODNAME...>
 
-      Prebuild the specified CocoaPods pods
+      Prebuild the specified CocoaPods pods.
         
 Options:
 "        
         opts.on("-u", "--update", "Update CocoaPods repos") do |o|
           OPTIONS[:update_repos] = o
         end
+        opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
+          OPTIONS[:allow_warnings] = o
+        end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -67,11 +72,23 @@ Options:
       ]
     },
 
-    "build_all" => {
+    "build_all" => {            
       :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder build_all [OPTIONS]
+
+      Prebuild all pods specified in the PodBuilder-Podfile.
+        
+Options:
+"        
         opts.on("-u", "--update", "Update CocoaPods repos") do |o|
           OPTIONS[:update_repos] = o
         end
+        opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
+          OPTIONS[:allow_warnings] = o
+        end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -81,8 +98,17 @@ Options:
       ]
     },
 
-    "restore_all" => {
+    "restore_all" => {         
       :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder restore_all [OPTIONS]
+
+      Rebuilds all pods to the version specified in the Restore-Podfile.
+        
+Options:
+"          
         opts.on("-u", "--update", "Update CocoaPods repos") do |o|
           OPTIONS[:update_repos] = o
         end
@@ -95,11 +121,18 @@ Options:
       ]
     },
 
-    "init" => {
+    "init" => {            
       :opts => OptionParser.new do |opts|
-        default_destination = PodBuilder::xcodepath(PodBuilder::Configuration.base_path)
+        opts.banner = "
+Usage:
+        
+    $ pod_builder init [OPTIONS]
 
-        opts.on("-d", "--destination path", "Prebuilt destination path (defaul: #{default_destination})") do |o|
+      Initializes PodBuilder.
+        
+Options:
+"         
+        opts.on("-d", "--destination path", "Prebuilt destination path (default: #{PodBuilder::Configuration.base_path})") do |o|
           OPTIONS[:prebuild_path] = o
         end
       end,
@@ -116,40 +149,124 @@ Options:
       ]
     },
 
-    "deintegrate" => {
+    "update_lfs" => {
       :opts => OptionParser.new do |opts|
+      end,
+      :call => [        
+        PodBuilder::Command::GenerateLFS
+      ]
+    },
+
+    "deintegrate" => {           
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder deintegrate
+
+      Remove PodBuilder from your project.
+        
+Options:
+"          
       end,
       :call => [        
         PodBuilder::Command::Deintegrate
       ]
     },
 
-    "clean" => {
+    "clean" => {      
       :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder clean
+
+      Remove unused framework, dSYM and source folders.
+        
+Options:
+"           
       end,
       :call => [        
         PodBuilder::Command::Clean
       ]
     },
 
-    "install_sources" => {
+    "install_sources" => {         
       :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder install_sources
+
+      Install source of prebuilt pods to be able to step into and debug framework's code.
+        
+Options:
+"         
       end,
       :call => [        
         PodBuilder::Command::InstallSources
       ]
-    }    
+    },
+
+    "switch" => {      
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder switch PODNAME [OPTIONS]
+
+      Switch integration between prebuilt/development/default pod version.
+        
+Options:
+"        
+        opts.on("-p", "--prebuilt", "Use prebuilt") do |o|
+          OPTIONS[:switch_mode] = "prebuilt"
+        end
+        opts.on("-d", "--development", "Development pod") do |o|
+          OPTIONS[:switch_mode] = "development"
+        end
+        opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
+          OPTIONS[:switch_mode] = "default"
+        end
+      end,
+      :call => [        
+        PodBuilder::Command::Switch
+      ]
+    },
+
+    "synch_podfile" => {      
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder synch_podfile
+
+      Rewrite the Application-Podfile based on the PodBuilder-Podfile. 
+      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,
+      :call => [        
+        PodBuilder::Command::SynchPodfile
+      ]
+    }      
   }
    
   subcommands["none"][:opts].order!
    
   subcommand = subcommands[ARGV.shift]
    
-  if subcommand  
-    subcommand[:opts].order!
-    subcommand[:call].each do |k|
-      if !k.call(OPTIONS)
-        puts subcommand[:opts].help
+  if subcommand
+    if ARGV.include?("--help") || ARGV.include?("-h")
+      puts subcommand[:opts].help
+    else
+      PodBuilder::Configuration.load
+
+      subcommand[:opts].order!
+      subcommand[:call].each do |k|
+        if !k.call(OPTIONS)
+          puts subcommand[:opts].help
+        end
       end
     end
 
@@ -169,7 +286,6 @@ begin
     raise "\n\nFor safety do not run this as root\n".red
   end
 
-  PodBuilder::Configuration.load
   command_executed = parse_commandline
 rescue Exception => e
   error = e.to_s