vae 0.6.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTFhZjg3MzcxNTRlMjc0YjkzNjQ3OGQwYTE4ZjE1YzQ1YzY5OGEyNQ==
+    Njc1YTZhN2ZhMTc0NjYzZTRiZjhmNDcwNWM5NTBjNTNiODY5NjA0MQ==
   data.tar.gz: !binary |-
-    NGRkOTQ3YjRkNTc2MjA1Mzc4NTNjMDQ4MDE3NmNjY2NlOWU2ZGZmMA==
+    ZDdjMzYyMzdmZTI1ZTMzYjQwZDk4Y2EyZjE5MDY2NjRjYmYwMWMxYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzFmM2M4NTcwYjdkNWQ5YWYyYTVmMWZhNDQ2MjUyOTc5NmM2NzM2ZmY2YzE5
-    MWUwOTdjNGM4OWMzZjE4NTIzYjdhZWQyYWJmMWUxZjk0NzNiZWRiYzkxNzBh
-    Y2VjYTUxZGRmNGU3NWNhMDliYTFkYjk5MjljODkxM2MxODg2ODM=
+    ZDg5YzRmMDBiMjYyMjQ5NjRiOWRlN2JjODBhODE5YTU1ODM1NjA5ZDY3Yzhk
+    YTEwNGY4ZTY2OWVhYzEwMWM4NmZlZjM0ODE5MDA1Yjc5MjE5MzYyMDhmOWMz
+    MjllNGM2NzMxNmRmN2NhZDlmMTVlYTU0ZDVhYzMzZjRjMDU1NTg=
   data.tar.gz: !binary |-
-    MWQ5OTlhYjFlN2M1OTI1ZTMwZjVhY2UwMTI3NzEyMmZlNTNlODZhZjAwNmM0
-    YTY5YmRkYzY5NzVlNzhlN2UwNWY4OGRjYjhmOWMwOTg5OWNhZjE0ZTRkNDEy
-    MTRiYjA3YjQxMzQwNzRiZTcyNmU5ZjMxODI1ZDJhMmQzYWJkN2M=
+    Y2NhZTZlNDE2OTQ5YTQ4MTFlOGYwZTY5NDAyY2NhNGVjZWI0MTM0NWYwOTQ1
+    MmVmZGRiMzU0MDE2OTlkNGYxMjYyN2VmZTFhYzdmMmY4YTUyYzczMjkwZjlh
+    OWMwZTliZGUyZDJkNjM4ODhlNjQzMzA0MmNmYjVhNzhkNDAyYzY=

data/lib/vae.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 
 require 'cgi'
 require 'digest/md5'
+require 'json'
 require 'mongrel'
 require 'net/http'
 require 'net/https'
@@ -145,22 +146,49 @@ class VaeLocal
       puts "Thanks for using Vae!"
     end
   end
+
+  def show_job_status(res, site)
+    data = JSON.parse(res.body)
+    if data['error']
+      raise VaeError, data['error']
+    else
+      puts "Request started, waiting for completion..."
+      loop do
+        sleep 5
+        req = Net::HTTP::Get.new("/resque_jobs/show/#{data['job']}")
+        res = fetch_from_vaeplatform(site, req)
+        status = JSON.parse(res.body)
+        if status['status'] == "completed"
+          puts data['success']
+          return
+        elsif status['status'] != "working"
+          raise VaeError, "Got the following error from Vae Platform: #{status['message']}"
+        end
+      end
+    end
+  rescue JSON::ParserError
+    raise VaeError, "An unknown error occurred requesting this operation from Vae Platform.  Please email support for help."
+  end
   
   def stagerelease(action, site, username, password)
-    if action == "deploy"
-      action = "stage"
+    if action == "deploy" or action == "stage"
+      action = "subversion/stage"
     elsif action == "stagerelease"
-      stagerelease("stage", site, username, password)
-      stagerelease("release", site, username, password)
+      stagerelease("subversion/stage", site, username, password)
+      stagerelease("subversion/release", site, username, password)
       return
+    elsif action == "release"
+      action = "releases/release"
+    elsif action == "rollback"
+      action = "releases/rollback"
     end
-    req = Net::HTTP::Post.new("/subversion/#{action}")
-    req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}"
+    req = Net::HTTP::Post.new("/#{action}")
+    req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}&vae_local=1"
     res = fetch_from_vaeplatform(site, req)
     if res.is_a?(Net::HTTPFound)
       raise VaeError, "Invalid username/password or insufficient permissions."
     else
-      puts res.body
+      show_job_status(res, site)
     end
   end
   

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.6.3"
+VER = "0.6.4"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png