torquespec 0.1.4 → 0.1.5

data/lib/torquespec/as7.rb

@@ -20,26 +20,25 @@ module TorqueSpec
     end
 
     def _deploy(path)
-      url = urlify(path)
-      response = JSON.parse( domain_api( :operation => "add",
-                                         :address   => [ "deployment", url ],
-                                         :url       => url ) )
-      if response['outcome']=='success'
-        deployments[path] = response['compensating-operation']
-        domain_api( :operation => "deploy",
-                    :address   => [ "deployment", url ] )
-      else
-        response.to_json
+      once = true
+      begin
+        domain_api( :operation => "add",
+                    :address   => [ "deployment", addressify(path) ],
+                    :url       => urlify(path) )
+      rescue Exception
+        _undeploy(path)
+        if once
+          once = false
+          retry
+        end
       end
+      domain_api( :operation => "deploy",
+                  :address   => [ "deployment", addressify(path) ] )
     end
 
     def _undeploy(path)
-      if deployments.has_key?(path)
-        domain_api( deployments.delete(path) )
-      else
-        domain_api( :operation => "remove",
-                    :address   => [ "deployment", urlify(path) ] )
-      end
+      domain_api( :operation => "remove",
+                  :address   => [ "deployment", addressify(path) ] )
     end
 
     def ready?
@@ -50,10 +49,6 @@ module TorqueSpec
       false
     end
 
-    def cleanup
-      deployments.keys.each { |k| domain_api( deployments.delete(k) ) }
-    end
-    
     private
 
     def domain_api(params)
@@ -63,9 +58,9 @@ module TorqueSpec
     def urlify(path)
       URI.parse(path).scheme.nil? ? "file:#{path}" : path
     end
-
-    def deployments
-      @deployments ||= {}
+    
+    def addressify(path)
+      File.basename(path)
     end
   end
 end

data/lib/torquespec/server.rb

@@ -26,7 +26,6 @@ module TorqueSpec
     end
 
     def stop
-      cleanup
       return if stopped
       self.stopped = true
       if TorqueSpec.lazy
@@ -62,10 +61,6 @@ module TorqueSpec
       raise "JBoss failed to start"
     end
 
-    def cleanup
-      # modules may mixin if needed
-    end
-
     protected
 
     def startup(opts)

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/hello_world_spec.rb

@@ -25,3 +25,14 @@ describe "simple directory deployment" do
     response.strip.should == "Hello World!"
   end
 end
+
+describe "war deployment" do
+  
+  deploy File.join( File.dirname(__FILE__), "../apps/node-info.war" )
+
+  it "should greet the world" do
+    response = open("http://localhost:8080/node-info") {|f| f.read}
+    response.should include( 'JBoss-Cloud node info' )
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jim Crossley
@@ -60,6 +60,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- apps/node-info.war
 - apps/simple.knob
 - apps/simple/config.ru
 - lib/torquespec.rb