From 102a7deaf109ef9d8259001e247b836607b01160 Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Wed, 23 Apr 2014 19:09:43 +0100 Subject: [PATCH 1/6] Bump version of t2-server gem we are using. --- taverna_player.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taverna_player.gemspec b/taverna_player.gemspec index 5e4d1cb..a1a106a 100644 --- a/taverna_player.gemspec +++ b/taverna_player.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |s| s.add_dependency "rails", "~> 3.2.12" s.add_dependency "jquery-rails", "~> 3.0" s.add_dependency "paperclip", "~> 4.1" - s.add_dependency "t2-server", "~> 1.0.0" + s.add_dependency "t2-server", "~> 1.1" s.add_dependency "delayed_job_active_record", "~> 4.0" s.add_dependency "daemons", "~> 1.1.9" s.add_dependency "rubyzip", "~> 0.9.9" From 8997496c2262c4df11a688cad5f2b9080738c0dd Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Fri, 25 Apr 2014 12:29:51 +0100 Subject: [PATCH 2/6] Use .ruby-version and .ruby-gemset files for configuration. --- .ruby-gemset | 1 + .ruby-version | 1 + 2 files changed, 2 insertions(+) create mode 100644 .ruby-gemset create mode 100644 .ruby-version diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 0000000..f067098 --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +taverna-player diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..02f2617 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-1.9.3-p484 From fa8b074f1ccf4705246ba4d1a1eae91833f826af Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Mon, 28 Apr 2014 16:10:16 +0100 Subject: [PATCH 3/6] Use SVG badges where possible in the ReadMe. --- README.rdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rdoc b/README.rdoc index 3f84147..a345eec 100644 --- a/README.rdoc +++ b/README.rdoc @@ -6,9 +6,9 @@ URL:: http://www.taverna.org.uk Licence:: BSD (See LICENCE or http://www.opensource.org/licenses/bsd-license.php) Copyright:: (c) 2013, 2014 The University of Manchester, UK -{Gem Version}[http://badge.fury.io/rb/taverna-player] +{Gem Version}[http://badge.fury.io/rb/taverna-player] {}[https://codeclimate.com/github/myGrid/taverna-player] -{Build Status}[https://travis-ci.org/myGrid/taverna-player] +{Build Status}[https://travis-ci.org/myGrid/taverna-player] {Coverage Status}[https://coveralls.io/r/myGrid/taverna-player?branch=master] == Synopsis From 0b406caf3943a66e04ea5d60cb5c579b9014c80b Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Mon, 28 Apr 2014 19:20:00 +0100 Subject: [PATCH 4/6] Bump version number. --- lib/taverna_player/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/taverna_player/version.rb b/lib/taverna_player/version.rb index 38d04a8..036b602 100644 --- a/lib/taverna_player/version.rb +++ b/lib/taverna_player/version.rb @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# Copyright (c) 2013 The University of Manchester, UK. +# Copyright (c) 2013, 2014 The University of Manchester, UK. # # BSD Licenced. See LICENCE.rdoc for details. # @@ -11,5 +11,5 @@ #------------------------------------------------------------------------------ module TavernaPlayer - VERSION = "0.6.0" + VERSION = "0.7.0" end From 36ac7e1cb49c70e1ee73c74b30d394400533ff49 Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Mon, 28 Apr 2014 19:20:14 +0100 Subject: [PATCH 5/6] Update changelog. --- CHANGES.rdoc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGES.rdoc b/CHANGES.rdoc index d9a0b4f..ff18d7c 100644 --- a/CHANGES.rdoc +++ b/CHANGES.rdoc @@ -1,5 +1,24 @@ = Changes log for Taverna Player +== Version 0.7.0 + +* Refactor full run JSON output. +* Improve the runs/new JSON output. +* Add more interaction fields to the JSON output. +* Fix non-ASCII character in gemspec info. +* Fix non-ASCII character in README. +* [TAV-508] Allow workers to run against different servers. +* [TAV-511] Don't save run log if it's an empty file. +* Add note about JSON interface to the Readme. +* Add a note about the API Docs to the Readme. +* Rework the testing of an empty log file for better testing. +* Add tests for taverna credentials in env variable. +* [TAV-512] Fix overzealous file extension restrictions for inputs. +* Add an alert flash to the test layout. +* Use flash[:alert] not flash[:error]. +* Recover from failed run creation more gracefully. +* Bump version of t2-server gem we are using. + == Version 0.6.0 * [TAV-485] Set up separate worker integration test. From 3ea14f8b8bfee332ff852a394802d0f9a07f4fd8 Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Mon, 28 Apr 2014 19:31:45 +0100 Subject: [PATCH 6/6] Add embedding note to ReadMe. --- README.rdoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.rdoc b/README.rdoc index a345eec..1f807d1 100644 --- a/README.rdoc +++ b/README.rdoc @@ -718,6 +718,13 @@ There is more information about how you can more closely integrate Taverna Player into your host application in the {API Documentation}[http://mygrid.github.io/taverna-player]. +== Embedding a workflow into another Web site + +Workflow runs handled by Taverna Player can be embedded in other Web sites in +much the same way that media like YouTube videos can be. Documentation on how +to achieve this +{is available separately[https://github.com/myGrid/taverna-player/wiki/Embedding]. + == Using Taverna Player as a Web Service As well as providing HTML views to the host application, Taverna Player also