engineyard-serverside 2.1.4 → 2.2.0.pre

data/spec/support/integration.rb

@@ -41,7 +41,6 @@ class FullTestDeploy < EY::Serverside::Deploy
   def framework_env
     config.framework_env
   end
-
 end
 
 class EY::Serverside::Deploy

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.1.4
-  prerelease: 
+  version: 2.2.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -34,10 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,10 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +164,6 @@ files:
 - lib/engineyard-serverside/deprecation.rb
 - lib/engineyard-serverside/maintenance.rb
 - lib/engineyard-serverside/paths.rb
-- lib/engineyard-serverside/propagator.rb
 - lib/engineyard-serverside/rails_assets/strategy.rb
 - lib/engineyard-serverside/rails_assets.rb
 - lib/engineyard-serverside/server.rb
@@ -180,6 +173,7 @@ files:
 - lib/engineyard-serverside/shell/helpers.rb
 - lib/engineyard-serverside/shell/yieldio.rb
 - lib/engineyard-serverside/shell.rb
+- lib/engineyard-serverside/spawner.rb
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
@@ -209,9 +203,6 @@ files:
 - lib/vendor/multi_json/spec/helper.rb
 - lib/vendor/multi_json/spec/json_common_shared_example.rb
 - lib/vendor/multi_json/spec/multi_json_spec.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/lib/thor/actions/create_file.rb
@@ -376,7 +367,6 @@ files:
 - spec/lockfile_parser_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
-- spec/propagator_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb
@@ -398,9 +388,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1955652891792976111
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -542,7 +529,6 @@ test_files:
 - spec/lockfile_parser_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
-- spec/propagator_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb

data/lib/engineyard-serverside/propagator.rb

@@ -1,75 +0,0 @@
-require 'engineyard-serverside/about'
-
-module EY
-  module Serverside
-    # Put the same engineyard-serverside on all the servers
-    class Propagator
-      def self.call(*args)
-        new(*args).call
-      end
-
-      attr_reader :config, :shell
-
-      def initialize(servers, config, shell, options={})
-        @remote_servers = servers.remote
-        @config, @shell = config, shell
-      end
-
-      # servers that need to have the gem installed
-      def servers
-        @servers ||= find_servers_missing_gem
-      end
-
-      # Find the servers that need the gem, then install the gem on them
-      def call
-        servers.any? && propagate
-      end
-
-      def remote_gem_file
-        File.join(Dir.tmpdir, About.gem_filename)
-      end
-
-      def gem_binary
-        File.join(Gem.default_bindir, 'gem')
-      end
-
-      # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
-      # 0.5.11, and mistakenly thinking 0.5.1 is there
-      def check_command
-        %{#{gem_binary} list #{About.gem_name} | grep "#{About.gem_name}" | egrep -q "#{About.version.gsub(/\./, '\.')}[,)]"}
-      end
-
-      def scp_command(server)
-        Escape.shell_command([
-          'scp',
-          '-i', config.paths.internal_key.to_s,
-          "-o", "StrictHostKeyChecking=no",
-          About.gem_file,
-         "#{server.authority}:#{remote_gem_file}",
-        ])
-      end
-
-      def install_command
-        "#{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'"
-      end
-
-      def count_servers(set)
-        "#{set.size} server#{set.size == 1 ? '' : 's'}"
-      end
-
-      def find_servers_missing_gem
-        return @remote_servers if @remote_servers.empty?
-        shell.status "Verifying #{About.name_with_version} on #{count_servers(@remote_servers)}."
-        @remote_servers.select_in_parallel do |server|
-          !shell.logged_system(server.command_on_server('sh -l -c', check_command)).success?
-        end
-      end
-
-      def propagate
-        shell.status "Propagating #{About.name_with_version} to #{count_servers(servers)}."
-        servers.run_on_each(shell) { |server| shell.logged_system(scp_command(server)) }
-        servers.run_on_each(shell) { |server| shell.logged_system(server.command_on_server('sudo sh -l -c', install_command)) }
-      end
-    end
-  end
-end

data/lib/vendor/systemu/LICENSE

@@ -1,3 +0,0 @@
-same as Ruby's
-
-http://www.ruby-lang.org/en/LICENSE.txt

data/lib/vendor/systemu/lib/systemu.rb

@@ -1,363 +0,0 @@
-# encoding: utf-8
-
-require 'tmpdir'
-require 'socket'
-require 'fileutils'
-require 'rbconfig'
-require 'thread'
-
-class Object
-  def systemu(*a, &b) SystemUniversal.new(*a, &b).systemu end
-end
-
-class SystemUniversal
-#
-# constants
-#
-  SystemUniversal::VERSION = '2.5.0' unless SystemUniversal.send(:const_defined?, :VERSION)
-  def SystemUniversal.version() SystemUniversal::VERSION end
-  def version() SystemUniversal::VERSION end
-#
-# class methods
-#
-
-  @host = Socket.gethostname
-  @ppid = Process.ppid
-  @pid = Process.pid
-  @turd = ENV['SYSTEMU_TURD']
-
-  c = begin; ::RbConfig::CONFIG; rescue NameError; ::Config::CONFIG; end
-  ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
-  @ruby = if system('%s -e 42' % ruby)
-    ruby
-  else
-    system('%s -e 42' % 'ruby') ? 'ruby' : warn('no ruby in PATH/CONFIG')
-  end
-
-  class << SystemUniversal
-    %w( host ppid pid ruby turd ).each{|a| attr_accessor a}
-
-    def quote(*words)
-      words.map{|word| word.inspect}.join(' ')
-    end
-  end
-
-#
-# instance methods
-#
-
-  def initialize argv, opts = {}, &block
-    getopt = getopts opts
-
-    @argv = argv
-    @block = block
-
-    @stdin = getopt[ ['stdin', 'in', '0', 0] ]
-    @stdout = getopt[ ['stdout', 'out', '1', 1] ]
-    @stderr = getopt[ ['stderr', 'err', '2', 2] ]
-    @env = getopt[ 'env' ]
-    @cwd = getopt[ 'cwd' ]
-
-    @host = getopt[ 'host', self.class.host ]
-    @ppid = getopt[ 'ppid', self.class.ppid ]
-    @pid = getopt[ 'pid', self.class.pid ]
-    @ruby = getopt[ 'ruby', self.class.ruby ]
-  end
-
-  def systemu
-    tmpdir do |tmp|
-      c = child_setup tmp
-      status = nil
-
-      begin
-        thread = nil
-
-        quietly{
-          IO.popen "#{ quote(@ruby) } #{ quote(c['program']) }", 'r+' do |pipe|
-            line = pipe.gets
-            case line
-              when %r/^pid: \d+$/
-                cid = Integer line[%r/\d+/]
-              else
-                begin
-                  buf = pipe.read
-                  buf = "#{ line }#{ buf }"
-                  e = Marshal.load buf
-                  raise unless Exception === e
-                  raise e
-                rescue
-                  raise "wtf?\n#{ buf }\n"
-                end
-            end
-            thread = new_thread cid, @block if @block
-            pipe.read rescue nil
-          end
-        }
-        status = $?
-      ensure
-        if thread
-          begin
-            class << status
-              attr 'thread'
-            end
-            status.instance_eval{ @thread = thread }
-          rescue
-            42
-          end
-        end
-      end
-
-      if @stdout or @stderr
-        open(c['stdout']){|f| relay f => @stdout} if @stdout
-        open(c['stderr']){|f| relay f => @stderr} if @stderr
-        status
-      else
-        [status, IO.read(c['stdout']), IO.read(c['stderr'])]
-      end
-    end
-  end
-
-  def quote *args, &block
-    SystemUniversal.quote(*args, &block)
-  end
-
-  def new_thread cid, block
-    q = Queue.new
-    Thread.new(cid) do |cid|
-      current = Thread.current
-      current.abort_on_exception = true
-      q.push current
-      block.call cid
-    end
-    q.pop
-  end
-
-  def child_setup tmp
-    stdin = File.expand_path(File.join(tmp, 'stdin'))
-    stdout = File.expand_path(File.join(tmp, 'stdout'))
-    stderr = File.expand_path(File.join(tmp, 'stderr'))
-    program = File.expand_path(File.join(tmp, 'program'))
-    config = File.expand_path(File.join(tmp, 'config'))
-
-    if @stdin
-      open(stdin, 'w'){|f| relay @stdin => f}
-    else
-      FileUtils.touch stdin
-    end
-    FileUtils.touch stdout
-    FileUtils.touch stderr
-
-    c = {}
-    c['argv'] = @argv
-    c['env'] = @env
-    c['cwd'] = @cwd
-    c['stdin'] = stdin
-    c['stdout'] = stdout
-    c['stderr'] = stderr
-    c['program'] = program
-    open(config, 'w'){|f| Marshal.dump(c, f)}
-
-    open(program, 'w'){|f| f.write child_program(config)}
-
-    c
-  end
-
-  def quietly
-    v = $VERBOSE
-    $VERBOSE = nil
-    yield
-  ensure
-    $VERBOSE = v
-  end
-
-  def child_program config
-    <<-program
-      # encoding: utf-8
-
-      PIPE = STDOUT.dup
-      begin
-        config = Marshal.load(IO.read('#{ config }'))
-
-        argv = config['argv']
-        env = config['env']
-        cwd = config['cwd']
-        stdin = config['stdin']
-        stdout = config['stdout']
-        stderr = config['stderr']
-
-        Dir.chdir cwd if cwd
-        env.each{|k,v| ENV[k.to_s] = v.to_s} if env
-
-        STDIN.reopen stdin
-        STDOUT.reopen stdout
-        STDERR.reopen stderr
-
-        PIPE.puts "pid: \#{ Process.pid }"
-        PIPE.flush                        ### the process is ready yo!
-        PIPE.close
-        if RUBY_VERSION >= "1.9"
-          exec *argv
-        else
-          exec argv
-        end
-      rescue Exception => e
-        PIPE.write Marshal.dump(e) rescue nil
-        exit 42
-      end
-    program
-  end
-
-  def relay srcdst
-    src, dst, ignored = srcdst.to_a.first
-    if src.respond_to? 'read'
-      while((buf = src.read(8192))); dst << buf; end
-    else
-      if src.respond_to?(:each_line)
-        src.each_line{|buf| dst << buf}
-      else
-        src.each{|buf| dst << buf}
-      end
-    end
-  end
-
-  def tmpdir d = Dir.tmpdir, max = 42, &b
-    i = -1 and loop{
-      i += 1
-
-      tmp = File.join d, "systemu_#{ @host }_#{ @ppid }_#{ @pid }_#{ rand }_#{ i += 1 }"
-
-      begin
-        Dir.mkdir tmp
-      rescue Errno::EEXIST
-        raise if i >= max
-        next
-      end
-
-      break(
-        if b
-          begin
-            b.call tmp
-          ensure
-            FileUtils.rm_rf tmp unless SystemU.turd
-          end
-        else
-          tmp
-        end
-      )
-    }
-  end
-
-  def getopts opts = {}
-    lambda do |*args|
-      keys, default, ignored = args
-      catch(:opt) do
-        [keys].flatten.each do |key|
-          [key, key.to_s, key.to_s.intern].each do |key|
-            throw :opt, opts[key] if opts.has_key?(key)
-          end
-        end
-        default
-      end
-    end
-  end
-end
-
-# some monkeypatching for JRuby
-if defined? JRUBY_VERSION
-  require 'jruby'
-  java_import org.jruby.RubyProcess
-
-  class SystemUniversal
-    def systemu
-      split_argv = JRuby::PathHelper.smart_split_command @argv
-      process = java.lang.Runtime.runtime.exec split_argv.to_java(:string)
-
-      stdout, stderr = [process.input_stream, process.error_stream].map do |stream|
-        StreamReader.new(stream)
-      end
-
-      exit_code = process.wait_for
-      field = process.get_class.get_declared_field("pid")
-      field.set_accessible(true)
-      pid = field.get(process)
-      [
-        RubyProcess::RubyStatus.new_process_status(JRuby.runtime, exit_code, pid),
-        stdout.join,
-        stderr.join
-      ]
-    end
-
-    class StreamReader
-      def initialize(stream)
-        @data = ""
-        @thread = Thread.new do
-          reader = java.io.BufferedReader.new java.io.InputStreamReader.new(stream)
-
-          while line = reader.read_line
-            @data << line << "\n"
-          end
-        end
-      end
-
-      def join
-        @thread.join
-        @data
-      end
-    end
-  end
-end
-
-
-
-SystemU = SystemUniversal unless defined? SystemU
-Systemu = SystemUniversal unless defined? Systemu
-
-
-
-
-
-
-
-
-
-
-
-
-
-if $0 == __FILE__
-#
-# date
-#
-  date = %q( ruby -e"  t = Time.now; STDOUT.puts t; STDERR.puts t  " )
-
-  status, stdout, stderr = systemu date
-  p [status, stdout, stderr]
-
-  status = systemu date, 1=>(stdout = '')
-  p [status, stdout]
-
-  status = systemu date, 2=>(stderr = '')
-  p [status, stderr]
-#
-# sleep
-#
-  sleep = %q( ruby -e"  p(sleep(1))  " )
-  status, stdout, stderr = systemu sleep
-  p [status, stdout, stderr]
-
-  sleep = %q( ruby -e"  p(sleep(42))  " )
-  status, stdout, stderr = systemu(sleep){|cid| Process.kill 9, cid}
-  p [status, stdout, stderr]
-#
-# env
-#
-  env = %q( ruby -e"  p ENV['A']  " )
-  status, stdout, stderr = systemu env, :env => {'A' => 42}
-  p [status, stdout, stderr]
-#
-# cwd
-#
-  env = %q( ruby -e"  p Dir.pwd  " )
-  status, stdout, stderr = systemu env, :cwd => Dir.tmpdir
-  p [status, stdout, stderr]
-end