From fc0ec0afda8502b18c7215d5ec8ec2167df076f7 Mon Sep 17 00:00:00 2001
From: Andy Delcambre & Samuel Merritt <adelcambre@engineyard.com>
Date: Wed, 25 Aug 2010 14:24:30 -0700
Subject: [PATCH] Move serverside version into its own file.

---
 lib/engineyard.rb                    | 1 +
 lib/engineyard/model/instance.rb     | 1 -
 lib/engineyard/serverside_version.rb | 3 +++
 spec/support/shared_behavior.rb      | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 lib/engineyard/serverside_version.rb

diff --git a/lib/engineyard.rb b/lib/engineyard.rb
index 7ae1d91..1618e2c 100644
--- a/lib/engineyard.rb
+++ b/lib/engineyard.rb
@@ -1,6 +1,7 @@
 module EY
   require 'engineyard/ruby_ext'
   require 'engineyard/version'
+  require 'engineyard/serverside_version'
 
   autoload :API,        'engineyard/api'
   autoload :Collection, 'engineyard/collection'
diff --git a/lib/engineyard/model/instance.rb b/lib/engineyard/model/instance.rb
index 9b0de38..919861d 100644
--- a/lib/engineyard/model/instance.rb
+++ b/lib/engineyard/model/instance.rb
@@ -3,7 +3,6 @@
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      ENGINEYARD_SERVERSIDE_VERSION = ENV["ENGINEYARD_SERVERSIDE_VERSION"] || "1.2.0"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "engineyard-serverside version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,
diff --git a/lib/engineyard/serverside_version.rb b/lib/engineyard/serverside_version.rb
new file mode 100644
index 0000000..5a5e078
--- /dev/null
+++ b/lib/engineyard/serverside_version.rb
@@ -0,0 +1,3 @@
+module EY
+  ENGINEYARD_SERVERSIDE_VERSION = ENV["ENGINEYARD_SERVERSIDE_VERSION"] || "1.2.0"
+end
diff --git a/spec/support/shared_behavior.rb b/spec/support/shared_behavior.rb
index 350570a..e002c19 100644
--- a/spec/support/shared_behavior.rb
+++ b/spec/support/shared_behavior.rb
@@ -187,7 +187,7 @@ def exiting_ssh(exit_code)
     it "does not try to install engineyard-serverside if it's already there" do
       run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(0)}})
       @ssh_commands.should_not have_command_like(/gem install engineyard-serverside/)
-      ver = Regexp.quote(EY::Model::Instance::ENGINEYARD_SERVERSIDE_VERSION)
+      ver = Regexp.quote(EY::ENGINEYARD_SERVERSIDE_VERSION)
       @ssh_commands.should have_command_like(/engineyard-serverside _#{ver}_ deploy/)
     end
   end