t2-server 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDViZjcxNjNjYzgwNjJkNThmYzEwMjcyOWRjZTYzM2ZlNGNmNzRmYg==
+    MTc3MWJiMzdjNWRjMmY1NGNmNjQyNWU5NmM3MTAwZTAwMjExMjljYg==
   data.tar.gz: !binary |-
-    MjMyMWEzOGM2N2Q1YWQ1YTYwYmRjMGIyZGY1OGViY2IxMzAzM2NkYQ==
+    YzI2ZmQ2M2U0NmVkOWE5OTYxNzQxMWZmOTYyOTgyY2M5MmEzZWE1NA==
 SHA512:
   metadata.gz: !binary |-
-    Yzk5ZmFiYWE5NThmYzYyNDdjYzhkMjQ3ODAwNThkOTEwMDBkZjI4ZmY4ZjU4
-    YWQ2N2Q2N2EzN2VhNWU1OGNmYTFkMmVmMzFlOWQ3ZWQ3MTI2ZGY1NGZiMWZi
-    MGQ4MDcyMjRkYTkyNjU2NWFkZjM3YTVjOWU4ZmYwMWMzNDg3ZGM=
+    YTcyYjIzYjZmMDZiZTFmMWUwMWJkZDAzNmQ2ZGVjOTM3NDk4NTg1YmM3ZWY0
+    NGZiYjE3MDBjNDVjY2ZjZjA3ZWE1MDgxMzQyNjYwNjcwMjAzNTNkMjYxNmEz
+    YzJkY2U3OWE4NWFlN2M1OWE1MjM3YjI4MWJlMGMxNWFhZGZiMDU=
   data.tar.gz: !binary |-
-    Mzk5NTU3MWE5ZjczMzM0YWViNTYyYTE5OWFiMzc5MzA4ZWEzODkzMWYwZThm
-    MGU5OGI4NjdjNmFlMzgzZjlkYzFlZjFjNjNhNDdmYjk3MWYyZDdjMDMzY2Y1
-    Yzk2MmE0YjVjZDAzMjc3ZGQyNjNkNzViNDNhODMxZTI1ODcxNDM=
+    OGU5NTIyNjRiMDE5YWMwY2VjNDYzYmJlNzk3ZDQyNmZjNDIxNDkyMDdhMDU4
+    ZDUxOTM3ZDg1ZWMzMzEyNjU0Zjc3MjAyM2Y1YjI5ZmIxZDc5MzY3YTQxMTJi
+    ODEzYjI3YTQ3ZTczZGEzZmYzYmQ5OGU1YjcwN2VlOWYzNDJjNDQ=

data/.travis.yml

@@ -1,11 +1,17 @@
 language: ruby
-cache: bundler
+
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
+  - 2.2.0
   - rbx-2
   - ruby-head
+
+sudo: false
+
+cache: bundler
+
 matrix:
   allow_failures:
     - rvm: rbx-2

data/CHANGES.rdoc

@@ -1,5 +1,16 @@
 = Changes log for the T2 Ruby Gem
 
+== Version 1.3.0
+
+* Fix time-based tests for timezone changes (again).
+* Add the test-unit gem so that we can test in ruby 2.2.
+* Tie down the webmock version number more carefully.
+* Update Travis config to test against ruby 2.1.5.
+* Update README with more precise version matching.
+* Update to ratom version 0.9.
+* Add ruby 2.2 to the Travis config.
+* Update ruby testing info in README.
+
 == Version 1.2.0
 
 * Test provenance collection on version 2.5.4 and up only.

data/LICENCE.rdoc

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 The University of Manchester, UK.
+Copyright (c) 2010-2015 The University of Manchester, UK.
 
 All rights reserved.
 

data/README.rdoc

@@ -4,12 +4,12 @@ Authors::     Robert Haines
 Contact::     mailto:support@mygrid.org.uk
 URL::         http://www.taverna.org.uk/
 Licence::     BSD (See LICENCE or http://www.opensource.org/licenses/bsd-license.php)
-Copyright::   (c) 2010-2014 The University of Manchester, UK
+Copyright::   (c) 2010-2015 The University of Manchester, UK
 
 {<img src="https://badge.fury.io/rb/t2-server.svg" alt="Gem Version" />}[http://badge.fury.io/rb/t2-server]
 {<img src="https://codeclimate.com/github/myGrid/t2-server-gem/badges/gpa.svg" />}[https://codeclimate.com/github/myGrid/t2-server-gem]
 {<img src="https://travis-ci.org/myGrid/t2-server-gem.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/myGrid/t2-server-gem]
-{<img src="https://coveralls.io/repos/myGrid/t2-server-gem/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/myGrid/t2-server-gem?branch=master]
+{<img src="https://coveralls.io/repos/myGrid/t2-server-gem/badge.svg?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/myGrid/t2-server-gem?branch=master]
 
 == Synopsis
 
@@ -54,14 +54,16 @@ Server, but if that is not possible right now then these are the recommended
 version pairings:
 * pre Taverna Server 2.3, use version 0.6.1 of the gem
 * 2.3, use version 0.9.3
-* 2.4 and up, use version 1.0.0 and up.
+* 2.4, use version 1.0.0 and up.
+* 2.5 and up, use version 1.2.0 and up.
 
 === Ruby
 
 This library is known to work with the following versions of Ruby:
 * 1.9.3 +*
 * 2.0.0 +*
-* 2.1.2 +*
+* 2.1.5 +*
+* 2.2.0 +*
 * rbx 2.2 +
 
 Those marked with an asterisk (*) are fully supported and bugs found against

data/t2-server.gemspec

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2014 The University of Manchester, UK.
+# Copyright (c) 2010-2015 The University of Manchester, UK.
 #
 # All rights reserved.
 #
@@ -60,10 +60,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc', '~> 4.1')
   s.add_development_dependency('launchy', '~> 2.2')
   s.add_development_dependency('hirb', '~> 0.7')
-  s.add_development_dependency('webmock', '~> 1.17')
+  s.add_development_dependency('test-unit', '~> 3.0')
+  s.add_development_dependency('webmock', '~> 1.19.0')
   s.add_development_dependency('coveralls')
   s.add_runtime_dependency('net-http-persistent', '~> 2.6')
   s.add_runtime_dependency('taverna-baclava', '~> 1.0')
-  s.add_runtime_dependency('ratom', '~> 0.8.2')
+  s.add_runtime_dependency('ratom', '~> 0.9')
   s.add_runtime_dependency('libxml-ruby', '~> 2.6')
 end

data/test/helpers/{timezone.rb → mangle-time.rb}

@@ -30,10 +30,9 @@
 #
 # Author: Robert Haines
 
-# For time-based tests to run we have to mangle the timezone to match the
-# local server. Sigh.
-def timezone
-  z = Time.zone_offset(Time.now.zone) / 3600
-  s = z.abs < 10 ? "0#{z.abs.to_s}" : z.abs.to_s
-  z < 0 ? "-#{s}" : "+#{s}"
+# For time-based tests we need to mangle the time strings for uploading to
+# Taverna Server.
+def mangle_time(time)
+  date_str = time.xmlschema(2)
+  date_str = date_str[0..-4] + date_str[-2..-1]
 end

data/test/tc_run.rb

@@ -33,7 +33,7 @@
 require 'mocked-server-responses/mocks'
 require 't2-server'
 
-require 'helpers/timezone'
+require 'helpers/mangle-time'
 require 'helpers/test-cache'
 
 class TestRun < Test::Unit::TestCase
@@ -42,9 +42,10 @@ class TestRun < Test::Unit::TestCase
   WKF_PASS = "test/workflows/pass_through.t2flow"
 
   # Some expiry times, mangled to work in different timezones.
-  TIME_STR = "2014-05-08 17:41:57 #{timezone}00"    # Ruby time format
-  TIME_RET = "2014-05-08T17:41:57.00#{timezone}:00" # Server return format
-  TIME_SET = "2014-05-08T17:41:57.00#{timezone}00"  # Server update format
+  TIME_OBJ = Time.now                                      # Ruby time object
+  TIME_STR = TIME_OBJ.strftime("%Y-%m-%d %H:%M:%S.%2N %z") # Ruby time string
+  TIME_RET = TIME_OBJ.xmlschema(2)                         # Server return format
+  TIME_SET = mangle_time(TIME_OBJ)                         # Server update format
 
   # Need to lock down the run UUID so recorded server responses make sense.
   RUN_UUID = "a341b87f-25cc-4dfd-be36-f5b073a6ba74"
@@ -134,7 +135,7 @@ class TestRun < Test::Unit::TestCase
       :status => 200, :body => TIME_SET, :credentials => $userinfo)
 
     @run.expiry = TIME_STR
-    @run.expiry = Time.parse(TIME_STR)
+    @run.expiry = TIME_OBJ
 
     assert_requested exp, :times => 2
   end

data/version.yml

@@ -1,4 +1,4 @@
 ---
   :major: 1
-  :minor: 2
+  :minor: 3
   :patch: 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t2-server
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Robert Haines
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,20 +81,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +157,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +231,9 @@ files:
 - lib/t2-server/xml/xpath_cache.rb
 - t2-server.gemspec
 - test/helpers/fake-run.rb
+- test/helpers/mangle-time.rb
 - test/helpers/test-cache.rb
 - test/helpers/test-xml.rb
-- test/helpers/timezone.rb
 - test/mocked-server-responses/.gitattributes
 - test/mocked-server-responses/get-admin.raw
 - test/mocked-server-responses/get-rest-policy-runlimit.raw
@@ -310,9 +324,9 @@ specification_version: 4
 summary: Support for interacting with Taverna 2 Server.
 test_files:
 - test/helpers/fake-run.rb
+- test/helpers/mangle-time.rb
 - test/helpers/test-cache.rb
 - test/helpers/test-xml.rb
-- test/helpers/timezone.rb
 - test/mocked-server-responses/.gitattributes
 - test/mocked-server-responses/get-admin.raw
 - test/mocked-server-responses/get-rest-policy-runlimit.raw