Merge branch 'master' into feature/localization-fixed

Author: mac-cain13

Podfile.lock

@@ -11,4 +11,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   R.swift.Library: e5e077ed04f6867a95676af491650091b23518e9
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 9b36d458fc7d86e4195dd7d7a184ba971f24e516
+
+COCOAPODS: 1.0.0

R.swift.xcodeproj/project.pbxproj

@@ -18,6 +18,8 @@
 		D56F923F1C2942B400177FF7 /* Struct+ChildValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D56F923E1C2942B400177FF7 /* Struct+ChildValidation.swift */; };
 		D56F92401C29475F00177FF7 /* Struct+ChildValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D56F923E1C2942B400177FF7 /* Struct+ChildValidation.swift */; };
 		D56F92411C29476700177FF7 /* TypeVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D56F923C1C29421600177FF7 /* TypeVar.swift */; };
+		D578CAD61CE064E900C50B7E /* version.swift in Sources */ = {isa = PBXBuildFile; fileRef = D578CAD51CE064E900C50B7E /* version.swift */; };
+		D578CAD71CE06AB000C50B7E /* version.swift in Sources */ = {isa = PBXBuildFile; fileRef = D578CAD51CE064E900C50B7E /* version.swift */; };
 		D579466B1B9347C20044D2FC /* XCProjectFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D579466A1B9347C20044D2FC /* XCProjectFile.swift */; };
 		D58672491C21FC9700A760EC /* TypeSequenceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58672481C21FC9700A760EC /* TypeSequenceProvider.swift */; };
 		D586724A1C21FF7D00A760EC /* TypeSequenceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58672481C21FC9700A760EC /* TypeSequenceProvider.swift */; };
@@ -116,6 +118,7 @@
 		D56DC76C1C41758800623437 /* AccessModifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessModifier.swift; sourceTree = "<group>"; };
 		D56F923C1C29421600177FF7 /* TypeVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeVar.swift; sourceTree = "<group>"; };
 		D56F923E1C2942B400177FF7 /* Struct+ChildValidation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Struct+ChildValidation.swift"; sourceTree = "<group>"; };
+		D578CAD51CE064E900C50B7E /* version.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = version.swift; sourceTree = "<group>"; };
 		D579466A1B9347C20044D2FC /* XCProjectFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCProjectFile.swift; sourceTree = "<group>"; };
 		D58672481C21FC9700A760EC /* TypeSequenceProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeSequenceProvider.swift; sourceTree = "<group>"; };
 		D59F72251C1963DA0089767C /* Type.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Type.swift; sourceTree = "<group>"; };
@@ -172,6 +175,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		F1F5322A6D46CBD2B0ABA60D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -275,6 +285,7 @@
 				D5F97E361C1789E50066D7C0 /* ResourceTypes */,
 				D5F97E501C18D5EF0066D7C0 /* SwiftTypes */,
 				D5B7997B1C1B06F5009EA901 /* Util */,
+				D578CAD51CE064E900C50B7E /* version.swift */,
 			);
 			path = R.swift;
 			sourceTree = "<group>";
@@ -345,6 +356,7 @@
 			buildPhases = (
 				D5EA0DF01A3DF45600FFEBC4 /* Sources */,
 				D5DE480C1B5E1B14000F6A85 /* Install into test project */,
+				F1F5322A6D46CBD2B0ABA60D /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -459,6 +471,7 @@
 				D59F72311C19644F0089767C /* Function.swift in Sources */,
 				E241E4A11CD6545200F449E3 /* Unifiable.swift in Sources */,
 				D5B799721C199755009EA901 /* ImageGenerator.swift in Sources */,
+				D578CAD71CE06AB000C50B7E /* version.swift in Sources */,
 				D5B7997A1C19C1BD009EA901 /* WhiteListedExtensionsResourceType.swift in Sources */,
 				D59F722A1C1963EA0089767C /* Struct.swift in Sources */,
 				E2156B8F1CC5255000F341DC /* StringParam.swift in Sources */,
@@ -493,6 +506,7 @@
 				D5B129B11C3BA65C00A1C5FC /* Property.swift in Sources */,
 				E22D43651C95845200692FFF /* ColorPalette.swift in Sources */,
 				D5F97E421C1816360066D7C0 /* Image.swift in Sources */,
+				D578CAD61CE064E900C50B7E /* version.swift in Sources */,
 				D56F923D1C29421600177FF7 /* TypeVar.swift in Sources */,
 				D5B7996E1C19940F009EA901 /* ResourceFileGenerator.swift in Sources */,
 				E2762ACF1CCD0B970009BCAA /* LocalizableStrings.swift in Sources */,

R.swift/input.swift

@@ -13,8 +13,39 @@ enum InputParsingError: ErrorType {
   case IllegalOption(error: String, helpString: String)
   case MissingOption(error: String, helpString: String)
   case UserAskedForHelp(helpString: String)
+  case UserRequestsVersionInformation(helpString: String)
+
+  var helpString: String {
+    switch self {
+    case let .IllegalOption(_, helpString):
+      return helpString
+    case let .MissingOption(_, helpString):
+      return helpString
+    case let .UserAskedForHelp(helpString):
+      return helpString
+    case let .UserRequestsVersionInformation(helpString):
+      return helpString
+    }
+  }
+
+  var errorDescription: String? {
+    switch self {
+    case let .IllegalOption(error, _):
+      return error
+    case let .MissingOption(error, _):
+      return error
+    case .UserAskedForHelp, .UserRequestsVersionInformation:
+      return nil
+    }
+  }
 }
 
+private let versionOption = Option(
+  trigger: .Long( "version"),
+  numberOfParameters: 0,
+  helpDescription: "Prints version information about this release."
+)
+
 private let xcodeprojOption = Option(
   trigger: .Mixed("p", "xcodeproj"),
   numberOfParameters: 1,
@@ -57,6 +88,7 @@ private let sdkRootOption = Option(
 )
 
 private let AllOptions = [
+  versionOption,
   xcodeprojOption,
   targetOption,
   bundleIdentifierOption,
@@ -96,6 +128,10 @@ struct CallInformation {
         throw InputParsingError.UserAskedForHelp(helpString: optionParser.helpStringForCommandName(commandName))
       }
 
+      if options[versionOption] != nil {
+        throw InputParsingError.UserRequestsVersionInformation(helpString: "\(commandName) (R.swift) \(version)")
+      }
+
       guard let outputPath = extraArguments.first where extraArguments.count == 1 else {
         throw InputParsingError.IllegalOption(
           error: "Output folder for the 'R.generated.swift' file is mandatory as last argument.",

R.swift/main.swift

@@ -56,18 +56,27 @@ do {
     }
   }
 
-} catch let InputParsingError.UserAskedForHelp(helpString: helpString) {
-  print(helpString)
-  exit(0)
-} catch let InputParsingError.IllegalOption(error: error, helpString: helpString) {
-  fail(error)
-  print(helpString)
-  exit(2)
-} catch let InputParsingError.MissingOption(error: error, helpString: helpString) {
-  fail(error)
-  print(helpString)
-  exit(2)
-} catch let ResourceParsingError.ParsingFailed(description) {
-  fail(description)
+} catch let error as InputParsingError {
+  if let errorDescription = error.errorDescription {
+    fail(errorDescription)
+  }
+
+  print(error.helpString)
+
+  switch error {
+  case .IllegalOption, .MissingOption:
+    exit(2)
+  case .UserAskedForHelp, .UserRequestsVersionInformation:
+    exit(0)
+  }
+} catch let error as ResourceParsingError {
+  switch error {
+  case let .ParsingFailed(description):
+    fail(description)
+  case let .UnsupportedExtension(givenExtension, supportedExtensions):
+    let joinedSupportedExtensions = supportedExtensions.joinWithSeparator(", ")
+    fail("File extension '\(givenExtension)' is not one of the supported extensions: \(joinedSupportedExtensions)")
+  }
+
   exit(3)
 }

R.swift/version.swift

@@ -0,0 +1,11 @@
+//
+//  version.swift
+//  R.swift
+//
+//  Created by Mathijs Kadijk on 09-05-16.
+//  Copyright © 2016 Mathijs Kadijk. All rights reserved.
+//
+
+import Foundation
+
+let version = "nightly build"

ResourceApp/ResourceApp.xcodeproj/project.pbxproj

@@ -448,13 +448,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D55C6CD91B5D757300301B0D /* Build configuration list for PBXNativeTarget "ResourceApp" */;
 			buildPhases = (
-				978E4B8123C372F370555011 /* Check Pods Manifest.lock */,
+				978E4B8123C372F370555011 /* 📦 Check Pods Manifest.lock */,
 				D55C6CED1B5E172900301B0D /* R.swift */,
 				D55C6CB41B5D757300301B0D /* Sources */,
 				D55C6CB51B5D757300301B0D /* Frameworks */,
 				D55C6CB61B5D757300301B0D /* Resources */,
-				89BF8D4EC08D38DB6564C369 /* Embed Pods Frameworks */,
-				ADB91CF666C6624CD5A00F13 /* Copy Pods Resources */,
+				89BF8D4EC08D38DB6564C369 /* 📦 Embed Pods Frameworks */,
+				ADB91CF666C6624CD5A00F13 /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -655,44 +655,44 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		89BF8D4EC08D38DB6564C369 /* Embed Pods Frameworks */ = {
+		89BF8D4EC08D38DB6564C369 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "📦 Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ResourceApp/Pods-ResourceApp-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		978E4B8123C372F370555011 /* Check Pods Manifest.lock */ = {
+		978E4B8123C372F370555011 /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "📦 Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		ADB91CF666C6624CD5A00F13 /* Copy Pods Resources */ = {
+		ADB91CF666C6624CD5A00F13 /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "📦 Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

fastlane/Fastfile

@@ -16,6 +16,42 @@ lane :release do |options|
     raise "Aborted by user".red
   end
 
+  currentVersion = version_get_podspec()
+  Helper.log.info "Current R.swift podspec version is #{currentVersion}"
+
+  isPrerelease = false
+  if options[:skip_version_bump] != true
+    bumpType = prompt(text: "What kind of release is this? (major/minor/patch/custom)".green, boolean: false, ci_input: "")
+    case bumpType
+    when "major", "minor", "patch"
+      version_bump_podspec(bump_type: bumpType)
+    when "custom"
+      newVersion = prompt(text: "What is the new custom version number?".green, boolean: false, ci_input: "")
+      version_bump_podspec(version_number: newVersion)
+
+      isPrerelease = prompt(text: "Is this a prerelease version?".green, boolean: true, ci_input: "")
+    else
+      raise "Invalid release type: #{bumpType}".red
+    end
+
+    newVersion = version_get_podspec()
+    changelog = prompt(text: "Please provide release notes:".green, boolean: false, ci_input: "", multi_line_end_keyword: "FIN")
+    af_insert_text_into_file(
+      file_path: "Changelog.md",
+      text: "## #{newVersion}\n\n#{changelog}\n\n",
+      insert_at_bottom: false
+    )
+  else
+    isPrerelease = prompt(text: "Is this a prerelease version?".green, boolean: true, ci_input: "")
+  end
+
+  # Sync version.swift with version in podspec
+  filepath = '../R.swift/version.swift'
+  newVersion = version_get_podspec()
+
+  content = File.read(filepath).sub(/let version = "(.*)"/, "let version = \"#{newVersion}\"")
+  File.open(filepath, 'wb') { |file| file.write(content) }
+
   if options[:skip_tests] != true
     runalltests
   else
@@ -31,39 +67,6 @@ lane :release do |options|
     archive: true
   )
 
-  unless is_ci
-    notification(
-      title: "R.swift release",
-      message: "💡 Needs your attention."
-    )
-  end
-
-  currentVersion = version_get_podspec()
-  Helper.log.info "Current R.swift podspec version is #{currentVersion}"
-
-  bumpType = prompt(text: "What kind of release is this? (major/minor/patch/custom)".green, boolean: false, ci_input: "")
-  isPrerelease = false
-  case bumpType
-  when "major", "minor", "patch"
-    version_bump_podspec(bump_type: bumpType)
-  when "custom"
-    newVersion = prompt(text: "What is the new custom version number?".green, boolean: false, ci_input: "")
-    version_bump_podspec(version_number: newVersion)
-
-    isPrerelease = prompt(text: "Is this a prerelease version?".green, boolean: true, ci_input: "")
-  else
-    raise "Invalid release type: #{bumpType}".red
-  end
-
-  newVersion = version_get_podspec()
-  changelog = prompt(text: "Please provide release notes:".green, boolean: false, ci_input: "", multi_line_end_keyword: "FIN")
-
-  af_insert_text_into_file(
-    file_path: "Changelog.md",
-    text: "## #{newVersion}\n\n#{changelog}\n\n",
-    insert_at_bottom: false
-  )
-
   zipPath = "/tmp/rswift-#{newVersion}.zip"
   sh "rm -f #{zipPath}"
 
@@ -72,6 +75,13 @@ lane :release do |options|
     output_path: zipPath
   )
 
+  unless is_ci
+    notification(
+      title: "R.swift release",
+      message: "💡 Needs your attention."
+    )
+  end
+
   unless prompt(text: "#{newVersion} has been build and prepped for release. If you have any additional changes you would like to make, please do those before continuing. Would you like to commit, tag, push and release #{newVersion} including all uncommitted changes?".green, boolean: true, ci_input:"y")
     raise "Aborted by user".red
   end