torquespec 0.1.1 → 0.1.2

data/lib/torquespec/as7.rb

@@ -21,16 +21,25 @@ module TorqueSpec
 
     def _deploy(path)
       url = urlify(path)
-      domain_api( :operation => "add",
-                  :address   => [ "deployment", url ],
-                  :url       => url )
-      domain_api( :operation => "deploy",
-                  :address   => [ "deployment", url ] )
+      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
+      end
     end
 
     def _undeploy(path)
-      domain_api( :operation => "remove",
-                  :address   => [ "deployment", urlify(path) ] )
+      if deployments.has_key?(path)
+        domain_api( deployments.delete(path) )
+      else
+        domain_api( :operation => "remove",
+                    :address   => [ "deployment", urlify(path) ] )
+      end
     end
 
     def ready?
@@ -41,6 +50,10 @@ module TorqueSpec
       false
     end
 
+    def cleanup
+      deployments.keys.each { |k| domain_api( deployments.delete(k) ) }
+    end
+    
     private
 
     def domain_api(params)
@@ -51,5 +64,8 @@ module TorqueSpec
       URI.parse(path).scheme.nil? ? "file:#{path}" : path
     end
 
+    def deployments
+      @deployments ||= {}
+    end
   end
 end

data/lib/torquespec/server.rb

@@ -26,6 +26,7 @@ module TorqueSpec
     end
 
     def stop
+      cleanup
       return if stopped
       self.stopped = true
       if TorqueSpec.lazy
@@ -38,14 +39,14 @@ module TorqueSpec
 
     def deploy(url)
       t0 = Time.now
-      puts "#{url}"
+      puts " deploying #{url}"
       _deploy(url)
-      puts "  deployed in #{(Time.now - t0).to_i}s"
+      puts "  deployed #{url} in #{(Time.now - t0).to_i}s"
     end
 
     def undeploy(url)
       _undeploy(url)
-      puts "  undeployed #{url.split('/')[-1]}"
+      puts "   removed #{url}"
     end
 
     def wait_for_ready(timeout)
@@ -61,6 +62,10 @@ 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.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency