You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/27 11:16:46 UTC
[1/5] tinkerpop git commit: added multi-line line number support
Repository: tinkerpop
Updated Branches:
refs/heads/master 3857c9eab -> b1afafa82
added multi-line line number support
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/45e1fbc2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/45e1fbc2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/45e1fbc2
Branch: refs/heads/master
Commit: 45e1fbc28b03959570984a969d76040d6d961ef4
Parents: 3f722e6
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Aug 18 15:18:31 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Aug 26 17:04:26 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/Console.groovy | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/45e1fbc2/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 202f068..792611f 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -167,7 +167,23 @@ class Console {
groovy.setResultHook(handleResultShowNothing)
}
- private def handlePrompt = { interactive ? Colorizer.render(Preferences.inputPromptColor, Preferences.inputPrompt + " ") : "" }
+ private def handlePrompt = {
+ if (interactive) {
+ int lineNo = groovy.buffers.current().size()
+ if (lineNo > 0 ) {
+ String lineStr = lineNo.toString() + "> "
+ int pad = Preferences.inputPrompt.length() - lineStr.length()
+ if (pad < 0) {
+ pad = 0
+ }
+ return Colorizer.render(Preferences.inputPromptColor, lineNo.toString().padLeft(pad, '.'))
+ } else {
+ return Colorizer.render(Preferences.inputPromptColor, Preferences.inputPrompt + " ")
+ }
+ } else {
+ return ""
+ }
+ }
private def handleResultShowNothing = { args -> null }
[4/5] tinkerpop git commit: Merge branch 'pr-385'
Posted by sp...@apache.org.
Merge branch 'pr-385'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/adf19604
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/adf19604
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/adf19604
Branch: refs/heads/master
Commit: adf196049ae02c3df152ac452f04d17f8007ddb6
Parents: 3857c9e 8f80bfc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Aug 27 07:00:27 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Aug 27 07:00:27 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/upgrade/release-3.2.x-incubating.asciidoc | 8 ++++++++
.../tinkerpop/gremlin/console/Console.groovy | 18 +++++++++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/adf19604/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/adf19604/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
[5/5] tinkerpop git commit: Update upgrade docs for new console
features
Posted by sp...@apache.org.
Update upgrade docs for new console features
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b1afafa8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b1afafa8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b1afafa8
Branch: refs/heads/master
Commit: b1afafa82c5d73f6f4a4ba374fee8b3c722a4511
Parents: adf1960
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Aug 27 07:16:19 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Aug 27 07:16:19 2016 -0400
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 49 ++++++++++----------
2 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b1afafa8/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index ae4635c..495aadd 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -150,6 +150,7 @@ some other useful operations. The following table outlines the most commonly us
|:submit |:> |Submit Gremlin to the currently active context defined by `:remote`.
|=========================================================
+[[console-preferences]]
Console Preferences
~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b1afafa8/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 23761ca..3f4d786 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -38,7 +38,7 @@ GraphSON 2.0
GraphSON 2.0 has been introduced to improve and normalize the format of types embedded in GraphSON.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1274[TINKERPOP-1274],
-link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#graphson-2-0-types[Reference Documentation -
+link:http://tinkerpop.apache.org/docs/3.2.2/reference/#graphson-2-0-types[Reference Documentation -
GraphSON 2.0].
Log4j Dependencies
@@ -63,35 +63,36 @@ and overridden as needed.
See: https://issues.apache.org/jira/browse/TINKERPOP-1373[TINKERPOP-1373]
-New Console Preferences
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Colors
-
-* gremlin.color
-* info.color
-* error.color
-* input.prompt.color
-* result.prompt.color
-* vertex.color
-* edge.color
-* string.color
-* number.color
-* T.color (e.g. id, label)
+New Console Features
+^^^^^^^^^^^^^^^^^^^^
-Prompts
+The Gremlin Console can now have its text colorized. For example, you can set the color of the Gremlin ascii art to
+the more natural color of green by using the `:set` command:
-* input.prompt
-* result.prompt
-* empty.result.indicator
+[source,text]
+gremlin> :set gremlin.color green
-See: https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1037]
+It is also possible to colorize results, like vertices, edges, and other common returns. Please see the
+link:http://tinkerpop.apache.org/docs/3.2.2/reference/#console-preferences[reference documentation] for more details
+on all the settings.
+The console also now includes better multi-line support:
-Added multi-line indicator.
+[source,text]
+----
+gremlin> g.V().out().
+......1> has('name','josh').
+......2> out('created')
+==>v[5]
+==>v[3]
+----
-See: https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1285]
+This is a nice feature in that it can help you understand if a line is incomplete and unevaluated.
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1285],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1037],
+link:http://tinkerpop.apache.org/docs/3.2.2/reference/#console-preferences[Reference Documentation -
+Console Preferences]
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
@@ -134,7 +135,7 @@ languages can then implement their own mapping of the GraphSON's language agnost
to the appropriate representation for the driver's language.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1274[TINKERPOP-1274],
-link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#graphson-2.0-types[Reference Documentation -
+link:http://tinkerpop.apache.org/docs/3.2.2/reference/#graphson-2.0-types[Reference Documentation -
GraphSON 2.0].
Traversal Serialization
[2/5] tinkerpop git commit: updated docs
Posted by sp...@apache.org.
updated docs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2e51db92
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2e51db92
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2e51db92
Branch: refs/heads/master
Commit: 2e51db9218563cb6f2d95eb83e554b8e755efb09
Parents: 45e1fbc
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Aug 24 09:00:08 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Aug 26 17:12:44 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e51db92/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 24cb406..4ae9762 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
* Fixed a small bug in `StandardVerificationStrategy` that caused verification to fail when `withPath` was used in conjunction with `ProfileStep`.
* Added color preferences
* Added input, result prompt preferences
+* Added multi-line indicator in Gremlin Console
[[release-3-2-1]]
TinkerPop 3.2.1 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e51db92/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 0715f48..86f8e99 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -85,6 +85,14 @@ Prompts
* result.prompt
* empty.result.indicator
+See: https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1037]
+
+
+Added multi-line indicator.
+
+See: https://issues.apache.org/jira/browse/TINKERPOP-1285[TINKERPOP-1285]
+
+
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
[3/5] tinkerpop git commit: fixed alignment
Posted by sp...@apache.org.
fixed alignment
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8f80bfcf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8f80bfcf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8f80bfcf
Branch: refs/heads/master
Commit: 8f80bfcf5faf4523505202e41a6f3aca160da218
Parents: 2e51db9
Author: Robert Dale <ro...@gmail.com>
Authored: Fri Aug 26 17:28:48 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Fri Aug 26 17:28:48 2016 -0400
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/console/Console.groovy | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f80bfcf/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 792611f..5645e8d 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -171,14 +171,14 @@ class Console {
if (interactive) {
int lineNo = groovy.buffers.current().size()
if (lineNo > 0 ) {
- String lineStr = lineNo.toString() + "> "
- int pad = Preferences.inputPrompt.length() - lineStr.length()
+ String lineStr = lineNo.toString() + ">"
+ int pad = Preferences.inputPrompt.length() - lineStr.length() + 2
if (pad < 0) {
pad = 0
}
- return Colorizer.render(Preferences.inputPromptColor, lineNo.toString().padLeft(pad, '.'))
+ return Colorizer.render(Preferences.inputPromptColor, lineStr.toString().padLeft(pad, '.') + ' ')
} else {
- return Colorizer.render(Preferences.inputPromptColor, Preferences.inputPrompt + " ")
+ return Colorizer.render(Preferences.inputPromptColor, Preferences.inputPrompt + ' ')
}
} else {
return ""