engineyard-serverside 1.3.7 → 1.4.0

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,5 @@
 module EY
-  VERSION = '1.3.7'
+  module Serverside
+    VERSION = '1.4.0'
+  end
 end

data/spec/custom_deploy_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "the EY::Deploy API" do
+describe "the EY::Serverside::Deploy API" do
   it "calls tasks in the right order" do
-    class TestDeploy < EY::Deploy
+    class TestDeploy < EY::Serverside::Deploy
       # This happens before require_custom_tasks, so it's not
       # overrideable. That's why it's not in @call_order.
       def update_repository_cache() end
@@ -31,7 +31,7 @@ describe "the EY::Deploy API" do
       def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
     end
 
-    td = TestDeploy.new(EY::Deploy::Configuration.new)
+    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new)
     td.deploy
     td.call_order.should == %w(
       push_code
@@ -48,13 +48,13 @@ describe "the EY::Deploy API" do
   end
 
   describe "task overrides" do
-    class TestQuietDeploy < EY::Deploy
+    class TestQuietDeploy < EY::Serverside::Deploy
       def puts(*_) 'quiet' end
     end
 
     before(:each) do
       @tempdir = `mktemp -d -t custom_deploy_spec.XXXXX`.strip
-      @config = EY::Deploy::Configuration.new('repository_cache' => @tempdir)
+      @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
       @deploy = TestQuietDeploy.new(@config)
     end
 

data/spec/deploy_hook_spec.rb

@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "the deploy-hook API" do
   before(:each) do
-    @hook = EY::DeployHook.new(options)
-    @callback_context = EY::DeployHook::CallbackContext.new(@hook.config)
+    @hook = EY::Serverside::DeployHook.new(options)
+    @callback_context = EY::Serverside::DeployHook::CallbackContext.new(@hook.config)
   end
 
   def run_hook(options={}, &blk)
@@ -66,7 +66,7 @@ describe "the deploy-hook API" do
 
   context "the @node ivar" do
     before(:each) do
-      EY.dna_json = {
+      EY::Serverside.dna_json = {
         'instance_role' => 'solo',
         'applications' => {
           'myapp' => {

data/spec/deprecation_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe EY::Serverside do
+  
+  it "preserves the old constants" do
+    EY::BundleInstaller.should == EY::Serverside::BundleInstaller
+    EY::CLI.should == EY::Serverside::CLI
+    EY::Deploy.should == EY::Serverside::Deploy
+    EY::DeployBase.should == EY::Serverside::DeployBase
+    EY::Deploy::Configuration.should == EY::Serverside::Deploy::Configuration
+    EY::DeployHook.should == EY::Serverside::DeployHook
+    EY::LockfileParser.should == EY::Serverside::LockfileParser
+    EY::LoggedOutput.should == EY::Serverside::LoggedOutput
+    EY::Server.should == EY::Serverside::Server
+    EY::Task.should == EY::Serverside::Task    
+    EY::Strategies.should == EY::Serverside::Strategies
+    EY::Strategies::Git.should == EY::Serverside::Strategies::Git
+    
+    lambda{ EY::WTFNotDefined }.should raise_error(NameError, /uninitialized constant EY::WTFNotDefined/)    
+
+    #TODO: what about EY.node and EY.dna..
+
+  end
+
+end

data/spec/git_strategy_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "the git deploy strategy" do
   subject do
-    EY::Strategies::Git.new(:repo => File.expand_path("../fixtures/gitrepo/.git", __FILE__),
+    EY::Serverside::Strategies::Git.new(:repo => File.expand_path("../fixtures/gitrepo/.git", __FILE__),
                             :repository_cache => File.expand_path("../fixtures/gitrepo", __FILE__),
                             :ref => "master"
                             )

data/spec/lockfile_parser_spec.rb

@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "the bundler version retrieved from the lockfile" do
   def get_version(file)
     full_path = File.expand_path("../support/lockfiles/#{file}", __FILE__)
-    @config = EY::Deploy::Configuration.new('deploy_to' => 'dontcare')
-    EY::DeployBase.new(@config).get_bundler_installer(full_path).version
+    @config = EY::Serverside::Deploy::Configuration.new('deploy_to' => 'dontcare')
+    EY::Serverside::DeployBase.new(@config).get_bundler_installer(full_path).version
   end
 
   it "returns the default version for an 0.9 lockfile without a bundler dependency" do
-    get_version('0.9-no-bundler').should == EY::DeployBase.new(@config).send(:default_09_bundler)
+    get_version('0.9-no-bundler').should == EY::Serverside::DeployBase.new(@config).send(:default_09_bundler)
   end
 
   it "gets the version from an 0.9 lockfile with a bundler dependency" do
@@ -16,7 +16,7 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   it "returns the default version for a 1.0 lockfile without a bundler dependency" do
-    get_version('1.0-no-bundler').should == EY::DeployBase.new(@config).send(:default_10_bundler)
+    get_version('1.0-no-bundler').should == EY::Serverside::DeployBase.new(@config).send(:default_10_bundler)
   end
 
   it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do

data/spec/real_deploy_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-module EY::Strategies::IntegrationSpec
+module EY::Serverside::Strategies::IntegrationSpec
   module Helpers
 
     def update_repository_cache
@@ -61,7 +61,7 @@ EOF
 end
 
 describe "deploying an application" do
-  class FullTestDeploy < EY::Deploy
+  class FullTestDeploy < EY::Serverside::Deploy
     attr_reader :infos, :debugs, :commands
 
     def initialize(*)
@@ -134,12 +134,12 @@ describe "deploying an application" do
   before(:all) do
     @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
-    # set up EY::Server like we're on a solo
-    EY::Server.reset
-    EY::Server.add(:hostname => 'localhost', :roles => %w[solo])
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
 
     # run a deploy
-    config = EY::Deploy::Configuration.new({
+    config = EY::Serverside::Deploy::Configuration.new({
         "strategy"      => "IntegrationSpec",
         "deploy_to"     => @deploy_dir,
         "group"         => `id -gn`.strip,
@@ -149,11 +149,17 @@ describe "deploying an application" do
         'framework_env' => 'staging'
       })
 
-    $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @binpath = $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
     @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 
+  it "runs the right bundler command" do
+    install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
+    install_bundler_command_ran.should_not be_nil
+    install_bundler_command_ran.should == "#{@binpath} _#{EY::Serverside::VERSION}_ install_bundler 1.0.0"
+  end
+
   it "creates a REVISION file" do
     File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
   end

data/spec/restart_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-class TestRestartDeploy < EY::Deploy
+class TestRestartDeploy < EY::Serverside::Deploy
   attr_reader :call_order
   def initialize(*a)
     super
@@ -13,14 +13,14 @@ class TestRestartDeploy < EY::Deploy
   def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
 end
 
-describe "EY::Deploy#restart_with_maintenance_page" do
+describe "EY::Serverside::Deploy#restart_with_maintenance_page" do
 
   class TestRestartWithMaintenancePage < TestRestartDeploy
     def conditionally_enable_maintenance_page()  @call_order << 'conditionally_enable_maintenance_page'  end
   end
 
   it "puts up the maintenance page if necessary, restarts, and takes down the maintenance page" do
-    deployer = TestRestartWithMaintenancePage.new(EY::Deploy::Configuration.new)
+    deployer = TestRestartWithMaintenancePage.new(EY::Serverside::Deploy::Configuration.new)
     deployer.restart_with_maintenance_page
     deployer.call_order.should == %w(
       require_custom_tasks
@@ -34,7 +34,7 @@ end
 describe "glassfish stack" do
 
   it "requires a maintenance page" do
-    config = EY::Deploy::Configuration.new(:stack => 'glassfish')
+    config = EY::Serverside::Deploy::Configuration.new(:stack => 'glassfish')
     deployer = TestRestartDeploy.new(config)
     deployer.restart_with_maintenance_page
     deployer.call_order.should include('enable_maintenance_page')

data/spec/server_spec.rb

@@ -1,76 +1,76 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-describe EY::Server do
+describe EY::Serverside::Server do
   before(:each) do
-    EY::Server.reset
+    EY::Serverside::Server.reset
   end
 
   context ".all" do
     it "starts off empty" do
-      EY::Server.all.should be_empty
+      EY::Serverside::Server.all.should be_empty
     end
 
     it "is added to with .add" do
-      EY::Server.add(:hostname => 'otherhost', :roles => %w[fire water])
-      EY::Server.all.size.should == 1
+      EY::Serverside::Server.add(:hostname => 'otherhost', :roles => %w[fire water])
+      EY::Serverside::Server.all.size.should == 1
 
-      EY::Server.by_hostname('otherhost').should_not be_nil
+      EY::Serverside::Server.by_hostname('otherhost').should_not be_nil
     end
 
     it "rejects duplicates" do
-      EY::Server.add(:hostname => 'otherhost')
+      EY::Serverside::Server.add(:hostname => 'otherhost')
       lambda do
-        EY::Server.add(:hostname => 'otherhost')
-      end.should raise_error(EY::Server::DuplicateHostname)
+        EY::Serverside::Server.add(:hostname => 'otherhost')
+      end.should raise_error(EY::Serverside::Server::DuplicateHostname)
     end
   end
 
   it "makes sure your roles are symbols at creation time" do
-    EY::Server.add(:hostname => 'otherhost', :roles => ['beerguy'])
+    EY::Serverside::Server.add(:hostname => 'otherhost', :roles => ['beerguy'])
 
-    EY::Server.by_hostname('otherhost').roles.should == [:beerguy]
+    EY::Serverside::Server.by_hostname('otherhost').roles.should == [:beerguy]
   end
 
   it "makes sure your roles are symbols when updated" do
-    EY::Server.add(:hostname => 'otherhost')
+    EY::Serverside::Server.add(:hostname => 'otherhost')
 
-    server = EY::Server.by_hostname('otherhost')
+    server = EY::Serverside::Server.by_hostname('otherhost')
     server.roles = %w[bourbon scotch beer]
     server.roles.should == [:bourbon, :scotch, :beer]
   end
 
   context ".from_roles" do
     before(:each) do
-      @localhost = EY::Server.add(:hostname => 'localhost', :roles => [:ice, :cold])
-      @host1 = EY::Server.add(:hostname => 'host1', :roles => [:fire, :water])
-      @host2 = EY::Server.add(:hostname => 'host2', :roles => [:ice, :water])
+      @localhost = EY::Serverside::Server.add(:hostname => 'localhost', :roles => [:ice, :cold])
+      @host1 = EY::Serverside::Server.add(:hostname => 'host1', :roles => [:fire, :water])
+      @host2 = EY::Serverside::Server.add(:hostname => 'host2', :roles => [:ice, :water])
     end
 
     it "works with strings or symbols" do
-      EY::Server.from_roles(:fire).should == [@host1]
-      EY::Server.from_roles('fire').should == [@host1]
+      EY::Serverside::Server.from_roles(:fire).should == [@host1]
+      EY::Serverside::Server.from_roles('fire').should == [@host1]
     end
 
     it "finds all servers with the specified role" do
-      EY::Server.from_roles('ice').size.should == 2
-      EY::Server.from_roles('ice').sort do |a, b|
+      EY::Serverside::Server.from_roles('ice').size.should == 2
+      EY::Serverside::Server.from_roles('ice').sort do |a, b|
         a.hostname <=> b.hostname
       end.should == [@host2, @localhost]
     end
 
     it "finds all servers with any of the specified roles" do
-      EY::Server.from_roles(:ice, :water).should == EY::Server.all
+      EY::Serverside::Server.from_roles(:ice, :water).should == EY::Serverside::Server.all
     end
 
     it "returns everything when asked for :all" do
-      EY::Server.from_roles(:all).should == EY::Server.all
+      EY::Serverside::Server.from_roles(:all).should == EY::Serverside::Server.all
     end
   end
 
   context "#local?" do
     it "is true only for localhost" do
-      EY::Server.new('localhost').should be_local
-      EY::Server.new('neighborhost').should_not be_local
+      EY::Serverside::Server.new('localhost').should be_local
+      EY::Serverside::Server.new('neighborhost').should_not be_local
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,22 +5,24 @@ require 'pp'
 require 'engineyard-serverside'
 
 module EY
-  def self.dna_json=(j)
-    @dna_json = j;
-    @node = nil
-    j
-  end
+  module Serverside
+    def self.dna_json=(j)
+      @dna_json = j;
+      @node = nil
+      j
+    end
 
-  module LoggedOutput
-    def info(_) end
+    module LoggedOutput
+      def info(_) end
 
-    def logged_system(cmd)
-      system("#{cmd} 2>/dev/null")
+      def logged_system(cmd)
+        system("#{cmd} 2>/dev/null")
+      end
     end
-  end
 
-  class Strategies::Git
-    def short_log_message(_) "" end
+    class Strategies::Git
+      def short_log_message(_) "" end
+    end
   end
 end
 
@@ -32,6 +34,6 @@ Kernel.system "tar xzf #{GITREPO_DIR}.tar.gz -C #{FIXTURES_DIR}"
 
 Spec::Runner.configure do |config|
   config.before(:all) do
-    EY.dna_json = {}.to_json
+    EY::Serverside.dna_json = {}.to_json
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 7
-  version: 1.3.7
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/engineyard-serverside/default_maintenance_page.html
 - lib/engineyard-serverside/deploy.rb
 - lib/engineyard-serverside/deploy_hook.rb
+- lib/engineyard-serverside/deprecation.rb
 - lib/engineyard-serverside/lockfile_parser.rb
 - lib/engineyard-serverside/logged_output.rb
 - lib/engineyard-serverside/server.rb
@@ -235,6 +236,7 @@ files:
 - LICENSE
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
+- spec/deprecation_spec.rb
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -291,6 +293,7 @@ summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
+- spec/deprecation_spec.rb
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb