rake-subproject 0.0.1 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg0MTViNTE2YWNmOThkOGU0NGQ0NDA4MzA4ZmU3M2Q4MTVjOWU5Ng==
+    MjFiN2QzYzg4OTFkYjk1NmQxNzI3N2U3MTZhNTk1ZGJlZThlOGM3YQ==
   data.tar.gz: !binary |-
-    OGQzOThhYjRjNjllZGI4OTNlNDg0Yzk5NzkwNjg1MjQ2ZWU3NzYyNQ==
+    MzQ2M2E3ZjBkMWQ0NzQ2OTFkM2QwN2Q3MTQzZTMxNWNhMzU1YTM3Zg==
 SHA512:
   metadata.gz: !binary |-
-    NTZlMGQ1ZTczMjhiNTNhMWViOTRjYzY1OGZjMWQ3NWQ4ZDcyNzhmMjU1Nzdk
-    NTMyMGNkYTlmZTI0YjQ3MTFkMmQ2YzU1OTRjMTg5MzRiNDBiMThjNTU5ZTVk
-    YWMwY2EwMzY0OTQyYmQxYTRmNzA4YTIzMGU1ZTBjOWIzYjlkMDg=
+    YmViZmRiMDQxOWJhYjIzZTIxNDgwYzc3NDBhYjc0ZjFhYTYzNWZmNWQyYzUw
+    OGU5YjY1MzJiOTliM2IwMWQ4MWFjN2Y2OWY5ZWQ3YmU1MjE2ZGQxNTBiZWNi
+    YzdiNzZhYzdhYThlNzdiNDIxOTQwYWQ0M2Y5YjYyZWJmYzA5ZWM=
   data.tar.gz: !binary |-
-    NGMwNTNkOTBhZDg3OGEwYzFiZmUwODU4YWQzODE3MTU1ZWI3YjUwZjRmYzhj
-    ODVhZThjYTk1NTM5MzM3YWM3ZDVlMzc5OTAxM2QwNGE0OTRkMTkzYjk5YjMx
-    NTYzMDdkMTdjN2VhZGNkZTg1YWIzNTI2ODdjMzlmMDM0MjBiN2U=
+    OWQwOGRkZDZiYWExZGU4NzZiNjJkZGUyYjI1N2YzMTkyNGQxMzdjMTJmYTc0
+    NDlhZWM2NTM1MmNiNDVjNThkZDExNmQ4N2UxMzVlOWIxNzA0MTgyYWJkYzIx
+    ZDI0YTFiNDczOTJhZDI2MGQzYjgwYWU3YmUyMDkwNzNkNmE0OWU=

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/Rakefile

@@ -1,6 +1,36 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake/clean'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+['Client', 'Server'].each do |name|
+  dir = "lib/rake/subproject/#{name.downcase}"
+  directory dir
+  CLEAN.include dir
+  FileList["resources/network/*.rb"].each do |path|
+    file "#{dir}/#{File.basename(path)}" => "lib/rake/subproject/#{name.downcase}" do |t|
+      File.open(t.name, 'w') do |f|
+        f.puts "module Rake ; module Subproject ; module #{name}"
+        f.puts File.read(path)
+        f.puts "end ; end ; end"
+      end
+    end
+    namespace :build do
+      task :library => "#{dir}/#{File.basename(path)}"
+    end
+    CLEAN.include "#{dir}/#{File.basename(path)}"
+  end
+end
+
+file "lib/rake/subproject/server/task.rb" => ["resources/server_task.rb", "lib/rake/subproject/server"] do |t|
+  cp t.prerequisites.first, t.name
+end
+
+namespace :build do
+  task :library => "lib/rake/subproject/server/task.rb"
+end
+
+task :build => 'build:library'

data/lib/rake/subproject.rb

@@ -1,5 +1,14 @@
 require 'rake'
+require 'json'
 
+module Rake::Subproject
+end
+
+require 'rake/subproject/client/port'
+require 'rake/subproject/client/session_manager'
+require 'rake/subproject/client/session'
+require 'rake/subproject/client/port'
+require 'rake/subproject/task_runner'
 require 'rake/subproject/task_manager'
 require 'rake/subproject/ext/application'
 require 'rake/subproject/ext/dsl'

data/lib/rake/subproject/client/port.rb

@@ -0,0 +1,52 @@
+module Rake ; module Subproject ; module Client
+class Port
+  attr_accessor :name
+
+  def self.open(fd, option)
+    return unless block_given?
+    IO.open(fd, option) do |io|
+      yield port = self.new(io, "server")
+    end
+  end
+
+  DELIMITER = "\0"
+
+  def initialize(io, name = nil)
+    fail ArgumentError, "Requires an IO object" unless io.kind_of?(IO)
+    @io = io
+    self.name = name
+  end
+  
+  def inspect
+    "Port(#{self.name || @io.fileno})"
+  end
+  
+  def read
+    log "reading #{self.inspect}..."
+    json_message = @io.readline(DELIMITER).chomp(DELIMITER)
+    log "... #{self.inspect} received: #{json_message}"
+    ::JSON.parse(json_message)
+  end
+  
+  def write(object)
+    json_message = ::JSON.generate(object)
+    @io.print(json_message+DELIMITER)
+    @io.flush
+    log "#{self.inspect} wrote: #{json_message}"
+  end
+  
+  def close
+    log "closing #{self.inspect}"
+    @io.close
+  end
+  
+  def closed?
+    @io.closed?
+  end
+  
+  private
+  def log(message)
+    $stderr.print "#{message}\n" if false
+  end
+end
+end ; end ; end

data/lib/rake/subproject/client/session.rb

@@ -0,0 +1,24 @@
+module Rake ; module Subproject ; module Client
+class Session
+  def initialize(manager, id = nil)
+    @id = id
+    @manager = manager
+  end
+  
+  def id
+    @id || object_id
+  end
+  
+  def write(object)
+    @manager.send(:write_session, self, object)
+  end
+
+  def read
+    @manager.send(:read_session, self)
+  end
+  
+  def close
+    @manager.send(:close_session, self)
+  end
+end
+end ; end ; end

data/lib/rake/subproject/client/session_manager.rb

@@ -0,0 +1,101 @@
+module Rake ; module Subproject ; module Client
+class SessionManager
+
+  def initialize(port)
+    fail ArgumentError, "Requires a Port object" unless port.kind_of?(Port)
+    @port = port
+    @session_queues = {}
+  end
+  
+  def self.with_each_session(port, &block)
+    return unless block_given?
+    session_manager = self.new(port)
+    threads = Set.new
+    mutex = Mutex.new
+    session_manager.start do |session|
+      mutex.synchronize do
+        threads << thread = Thread.start do
+          block.call(session)
+          mutex.synchronize { threads.delete thread }
+        end
+      end
+    end
+  ensure
+    log "Waiting for #{threads.count} threads"
+    mutex.synchronize { threads.dup }.each(&:join)
+    session_manager.close
+  end
+  
+  def start(&block)
+    log "starting read loop on #{@port.inspect}"
+    loop do
+      envelope = @port.read
+      fail "no 'message' tag in envelope" if (message = envelope['message']).nil?
+      fail "no 'session_id' tag in envelope"  if (session_id = envelope['session_id']).nil? || session_id == "0"
+      session_id = session_id.to_i
+      fail "null(0) 'session_id' tag in envelope" if session_id == 0
+
+      case message
+      when 'create_session'
+        session = Session.new(self, session_id.to_i)
+        @session_queues[session.id] = Queue.new
+        block.call(session) unless block.nil?
+      when 'message_session'
+        fail "No session for #{session_id.to_i}" if (queue = @session_queues[session_id.to_i]).nil?
+        queue << envelope['payload']
+      else
+        fail "did not recognize message: '#{message}'"  if (session_id = envelope['session_id']).nil? || session_id == 0
+      end
+      
+    end
+  rescue EOFError => e
+#       log "#{e.message}\n#{e.backtrace.join("\n")}"
+  rescue IOError => e
+#       log "#{e.message}\n#{e.backtrace.join("\n")}"
+#       raise
+  end
+  
+  def with_session
+    return unless block_given?
+    yield session = create_session
+  ensure
+    session.close
+  end
+  
+  def create_session
+    session = Session.send(:new, self)
+    @port.write(message: 'create_session', session_id: session.id)
+    @session_queues[session.id] = Queue.new
+    session
+  end
+  
+  def close
+    log "session manager: closing #{@port.inspect}"
+  end
+
+  private
+      
+  def close_session(session)
+    log "closing session: #{session.id} on #{@port.inspect}"
+    @session_queues.delete(session.id)
+  end
+  
+  def read_session(session)
+    fail "No queue for #{session.inspect}" if (queue = @session_queues[session.id]).nil?
+    fail EOFError if queue.empty? && @port.closed?
+    queue.pop
+  end
+  
+  def write_session(session, object)
+    @port.write(message: 'message_session', session_id: session.id, payload: object)
+  end
+  
+  private
+  def self.log(message)
+    $stderr.print "#{message}\n" if false
+  end
+  def log(message)
+    self.class.log(message)
+  end
+end
+end ; end ; end

data/lib/rake/subproject/server/port.rb

@@ -0,0 +1,52 @@
+module Rake ; module Subproject ; module Server
+class Port
+  attr_accessor :name
+
+  def self.open(fd, option)
+    return unless block_given?
+    IO.open(fd, option) do |io|
+      yield port = self.new(io, "server")
+    end
+  end
+
+  DELIMITER = "\0"
+
+  def initialize(io, name = nil)
+    fail ArgumentError, "Requires an IO object" unless io.kind_of?(IO)
+    @io = io
+    self.name = name
+  end
+  
+  def inspect
+    "Port(#{self.name || @io.fileno})"
+  end
+  
+  def read
+    log "reading #{self.inspect}..."
+    json_message = @io.readline(DELIMITER).chomp(DELIMITER)
+    log "... #{self.inspect} received: #{json_message}"
+    ::JSON.parse(json_message)
+  end
+  
+  def write(object)
+    json_message = ::JSON.generate(object)
+    @io.print(json_message+DELIMITER)
+    @io.flush
+    log "#{self.inspect} wrote: #{json_message}"
+  end
+  
+  def close
+    log "closing #{self.inspect}"
+    @io.close
+  end
+  
+  def closed?
+    @io.closed?
+  end
+  
+  private
+  def log(message)
+    $stderr.print "#{message}\n" if false
+  end
+end
+end ; end ; end

data/lib/rake/subproject/server/session.rb

@@ -0,0 +1,24 @@
+module Rake ; module Subproject ; module Server
+class Session
+  def initialize(manager, id = nil)
+    @id = id
+    @manager = manager
+  end
+  
+  def id
+    @id || object_id
+  end
+  
+  def write(object)
+    @manager.send(:write_session, self, object)
+  end
+
+  def read
+    @manager.send(:read_session, self)
+  end
+  
+  def close
+    @manager.send(:close_session, self)
+  end
+end
+end ; end ; end

data/lib/rake/subproject/server/session_manager.rb

@@ -0,0 +1,101 @@
+module Rake ; module Subproject ; module Server
+class SessionManager
+
+  def initialize(port)
+    fail ArgumentError, "Requires a Port object" unless port.kind_of?(Port)
+    @port = port
+    @session_queues = {}
+  end
+  
+  def self.with_each_session(port, &block)
+    return unless block_given?
+    session_manager = self.new(port)
+    threads = Set.new
+    mutex = Mutex.new
+    session_manager.start do |session|
+      mutex.synchronize do
+        threads << thread = Thread.start do
+          block.call(session)
+          mutex.synchronize { threads.delete thread }
+        end
+      end
+    end
+  ensure
+    log "Waiting for #{threads.count} threads"
+    mutex.synchronize { threads.dup }.each(&:join)
+    session_manager.close
+  end
+  
+  def start(&block)
+    log "starting read loop on #{@port.inspect}"
+    loop do
+      envelope = @port.read
+      fail "no 'message' tag in envelope" if (message = envelope['message']).nil?
+      fail "no 'session_id' tag in envelope"  if (session_id = envelope['session_id']).nil? || session_id == "0"
+      session_id = session_id.to_i
+      fail "null(0) 'session_id' tag in envelope" if session_id == 0
+
+      case message
+      when 'create_session'
+        session = Session.new(self, session_id.to_i)
+        @session_queues[session.id] = Queue.new
+        block.call(session) unless block.nil?
+      when 'message_session'
+        fail "No session for #{session_id.to_i}" if (queue = @session_queues[session_id.to_i]).nil?
+        queue << envelope['payload']
+      else
+        fail "did not recognize message: '#{message}'"  if (session_id = envelope['session_id']).nil? || session_id == 0
+      end
+      
+    end
+  rescue EOFError => e
+#       log "#{e.message}\n#{e.backtrace.join("\n")}"
+  rescue IOError => e
+#       log "#{e.message}\n#{e.backtrace.join("\n")}"
+#       raise
+  end
+  
+  def with_session
+    return unless block_given?
+    yield session = create_session
+  ensure
+    session.close
+  end
+  
+  def create_session
+    session = Session.send(:new, self)
+    @port.write(message: 'create_session', session_id: session.id)
+    @session_queues[session.id] = Queue.new
+    session
+  end
+  
+  def close
+    log "session manager: closing #{@port.inspect}"
+  end
+
+  private
+      
+  def close_session(session)
+    log "closing session: #{session.id} on #{@port.inspect}"
+    @session_queues.delete(session.id)
+  end
+  
+  def read_session(session)
+    fail "No queue for #{session.inspect}" if (queue = @session_queues[session.id]).nil?
+    fail EOFError if queue.empty? && @port.closed?
+    queue.pop
+  end
+  
+  def write_session(session, object)
+    @port.write(message: 'message_session', session_id: session.id, payload: object)
+  end
+  
+  private
+  def self.log(message)
+    $stderr.print "#{message}\n" if false
+  end
+  def log(message)
+    self.class.log(message)
+  end
+end
+end ; end ; end

data/lib/rake/subproject/server/task.rb

@@ -0,0 +1,47 @@
+require 'rake'
+require 'json'
+
+require_relative 'port'
+require_relative 'session'
+require_relative 'session_manager'
+
+Rake::Task.define_task(:'subproject:server:start', [:fd]) do |t, args|
+  include Rake::Subproject::Server
+  Port.open(args[:fd].to_i, 'r+') do |port|
+
+    def log(message)
+      $stderr.print "#{message}\n" if false
+    end
+
+    port.name = "server"
+    log "Starting server on #{port.inspect}\n"
+
+    SessionManager.with_each_session(port) do |session|
+
+      log "Received session"
+      request = session.read
+      message = request['message']
+
+      log "Got message: '#{message}'"
+      next unless message == 'invoke_task'
+
+      task_name = request['name']
+      log "Got task name: '#{task_name}'"
+
+      task_args = request['args']
+
+      log "Got task args: '#{task_args}'"
+
+      begin
+        log "Executing task #{task_name}"
+        Rake::Task[task_name].invoke(*task_args['array'])
+        log "#{task_name} complete!"
+        session.write(message: 'task_complete')
+      rescue RuntimeError => e
+        session.write(message: 'task_failed', exception:{message: e.message, backtrace: e.backtrace})
+      ensure
+        session.close
+      end
+    end
+  end
+end

data/lib/rake/subproject/task_manager.rb

@@ -1,39 +1,28 @@
-require "rake/subproject/version"
+module Rake::Subproject
+  module TaskManager
 
-module Rake::Subproject::TaskManager
-  class RakeRunner
-    include FileUtils
-
-    def run(*args)
-      ruby '-S', 'rake', *args
+    def define_subproject(path)
+      return if runners[path]
+      runners[path] = Rake::Subproject::TaskRunner.new(path)
     end
-  end
 
-  def define_subproject(path)
-    subprojects << path
-    subproject_semaphores[path] ||= Mutex.new
-  end
-
-  def subprojects
-    @subprojects ||= Set.new
-  end
-
-  def [](task_name, scopes=nil)
-    self.lookup(task_name, scopes) or 
-    subprojects.each do |subproject|
-      task_name.match /^#{subproject}[\/\:](.*)/ do |md|
-        return Rake::Task.define_task task_name do |t|
-          subproject_semaphores[subproject].synchronize do
-            RakeRunner.new.run md[1], {chdir: subproject}, {verbose: false}
+    def [](task_name, scopes=nil)
+      self.lookup(task_name, scopes) or 
+      runners.each do |dir, subproject|
+        task_name.match /^#{dir}[\/\:](.*)/ do |md|
+        # Here, we need a remote task class that can receive the 
+          return Rake::Task.define_task task_name do |t, args|
+            subproject.invoke_task(md[1], args)
           end
         end
       end
+      super
     end
-    super
-  end
-  private
 
-  def subproject_semaphores
-    @subproject_semaphores ||= {}.extend(MonitorMixin)
+    private
+
+    def runners
+      @runners ||= {}
+    end
   end
 end

data/lib/rake/subproject/task_runner.rb

@@ -0,0 +1,58 @@
+require 'json'
+module Rake::Subproject
+  class TaskRunner
+    attr_reader :directory
+
+    include FileUtils
+    include Rake::Subproject::Client
+    
+    def initialize(directory)
+      @directory = directory
+      @@rake_env ||= ARGV.each_with_object({}) do |arg, hash|
+        hash[$1] = $2 if arg =~ /^(\w+)=(.*)$/m
+      end
+      
+      child_socket, parent_socket  = Socket.pair(:UNIX, :STREAM, 0)
+      port = Port.new(parent_socket, "client")
+      @session_manager = SessionManager.new(port)
+      thread = Thread.new { @session_manager.start } 
+      at_exit do
+        @session_manager.close
+        port.close
+        thread.join
+      end
+
+      Bundler.with_clean_env do
+        @server_pid = Process.spawn(
+          "bundle", "exec", "--keep-file-descriptors",
+          "rake",
+            # Do not search parent directories for the Rakefile.
+          "--no-search",
+            # Include LIBDIR in the search path for required modules.
+          "--libdir", File.dirname(__FILE__)+ "/server",
+            # Require MODULE before executing rakefile.
+          "-r", "task", "subproject:server:start[#{child_socket.fileno}]",
+          {child_socket.fileno => child_socket, :chdir => @directory})
+      end
+      child_socket.close
+    end
+    
+    def invoke_task(name, args)
+      log "TaskRunner#invoke_task: #{name} with #{args}"
+      session = @session_manager.with_session do |session|
+        session.write(message: 'invoke_task', name: name, args: {hash: args.to_hash, array: args.to_a})
+        response = session.read
+        if (response['message'] == 'task_failed')
+          e = ::RuntimeError.new(response['exception']['message'])
+          e.set_backtrace(response['exception']['backtrace'] + Thread.current.backtrace)
+          raise e
+        end
+      end
+    end
+
+    private
+    def log(message)
+      $stderr.print "#{message}\n" if false
+    end
+  end
+end

data/lib/rake/subproject/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Subproject
-    VERSION = "0.0.1"
+    VERSION = "0.0.5"
   end
 end

data/rake-subproject.gemspec

@@ -1,7 +1,8 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rake/subproject/version'
+# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "#{lib}/rake/subproject/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rake-subproject"
@@ -13,11 +14,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.start_with?('resources/')
+  end + Dir["lib/rake/subproject/{client,server}/*.rb"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
+  
+  spec.required_ruby_version = '~> 2.0'
+  
   spec.add_runtime_dependency "rake"
 
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-subproject
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,15 +59,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rake/subproject.rb
+- lib/rake/subproject/client/port.rb
+- lib/rake/subproject/client/session.rb
+- lib/rake/subproject/client/session_manager.rb
 - lib/rake/subproject/ext/application.rb
 - lib/rake/subproject/ext/dsl.rb
+- lib/rake/subproject/server/port.rb
+- lib/rake/subproject/server/session.rb
+- lib/rake/subproject/server/session_manager.rb
+- lib/rake/subproject/server/task.rb
 - lib/rake/subproject/task_manager.rb
+- lib/rake/subproject/task_runner.rb
 - lib/rake/subproject/version.rb
 - rake-subproject.gemspec
 - spec/rake/subproject_spec.rb
@@ -82,9 +90,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='

data/Gemfile.lock

@@ -1,27 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rake-subproject (0.0.1)
-      rake
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rake (10.2.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  rake-subproject!
-  rspec