torquespec 0.3.9.i → 0.4.0

data/lib/torquespec/as7.rb

@@ -14,7 +14,7 @@ module TorqueSpec
     end
 
     def shutdown
-      domain_api( :operation => "shutdown" )
+      api( :operation => "shutdown" )
     rescue EOFError
       # ignorable
     end
@@ -22,30 +22,30 @@ module TorqueSpec
     def _deploy(path)
       once = true
       begin
-        domain_api( :operation => "add",
-                    :address   => [ "deployment", addressify(path) ],
-                    :content   => [ { :url=>urlify(path)} ] )
-      rescue Exception=>e
+        api( :operation => "add",
+             :address   => [ "deployment", addressify(path) ],
+             :content   => [ { :url=>urlify(path)} ] )
+      rescue Exception
         _undeploy(path)
         if once
           once = false
           retry
         else
-          raise e 
+          raise
         end
       end
-      domain_api( :operation => "deploy",
-                  :address   => [ "deployment", addressify(path) ] )
+      api( :operation => "deploy",
+           :address   => [ "deployment", addressify(path) ] )
     end
 
     def _undeploy(path)
-      domain_api( :operation => "remove",
-                  :address   => [ "deployment", addressify(path) ] )
+      api( :operation => "remove",
+           :address   => [ "deployment", addressify(path) ] )
     end
 
     def ready?
-      response = JSON.parse( domain_api( :operation => "read-attribute",
-                                         :name      => "server-state") )
+      response = JSON.parse( api( :operation => "read-attribute",
+                                  :name      => "server-state") )
       response['outcome'].downcase=='success' && response['result'].downcase=='running'
     rescue
       false
@@ -53,12 +53,13 @@ module TorqueSpec
 
     private
 
-    def domain_api(params)
+    def api(params)
       post('/management', params.merge('json.pretty' => 1).to_json)
     end
 
     def urlify(path)
-      URI.parse(path).scheme.nil? ? "file:#{path}" : path
+      uri = URI.parse(path)
+      uri.scheme.nil? || uri.scheme =~ /^[a-zA-Z]$/ ? "file:#{path}" : path
     end
     
     def addressify(path)

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.3.9.i"
+  VERSION = "0.4.0"
 end

data/spec/empty_spec.rb

@@ -4,7 +4,7 @@ remote_describe "in-container tests without a deploy call" do
 
   it "should work" do
     require 'torquebox/messaging/queue'
-    queue = TorqueBox::Messaging::Queue.start('/queues/foo', :jndi => "")
+    queue = TorqueBox::Messaging::Queue.start('/queues/foo')
     queue.publish('bar')
     queue.receive.should == 'bar'
     queue.stop

data/spec/remote_spec.rb

@@ -18,7 +18,7 @@ remote_describe "in-container tests" do
 
   it "should work" do
     require 'torquebox/messaging/queue'
-    queue = TorqueBox::Messaging::Queue.start('/queues/foo', :jndi => "")
+    queue = TorqueBox::Messaging::Queue.start('/queues/foo')
     queue.publish('bar')
     queue.receive.should == 'bar'
     queue.stop

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 30
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  - i
-  version: 0.3.9.i
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jim Crossley
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -04:00
+date: 2011-08-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,14 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: torquespec