vae 0.6.6 → 0.6.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjlkNjk5NGI3Y2IyOTliN2E3OTMwNWE2MGYwMWM2MzQ1Njg0ZmRiZg==
-  data.tar.gz: !binary |-
-    NmM1YTAxMWM2NzlmMGJhMzRkNDUwN2FkOGJiZTQ0NzJkYmM0MTA1MQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NWJhYzU3YzVjMTA3YTFmZjEyMzRjNGY4MjVhN2IzMmJmOWJkOTEwMzQ4MDkx
-    MzBhOGExNTI0NzIzNmM2MGQ2MzhiMjU4MWEzNzIxNDRjOWM2OTk3MjhhZTk2
-    ODc1NjdlNWY5ZjkyYTE5M2Y3ZjcxZWU4YWNmMDQ1NzE5YTdiZjM=
-  data.tar.gz: !binary |-
-    NDg4YTZiZjk4NTM2YzFlNGM2YTBiNzQwZjFmYzFiYzZmOGI1N2U0Y2FkMGE3
-    ZTFhNjBlZjk3YzBkYzg5OWQ0Yzc4YzAyYjQzMWM0MDI0NWJhYzQ5Nzc1YzUy
-    MWFjNDEzMDZjZmUzOGM3ZDBkYmI5NzJiNTZlYzRlOWJjMWJjZjc=
+SHA1:
+  metadata.gz: ebd54606b10c4ebe84df93817c47257dfef15b38
+  data.tar.gz: f34dd3a798203625979717a6116f9a5962e74737
+SHA512:
+  metadata.gz: 4d3ae734b13795572be3c9e645a3d90f25d660926a067f7535eb25d837eff1738134143e36bd9c1e0a720a63fe0f074285f5561382ea3cd71a610f3aba5465bd
+  data.tar.gz: a23d732052a5ec40ecccd1a55bd720e41be3569afd8b3a685429bab6a4b1093dc0fea3549240b529444f3c7389c9130221d60f390c8fc6c263fbbd776e3655c4

data/lib/vae.rb

@@ -109,6 +109,9 @@ class VaeLocal
       stagerelease(ARGV.last, options[:site], options[:username], options[:password])
       exit
     end
+
+    # Move mongrel dependency here so not as required on Windows
+
     raise VaeError, "You did not specify the path to the root of the local copy of your Vae site.  Please specify it manually by using the --root option or cd to the site root (and make sure it contains a __vae.yml file)." unless options[:site_root]
     raise VaeError, "You specified an invalid path to the local copy of your Vae site." unless File.exists?(options[:site_root])
 
@@ -157,7 +160,7 @@ class VaeLocal
       puts "Request started, waiting for completion..."
       loop do
         sleep 5
-        req = Net::HTTP::Get.new("/resque_jobs/show/#{data['job']}")
+        req = Net::HTTP::Get.new("/api/local/v1/job_status/#{data['job']}")
         res = fetch_from_vaeplatform(site, req)
         status = JSON.parse(res.body)
         if status['status'] == "completed"
@@ -178,18 +181,14 @@ class VaeLocal
   end
   
   def stagerelease(action, site, username, password)
-    if action == "deploy" or action == "stage"
-      action = "subversion/stage"
+    if action == "deploy"
+      action = "stage"
     elsif action == "stagerelease"
-      stagerelease("subversion/stage", site, username, password)
-      stagerelease("subversion/release", site, username, password)
+      stagerelease("stage", site, username, password)
+      stagerelease("release", site, username, password)
       return
-    elsif action == "release"
-      action = "releases/release"
-    elsif action == "rollback"
-      action = "releases/rollback"
     end
-    req = Net::HTTP::Post.new("/#{action}")
+    req = Net::HTTP::Post.new("/api/local/v1/#{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)

data/lib/vae_site_servlet.rb

@@ -139,14 +139,14 @@ class VaeSiteServlet < Servlet
       st = File::stat(local_path)
       mtime = st.mtime
       etag = sprintf("%x-%x-%x", st.ino, st.size, st.mtime.to_i)
-      res.header['etag'] = etag
+      res.header['etag'] = etag if !req_scss?(req)
       if not_modified?(req, res, mtime, etag)
         puts "#{req.params["REQUEST_URI"]} not modified"
         res.status = 304
       else
         mtype = WEBrick::HTTPUtils::mime_type(local_path, WEBrick::HTTPUtils::DefaultMimeTypes)
-        res.header['last-modified'] = mtime.httpdate
-        if req.params["REQUEST_URI"] =~ /\.(sass|scss)$/
+        res.header['last-modified'] = mtime.httpdate if !req_scss?(req)
+        if req_scss?(req)
           res.header['Content-Type'] = "text/css"
           res.body << render_sass(local_path)
         else
@@ -180,6 +180,10 @@ class VaeSiteServlet < Servlet
       end
     end
   end
+
+  def req_scss?(req)
+    req.params["REQUEST_URI"] =~ /\.(sass|scss)$/
+  end
   
   def server_parsed?(path)
     SERVER_PARSED.each do |ext|

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.6.6"
+VER = "0.6.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.9
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -43,14 +43,14 @@ dependencies:
   name: directory_watcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -71,28 +71,28 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -150,19 +150,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem allows for local development for sites on Vae Platform (http://vaeplatform.com/)
 test_files: []
-has_rdoc: