engineyard-serverside 1.6.0.pre5 → 1.6.3

data/spec/spec_helper.rb

@@ -17,10 +17,24 @@ module EY
       @node = nil
     end
 
-    class Shell
-      def spawn_process(cmd, cmd_stdout, cmd_stderr)
-        cmd_stdout << `#{cmd} 2>&1`
-        $? == 0
+    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
     end
 
@@ -37,7 +51,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
@@ -48,46 +63,10 @@ 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 = 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,27 +75,25 @@ 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",
       'app'           => 'rails31',
-      'environment'   => 'env',
-      'account'       => 'acc',
       'framework_env' => 'staging'
     })
 
     # 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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Deploying an application with sqlite3 as the only DB adapter in the Gemfile.lock" do
-  before(:all) do
+  before do
     @release_path  = nil
     @shared_path   = nil
     @framework_env = nil
@@ -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)
@@ -201,7 +213,7 @@ module EY::Serverside::Strategies::NodeIntegrationSpec
   "name": "node-example",
   "version": "0.0.1",
   "dependencies": {
-    "express": "2.2.0"
+    "express": "2.5.8"
   }
 }
 EOF

metadata

@@ -1,94 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: -2759328146
-  prerelease: 6
-  segments: 
-  - 1
-  - 6
-  - 0
-  - pre
-  - 5
-  version: 1.6.0.pre5
+version: !ruby/object:Gem::Version
+  version: 1.6.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !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: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !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: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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,11 +93,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/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
@@ -288,7 +279,9 @@ files:
 - lib/vendor/json_pure/tools/fuzz.rb
 - lib/vendor/json_pure/tools/server.rb
 - lib/vendor/json_pure/VERSION
-- lib/vendor/open4/lib/open4.rb
+- lib/vendor/systemu/lib/systemu.rb
+- lib/vendor/systemu/LICENSE
+- lib/vendor/systemu/systemu.gemspec
 - lib/vendor/thor/bin/rake2thor
 - lib/vendor/thor/bin/thor
 - lib/vendor/thor/CHANGELOG.rdoc
@@ -351,51 +344,43 @@ 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2108879952767088363
+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.15
+rubygems_version: 1.8.19
 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
@@ -423,12 +408,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,102 +0,0 @@
-require 'logger'
-require 'pathname'
-require 'open4'
-require 'engineyard-serverside/shell/formatter'
-
-module EY
-  module Serverside
-    class Shell
-      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]
-
-
-        @stdout = options[:stdout] || $stdout
-        @stderr = options[:stderr] || $stderr
-
-        log_pathname = Pathname.new(options[:log_path])
-        log_pathname.unlink if log_pathname.exist? # start fresh
-        @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 = EY::Serverside::Shell::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
-
-      def substatus(msg)
-        debug msg.gsub(/^/, ' ~ ')
-      end
-
-      # a debug outputter that displays a command being run
-      # Formatis like this:
-      #   $ cmd blah do \
-      #   > something more
-      #   > end
-      def show_command(cmd)
-        debug cmd.gsub(/^/, '   > ').sub(/>/, '$')
-      end
-
-      def command_stdout(msg)
-        debug msg.gsub(/^/,'     ')
-      end
-
-      def command_stderr(msg)
-        unknown msg.gsub(/^/,'     ')
-      end
-
-      def fatal(msg)   logger.fatal   "FATAL: #{msg}"   end
-      def error(msg)   logger.error   "ERROR: #{msg}"   end
-      def warning(msg) logger.warn    "WARNING: #{msg}" end
-      def notice(msg)  logger.warn    msg end
-      def info(msg)    logger.info    msg end
-      def debug(msg)   logger.debug   msg end
-      def unknown(msg) logger.unknown msg 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| command_stdout(msg) }
-      end
-
-      # Return an IO that outputs to stderr
-      # unknown always shows, but without a severity title
-      def err
-        YieldIO.new { |msg| command_stderr(msg) }
-      end
-
-      def logged_system(cmd)
-        show_command(cmd)
-        spawn_process(cmd, out, err)
-      end
-
-      protected
-
-      # spawn_process is a separate utility method so tests can override just the meat
-      # of the process spawning and not couple the tests too tightly with the implementation.
-      # we do this because Open4 LOVES to segfault in CI. FUN!
-      def spawn_process(cmd, cmd_stdout, cmd_stderr)
-        # :quiet means don't raise an error on nonzero exit status
-        result = Open4.spawn cmd, 0 => '', 1 => cmd_stdout, 2 => cmd_stderr, :quiet => true
-        result.exitstatus == 0
-      end
-    end
-  end
-end