engineyard-serverside 1.5.28.pre.timestamps4 → 1.5.28

data/spec/basic_deploy_spec.rb

@@ -12,17 +12,17 @@ describe "Deploying an application without Bundler" do
 
     # run a deploy
     config = EY::Serverside::Deploy::Configuration.new({
-      "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir.to_s,
-      "group"         => `id -gn`.strip,
-      "stack"         => 'nginx_passenger',
-      "migrate"       => nil,
-      'app'           => 'foo',
-      'framework_env' => 'staging'
-    })
+        "strategy"      => "IntegrationSpec",
+        "deploy_to"     => @deploy_dir.to_s,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_passenger',
+        "migrate"       => nil,
+        'app'           => 'foo',
+        'framework_env' => 'staging'
+      })
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 

data/spec/bundler_deploy_spec.rb

@@ -32,7 +32,7 @@ describe "Deploying an application that uses Bundler" do
     end
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 

data/spec/custom_deploy_spec.rb

@@ -34,7 +34,7 @@ describe "the EY::Serverside::Deploy API" do
       def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
     end
 
-    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new, test_shell)
+    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new)
     td.deploy
     td.call_order.should == %w(
       push_code
@@ -60,7 +60,7 @@ describe "the EY::Serverside::Deploy API" do
     before(:each) do
       @tempdir = `mktemp -d -t custom_deploy_spec.XXXXX`.strip
       @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
-      @deploy = TestQuietDeploy.new(@config, test_shell)
+      @deploy = TestQuietDeploy.new(@config)
     end
 
     def write_eydeploy(relative_path, contents = "def got_new_methods() 'from the file on disk' end")
@@ -92,7 +92,7 @@ describe "the EY::Serverside::Deploy API" do
         def value() 'base' end
       end
 
-      deploy = TestDeploySuper.new(@config, test_shell)
+      deploy = TestDeploySuper.new(@config)
       deploy.require_custom_tasks.should be_true
       deploy.value.should == "base + derived"
     end

data/spec/deprecation_spec.rb

@@ -12,12 +12,34 @@ describe EY::Serverside do
     $stderr = @original_stderr
   end
 
-  it "deprecates EY::Serverside::LoggedOutput for EY::Serverside::Shell::Helpers" do
-    EY::Serverside::LoggedOutput.should == EY::Serverside::Shell::Helpers
-    @warnings.string.should include("EY::Serverside::LoggedOutput")
+  def check_deprecation(new_const, prints_warning = true)
+    old_name = new_const.to_s.gsub('EY::Serverside::', 'EY::')
+    eval(old_name).should == new_const
+    @warnings.string.should include(old_name) if prints_warning
+  end
+
+  it "preserves the old constants" do
+    names = %w[CLI Deploy DeployBase Deploy::Configuration
+               DeployHook LockfileParser LoggedOutput Server Task
+               Strategies Strategies::Git]
+
+    names.map do |name|
+      const = eval("::EY::Serverside::#{name}")
+      # The way deprecations are implemented currently, we don't print
+      # warning messages for constants that aren't directly under EY::
+      prints_warning = name.include?('::') ? false : true
+      check_deprecation(const, prints_warning)
+    end
+  end
+
+  it "deprecates EY.dna_json and EY.node" do
+    EY.dna_json.should == EY::Serverside.dna_json
+    @warnings.string.should include("EY.dna_json")
+    EY.node.should == EY::Serverside.node
+    @warnings.string.should include("EY.node")
   end
 
   it "doesn't interfere with unrelated constants" do
-    lambda{ EY::Serverside::WTFNotDefined }.should raise_error(NameError, /uninitialized constant.*WTFNotDefined/)
+    lambda{ EY::WTFNotDefined }.should raise_error(NameError, /uninitialized constant.*EY::WTFNotDefined/)
   end
 end

data/spec/git_strategy_spec.rb

@@ -2,12 +2,8 @@ require 'spec_helper'
 
 describe "the git deploy strategy" do
   subject do
-    EY::Serverside::Strategies::Git.new(
-      test_shell,
-      :repo => File.join(GITREPO_DIR, 'git'),
-      :repository_cache => GITREPO_DIR,
-      :ref => "master"
-    )
+    EY::Serverside::Strategies::Git.new(:repo => File.join(GITREPO_DIR, 'git'),
+                                        :repository_cache => GITREPO_DIR, :ref => "master")
   end
 
   before { subject.checkout }

data/spec/logged_output_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'tempfile'
+require 'timecop'
+
+class SampleLogUser
+  include EY::Serverside::LoggedOutput
+  def initialize
+    EY::Serverside::LoggedOutput.logfile = tempfile.path
+    EY::Serverside::LoggedOutput.verbose = true
+  end
+
+  def starting_time
+    @starting_time ||= Time.now
+  end
+
+  def tempfile
+    @tempfile ||= Tempfile.new('logged_output')
+  end
+end
+
+describe EY::Serverside::LoggedOutput do
+  before do
+    EY::Serverside::LoggedOutput.enable_actual_info!
+    @log_user = SampleLogUser.new
+  end
+
+  after do
+    EY::Serverside::LoggedOutput.disable_actual_info!
+  end
+
+  it "has a timestamp before each line" do
+    time1 = Time.local(2008, 9, 1, 12, 0, 0)
+    time2 = Time.local(2008, 9, 1, 12, 3, 5)
+    time3 = Time.local(2008, 9, 1, 12, 10, 25)
+
+    Timecop.freeze(time1) do
+      @log_user.debug('test1')
+      @log_user.warning('test2')
+    end
+    Timecop.freeze(time2) do
+      @log_user.info('test3')
+
+      @log_user.debug("test11\ntest12\ntest13")
+      @log_user.warning("test21\ntest22\ntest23")
+    end
+    Timecop.freeze(time3) do
+      @log_user.info("test31\ntest32\ntest33")
+    end
+
+    timestamp_1 = "+ 0m 00s "
+    timestamp_2 = "+ 3m 05s "
+    timestamp_3 = "+10m 25s "
+    File.read(@log_user.tempfile.path).should == "#{timestamp_1}test1\n#{timestamp_1}!> WARNING: test2\n\n#{timestamp_2}test3\n#{timestamp_2}test11\n#{timestamp_2}test12\n#{timestamp_2}test13\n#{timestamp_2}!> WARNING: test21\n#{timestamp_2}!> test22\n#{timestamp_2}!> test23\n\n#{timestamp_3}test31\n#{timestamp_3}test32\n#{timestamp_3}test33\n"
+  end
+end

data/spec/nodejs_deploy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Deploying an application that uses Node.js and NPM" do
   def deploy_test_application
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -19,7 +19,7 @@ describe "Deploying an application that uses Node.js and NPM" do
       })
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy do
       FileUtils.mkdir_p(config.repository_cache) # block runs before deploy
       @deployer.generate_package_json_in(config.repository_cache)

data/spec/services_deploy_spec.rb

@@ -23,8 +23,9 @@ describe "Deploying an application with services" do
         'framework_env' => 'staging'
       })
 
+    EY::Serverside::LoggedOutput.verbose = true
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    FullTestDeploy.new(config, test_shell)
+    FullTestDeploy.new(config)
   end
 
   def exist
@@ -64,7 +65,7 @@ DEPENDENCIES
       end
 
       it "warns about missing ey_config" do
-        read_stderr.should include("WARNING: Gemfile.lock does not contain ey_config")
+        @deployer.infos.should be_any { |info| info =~ /WARNING: Gemfile.lock does not contain ey_config/ }
       end
 
     end
@@ -74,7 +75,7 @@ DEPENDENCIES
       end
 
       it "works without warnings" do
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -100,7 +101,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
-      read_output.should_not =~ /WARNING/
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
   end
 
@@ -124,7 +125,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@services_yml}\n"
 
-      read_output.should_not =~ /WARNING/
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
 
     describe "followed by a deploy that can't find the command" do
@@ -143,7 +144,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -165,7 +166,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_stderr.should include('WARNING: External services configuration not updated')
+        @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
       end
 
       it "does not log a warning or symlink a config file when there is no existing services file" do
@@ -175,7 +176,7 @@ DEPENDENCIES
         @shared_services_file.should_not exist
         @symlinked_services_file.should_not exist
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -198,7 +199,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end

data/spec/spec_helper.rb

@@ -17,9 +17,27 @@ module EY
       @node = nil
     end
 
-    class Shell
+    module LoggedOutput
+      def self.enable_actual_info!
+        @use_actual_info = true
+      end
+
+      def self.disable_actual_info!
+        @use_actual_info = false
+      end
+
+      def self.use_actual_info?
+        @use_actual_info
+      end
+
+      alias old_info info
+      def info(*args)
+        if EY::Serverside::LoggedOutput.use_actual_info?
+          old_info(*args)
+        end
+      end
+
       def logged_system(cmd)
-        running(cmd)
         output = `#{cmd} 2>&1`
         successful = ($? == 0)
         if ENV['VERBOSE']
@@ -46,7 +64,8 @@ FileUtils.rm_rf GITREPO_DIR if File.exists? GITREPO_DIR
 Kernel.system "tar xzf #{GITREPO_DIR}.tar.gz -C #{FIXTURES_DIR}"
 
 Spec::Runner.configure do |config|
-  $NPM_INSTALLED = system('which npm 2>&1')
+  `which npm 2>&1`
+  $NPM_INSTALLED = ($? == 0)
   unless $NPM_INSTALLED
     $stderr.puts "npm not found; skipping Node.js specs."
   end
@@ -57,37 +76,10 @@ Spec::Runner.configure do |config|
     EY::Serverside.dna_json = {}.to_json
   end
 
-  def stdout
-    @stdout ||= StringIO.new
-  end
-
-  def stderr
-    @stderr ||= StringIO.new
-  end
-
-  def read_stdout
-    stdout.rewind
-    stdout.read
-  end
-
-  def read_stderr
-    stderr.rewind
-    stderr.read
-  end
-
-  def read_output
-    read_stdout + "\n" + read_stderr
-  end
-
-  def test_shell
-    log_path =  Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}.log")
-    EY::Serverside::Shell.new(:verbose => true, :log_path => log_path, :stdout => stdout, :stderr => stderr)
-  end
-
   def deploy_test_application(assets_enabled = true, &block)
     $DISABLE_GEMFILE = false
     $DISABLE_LOCKFILE = false
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -96,7 +88,7 @@ Spec::Runner.configure do |config|
     # run a deploy
     @config = EY::Serverside::Deploy::Configuration.new({
       "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir.to_s,
+      "deploy_to"     => @deploy_dir,
       "group"         => `id -gn`.strip,
       "stack"         => 'nginx_passenger',
       "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
@@ -105,16 +97,16 @@ Spec::Runner.configure do |config|
     })
 
     # pretend there is a shared bundled_gems directory
-    @deploy_dir.join('shared', 'bundled_gems').mkpath
+    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
     %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
-      @deploy_dir.join('shared', 'bundled_gems', name).open("w") { |f| f.write("old\n") }
+      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
     end
 
     # Set up the application directory to have the requested asset options.
     prepare_rails31_app(assets_enabled)
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(@config, test_shell)
+    @deployer = FullTestDeploy.new(@config)
     @deployer.deploy(&block)
   end
 

data/spec/sqlite3_deploy_spec.rb

@@ -17,6 +17,7 @@ describe "Deploying an application with sqlite3 as the only DB adapter in the Ge
       @framework_env             = deployer.framework_env
     end
   end
+    
 
   it 'should symlink database.sqlite3.yml' do
     File.exist?(File.join(@release_path, 'config', 'database.yml')).should be_true

data/spec/support/integration.rb

@@ -1,13 +1,25 @@
 class FullTestDeploy < EY::Serverside::Deploy
-  attr_reader :commands
+  attr_reader :infos, :debugs, :commands
 
   def initialize(*)
     super
+    @infos = []
+    @debugs = []
     @commands = []
     @gemfile_contents = nil
     @lockfile_contents = nil
   end
 
+  # stfu
+  def info(msg)
+    @infos << msg
+  end
+
+  # no really, stfu
+  def debug(msg)
+    @debugs << msg
+  end
+
   # passwordless sudo is neither guaranteed nor desired
   def sudo(cmd)
     run(cmd)

metadata

@@ -1,16 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: -5549315490
-  prerelease: 7
+  hash: 59
+  prerelease: 
   segments: 
   - 1
   - 5
   - 28
-  - pre
-  - timestamps
-  - 4
-  version: 1.5.28.pre.timestamps4
+  version: 1.5.28
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -18,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -34,12 +31,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  type: :development
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,12 +48,12 @@ dependencies:
         - 2
         - 2
         version: 0.9.2.2
-  type: :development
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +62,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: timecop
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,8 +76,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -101,9 +98,9 @@ files:
 - lib/engineyard-serverside/futures/celluloid.rb
 - lib/engineyard-serverside/futures/dataflow.rb
 - lib/engineyard-serverside/lockfile_parser.rb
+- lib/engineyard-serverside/logged_output.rb
 - lib/engineyard-serverside/rails_asset_support.rb
 - lib/engineyard-serverside/server.rb
-- lib/engineyard-serverside/shell.rb
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
@@ -329,7 +326,6 @@ files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -350,12 +346,12 @@ files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/logged_output_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
-- spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb
@@ -390,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -401,7 +397,6 @@ test_files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -422,12 +417,12 @@ test_files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/logged_output_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
-- spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb