engineyard-serverside 1.5.29.pre.timestamps2 → 1.5.30

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: 8141375
-  prerelease: 7
+  hash: 63
+  prerelease: 
   segments: 
   - 1
   - 5
-  - 29
-  - pre
-  - timestamps
-  - 2
-  version: 1.5.29.pre.timestamps2
+  - 30
+  version: 1.5.30
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -18,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 Z
+date: 2012-02-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -34,12 +29,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  prerelease: false
+  requirement: *id001
   type: :development
-  version_requirements: *id001
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,12 +46,12 @@ dependencies:
         - 2
         - 2
         version: 0.9.2.2
+  prerelease: false
+  requirement: *id002
   type: :development
-  version_requirements: *id002
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  requirement: *id003
   type: :development
-  version_requirements: *id003
+  name: rdoc
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,8 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  requirement: *id004
   type: :development
-  version_requirements: *id004
+  name: timecop
 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
@@ -350,12 +347,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
@@ -422,12 +419,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

data/lib/engineyard-serverside/shell.rb

@@ -1,151 +0,0 @@
-require 'logger'
-require 'open4'
-
-module EY
-  module Serverside
-    # FileIO
-
-    class Shell
-      # Compatibility with old LoggedOutput where the module was included into the class.
-      module Helpers
-        def verbose?
-          shell.verbose?
-        end
-
-        def warning(*a)
-          shell.warning(*a)
-        end
-
-        def info(*a)
-          shell.info(*a)
-        end
-
-        def debug(*a)
-          shell.debug(*a)
-        end
-
-        def logged_system(*a)
-          shell.logged_system(*a)
-        end
-      end
-
-      class Formatter
-
-        def initialize(stdout, stderr, start_time, verbose)
-          @stdout, @stderr = stdout, stderr
-          @start = start_time.to_i
-          @verbose = verbose
-        end
-
-        def call(severity, time, _, message)
-          if %w[WARN ERROR FATAL].include?(severity)
-            msg = prepend("#{timestamp(time)}!> ", "#{severity_name(severity)}#{message}")
-          else
-            msg = prepend(timestamp(time), message)
-          end
-
-          put_to_io(severity, msg)
-          msg
-        end
-
-        def prepend(pre, str)
-          str.gsub(/^/, pre).sub(/\n?\z/m,"\n")
-        end
-
-        def put_to_io(severity, msg)
-          if severity == "DEBUG" && !@verbose
-            # quiet
-          elsif severity == "INFO"
-            @stdout << msg
-            @stdout.flush
-          else
-            @stderr << msg
-            @stderr.flush
-          end
-        end
-
-        def timestamp(datetime)
-          diff = datetime.to_i - @start
-          diff = 0 if diff < 0
-          "+%2dm %02ds\t" % diff.divmod(60)
-        end
-
-        def severity_name(severity)
-          if %w[INFO DEBUG ANY].include?(severity)
-            ""
-          elsif severity =='WARN'
-            "WARNING: "
-          else
-            "#{severity}: "
-          end
-        end
-      end
-
-      class YieldIO
-        def initialize(&block)
-          @block = block
-        end
-
-        def <<(str)
-          @block.call str
-        end
-      end
-
-      attr_reader :logger
-
-      def initialize(options)
-        @start_time = options[:start_time]
-        @verbose    = options[:verbose]
-
-        @log_pathname = Pathname.new(options[:log_path])
-        @log_pathname.unlink if @log_pathname.exist? # start fresh
-
-        @stdout = options[:stdout] || $stdout
-        @stderr = options[:stderr] || $stderr
-
-        @logger = Logger.new(@log_pathname.to_s)
-        @logger.level = Logger::DEBUG # Always log to the file at debug, formatter hides debug for non-verbose
-        @logger.formatter = Formatter.new(@stdout, @stderr, start_time, @verbose)
-      end
-
-      def start_time
-        @start_time ||= Time.now
-      end
-
-      # a nice info outputter that prepends spermy operators for some reason.
-      def status(msg)
-        info msg.gsub(/^/, '~> ')
-      end
-
-      # a debug outputter that displays a command being run
-      def running(cmd)
-        debug ":: running #{cmd}"
-      end
-
-      def fatal(msg)   logger.fatal msg end
-      def error(msg)   logger.error msg end
-      def warning(msg) logger.warn  msg end
-      def info(msg)    logger.info  msg end
-      def debug(msg)   logger.debug msg end
-
-      def logged_system(cmd)
-        running(cmd)
-        # :quiet means don't raise an error on nonzero exit status
-        status = Open4.spawn cmd, 0 => '', 1 => out, 2 => err, :quiet => true
-        status.exitstatus == 0
-      end
-
-      # Return an IO that outputs to stdout or not according to the verbosity settings
-      # debug is hidden in non-verbose mode
-      def out
-        YieldIO.new { |msg| logger.debug(msg) }
-      end
-
-      # Return an IO that outputs to stderr
-      # unknown always shows, but without a severity title
-      def err
-        YieldIO.new { |msg| logger.unknown(msg) }
-      end
-    end
-  end
-end

data/spec/shell_spec.rb

@@ -1,46 +0,0 @@
-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.info('test3')
-      @shell.debug("test11\ntest12\ntest13")
-      @shell.warning("test21\ntest22\ntest23")
-    end
-    Timecop.freeze(time3) do
-      @shell.info("test31\ntest32\ntest33")
-    end
-
-    timestamp_1 = "+ 0m 00s "
-    timestamp_2 = "+ 3m 05s "
-    timestamp_3 = "+10m 25s "
-    @output.rewind
-    @output.read.should == <<-OUTPUT
-#{timestamp_1}test1
-#{timestamp_1}!> WARNING: test2
-#{timestamp_2}test3
-#{timestamp_2}test11
-#{timestamp_2}test12
-#{timestamp_2}test13
-#{timestamp_2}!> WARNING: test21
-#{timestamp_2}!> test22
-#{timestamp_2}!> test23
-#{timestamp_3}test31
-#{timestamp_3}test32
-#{timestamp_3}test33
-    OUTPUT
-  end
-end