rake-subproject 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFiN2QzYzg4OTFkYjk1NmQxNzI3N2U3MTZhNTk1ZGJlZThlOGM3YQ==
+    ZjU1ZjYyZDg0ZGQzODYwZmQxNTAyMTMxN2RmZWRiYTdlYjg4NTAzYw==
   data.tar.gz: !binary |-
-    MzQ2M2E3ZjBkMWQ0NzQ2OTFkM2QwN2Q3MTQzZTMxNWNhMzU1YTM3Zg==
+    ZTg4OTI4NTQzNzE5MzNhOGU4YzljM2YxZTExOTY2NzQwOWJlMjJiNw==
 SHA512:
   metadata.gz: !binary |-
-    YmViZmRiMDQxOWJhYjIzZTIxNDgwYzc3NDBhYjc0ZjFhYTYzNWZmNWQyYzUw
-    OGU5YjY1MzJiOTliM2IwMWQ4MWFjN2Y2OWY5ZWQ3YmU1MjE2ZGQxNTBiZWNi
-    YzdiNzZhYzdhYThlNzdiNDIxOTQwYWQ0M2Y5YjYyZWJmYzA5ZWM=
+    OGYyYmExYWFiYjQ5M2JiMDEyYzRkZTU3ODEwZjhjODE4YTBhYTMwNWU4M2Mx
+    NmZmMjRmYmUzNGFkZTA0NjgzZjhlMmY0M2Y4ZmEyYjYxMDYwM2JiOWJiYmU1
+    NTI5N2FlNGRlNjZiYjY3ODk5Mzc0ODNiZjI0OGIyZjFkMWFmNzA=
   data.tar.gz: !binary |-
-    OWQwOGRkZDZiYWExZGU4NzZiNjJkZGUyYjI1N2YzMTkyNGQxMzdjMTJmYTc0
-    NDlhZWM2NTM1MmNiNDVjNThkZDExNmQ4N2UxMzVlOWIxNzA0MTgyYWJkYzIx
-    ZDI0YTFiNDczOTJhZDI2MGQzYjgwYWU3YmUyMDkwNzNkNmE0OWU=
+    ZTNlZjVlNmYxZmMxMzkwYTZjY2E5YzVmMzJkYjY2MWM1ZDU2MWU3ZTQ5ZjU1
+    MmMzYjZjNjM0NWQ1MTFlNzgwMzQ5YzU2NzVmYWNmYzdlZjBjZGRiNGM5NjA2
+    NjU3ZTA2ZjVkYzkzNTgyZmExOGYyMmM2ODlmOGQwNDZhMjI0MmI=

data/lib/rake/subproject.rb

@@ -10,5 +10,6 @@ require 'rake/subproject/client/session'
 require 'rake/subproject/client/port'
 require 'rake/subproject/task_runner'
 require 'rake/subproject/task_manager'
+require 'rake/subproject/error'
 require 'rake/subproject/ext/application'
 require 'rake/subproject/ext/dsl'

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

@@ -59,7 +59,7 @@ class SessionManager
     return unless block_given?
     yield session = create_session
   ensure
-    session.close
+    session.close unless session.nil?
   end
   
   def create_session

data/lib/rake/subproject/error.rb

@@ -0,0 +1,4 @@
+module Rake::Subproject
+  class Error < StandardError
+  end
+end

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

@@ -59,7 +59,7 @@ class SessionManager
     return unless block_given?
     yield session = create_session
   ensure
-    session.close
+    session.close unless session.nil?
   end
   
   def create_session

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

@@ -9,6 +9,12 @@ Rake::Task.define_task(:'subproject:server:start', [:fd]) do |t, args|
   include Rake::Subproject::Server
   Port.open(args[:fd].to_i, 'r+') do |port|
 
+    ['TERM', 'KILL', 'INT'].each do |sig|
+      Signal.trap(sig) do
+        port.close ; exit
+      end
+    end
+    
     def log(message)
       $stderr.print "#{message}\n" if false
     end

data/lib/rake/subproject/task_manager.rb

@@ -2,8 +2,12 @@ module Rake::Subproject
   module TaskManager
 
     def define_subproject(path)
+      raise "Subproject path '#{path}' does not exist" unless File.exist?(path)
+
+      directory = File.directory?(path) ? path : File.dirname(path)
+
       return if runners[path]
-      runners[path] = Rake::Subproject::TaskRunner.new(path)
+      runners[directory] = Rake::Subproject::TaskRunner.new(path)
     end
 
     def [](task_name, scopes=nil)

data/lib/rake/subproject/task_runner.rb

@@ -6,8 +6,15 @@ module Rake::Subproject
     include FileUtils
     include Rake::Subproject::Client
     
-    def initialize(directory)
-      @directory = directory
+    def initialize(path)
+      raise "Subproject path '#{path}' does not exist" unless File.exist?(path)
+      if File.directory?(path)
+        @directory = path
+      else
+        rakefile = path
+        @directory = File.dirname(path)
+      end
+
       @@rake_env ||= ARGV.each_with_object({}) do |arg, hash|
         hash[$1] = $2 if arg =~ /^(\w+)=(.*)$/m
       end
@@ -16,14 +23,14 @@ module Rake::Subproject
       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(
+      rake_args = [
           "bundle", "exec", "--keep-file-descriptors",
           "rake",
             # Do not search parent directories for the Rakefile.
@@ -32,8 +39,21 @@ module Rake::Subproject
           "--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})
+          
+      ]
+      rake_args = rake_args + ['--rakefile', File.basename(rakefile)] unless rakefile.nil?
+      rake_args << {child_socket.fileno => child_socket, :chdir => @directory}
+
+      Bundler.with_clean_env do
+        @server_pid = Process.spawn(*rake_args)
       end
+
+      ['TERM', 'KILL', 'INT'].each do |sig|
+        Signal.trap(sig) do
+          Process.kill(sig, @server_pid)
+        end
+      end
+      
       child_socket.close
     end
     
@@ -43,7 +63,7 @@ module Rake::Subproject
         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 = ::Rake::Subproject::Error.new(response['exception']['message'])
           e.set_backtrace(response['exception']['backtrace'] + Thread.current.backtrace)
           raise e
         end

data/lib/rake/subproject/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-subproject
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michael Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,6 +68,7 @@ files:
 - lib/rake/subproject/client/port.rb
 - lib/rake/subproject/client/session.rb
 - lib/rake/subproject/client/session_manager.rb
+- lib/rake/subproject/error.rb
 - lib/rake/subproject/ext/application.rb
 - lib/rake/subproject/ext/dsl.rb
 - lib/rake/subproject/server/port.rb