Merge branch 'master' into c++11-fixes

Author: Andrew Ford

.gitignore

@@ -111,6 +111,13 @@ csharp/sbe-generated/since-deprecated
 csharp/sbe-generated/mktdata/*.cs
 csharp/sbe-generated/uk_co_real_logic_sbe_benchmarks_fix
 
+# rust
+rust/car_example/.vscode
+rust/car_example/car_example_data.sbe
+rust/car_example/Cargo.lock
+rust/car_example/src/car_example_generated_codec.rs
+rust/car_example/target
+
 # Mac
 .DS_Store
 /sbe-tool/src/main/golang/uk_co_real_logic_sbe_ir_generated/

README.md

@@ -18,23 +18,6 @@ The Java and C++ SBE implementations are designed with work very efficiently wit
 high-throughput communications. The Java SBE implementation has a dependency on
 [Agrona](https://github.com/real-logic/agrona) for its buffer implementations.
 
-License (See LICENSE file for full license)
--------------------------------------------
-Copyright 2014 - 2017 Real Logic Limited  
-Copyright 2017 MarketFactory Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
 
 Binaries
 --------
@@ -51,7 +34,6 @@ Example for Maven:
 </dependency>
 ```
 
-
 Directory Layout
 ----------------
 Main source code
@@ -156,3 +138,21 @@ example. This solution also builds some tests which can be run via the provided
 Users of csharp generated code should see the [user documentation (coming)](https://github.com/real-logic/simple-binary-encoding/wiki/Csharp-User-Guide).
 
 Developers wishing to enhance the csharp generator should see the [developer documentation (coming)](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/README.md)
+
+
+License (See LICENSE file for full license)
+-------------------------------------------
+Copyright 2014 - 2017 Real Logic Limited  
+Copyright 2017 MarketFactory Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

build.gradle

@@ -118,18 +118,18 @@ subprojects {
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
     dependencies {
-        checkstyle 'com.puppycrawl.tools:checkstyle:8.1'
+        checkstyle 'com.puppycrawl.tools:checkstyle:8.2'
         checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.24.1'
 
         testCompile 'org.hamcrest:hamcrest-all:1.3'
         testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:2.8.47'
+        testCompile 'org.mockito:mockito-core:2.10.0'
         testCompile 'com.google.code.gson:gson:2.8.0'
     }
 
     checkstyle {
         configFile = new File(rootDir, 'config/checkstyle/checkstyle.xml')
-        toolVersion = '8.1'
+        toolVersion = '8.2'
     }
 
     compileJava {
@@ -468,6 +468,64 @@ project(':sbe-benchmarks') {
     }
 }
 
+/*
+ * Rust codec targets used for testing and demonstration
+ */
+task(generateRustCarExample, type: JavaExec) {
+    main = 'uk.co.real_logic.sbe.SbeTool'
+    classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
+    systemProperties(
+            'sbe.output.dir': 'rust/car_example/src',
+            'sbe.target.language': 'uk.co.real_logic.sbe.generation.rust.Rust',
+            'sbe.target.namespace': 'car_example_generated_codec')
+    args = ['sbe-tool/src/test/resources/example-schema.xml']
+}
+task(generateCarExampleDataFile, type: JavaExec) {
+    main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub'
+    classpath = project(':sbe-samples').sourceSets.main.runtimeClasspath
+    systemProperties(
+            'sbe.encoding.filename': 'rust/car_example/car_example_data.sbe')
+    args = []
+    standardOutput = new ByteArrayOutputStream()
+}
+
+task(runRustCarExample, type: Exec) {
+    workingDir = './rust/car_example'
+    executable = 'cargo'
+    args = ['run']
+    standardOutput = new ByteArrayOutputStream()
+    errorOutput = new ByteArrayOutputStream()
+    dependsOn 'generateRustCarExample', 'generateCarExampleDataFile'
+}
+
+def cargo_exists() {
+    try {
+        def result = project.exec {
+            executable 'cargo'
+            args '-v'
+            standardOutput = new ByteArrayOutputStream()
+            errorOutput = new ByteArrayOutputStream()
+        }
+        return result.exitValue == 0
+    }
+    catch (Exception ignore)
+    {
+        return false
+    }
+}
+
+if (cargo_exists()) {
+    test.dependsOn('runRustCarExample')
+} else {
+    println 'Skipping Rust integration test due to absent cargo command'
+}
+
+task generateRustCodecs {
+    description = 'Generate rust test codecs'
+    dependsOn 'generateRustCarExample',
+            'generateCarExampleDataFile'
+}
+
 /*
  * Golang codec targets used for testing, benchmarking etc. We have
  * multiple targets as:

rust/car_example/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "sbe_rust_car_example"
+version = "0.1.0"
+authors = []
+
+[dependencies]
+[dev-dependencies]

rust/car_example/README.md

@@ -0,0 +1,6 @@
+# Rust Car Example project
+
+Depends on SBE-tool generated bindings, which can be created by running, from the simple-binary-encoding project root,
+`./gradlew generateRustCodecs`.
+
+Assumes the presence of Rust and Cargo.