Skip to content

Commit

Permalink
Replace YamlSwift with Yams
Browse files Browse the repository at this point in the history
  • Loading branch information
@norio-nomura
norio-nomura committed Apr 3, 2017
1 parent ee90273 commit b5cba7a
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 107 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
View file
Expand Up @@ -4,9 +4,6 @@
[submodule "Carthage/Checkouts/SWXMLHash"]
path = Carthage/Checkouts/SWXMLHash
url = https://github.com/drmohundro/SWXMLHash.git
[submodule "Carthage/Checkouts/YamlSwift"]
path = Carthage/Checkouts/YamlSwift
url = https://github.com/behrang/YamlSwift.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.17.0
github "jpsim/SourceKitten" "nn-swift3.1"
github "scottrhoyt/SwiftyTextTable" ~> 0.5.0
2 changes: 1 addition & 1 deletion Cartfile.private
View file
@@ -1,3 +1,3 @@
github "Carthage/Commandant" "master"
github "jspahrsummers/xcconfigs" "master"
github "behrang/YamlSwift" ~> 3.3
github "jpsim/Yams" ~> 0.3
13 changes: 6 additions & 7 deletions Cartfile.resolved
View file
@@ -1,8 +1,7 @@
github "antitypical/Result" "3.1.0"
github "drmohundro/SWXMLHash" "3.0.3"
github "scottrhoyt/SwiftyTextTable" "0.5.0"
github "behrang/YamlSwift" "3.3.1"
github "jpsim/Yams" "0.1.4"
github "Carthage/Commandant" "5100432bdc567db3e88c16c2e834fde0fc2c053c"
github "antitypical/Result" "3.2.1"
github "drmohundro/SWXMLHash" "3.0.4"
github "jpsim/SourceKitten" "14e51675b9414890d1e4fcd7164e91c6cef4d052"
github "jpsim/Yams" "0.3.0"
github "jspahrsummers/xcconfigs" "2055f18efbe18e77408f7f43947f7ad92b2d4ff0"
github "Carthage/Commandant" "82f1b66f9b42c54fc18288643acd9b243c791537"
github "jpsim/SourceKitten" "0.17.0"
github "scottrhoyt/SwiftyTextTable" "0.5.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Commandant
Submodule Commandant updated 14 files
+3 −3 .Package.test.swift
+8 −1 .travis.yml
+1 −1 Cartfile
+2 −2 Cartfile.private
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/Result
+9 −1 Commandant.xcodeproj/project.pbxproj
+1 −1 Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.xcscheme
+1 −1 Package.swift
+5 −3 Sources/Commandant/Command.swift
+1 −1 Sources/Commandant/Info.plist
+1 −1 Tests/CommandantTests/Info.plist
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Submodule Result updated 8 files
+11 −0 .travis.yml
+1 −2 Result.podspec
+0 −109 Result.xcodeproj/project.pbxproj
+1 −1 Result/Info.plist
+36 −2 Result/Result.swift
+19 −1 Result/ResultProtocol.swift
+1 −1 Tests/ResultTests/Info.plist
+84 −23 Tests/ResultTests/ResultTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SWXMLHash
Submodule SWXMLHash updated 27 files
+2 −0 .gitignore
+6 −0 .slather.yml
+0 −1 .swiftlint.yml
+5 −1 .travis.yml
+1 −1 CONTRIBUTING.md
+3 −3 Rakefile
+6 −4 SWXMLHash.podspec
+2 −0 SWXMLHash.xcodeproj/project.pbxproj
+2 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash OSX.xcscheme
+2 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash iOS.xcscheme
+2 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash tvOS.xcscheme
+2 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash watchOS.xcscheme
+2 −5 SWXMLHashPlayground.playground/section-1.swift
+1 −4 Source/SWXMLHash+TypeConversion.swift
+67 −22 Source/SWXMLHash.swift
+1 −1 Tests/LinuxMain.swift
+1 −1 Tests/SWXMLHashTests/LazyTypesConversionTests.swift
+1 −1 Tests/SWXMLHashTests/LazyWhiteSpaceParsingTests.swift
+1 −1 Tests/SWXMLHashTests/LazyXMLParsingTests.swift
+1 −1 Tests/SWXMLHashTests/MixedTextWithXMLElementsTests.swift
+1 −1 Tests/SWXMLHashTests/SWXMLHashConfigTests.swift
+11 −1 Tests/SWXMLHashTests/TypeConversionArrayOfNonPrimitiveTypesTests.swift
+4 −1 Tests/SWXMLHashTests/TypeConversionBasicTypesTests.swift
+4 −3 Tests/SWXMLHashTests/TypeConversionComplexTypesTests.swift
+1 −1 Tests/SWXMLHashTests/TypeConversionPrimitypeTypesTests.swift
+1 −1 Tests/SWXMLHashTests/WhiteSpaceParsingTests.swift
+1 −1 Tests/SWXMLHashTests/XMLParsingTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SourceKitten
Submodule SourceKitten updated 43 files
+1 −0 .swiftlint.yml
+2 −2 .travis.yml
+20 −0 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.private
+4 −4 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+1 −1 Carthage/Checkouts/Result
+1 −1 Carthage/Checkouts/SWXMLHash
+1 −1 Carthage/Checkouts/Yams
+6 −3 Makefile
+8 −4 Package.swift
+5 −5 Source/SourceKittenFramework/Clang+SourceKitten.swift
+1 −1 Source/SourceKittenFramework/ClangTranslationUnit.swift
+11 −2 Source/SourceKittenFramework/CodeCompletionItem.swift
+2 −2 Source/SourceKittenFramework/Documentation.swift
+1 −1 Source/SourceKittenFramework/File.swift
+6 −0 Source/SourceKittenFramework/LinuxCompatibility.swift
+11 −37 Source/SourceKittenFramework/Module.swift
+2 −2 Source/SourceKittenFramework/Parameter.swift
+1 −0 Source/SourceKittenFramework/Request.swift
+14 −14 Source/SourceKittenFramework/SourceDeclaration.swift
+4 −4 Source/SourceKittenFramework/SourceLocation.swift
+3 −1 Source/SourceKittenFramework/StatementKind.swift
+6 −6 Source/SourceKittenFramework/String+SourceKitten.swift
+1 −1 Source/SourceKittenFramework/library_wrapper.swift
+1 −1 Source/sourcekitten/DocCommand.swift
+1 −1 SourceKittenFramework.podspec
+5 −0 Tests/SourceKittenFrameworkTests/FileTests.swift
+178 −68 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle.json
+1,963 −756 Tests/SourceKittenFrameworkTests/Fixtures/Commandant.json
+1,933 −729 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM.json
+10 −0 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion.json
+13 −3 Tests/SourceKittenFrameworkTests/Fixtures/Subscript.json
+23 −1 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+10 −0 Tests/SourceKittenFrameworkTests/OffsetMapTests.swift
+5 −0 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+21 −0 Tests/SourceKittenFrameworkTests/StringTests.swift
+34 −5 Tests/SourceKittenFrameworkTests/StructureTests.swift
+18 −4 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
+25 −3 Tests/SourceKittenFrameworkTests/SyntaxTests.swift
+9 −9 jazzy.sh
+0 −16 sourcekitten.xcodeproj/project.pbxproj
1 change: 0 additions & 1 deletion Carthage/Checkouts/YamlSwift
Submodule YamlSwift deleted from e5ac62
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Yams
Submodule Yams updated 33 files
+37 −5 .travis.yml
+1 −1 README.md
+1 −0 Sources/CYaml/include/CYaml.h
+389 −0 Sources/Yams/Constructor.swift
+381 −0 Sources/Yams/Emitter.swift
+168 −0 Sources/Yams/Node.Mapping.swift
+77 −0 Sources/Yams/Node.Scalar.swift
+143 −0 Sources/Yams/Node.Sequence.swift
+263 −0 Sources/Yams/Node.swift
+351 −0 Sources/Yams/Parser.swift
+167 −0 Sources/Yams/Representer.swift
+104 −0 Sources/Yams/Resolver.swift
+32 −6 Sources/Yams/String+Yams.swift
+148 −0 Sources/Yams/Tag.swift
+147 −0 Sources/Yams/YamlError.swift
+19 −0 Sources/Yams/Yams.h
+0 −165 Sources/Yams/Yams.swift
+8 −1 Tests/LinuxMain.swift
+402 −0 Tests/YamsTests/ConstructorTests.swift
+124 −0 Tests/YamsTests/EmitterTests.swift
+166 −0 Tests/YamsTests/Fixtures/SourceKitten#289/debug.yaml
+215 −0 Tests/YamsTests/NodeTests.swift
+120 −0 Tests/YamsTests/PerformanceTests.swift
+137 −0 Tests/YamsTests/RepresenterTests.swift
+103 −0 Tests/YamsTests/ResolverTests.swift
+952 −0 Tests/YamsTests/SpecTests.swift
+54 −19 Tests/YamsTests/StringTests.swift
+127 −0 Tests/YamsTests/TestHelper.swift
+142 −0 Tests/YamsTests/YamlErrorTests.swift
+0 −84 Tests/YamsTests/YamsTests.swift
+1 −1 Yams.podspec
+1 −1 Yams.xcodeproj/Yams_Info.plist
+124 −28 Yams.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion Package.swift
View file
Expand Up @@ -11,7 +11,7 @@ let package = Package(
],
dependencies: [
.Package(url: "https://github.com/jpsim/SourceKitten.git", majorVersion: 0, minor: 17),
.Package(url: "https://github.com/behrang/YamlSwift.git", majorVersion: 3),
.Package(url: "https://github.com/jpsim/Yams.git", Version(0, 3, 0)),
.Package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", majorVersion: 0, minor: 5),
]
)
66 changes: 0 additions & 66 deletions Source/SwiftLintFramework/Extensions/Yaml+SwiftLint.swift
View file

This file was deleted.

14 changes: 7 additions & 7 deletions Source/SwiftLintFramework/Models/YamlParser.swift
View file
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Realm. All rights reserved.
//

import Yaml
import Yams

// MARK: - YamlParsingError

Expand All @@ -31,14 +31,14 @@ internal func == (lhs: YamlParserError, rhs: YamlParserError) -> Bool {
public struct YamlParser {
public static func parse(_ yaml: String) throws -> [String: Any] {
do {
if let dict = try Yaml.load(yaml).flatDictionary {
return dict
if let obj = try Yams.load(yaml: yaml) {
if let dic = obj as? [String: Any] {
return dic
}
}
throw YamlParserError.yamlFlattening
} catch Yaml.ResultError.message(let message) {
throw YamlParserError.yamlParsing(message ?? "Unknown YAML Error")
return [:]
} catch {
throw error
throw YamlParserError.yamlParsing("\(error)")
}
}
}
8 changes: 0 additions & 8 deletions SwiftLint.xcodeproj/project.pbxproj
View file
Expand Up @@ -27,7 +27,6 @@
37B3FA8B1DFD45A700AD30D2 /* Dictionary+SwiftLint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B3FA8A1DFD45A700AD30D2 /* Dictionary+SwiftLint.swift */; };
3B034B6E1E0BE549005D49A9 /* LineLengthConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B034B6C1E0BE544005D49A9 /* LineLengthConfiguration.swift */; };
3B0B14541C505D6300BE82F7 /* SeverityConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B0B14531C505D6300BE82F7 /* SeverityConfiguration.swift */; };
3B1150CA1C31FC3F00D83B1E /* Yaml+SwiftLint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B1150C91C31FC3F00D83B1E /* Yaml+SwiftLint.swift */; };
3B12C9C11C3209CB000B423F /* test.yml in Resources */ = {isa = PBXBuildFile; fileRef = 3B12C9BF1C3209AC000B423F /* test.yml */; };
3B12C9C31C320A53000B423F /* Yaml+SwiftLintTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B12C9C21C320A53000B423F /* Yaml+SwiftLintTests.swift */; };
3B12C9C51C322032000B423F /* MasterRuleList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B12C9C41C322032000B423F /* MasterRuleList.swift */; };
Expand Down Expand Up @@ -71,7 +70,6 @@
6CCFCF2D1CFEF731003239EB /* SourceKittenFramework.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = E876BFBD1B07828500114ED5 /* SourceKittenFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6CCFCF2E1CFEF73A003239EB /* SWXMLHash.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = E8C0DFCC1AD349DB007EE3D4 /* SWXMLHash.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6CCFCF2F1CFEF73E003239EB /* SwiftyTextTable.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = 3BBF2F9C1C640A0F006CD775 /* SwiftyTextTable.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6CCFCF301CFEF742003239EB /* Yaml.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = E89376AC1B8A701E0025708E /* Yaml.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7250948A1D0859260039B353 /* StatementPositionConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 725094881D0855760039B353 /* StatementPositionConfiguration.swift */; };
78F032461D7C877E00BE709A /* OverriddenSuperCallRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78F032441D7C877800BE709A /* OverriddenSuperCallRule.swift */; };
78F032481D7D614300BE709A /* OverridenSuperCallConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78F032471D7D614300BE709A /* OverridenSuperCallConfiguration.swift */; };
Expand Down Expand Up @@ -216,7 +214,6 @@
E88DEA771B098D0C00A66CB0 /* Rule.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88DEA761B098D0C00A66CB0 /* Rule.swift */; };
E88DEA791B098D4400A66CB0 /* RuleParameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88DEA781B098D4400A66CB0 /* RuleParameter.swift */; };
E88DEA8C1B0999A000A66CB0 /* ASTRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88DEA8B1B0999A000A66CB0 /* ASTRule.swift */; };
E89376AD1B8A701E0025708E /* Yaml.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E89376AC1B8A701E0025708E /* Yaml.framework */; };
E8B067811C13E49600E9E13F /* Configuration+CommandLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B067801C13E49600E9E13F /* Configuration+CommandLine.swift */; };
E8B67C3E1C095E6300FDED8E /* Correction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B67C3D1C095E6300FDED8E /* Correction.swift */; };
E8BE1FCC1E07687400F781C7 /* Yams.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = E8BE1FCB1E07687400F781C7 /* Yams.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -250,7 +247,6 @@
dstPath = SwiftLintFramework.framework/Versions/Current/Frameworks;
dstSubfolderSpec = 10;
files = (
6CCFCF301CFEF742003239EB /* Yaml.framework in Embed Frameworks into SwiftLintFramework.framework */,
6CCFCF2A1CFEF729003239EB /* Commandant.framework in Embed Frameworks into SwiftLintFramework.framework */,
6CCFCF2C1CFEF72D003239EB /* Result.framework in Embed Frameworks into SwiftLintFramework.framework */,
6CCFCF2D1CFEF731003239EB /* SourceKittenFramework.framework in Embed Frameworks into SwiftLintFramework.framework */,
Expand Down Expand Up @@ -295,7 +291,6 @@
37B3FA8A1DFD45A700AD30D2 /* Dictionary+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+SwiftLint.swift"; sourceTree = "<group>"; };
3B034B6C1E0BE544005D49A9 /* LineLengthConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineLengthConfiguration.swift; sourceTree = "<group>"; };
3B0B14531C505D6300BE82F7 /* SeverityConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeverityConfiguration.swift; sourceTree = "<group>"; };
3B1150C91C31FC3F00D83B1E /* Yaml+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Yaml+SwiftLint.swift"; sourceTree = "<group>"; };
3B12C9BF1C3209AC000B423F /* test.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = test.yml; sourceTree = "<group>"; };
3B12C9C21C320A53000B423F /* Yaml+SwiftLintTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Yaml+SwiftLintTests.swift"; sourceTree = "<group>"; };
3B12C9C41C322032000B423F /* MasterRuleList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MasterRuleList.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -517,7 +512,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E89376AD1B8A701E0025708E /* Yaml.framework in Frameworks */,
E876BFBE1B07828500114ED5 /* SourceKittenFramework.framework in Frameworks */,
E8C0DFCD1AD349DB007EE3D4 /* SWXMLHash.framework in Frameworks */,
3BBF2F9D1C640A0F006CD775 /* SwiftyTextTable.framework in Frameworks */,
Expand Down Expand Up @@ -970,7 +964,6 @@
D47079AA1DFDCF7A00027086 /* SwiftExpressionKind.swift */,
E87E4A081BFB9CAE00FCFE46 /* SyntaxKind+SwiftLint.swift */,
6CC4259A1C77046200AEA885 /* SyntaxMap+SwiftLint.swift */,
3B1150C91C31FC3F00D83B1E /* Yaml+SwiftLint.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -1317,7 +1310,6 @@
E88DEA6B1B0983FE00A66CB0 /* StyleViolation.swift in Sources */,
3BB47D831C514E8100AE6A10 /* RegexConfiguration.swift in Sources */,
D4C889711E385B7B00BAE88D /* RedundantDiscardableLetRule.swift in Sources */,
3B1150CA1C31FC3F00D83B1E /* Yaml+SwiftLint.swift in Sources */,
4A9A3A3A1DC1D75F00DF5183 /* HTMLReporter.swift in Sources */,
D40F83881DE9179200524C62 /* TrailingCommaConfiguration.swift in Sources */,
3B5B9FE11C444DA20009AD27 /* Array+SwiftLint.swift in Sources */,
Expand Down
3 changes: 0 additions & 3 deletions SwiftLint.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Tests/SwiftLintFrameworkTests/Yaml+SwiftLintTests.swift
View file
Expand Up @@ -9,14 +9,16 @@
import Foundation
@testable import SwiftLintFramework
import XCTest
import Yaml
import Yams

class YamlSwiftLintTests: XCTestCase {

func testFlattenYaml() {
do {
let yaml = try Yaml.load(getTestYaml())
let yamlDict = yaml.flatDictionary!
guard let yamlDict = try Yams.load(yaml: getTestYaml()) as? [String: Any] else {
XCTFail()
return
}

let dict1 = (yamlDict["dictionary1"] as? [Swift.String: Any])!
let dict2 = (yamlDict["dictionary2"] as? [Swift.String: Any])!
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftLintFrameworkTests/YamlParserTests.swift
View file
Expand Up @@ -22,7 +22,7 @@ class YamlParserTests: XCTestCase {
}

func testParseInvalidStringThrows() {
checkError(YamlParserError.yamlParsing("expected end, near \"a\"")) {
checkError(YamlParserError.yamlParsing("1:0: error: parser: did not find expected <document start>:\na\n^")) {
_ = try YamlParser.parse("|\na")
}
}
Expand Down

0 comments on commit b5cba7a

Please sign in to comment.