engineyard-serverside 2.6.0 → 2.6.1

data/lib/engineyard-serverside/paths.rb

@@ -105,8 +105,10 @@ module EY
         Time.now.utc.strftime("%Y%m%d%H%M%S")
       end
 
+      # if active_release is already set, it's set because we're operating on
+      # an existing release. This happens during integrate
       def new_release!
-        @active_release = path(:releases, release_dirname)
+        @active_release ||= path(:releases, release_dirname)
       end
 
       # If no active release is defined, use current

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.6.0'
+    VERSION = '2.6.1'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -1,19 +1,26 @@
 require 'spec_helper'
 
 describe "Deploying a simple application" do
-  context "without Bundler" do
-    before(:all) do
-      deploy_test_application('not_bundled')
-    end
+  before(:all) do
+    deploy_test_application('not_bundled')
+  end
+
+  it "creates a REVISION file" do
+    expect(deploy_dir.join('current', 'REVISION')).to exist
+  end
+
+  it "restarts the app servers" do
+    restart = deploy_dir.join('current', 'restart')
+    expect(restart).to exist
+    expect(restart.read.chomp).to eq(%|LANG="en_US.UTF-8" /engineyard/bin/app_rails31 deploy|)
+  end
+
+  it "reuses the same active_release directory if a release_path is specified (such as in integrate)" do
+    path = @config.paths.active_release
+    expect(path.parent.children.size).to eq(1)
 
-    it "creates a REVISION file" do
-      expect(deploy_dir.join('current', 'REVISION')).to exist
-    end
+    redeploy_test_application('config' => {'release_path' => path.to_s})
 
-    it "restarts the app servers" do
-      restart = deploy_dir.join('current', 'restart')
-      expect(restart).to exist
-      expect(restart.read.chomp).to eq(%|LANG="en_US.UTF-8" /engineyard/bin/app_rails31 deploy|)
-    end
+    expect(path.parent.children.size).to eq(1)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -482,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 696469692367855217
+      hash: -1292946205769568354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: