vulcan 0.2.2 → 0.2.3

data/lib/vulcan/cli.rb

@@ -139,7 +139,7 @@ update the build server
         system "git commit -m commit >/dev/null"
         system "git push heroku -f master"
 
-        %x{ env BUNDLE_GEMFILE= heroku config:add SECRET=#{config[:secret]} SPAWN_ENV=heroku HEROKU_APP=#{config[:app]} HEROKU_API_KEY=#{api_key} 2>&1 }
+        %x{ env BUNDLE_GEMFILE= heroku config:add SECRET=#{config[:secret]} SPAWN_ENV=heroku HEROKU_APP=#{config[:app]} HEROKU_API_KEY=#{api_key} NODE_PATH=lib 2>&1 }
         %x{ env BUNDLE_GEMFILE= heroku config:add BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs.git#versions 2>&1 }
         %x{ env BUNDLE_GEMFILE= heroku addons:add cloudant:oxygen }
       end

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 
 end

data/server/web.js

@@ -68,7 +68,14 @@ app.post('/make', function(request, response, next) {
             'application/octet-stream',
             fs.createReadStream(files.code.path),
             function(err, data) {
-              if (err) { log_error(id, util.inspect(err)); return next(err); }
+              if (err) {
+                // work around temporary problem with cloudant and document
+                // conflicts
+                if (err.error != 'conflict') {
+                  log_error(id, err.reason);
+                  return next(err.reason);
+                }
+              }
 
               // spawn bin/make with this build id
               log_action(id, 'spawning build');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70212546154200 !ruby/object:Gem::Requirement
+  requirement: &70223361817240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70212546154200
+  version_requirements: *70223361817240
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70212546153260 !ruby/object:Gem::Requirement
+  requirement: &70223361816240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70212546153260
+  version_requirements: *70223361816240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70212546152260 !ruby/object:Gem::Requirement
+  requirement: &70223361814920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212546152260
+  version_requirements: *70223361814920
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables: