engineyard-serverside 1.5.35.pre.2 → 1.6.0.pre

data/spec/services_deploy_spec.rb

@@ -20,12 +20,13 @@ describe "Deploying an application with services" do
         "stack"         => 'nginx_passenger',
         "migrate"       => nil,
         'app'           => 'foo',
+        'environment'   => 'env',
+        'account'       => 'acc',
         'framework_env' => 'staging'
       })
 
-    EY::Serverside::LoggedOutput.verbose = true
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    FullTestDeploy.new(config)
+    FullTestDeploy.new(config, test_shell)
   end
 
   def exist
@@ -65,7 +66,7 @@ DEPENDENCIES
       end
 
       it "warns about missing ey_config" do
-        @deployer.infos.should be_any { |info| info =~ /WARNING: Gemfile.lock does not contain ey_config/ }
+        read_stderr.should include("WARNING: Gemfile.lock does not contain ey_config")
       end
 
     end
@@ -75,7 +76,7 @@ DEPENDENCIES
       end
 
       it "works without warnings" do
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end
@@ -101,7 +102,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
-      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      read_output.should_not =~ /WARNING/
     end
   end
 
@@ -125,7 +126,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@services_yml}\n"
 
-      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      read_output.should_not =~ /WARNING/
     end
 
     describe "followed by a deploy that can't find the command" do
@@ -144,7 +145,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end
@@ -166,7 +167,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
+        read_stderr.should include('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
@@ -176,7 +177,7 @@ DEPENDENCIES
         @shared_services_file.should_not exist
         @symlinked_services_file.should_not exist
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end
@@ -199,7 +200,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end

data/spec/shell_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'tempfile'
+require 'timecop'
+
+describe EY::Serverside::Shell do
+  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)
+
+    @output = StringIO.new
+    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => Pathname.new(Dir.tmpdir).join("engineyard-serverside-#{Time.now.to_i}-${$$}.log"), :start_time => time1)
+
+    Timecop.freeze(time1) do
+      @shell.debug('test1')
+      @shell.warning('test2')
+    end
+    Timecop.freeze(time2) do
+      @shell.status('STATUS')
+      @shell.debug("test11\ntest12\ntest13")
+      @shell.warning("test21\ntest22\ntest23")
+    end
+    Timecop.freeze(time3) do
+      @shell.substatus("test31\ntest32\ntest33")
+    end
+
+    tstp_1 = "+    00s "
+    tstp_2 = "+ 3m 05s "
+    tstp_3 = "+10m 25s "
+    notstp = "         "
+    @output.rewind
+    @output.read.should == <<-OUTPUT
+#{notstp} test1
+#{tstp_1} !> WARNING: test2
+
+\e[1m#{tstp_2} ~> STATUS
+\e[0m#{notstp} test11
+#{notstp} test12
+#{notstp} test13
+#{tstp_2} !> WARNING: test21
+#{tstp_2} !> test22
+#{tstp_2} !> test23
+#{notstp}  ~ test31
+#{notstp}  ~ test32
+#{notstp}  ~ test33
+    OUTPUT
+  end
+end

data/spec/spec_helper.rb

@@ -17,24 +17,10 @@ module EY
       @node = nil
     end
 
-    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
+    class Shell
+      def spawn_process(cmd, cmd_stdout, cmd_stderr)
+        cmd_stdout << `#{cmd} 2>&1`
+        $? == 0
       end
     end
 
@@ -51,8 +37,7 @@ 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|
-  `which npm 2>&1`
-  $NPM_INSTALLED = ($? == 0)
+  $NPM_INSTALLED = system('which npm 2>&1')
   unless $NPM_INSTALLED
     $stderr.puts "npm not found; skipping Node.js specs."
   end
@@ -63,10 +48,46 @@ Spec::Runner.configure do |config|
     EY::Serverside.dna_json = {}.to_json
   end
 
+  class VerboseStringIO < StringIO
+    def <<(str)
+      if ENV['VERBOSE'] || ENV['DEBUG']
+        $stderr << str
+      end
+      super
+    end
+  end
+
+  def stdout
+    @stdout ||= VerboseStringIO.new
+  end
+
+  def stderr
+    @stderr ||= VerboseStringIO.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 = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -75,25 +96,27 @@ Spec::Runner.configure do |config|
     # run a deploy
     @config = EY::Serverside::Deploy::Configuration.new({
       "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir,
+      "deploy_to"     => @deploy_dir.to_s,
       "group"         => `id -gn`.strip,
       "stack"         => 'nginx_passenger',
       "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
       'app'           => 'rails31',
+      'environment'   => 'env',
+      'account'       => 'acc',
       'framework_env' => 'staging'
     })
 
     # pretend there is a shared bundled_gems directory
-    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    @deploy_dir.join('shared', 'bundled_gems').mkpath
     %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
-      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
+      @deploy_dir.join('shared', 'bundled_gems', name).open("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)
+    @deployer = FullTestDeploy.new(@config, test_shell)
     @deployer.deploy(&block)
   end
 

data/spec/sqlite3_deploy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Deploying an application with sqlite3 as the only DB adapter in the Gemfile.lock" do
-  before do
+  before(:all) do
     @release_path  = nil
     @shared_path   = nil
     @framework_env = nil
@@ -17,7 +17,6 @@ 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,25 +1,13 @@
 class FullTestDeploy < EY::Serverside::Deploy
-  attr_reader :infos, :debugs, :commands
+  attr_reader :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,94 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: -3562360294
-  prerelease: 7
-  segments: 
-  - 1
-  - 5
-  - 35
-  - pre
-  - 2
-  version: 1.5.35.pre.2
+version: !ruby/object:Gem::Version
+  version: 1.6.0.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70164047775160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70164047775160
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70164047774660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70164047774660
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70164047774100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70164047774100
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70164047789780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70164047789780
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/configuration.rb
@@ -100,9 +73,11 @@ 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/formatter.rb
+- lib/engineyard-serverside/shell/helpers.rb
+- lib/engineyard-serverside/shell.rb
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
@@ -286,9 +261,7 @@ files:
 - lib/vendor/json_pure/tools/fuzz.rb
 - lib/vendor/json_pure/tools/server.rb
 - lib/vendor/json_pure/VERSION
-- lib/vendor/systemu/lib/systemu.rb
-- lib/vendor/systemu/LICENSE
-- lib/vendor/systemu/systemu.gemspec
+- lib/vendor/open4/lib/open4.rb
 - lib/vendor/thor/bin/rake2thor
 - lib/vendor/thor/bin/thor
 - lib/vendor/thor/CHANGELOG.rdoc
@@ -330,7 +303,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
@@ -351,58 +323,46 @@ 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
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/custom_deploy_spec.rb
 - 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
@@ -423,12 +383,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