From a12adc7339f0604d4e77d78fc54bc7134f096104 Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Sun, 7 Sep 2014 19:09:57 -0400
Subject: [PATCH 1/5] updated for rspec 3.x

---
 lib/torquespec/torquespec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/torquespec/torquespec.rb b/lib/torquespec/torquespec.rb
index bd10276..e54d4dc 100644
--- a/lib/torquespec/torquespec.rb
+++ b/lib/torquespec/torquespec.rb
@@ -26,7 +26,7 @@ def deploy(*descriptors, &block)
       i = descriptors.size > 1 ? 0 : nil
       @deploy_paths = descriptors.map do |descriptor| 
         DeploymentDescriptor.new(descriptor, 
-                                 "#{self.display_name}#{i&&i-=1}", 
+                                 "#{self.description}#{i&&i-=1}", 
                                  descriptors.last==descriptor && descendants.any? {|x| x.is_a?(TorqueSpec::Daemon::Client)}
                                  ).path
       end

From 3a106860de2b43f5742990233fe8211f09aba4ad Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Sun, 7 Sep 2014 19:24:00 -0400
Subject: [PATCH 2/5] fixes to remote deploy

---
 lib/torquespec/daemon.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/torquespec/daemon.rb b/lib/torquespec/daemon.rb
index b8f7bb6..a308009 100644
--- a/lib/torquespec/daemon.rb
+++ b/lib/torquespec/daemon.rb
@@ -86,6 +86,8 @@ def torquespec_after_alls
           eval_after_alls(new) # v 2.3
         elsif respond_to?(:run_after_all_hooks)
           run_after_all_hooks(new) # 2.7
+        elsif respond_to?(:run_after_context_hooks)
+          run_after_context_hooks(new) # 3.0
         else
           raise "Unknown method to run after(:all) hooks"
         end

From 51533074c8015834c92f2d7817d4f87003cc3a2f Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Sun, 7 Sep 2014 20:12:27 -0400
Subject: [PATCH 3/5] more rspec compat fixes

---
 lib/torquespec/daemon.rb     |  2 ++
 lib/torquespec/torquespec.rb | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/torquespec/daemon.rb b/lib/torquespec/daemon.rb
index a308009..24c309f 100644
--- a/lib/torquespec/daemon.rb
+++ b/lib/torquespec/daemon.rb
@@ -76,6 +76,8 @@ def torquespec_before_alls
           eval_before_alls(new) # v 2.3
         elsif respond_to?(:run_before_all_hooks)
           run_before_all_hooks(new) # 2.7
+        elsif respond_to?(:run_before_context_hooks)
+          run_before_context_hooks(new)
         else
           raise "Unknown method to run before(:all) hooks"
         end
diff --git a/lib/torquespec/torquespec.rb b/lib/torquespec/torquespec.rb
index e54d4dc..81dcc61 100644
--- a/lib/torquespec/torquespec.rb
+++ b/lib/torquespec/torquespec.rb
@@ -24,11 +24,20 @@ def deploy(*descriptors, &block)
       return @deploy_paths if @deploy_paths
       descriptors += [block.call].flatten if block
       i = descriptors.size > 1 ? 0 : nil
-      @deploy_paths = descriptors.map do |descriptor| 
-        DeploymentDescriptor.new(descriptor, 
-                                 "#{self.description}#{i&&i-=1}", 
-                                 descriptors.last==descriptor && descendants.any? {|x| x.is_a?(TorqueSpec::Daemon::Client)}
-                                 ).path
+      if respond_to?(:display_name)
+        @deploy_paths = descriptors.map do |descriptor| 
+          DeploymentDescriptor.new(descriptor, 
+                                   "#{self.display_name}#{i&&i-=1}", 
+                                   descriptors.last==descriptor && descendants.any? {|x| x.is_a?(TorqueSpec::Daemon::Client)}
+                                   ).path
+        end
+      else
+        @deploy_paths = descriptors.map do |descriptor| 
+          DeploymentDescriptor.new(descriptor, 
+                                   "#{self.description}#{i&&i-=1}", 
+                                   descriptors.last==descriptor && descendants.any? {|x| x.is_a?(TorqueSpec::Daemon::Client)}
+                                   ).path
+        end
       end
     end
   end

From 56b7703158c592ec17b3f36c68f7b7dade602e8c Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Sun, 7 Sep 2014 20:21:57 -0400
Subject: [PATCH 4/5] fixes to option parse

---
 lib/torquespec/daemon.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/torquespec/daemon.rb b/lib/torquespec/daemon.rb
index 24c309f..5f081b5 100644
--- a/lib/torquespec/daemon.rb
+++ b/lib/torquespec/daemon.rb
@@ -32,7 +32,11 @@ def initialize(opts={})
       Dir.chdir( dir ) do
         RSpec::Core::Runner.disable_autorun! # avoid a bunch of at_exit finalizer errors
         @options = RSpec::Core::ConfigurationOptions.new( opts['argv'].to_a )
-        @options.parse_options
+        if (@options.respond_to?(:parse_options))
+          @options.parse_options
+        else
+          @options.options
+        end
 
         @configuration = RSpec::configuration
         @world         = RSpec::world

From 95dad2111eeb664a697df8f848632ea804e3ae3a Mon Sep 17 00:00:00 2001
From: Joshua Harding <josh@statewidesoftware.com>
Date: Wed, 8 Apr 2015 01:29:14 +0000
Subject: [PATCH 5/5] rspec 3.x seems to work...

---
 lib/torquespec/daemon.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 lib/torquespec/daemon.rb

diff --git a/lib/torquespec/daemon.rb b/lib/torquespec/daemon.rb
old mode 100644
new mode 100755
index 5f081b5..8f0d53c
--- a/lib/torquespec/daemon.rb
+++ b/lib/torquespec/daemon.rb
@@ -126,7 +126,11 @@ def run_remotely(reporter)
       end
       
       def deploy_paths
-        [ DeploymentDescriptor.new( {}, display_name, true ).path ]
+        if respond_to?(:display_name)
+          [ DeploymentDescriptor.new( {}, display_name, true ).path ]
+        else
+          [ DeploymentDescriptor.new( {}, description, true ).path ]  
+        end
       end
 
     end