Merge branch 'pr/50'

Author: parkera

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -228,6 +228,7 @@ extern void _CFDataInit(CFMutableDataRef memory, CFOptionFlags flags, CFIndex ca
 extern int32_t _CF_SOCK_STREAM();
 
 extern CFStringRef CFCopySystemVersionString(void);
+extern CFDictionaryRef _CFCopySystemVersionDictionary(void);
 
 extern Boolean _CFCalendarInitWithIdentifier(CFCalendarRef calendar, CFStringRef identifier);
 extern Boolean _CFCalendarComposeAbsoluteTimeV(CFCalendarRef calendar, /* out */ CFAbsoluteTime *atp, const char *componentDesc, int32_t *vector, int32_t count);

Foundation/NSProcessInfo.swift

@@ -95,7 +95,20 @@ public class NSProcessInfo : NSObject {
 
     public var operatingSystemVersion: NSOperatingSystemVersion {
         get {
-            NSUnimplemented()
+            let productVersionKey = unsafeBitCast(_kCFSystemVersionProductVersionKey, UnsafePointer<Void>.self)
+            let productVersion = unsafeBitCast(CFDictionaryGetValue(_CFCopySystemVersionDictionary(), productVersionKey), NSString!.self)
+            // The following fallback values match Darwin Foundation
+            let fallbackMajor = -1
+            let fallbackMinor = 0
+            let fallbackPatch = 0
+            if productVersion == nil {
+                return NSOperatingSystemVersion(majorVersion: fallbackMajor, minorVersion: fallbackMinor, patchVersion: fallbackPatch)
+            }
+            let versionComponents = productVersion._swiftObject.characters.split(".").flatMap(String.init).flatMap({ Int($0) })
+            let majorVersion = versionComponents.dropFirst(0).first ?? fallbackMajor
+            let minorVersion = versionComponents.dropFirst(1).first ?? fallbackMinor
+            let patchVersion = versionComponents.dropFirst(2).first ?? fallbackPatch
+            return NSOperatingSystemVersion(majorVersion: majorVersion, minorVersion: minorVersion, patchVersion: patchVersion)
         }
     }
 

TestFoundation/TestNSProcessInfo.swift

@@ -21,10 +21,19 @@ class TestNSProcessInfo : XCTestCase {
 
     var allTests : [(String, () -> ())] {
         return [
+            ("test_operatingSystemVersion", test_operatingSystemVersion ),
             ("test_processName", test_processName ),
         ]
     }
 
+    func test_operatingSystemVersion() {
+        let processInfo = NSProcessInfo.processInfo()
+        let versionString = processInfo.operatingSystemVersionString
+        let version = processInfo.operatingSystemVersion
+        let reconstructedVersionString = "Version \(version.majorVersion).\(version.minorVersion).\(version.patchVersion)"
+        XCTAssert(versionString.hasPrefix(reconstructedVersionString))
+    }
+    
     func test_processName() {
         // Assert that the original process name is "TestFoundation". This test
         // will fail if the test target ever gets renamed, so maybe it should