Merge branch 'Prosumma-reorg'

alex-chan · Aug 7, 2015 · 5b6a706 · 5b6a706
2 parents 72b364e + b0089b4
commit 5b6a706
Show file tree

Hide file tree

Showing 21 changed files with 542 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+xcuserdata
 .DS_Store
 Carthage
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Yaml.xcodeproj/.gitignore b/Yaml.xcodeproj/.gitignore
@@ -0,0 +1 @@
+project.xcworkspace
diff --git a/Yaml.xcodeproj/project.pbxproj b/Yaml.xcodeproj/project.pbxproj
diff --git a/Yaml.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Yaml.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Yaml.xcodeproj/project.xcworkspace/xcshareddata/Yaml.xccheckout b/Yaml.xcodeproj/project.xcworkspace/xcshareddata/Yaml.xccheckout
diff --git a/...odeproj/project.xcworkspace/xcuserdata/behrang.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/behrang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...proj/xcshareddata/xcschemes/Yaml.xcscheme → .../xcshareddata/xcschemes/Yaml OSX.xcscheme b/...proj/xcshareddata/xcschemes/Yaml.xcscheme → .../xcshareddata/xcschemes/Yaml OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8E1D76201B258FEE0022C013"
                BuildableName = "Yaml.framework"
-               BlueprintName = "Yaml"
+               BlueprintName = "Yaml OSX"
                ReferencedContainer = "container:Yaml.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -30,25 +30,25 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8E1D762B1B258FEE0022C013"
                BuildableName = "YamlTests.xctest"
-               BlueprintName = "YamlTests"
+               BlueprintName = "YamlTests OSX"
                ReferencedContainer = "container:Yaml.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8E1D762B1B258FEE0022C013"
                BuildableName = "YamlTests.xctest"
-               BlueprintName = "YamlTests"
+               BlueprintName = "YamlTests OSX"
                ReferencedContainer = "container:Yaml.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -58,44 +58,47 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8E1D76201B258FEE0022C013"
             BuildableName = "Yaml.framework"
-            BlueprintName = "Yaml"
+            BlueprintName = "Yaml OSX"
             ReferencedContainer = "container:Yaml.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8E1D76201B258FEE0022C013"
             BuildableName = "Yaml.framework"
-            BlueprintName = "Yaml"
+            BlueprintName = "Yaml OSX"
             ReferencedContainer = "container:Yaml.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8E1D76201B258FEE0022C013"
             BuildableName = "Yaml.framework"
-            BlueprintName = "Yaml"
+            BlueprintName = "Yaml OSX"
             ReferencedContainer = "container:Yaml.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Yaml.xcodeproj/xcshareddata/xcschemes/Yaml iOS.xcscheme b/Yaml.xcodeproj/xcshareddata/xcschemes/Yaml iOS.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F32DF2571B73054C0011046A"
+               BuildableName = "Yaml.framework"
+               BlueprintName = "Yaml iOS"
+               ReferencedContainer = "container:Yaml.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F32DF2601B73054C0011046A"
+               BuildableName = "YamlTests.xctest"
+               BlueprintName = "YamlTests iOS"
+               ReferencedContainer = "container:Yaml.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F32DF2571B73054C0011046A"
+            BuildableName = "Yaml.framework"
+            BlueprintName = "Yaml iOS"
+            ReferencedContainer = "container:Yaml.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F32DF2571B73054C0011046A"
+            BuildableName = "Yaml.framework"
+            BlueprintName = "Yaml iOS"
+            ReferencedContainer = "container:Yaml.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F32DF2571B73054C0011046A"
+            BuildableName = "Yaml.framework"
+            BlueprintName = "Yaml iOS"
+            ReferencedContainer = "container:Yaml.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Yaml/Info.plist b/Yaml/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>behrang.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/src/Operators.swift → Yaml/Operators.swift b/src/Operators.swift → Yaml/Operators.swift
diff --git a/src/Parser.swift → Yaml/Parser.swift b/src/Parser.swift → Yaml/Parser.swift
diff --git a/src/Regex.swift → Yaml/Regex.swift b/src/Regex.swift → Yaml/Regex.swift
@@ -45,7 +45,7 @@ func replace (regex: NSRegularExpression, template: String) (string: String)
 
 func replace (regex: NSRegularExpression, block: [String] -> String)
     (string: String) -> String {
-  var s = NSMutableString(string: string)
+  let s = NSMutableString(string: string)
   let range = NSMakeRange(0, string.utf16.count)
   var offset = 0
   regex.enumerateMatchesInString(string, options: [], range: range) {

diff --git a/src/Result.swift → Yaml/Result.swift b/src/Result.swift → Yaml/Result.swift
diff --git a/src/Tokenizer.swift → Yaml/Tokenizer.swift b/src/Tokenizer.swift → Yaml/Tokenizer.swift
diff --git a/Yaml/Yaml.h b/Yaml/Yaml.h
@@ -2,11 +2,11 @@
 //  Yaml.h
 //  Yaml
 //
-//  Created by Behrang Noruzi Niya on 3/18/1394 AP.
+//  Created by Gregory Higley on 8/5/15.
 //
 //
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for Yaml.
 FOUNDATION_EXPORT double YamlVersionNumber;

diff --git a/src/Yaml.swift → Yaml/Yaml.swift b/src/Yaml.swift → Yaml/Yaml.swift
diff --git a/test/ExampleTests.swift → YamlTests/ExampleTests.swift b/test/ExampleTests.swift → YamlTests/ExampleTests.swift
diff --git a/YamlTests/Info.plist b/YamlTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>behrang.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/test/YamlTests.swift → YamlTests/YamlTests.swift b/test/YamlTests.swift → YamlTests/YamlTests.swift