Merge pull request #46 from SomaticLabs/protobuf

add `writeTimeline` functionality

Author: ajaykarpur

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "Carthage/Checkouts/SwiftyBluetooth"]
 	path = Carthage/Checkouts/SwiftyBluetooth
 	url = https://github.com/jordanebelanger/SwiftyBluetooth.git
+[submodule "SwiftyZorb/Internal/zorb-protocol"]
+	path = SwiftyZorb/Internal/zorb-protocol
+	url = https://github.com/SomaticLabs/zorb-protocol.git

Cartfile

@@ -1,3 +1,4 @@
 github "jordanebelanger/SwiftyBluetooth" ~> 1.0
 github "Alamofire/Alamofire" ~> 4.5
 github "SwiftyJSON/SwiftyJSON" ~> 4.0
+github "apple/swift-protobuf" ~> 1.0

Cartfile.resolved

@@ -1,3 +1,4 @@
 github "Alamofire/Alamofire" "4.7.3"
 github "SwiftyJSON/SwiftyJSON" "4.1.0"
+github "apple/swift-protobuf" "1.1.2"
 github "jordanebelanger/SwiftyBluetooth" "1.0.0"

Carthage/Checkouts/swift-protobuf/.github/issue_template.md

@@ -0,0 +1,19 @@
+Please be sure to include:
+
+* what OS you are developing on (Linux or macOS, including the version)
+
+* for macOS, what version of Xcode you are using (`xcodebuild -version`),
+  for Linux, what version of Swift (`swift --version`)
+
+* what version of Swift is your code set to compile with (i.e. from project
+  settings, etc.)
+
+* what branch/tag of SwiftProtobuf you are using (1.0.0, etc.)
+
+* if you are getting compile errors, please be sure include all errors/warnings,
+  sometimes the error before the one you are stuck on is important.
+
+* lastly, if it all possible, provide a snippet of `.proto` and/or source
+  that shows the problem.
+
+Thank you!

Carthage/Checkouts/swift-protobuf/.gitignore

@@ -0,0 +1,15 @@
+.DS_Store
+/.build
+/Packages
+*~
+xcuserdata
+xcbaselines
+/_test
+/docs
+/build
+mined_words.txt
+/DescriptorTestData.bin
+
+# Intermediate conformance test outputs
+failing_tests.txt
+nonexistent_tests.txt

Carthage/Checkouts/swift-protobuf/.jazzy.yaml

@@ -0,0 +1 @@
+documentation: "Documentation/{API,GENERATED_CODE,PLUGIN}.md"

Carthage/Checkouts/swift-protobuf/DevTools/CollectTests.awk

@@ -0,0 +1,82 @@
+#!/usr/bin/awk -f
+
+# ProtobufRuntime/Sources/Protobuf/ProtobufBinaryEncoding.swift - Binary encoding support
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# -----------------------------------------------------------------------------
+#
+# The Linux version of XCTest cannot automatically
+# discover tests at run-time.  So you can either manually
+# maintain lists of tests or collect them at build time.
+#
+# This script is used by the Makefile to do the latter:
+#  = Scans each XCTest source file for 'class Foo: XCTestCase'
+#  = Looks for 'func test*' within those classes
+#  = Emits a class extension with the necessary 'allTests' property
+#  = Emits an XCTMain invocation to run all the classes
+#
+# The macOS version of XCTest has another mechanism for
+# finding tests at run-time, so this is not needed there.
+#
+# -----------------------------------------------------------------------------
+
+BEGIN {
+    CLASS=""
+    TESTCASES=""
+    TESTCASE_separator=""
+    printf("//\n")
+    printf("// GENERATED FILE\n")
+    printf("// DO NOT EDIT\n")
+    printf("//\n")
+    printf("\n")
+    printf("import XCTest\n")
+    printf("@testable import SwiftProtobufTests\n")
+    printf("@testable import SwiftProtobufPluginLibraryTests\n")
+    printf("\n")
+}
+
+/class .*:.* XCTestCase/ {
+    if (CLASS != "") {
+	printf("\n    ]\n")
+	printf("}\n")
+    }
+    split($0, a, ":")
+    split(a[1], words, " ")
+    CLASS=words[2]
+    TESTCASES = TESTCASES TESTCASE_separator "\n" "        testCase(" CLASS ".allTests)"
+    TESTCASE_separator = ","
+    printf("\n")
+    printf("extension %s {\n", CLASS)
+    printf("    static var allTests = [")
+    FUNC_separator=""
+}
+
+
+/^ *func *test.*/ {
+    split($0, a, "(")
+    split(a[1], words, " ")
+    FUNC=words[2]
+    printf("")
+    printf("%s\n        (\"%s\", %s)", FUNC_separator, FUNC, FUNC)
+    FUNC_separator = ","
+}
+
+END {
+    if (CLASS != "") {
+	printf("\n    ]\n")
+	printf("}\n")
+    }
+    printf("\n")
+
+    printf("XCTMain(\n")
+    printf("    [")
+    printf(TESTCASES)
+    printf("\n    ]\n)\n")
+}

Carthage/Checkouts/swift-protobuf/DevTools/CopyrightFixup.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+
+set -eu
+
+readonly DevToolsDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
+readonly RootDir="${DevToolsDir}/.."
+
+cd "${RootDir}"
+
+for f in `find . -name '*.swift' -o -name '*.cc' | sed -e 's|./||' | grep -v '.pb.swift'`; do
+    if head -n 4 $f | grep 'DO NOT EDIT' > /dev/null; then
+        # If the first lines contain 'DO NOT EDIT', then
+        # this is a generated file and we should not
+        # try to check or edit the copyright message.
+        # But: print the filename; all such files should be .pb.swift
+        # files that we're not even looking at here.
+        echo "DO NOT EDIT: $f"
+    else
+        tmp=$f~
+        mv $f $tmp
+        if head -n 10 $tmp | grep 'Copyright.*Apple' > /dev/null; then
+            # This has a copyright message, update it
+            # Edit the first line to have the correct filename
+            head -n 1 $tmp | sed "s|// [^-]* - \(.*\)|// $f - \1|" >$f
+            # Followed by the current copyright text:
+            cat <<EOF >>$f
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See LICENSE.txt for license information:
+// https://github.com/apple/swift-protobuf/blob/master/LICENSE.txt
+EOF
+            # Followed by the body of the file
+            # The copyright message ends at the first blank comment line after
+            # the first line containing "LICENSE.txt":
+            cat $tmp | sed -n '/LICENSE.txt/,$ p' | sed -n '/^\/\/$/,$ p' >> $f
+            rm $tmp
+        else
+            # This does not have a copyright message, insert one
+            echo "Inserting copyright >> $f"
+            cat <<EOF >>$f
+// $f - description
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See LICENSE.txt for license information:
+// https://github.com/apple/swift-protobuf/blob/master/LICENSE.txt
+//
+
+EOF
+            cat $tmp >> $f
+        fi
+    fi
+done

Carthage/Checkouts/swift-protobuf/DevTools/LibraryVersions.py

@@ -0,0 +1,121 @@
+#! /usr/bin/python
+# DevTools/LibraryVersions.py - Helper for the library's version number
+#
+# Copyright (c) 2014 - 2017 Apple Inc. and the project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See LICENSE.txt for license information:
+# https://github.com/apple/swift-protobuf/blob/master/LICENSE.txt
+#
+
+"""Helper script to for the versions numbers in the project sources."""
+
+import optparse
+import os
+import re
+import sys
+
+_VERSION_RE = re.compile(r'^(?P<major>\d+)\.(?P<minor>\d+)(.(?P<revision>\d+))?$')
+
+_PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+_PODSPEC_PATH = os.path.join(_PROJECT_ROOT, 'SwiftProtobuf.podspec')
+_VERSION_SWIFT_PATH = os.path.join(_PROJECT_ROOT, 'Sources/SwiftProtobuf/Version.swift')
+_XCODE_PROJECT_PATH = os.path.join(_PROJECT_ROOT, 'SwiftProtobuf.xcodeproj/project.pbxproj')
+
+def Fail(message):
+  sys.stderr.write('Error: %s\n' % message)
+  sys.exit(1)
+
+
+def ExtractVersion(s):
+  match = _VERSION_RE.match(s)
+  return (match.group('major'), match.group('minor'), match.group('revision') or '0')
+
+
+def ValidateFiles():
+  # Extra from SwiftProtobuf.podspec
+  pod_content = open(_PODSPEC_PATH).read()
+  match = re.search(r'version = \'(\d+.\d+.\d+)\'', pod_content)
+  if not match:
+    Fail('Failed to extract a version from SwiftProtobuf.podspec')
+  (major, minor, revision) = ExtractVersion(match.group(1))
+
+  # Test Sources/SwiftProtobuf/Version.swift
+  version_swift_content = open(_VERSION_SWIFT_PATH).read()
+  major_line = 'static public let major = %s\n' % major
+  minor_line = 'static public let minor = %s\n' % minor
+  revision_line = 'static public let revision = %s\n' % revision
+  had_major = major_line in version_swift_content
+  had_minor = minor_line in version_swift_content
+  had_revision = revision_line in version_swift_content
+  if not had_major or not had_minor or not had_revision:
+    Fail('Version in Sources/SwiftProtobuf/Version.swift did not match SwiftProtobuf.podspec')
+
+  # Test SwiftProtobuf.xcodeproj/project.pbxproj
+  xcode_project_content = open(_XCODE_PROJECT_PATH).read()
+  matches = re.findall(r'CURRENT_PROJECT_VERSION = %s\.%s\.%s;' % (major, minor, revision),
+                       xcode_project_content)
+  if len(matches) != 2:
+    Fail('Version in SwiftProtobuf.xcodeproj/project.pbxproj did not match SwiftProtobuf.podspec')
+
+
+def UpdateFiles(version_string):
+  (major, minor, revision) = ExtractVersion(version_string)
+
+  # Update SwiftProtobuf.podspec
+  pod_content = open(_PODSPEC_PATH).read()
+  pod_content = re.sub(r'version = \'(\d+\.\d+\.\d+)\'',
+                       'version = \'%s.%s.%s\'' % (major, minor, revision),
+                       pod_content)
+  open(_PODSPEC_PATH, 'w').write(pod_content)
+
+  # Update Sources/SwiftProtobuf/Version.swift
+  version_swift_content = open(_VERSION_SWIFT_PATH).read()
+  version_swift_content = re.sub(r'static public let major = \d+\n',
+                                 'static public let major = %s\n' % major,
+                                 version_swift_content)
+  version_swift_content = re.sub(r'static public let minor = \d+\n',
+                                 'static public let minor = %s\n' % minor,
+                                 version_swift_content)
+  version_swift_content = re.sub(r'static public let revision = \d+\n',
+                                 'static public let revision = %s\n' % revision,
+                                 version_swift_content)
+  open(_VERSION_SWIFT_PATH, 'w').write(version_swift_content)
+
+  # Update SwiftProtobuf.xcodeproj/project.pbxproj
+  xcode_project_content = open(_XCODE_PROJECT_PATH).read()
+  xcode_project_content = re.sub(r'CURRENT_PROJECT_VERSION = \d+\.\d+\.\d+',
+                                 'CURRENT_PROJECT_VERSION = %s.%s.%s' % (major, minor, revision),
+                                 xcode_project_content)
+  open(_XCODE_PROJECT_PATH, 'w').write(xcode_project_content)
+
+
+def main(args):
+  usage = '%prog [OPTIONS] [VERSION]'
+  description = (
+      'Helper for the version numbers in the project sources.'
+  )
+  parser = optparse.OptionParser(usage=usage, description=description)
+  parser.add_option('--validate',
+                    default=False, action='store_true',
+                    help='Check if the versions in all the files match.')
+  opts, extra_args = parser.parse_args(args)
+
+  if opts.validate:
+    if extra_args:
+      parser.error('No version can be given when using --validate.')
+  else:
+    if len(extra_args) != 1:
+      parser.error('Expected one argument, the version number to ensure is in the sources.')
+    if not _VERSION_RE.match(extra_args[0]):
+      parser.error('Version does not appear to be in the form of x.y.z.')
+
+  # Always validate, just use the flag to tell if we're expected to also have set something.
+  if not opts.validate:
+    UpdateFiles(extra_args[0])
+  ValidateFiles()
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))