engineyard-serverside 2.0.4 → 2.0.5.pre

data/spec/spec_helper.rb

@@ -117,7 +117,7 @@ Spec::Runner.configure do |config|
 
   # set up EY::Serverside::Server like we're on a solo
   def test_servers
-    EY::Serverside::Servers.from_hashes([{:hostname => 'localhost', :roles => %w[solo]}])
+    EY::Serverside::Servers.from_hashes([{:hostname => 'localhost', :roles => %w[solo], :user => ENV['USER']}])
   end
 
   # When a repo fixture name is specified, the files found in the specified

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 1113733578
+  prerelease: 6
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  - pre
+  version: 2.0.5.pre
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-17 00:00:00 Z
+date: 2013-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -46,6 +47,13 @@ dependencies:
         - 2
         - 2
         version: 0.9.2.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 10
+        - 0
+        version: "10.0"
   prerelease: false
   type: :development
   name: rake
@@ -108,6 +116,36 @@ dependencies:
   type: :development
   name: engineyard-cloud-client
   requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  name: sqlite3
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 13
+        - 2
+        version: 0.13.2
+  prerelease: false
+  type: :development
+  name: pg
+  requirement: *id008
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -118,6 +156,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/engineyard-serverside
+- lib/engineyard-serverside/about.rb
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/cli_helpers.rb
 - lib/engineyard-serverside/configuration.rb
@@ -125,12 +164,10 @@ files:
 - lib/engineyard-serverside/deploy.rb
 - lib/engineyard-serverside/deploy_hook.rb
 - lib/engineyard-serverside/deprecation.rb
-- lib/engineyard-serverside/future.rb
-- lib/engineyard-serverside/futures/celluloid.rb
-- lib/engineyard-serverside/futures/dataflow.rb
 - lib/engineyard-serverside/lockfile_parser.rb
 - lib/engineyard-serverside/maintenance.rb
 - lib/engineyard-serverside/paths.rb
+- lib/engineyard-serverside/propagator.rb
 - lib/engineyard-serverside/rails_asset_support.rb
 - lib/engineyard-serverside/server.rb
 - lib/engineyard-serverside/servers.rb
@@ -143,66 +180,6 @@ files:
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
 - lib/engineyard-serverside.rb
-- lib/vendor/celluloid/lib/celluloid/actor.rb
-- lib/vendor/celluloid/lib/celluloid/actor_pool.rb
-- lib/vendor/celluloid/lib/celluloid/actor_proxy.rb
-- lib/vendor/celluloid/lib/celluloid/application.rb
-- lib/vendor/celluloid/lib/celluloid/calls.rb
-- lib/vendor/celluloid/lib/celluloid/core_ext.rb
-- lib/vendor/celluloid/lib/celluloid/events.rb
-- lib/vendor/celluloid/lib/celluloid/fiber.rb
-- lib/vendor/celluloid/lib/celluloid/fsm.rb
-- lib/vendor/celluloid/lib/celluloid/future.rb
-- lib/vendor/celluloid/lib/celluloid/links.rb
-- lib/vendor/celluloid/lib/celluloid/logger.rb
-- lib/vendor/celluloid/lib/celluloid/mailbox.rb
-- lib/vendor/celluloid/lib/celluloid/receivers.rb
-- lib/vendor/celluloid/lib/celluloid/registry.rb
-- lib/vendor/celluloid/lib/celluloid/responses.rb
-- lib/vendor/celluloid/lib/celluloid/rspec.rb
-- lib/vendor/celluloid/lib/celluloid/signals.rb
-- lib/vendor/celluloid/lib/celluloid/supervisor.rb
-- lib/vendor/celluloid/lib/celluloid/task.rb
-- lib/vendor/celluloid/lib/celluloid/tcp_server.rb
-- lib/vendor/celluloid/lib/celluloid/timers.rb
-- lib/vendor/celluloid/lib/celluloid/version.rb
-- lib/vendor/celluloid/lib/celluloid.rb
-- lib/vendor/dataflow/dataflow/actor.rb
-- lib/vendor/dataflow/dataflow/equality.rb
-- lib/vendor/dataflow/dataflow/future_queue.rb
-- lib/vendor/dataflow/dataflow/port.rb
-- lib/vendor/dataflow/dataflow.rb
-- lib/vendor/dataflow/examples/barrier.rb
-- lib/vendor/dataflow/examples/data_driven.rb
-- lib/vendor/dataflow/examples/dataflow_http_gets.rb
-- lib/vendor/dataflow/examples/flow.rb
-- lib/vendor/dataflow/examples/future_http_gets.rb
-- lib/vendor/dataflow/examples/future_queue.rb
-- lib/vendor/dataflow/examples/instance_variables.rb
-- lib/vendor/dataflow/examples/laziness.rb
-- lib/vendor/dataflow/examples/local_variables.rb
-- lib/vendor/dataflow/examples/messages.rb
-- lib/vendor/dataflow/examples/port_http_gets.rb
-- lib/vendor/dataflow/examples/port_send.rb
-- lib/vendor/dataflow/examples/ring.rb
-- lib/vendor/dataflow/HISTORY
-- lib/vendor/dataflow/LICENSE
-- lib/vendor/dataflow/Rakefile
-- lib/vendor/dataflow/README.textile
-- lib/vendor/dataflow/spec/actor_spec.rb
-- lib/vendor/dataflow/spec/anonymous_variables_spec.rb
-- lib/vendor/dataflow/spec/barrier_spec.rb
-- lib/vendor/dataflow/spec/by_need_spec.rb
-- lib/vendor/dataflow/spec/dataflow_spec.rb
-- lib/vendor/dataflow/spec/equality_spec.rb
-- lib/vendor/dataflow/spec/flow_spec.rb
-- lib/vendor/dataflow/spec/forker_spec.rb
-- lib/vendor/dataflow/spec/future_queue_spec.rb
-- lib/vendor/dataflow/spec/inspect_spec.rb
-- lib/vendor/dataflow/spec/need_later_spec.rb
-- lib/vendor/dataflow/spec/port_spec.rb
-- lib/vendor/dataflow/spec/spec.opts
-- lib/vendor/dataflow/spec/spec_helper.rb
 - lib/vendor/escape/doc_include/template/qualitysmith.rb
 - lib/vendor/escape/lib/escape.rb
 - lib/vendor/escape/Readme
@@ -471,6 +448,7 @@ files:
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/nodejs_deploy_spec.rb
+- spec/propagator_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb
@@ -626,6 +604,7 @@ test_files:
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/nodejs_deploy_spec.rb
+- spec/propagator_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb

data/lib/engineyard-serverside/future.rb

@@ -1,35 +0,0 @@
-module EY
-  module Serverside
-    class Future
-      def self.map(blocks)
-        blocks.map { |block| new(&block) }
-      end
-
-      def self.success?(futures)
-        futures.empty? || futures.all? {|f| f.success?}
-      end
-
-      def initialize(&block)
-        @block = block
-      end
-
-      def result
-        @result ||= call
-      end
-
-      def success?
-        result.success?
-      end
-
-      def error?
-        !success?
-      end
-    end
-
-    if defined?(Fiber)
-      require 'engineyard-serverside/futures/celluloid'
-    else
-      require 'engineyard-serverside/futures/dataflow'
-    end
-  end
-end

data/lib/engineyard-serverside/futures/celluloid.rb

@@ -1,15 +0,0 @@
-module EY
-  module Serverside
-    $LOAD_PATH.unshift File.expand_path('../../vendor/celluloid/lib', File.dirname(__FILE__))
-    require 'celluloid'
-    class Future
-      def self.call(blocks)
-        map(blocks).each {|f| f.result }
-      end
-
-      def call
-        Celluloid::Future.new(&@block).call
-      end
-    end
-  end
-end

data/lib/engineyard-serverside/futures/dataflow.rb

@@ -1,26 +0,0 @@
-module EY
-  module Serverside
-    $LOAD_PATH.unshift File.expand_path('../../vendor/dataflow', File.dirname(__FILE__))
-    require 'dataflow'
-
-    class Future
-      extend Dataflow
-
-      def self.call(blocks)
-        futures = map(blocks)
-
-        # Dataflow needs to call `barrier` and `need_later` in the same object
-        need_laters = futures.map do |future|
-          need_later { future.result }
-        end
-        barrier(*need_laters)
-
-        futures
-      end
-
-      def call
-        @block.call
-      end
-    end
-  end
-end

data/lib/vendor/celluloid/lib/celluloid.rb

@@ -1,261 +0,0 @@
-require 'logger'
-require 'thread'
-
-module Celluloid
-  @logger = Logger.new STDERR
-
-  class << self
-    attr_accessor :logger # Thread-safe logger class
-
-    def included(klass)
-      klass.send :extend, ClassMethods
-    end
-
-    # Are we currently inside of an actor?
-    def actor?
-      !!Thread.current[:actor]
-    end
-
-    # Obtain the currently running actor (if one exists)
-    def current_actor
-      actor = Thread.current[:actor]
-      raise NotActorError, "not in actor scope" unless actor
-      actor.proxy
-    end
-    alias_method :current, :current_actor
-
-    # Receive an asynchronous message
-    def receive(timeout = nil, &block)
-      actor = Thread.current[:actor]
-      if actor
-        actor.receive(timeout, &block)
-      else
-        Thread.mailbox.receive(timeout, &block)
-      end
-    end
-
-    # Sleep letting the actor continue processing messages
-    def sleep(interval)
-      actor = Thread.current[:actor]
-      if actor
-        actor.sleep(interval)
-      else
-        Kernel.sleep interval
-      end
-    end
-
-    # Obtain a hash of active tasks to their current activities
-    def tasks
-      actor = Thread.current[:actor]
-      raise NotActorError, "not in actor scope" unless actor
-      actor.tasks
-    end
-  end
-
-  # Class methods added to classes which include Celluloid
-  module ClassMethods
-    # Create a new actor
-    def new(*args, &block)
-      proxy = Actor.new(allocate).proxy
-      proxy.send(:initialize, *args, &block)
-      proxy
-    end
-    alias_method :spawn, :new
-
-    # Create a new actor and link to the current one
-    def new_link(*args, &block)
-      current_actor = Celluloid.current_actor
-      raise NotActorError, "can't link outside actor context" unless current_actor
-
-      proxy = Actor.new(allocate).proxy
-      current_actor.link proxy
-      proxy.send(:initialize, *args, &block)
-      proxy
-    end
-    alias_method :spawn_link, :new_link
-
-    # Create a supervisor which ensures an instance of an actor will restart
-    # an actor if it fails
-    def supervise(*args, &block)
-      Supervisor.supervise(self, *args, &block)
-    end
-
-    # Create a supervisor which ensures an instance of an actor will restart
-    # an actor if it fails, and keep the actor registered under a given name
-    def supervise_as(name, *args, &block)
-      Supervisor.supervise_as(name, self, *args, &block)
-    end
-
-    # Trap errors from actors we're linked to when they exit
-    def trap_exit(callback)
-      @exit_handler = callback.to_sym
-    end
-
-    # Obtain the exit handler for this actor
-    attr_reader :exit_handler
-
-    # Configure a custom mailbox factory
-    def use_mailbox(klass = nil, &block)
-      if block
-        define_method(:mailbox_factory, &block)
-      else
-        define_method(:mailbox_factory) { klass.new }
-      end
-    end
-  end
-
-  #
-  # Instance methods
-  #
-
-  # Is this actor alive?
-  def alive?
-    Thread.current[:actor].alive?
-  end
-
-  # Raise an exception in caller context, but stay running
-  def abort(cause)
-    raise AbortError.new(cause)
-  end
-
-  # Terminate this actor
-  def terminate
-    Thread.current[:actor].terminate
-  end
-
-  def inspect
-    str = "#<Celluloid::Actor(#{self.class}:0x#{object_id.to_s(16)})"
-    ivars = instance_variables.map do |ivar|
-      "#{ivar}=#{instance_variable_get(ivar).inspect}"
-    end
-
-    str << " " << ivars.join(' ') unless ivars.empty?
-    str << ">"
-  end
-
-  # Send a signal with the given name to all waiting methods
-  def signal(name, value = nil)
-    Thread.current[:actor].signal name, value
-  end
-
-  # Wait for the given signal
-  def wait(name)
-    Thread.current[:actor].wait name
-  end
-
-  # Obtain the current_actor
-  def current_actor
-    Celluloid.current_actor
-  end
-
-  # Obtain the running tasks for this actor
-  def tasks
-    Celluloid.tasks
-  end
-
-  # Obtain the Ruby object the actor is wrapping. This should ONLY be used
-  # for a limited set of use cases like runtime metaprogramming. Interacting
-  # directly with the wrapped object foregoes any kind of thread safety that
-  # Celluloid would ordinarily provide you, and the object is guaranteed to
-  # be shared with at least the actor thread. Tread carefully.
-  def wrapped_object; self; end
-
-  # Obtain the Celluloid::Links for this actor
-  def links
-    Thread.current[:actor].links
-  end
-
-  # Link this actor to another, allowing it to crash or react to errors
-  def link(actor)
-    actor.notify_link current_actor
-    notify_link actor
-  end
-
-  # Remove links to another actor
-  def unlink(actor)
-    actor.notify_unlink current_actor
-    notify_unlink actor
-  end
-
-  def notify_link(actor)
-    links << actor
-  end
-
-  def notify_unlink(actor)
-    links.delete actor
-  end
-
-  # Is this actor linked to another?
-  def linked_to?(actor)
-    Thread.current[:actor].links.include? actor
-  end
-
-  # Receive an asynchronous message via the actor protocol
-  def receive(timeout = nil, &block)
-    Celluloid.receive(timeout, &block)
-  end
-
-  # Sleep while letting the actor continue to receive messages
-  def sleep(interval)
-    Celluloid.sleep(interval)
-  end
-
-  # Call a block after a given interval
-  def after(interval, &block)
-    Thread.current[:actor].after(interval, &block)
-  end
-
-  # Perform a blocking or computationally intensive action inside an
-  # asynchronous thread pool, allowing the caller to continue processing other
-  # messages in its mailbox in the meantime
-  def async(&block)
-    # This implementation relies on the present implementation of
-    # Celluloid::Future, which uses an Actor to run the block
-    Future.new(&block).value
-  end
-
-  # Process async calls via method_missing
-  def method_missing(meth, *args, &block)
-    # bang methods are async calls
-    if meth.to_s.match(/!$/)
-      unbanged_meth = meth.to_s.sub(/!$/, '')
-      call = AsyncCall.new(@mailbox, unbanged_meth, args, block)
-
-      begin
-        Thread.current[:actor].mailbox << call
-      rescue MailboxError
-        # Silently swallow asynchronous calls to dead actors. There's no way
-        # to reliably generate DeadActorErrors for async calls, so users of
-        # async calls should find other ways to deal with actors dying
-        # during an async call (i.e. linking/supervisors)
-      end
-
-      return # casts are async and return immediately
-    end
-
-    super
-  end
-end
-
-require 'celluloid/version'
-require 'celluloid/actor_proxy'
-require 'celluloid/calls'
-require 'celluloid/core_ext'
-require 'celluloid/events'
-require 'celluloid/fiber'
-require 'celluloid/fsm'
-require 'celluloid/links'
-require 'celluloid/logger'
-require 'celluloid/mailbox'
-require 'celluloid/receivers'
-require 'celluloid/registry'
-require 'celluloid/responses'
-require 'celluloid/signals'
-require 'celluloid/task'
-require 'celluloid/timers'
-
-require 'celluloid/actor'
-require 'celluloid/actor_pool'
-require 'celluloid/supervisor'
-require 'celluloid/future'
-require 'celluloid/application'