Merge branch 'master' into list-inputs

* master:
  Add embedding note to ReadMe.
  Update changelog.
  Bump version number.
  Use SVG badges where possible in the ReadMe.
  Use .ruby-version and .ruby-gemset files for configuration.
  Bump version of t2-server gem we are using.

.ruby-gemset

@@ -0,0 +1 @@
+taverna-player

.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p484

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.

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
 
-{<img src="https://badge.fury.io/rb/taverna-player.png" alt="Gem Version" />}[http://badge.fury.io/rb/taverna-player]
+{<img src="https://badge.fury.io/rb/taverna-player.svg" alt="Gem Version" />}[http://badge.fury.io/rb/taverna-player]
 {<img src="https://codeclimate.com/github/myGrid/taverna-player.png" />}[https://codeclimate.com/github/myGrid/taverna-player]
-{<img src="https://travis-ci.org/myGrid/taverna-player.png?branch=master" alt="Build Status" />}[https://travis-ci.org/myGrid/taverna-player]
+{<img src="https://travis-ci.org/myGrid/taverna-player.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/myGrid/taverna-player]
 {<img src="https://coveralls.io/repos/myGrid/taverna-player/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/myGrid/taverna-player?branch=master]
 
 == Synopsis
@@ -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

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

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"