Commit d4044fce authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'integration_take_2' into 0.17

* integration_take_2:
  [Integration] Fix YAML representation

Conflicts:
	spec/integration/install_subspecs/after/execution_output.txt
parents 93a134ed 98df1a8a
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -24,7 +24,7 @@ File References: ...@@ -24,7 +24,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -89,7 +89,7 @@ Targets: ...@@ -89,7 +89,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -24,7 +24,7 @@ File References: ...@@ -24,7 +24,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -87,7 +87,7 @@ Targets: ...@@ -87,7 +87,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- iOS App: - iOS App:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -41,7 +41,7 @@ File References: ...@@ -41,7 +41,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- iOS App: - iOS App:
Build Phases: Build Phases:
...@@ -92,7 +92,7 @@ Targets: ...@@ -92,7 +92,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -22,7 +22,7 @@ File References: ...@@ -22,7 +22,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -83,7 +83,7 @@ Targets: ...@@ -83,7 +83,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- iOS App: - iOS App:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -41,7 +41,7 @@ File References: ...@@ -41,7 +41,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- iOS App: - iOS App:
Build Phases: Build Phases:
...@@ -92,7 +92,7 @@ Targets: ...@@ -92,7 +92,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -42,7 +42,7 @@ File References: ...@@ -42,7 +42,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -223,7 +223,7 @@ Targets: ...@@ -223,7 +223,7 @@ Targets:
Base Configuration: Pods-SampleApp_2.xcconfig Base Configuration: Pods-SampleApp_2.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -62,7 +62,7 @@ File References: ...@@ -62,7 +62,7 @@ File References:
- Pods-SampleApp_2.xcconfig - Pods-SampleApp_2.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -187,7 +187,7 @@ Targets: ...@@ -187,7 +187,7 @@ Targets:
PRODUCT_NAME: $(TARGET_NAME) PRODUCT_NAME: $(TARGET_NAME)
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -21,7 +21,7 @@ File References: ...@@ -21,7 +21,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -83,7 +83,7 @@ Targets: ...@@ -83,7 +83,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -21,7 +21,7 @@ File References: ...@@ -21,7 +21,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -85,7 +85,7 @@ Targets: ...@@ -85,7 +85,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -21,7 +21,7 @@ File References: ...@@ -21,7 +21,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -82,7 +82,7 @@ Targets: ...@@ -82,7 +82,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -21,7 +21,7 @@ File References: ...@@ -21,7 +21,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -83,7 +83,7 @@ Targets: ...@@ -83,7 +83,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Foundation.framework - Foundation.framework
...@@ -23,7 +23,7 @@ File References: ...@@ -23,7 +23,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods: - Pods:
Build Phases: Build Phases:
...@@ -86,7 +86,7 @@ Targets: ...@@ -86,7 +86,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- SampleApp: - SampleApp:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -25,7 +25,7 @@ File References: ...@@ -25,7 +25,7 @@ File References:
- Pods.xcconfig - Pods.xcconfig
---
Targets: Targets:
- SampleApp: - SampleApp:
Build Phases: Build Phases:
...@@ -61,7 +61,7 @@ Targets: ...@@ -61,7 +61,7 @@ Targets:
Base Configuration: Pods.xcconfig Base Configuration: Pods.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
---
File References: File References:
- Frameworks: - Frameworks:
- Cocoa.framework - Cocoa.framework
...@@ -34,7 +34,7 @@ File References: ...@@ -34,7 +34,7 @@ File References:
- Podfile - Podfile
---
Targets: Targets:
- Pods-iOS App: - Pods-iOS App:
Build Phases: Build Phases:
...@@ -155,7 +155,7 @@ Targets: ...@@ -155,7 +155,7 @@ Targets:
Base Configuration: Pods-OS X App.xcconfig Base Configuration: Pods-OS X App.xcconfig
---
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: {} Build Settings: {}
......
---
File References: File References:
- iOS App: - iOS App:
- CPAppDelegate.h - CPAppDelegate.h
...@@ -44,7 +44,7 @@ File References: ...@@ -44,7 +44,7 @@ File References:
- Pods-OS X App.xcconfig - Pods-OS X App.xcconfig
---
Targets: Targets:
- iOS App: - iOS App:
Build Phases: Build Phases:
...@@ -127,7 +127,7 @@ Targets: ...@@ -127,7 +127,7 @@ Targets:
Base Configuration: Pods-OS X App.xcconfig Base Configuration: Pods-OS X App.xcconfig
---
Build Configurations: Build Configurations:
- Debug: - Debug:
Build Settings: Build Settings:
......
...@@ -151,8 +151,9 @@ def run_post_execution_actions(folder) ...@@ -151,8 +151,9 @@ def run_post_execution_actions(folder)
yaml = { key => pretty_print[key]}.to_yaml yaml = { key => pretty_print[key]}.to_yaml
sections << yaml sections << yaml
end end
file_contents = (sections * "\n\n").gsub!("---",'')
File.open("#{project_path}.yaml", 'w') do |file| File.open("#{project_path}.yaml", 'w') do |file|
file.write(sections * "\n\n") file.write(file_contents)
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment