dia 1.1 → 1.2.pre

data/HACKING.md

@@ -0,0 +1,7 @@
+## Git policy
+
+* "master" should always be in a _working state_, so no experimental code ..
+* Pre releases should never be merged into "master", but should stay in experimental .. 
+* The experimental branch is the _one and only_ gateway to being merged into master ..  
+  So, if you're working on a feature, branch off from experimental, merge back into experimental, and when deemed stable experimental
+  will be merged into master ..

data/NEWS.md

@@ -1,9 +1,14 @@
 ## NEWS
+### 1.2.pre
+* I've decided to use Dia::Sandbox instead of Dia::SandBox but it won't be removed until 1.3 .. (Deprecated for 1.2)
+* I've decided to remove the explicit exit() call in a sandbox spawned with run\_with\_block .. (Introduced in 1.1 Final)
+* Added Dia::Sandbox#terminate for terminating a sandbox.
+* Process.detach(*sandbox pid*) is used in the parent process that spawns a sandbox to avoid collecting zombies ..
 
 ### 1.1 (final)
 * Dia::SandBox#run\_with\_block will exit the child process spawned by itself incase the user forgets to ..
 
-* Added some tests for Dia::SandBox.new#run\_with\_block ..  
+* Added some tests for Dia::Sandbox.new#run\_with\_block ..  
   We ain't got full coverage but we're getting there.
   
 * A person reported that ffi 0.6.0 does not work with dia ..  

data/TODO.md

@@ -0,0 +1,12 @@
+## TODO
+
+### 1.3
+* Deprecate and remove Dia::SandBox in favor of Dia::Sandbox ..
+
+### 1.2
+
+* Remove link to the experimental branch in the gem spec before release.
+
+### 1.2.pre
+
+..

data/lib/dia.rb

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), 'dia/commonapi.rb')
 require File.join(File.dirname(__FILE__), 'dia/sandbox.rb')
 
 module Dia
+  VERSION = '1.2.pre'
   class SandBoxException < StandardError; end
 end
 

data/lib/dia/sandbox.rb

@@ -4,6 +4,9 @@ module Dia
   
     include Dia::CommonAPI
     
+    # We're going to deprecate Dia::SandBox in favor of Dia::Sandbox in the next release.
+    Dia::Sandbox = SandBox
+    
     attr_accessor :app_path
     attr_accessor :profile
     attr_accessor :pid
@@ -28,16 +31,18 @@ module Dia
       @pid = fork do
         if ( ret = sandbox_init(@profile, 0x0001, error = FFI::MemoryPointer.new(:pointer)) ) != 0
           raise Dia::SandBoxException, "Couldn't sandbox #{@app_path}, sandbox_init returned #{ret} with error message: '#{error.get_pointer(0).read_string}'"
-        else
-          exec(@app_path)
         end
+        exec(@app_path)
       end
+      
+      # parent ..
+      Process.detach(@pid)
     end
   
     # The run\_with\_block method will spawn a child process and run a supplied block of ruby code in a sandbox.
     #
-    # It may raise any number of exceptions if the sandbox could be initiated ..  
-    # It depends on the restrictions of the sandbox and if the block actually violates a restriction imposed by 
+    # It may raise any number of exceptions if the sandbox could be initiated ..
+    # It depends on the restrictions of the sandbox and if the block violates a restriction imposed by
     # the sandbox .. In any case, the parent process will not be affected and if you want to catch an exception you
     # should do so in your block.
     #
@@ -45,13 +50,23 @@ module Dia
     # @return [Fixnum] The Process ID(PID) that the sandboxed block of code is being run under.
     def run_with_block &blk
       @pid = fork do
-         if ( ret = sandbox_init(@profile, 0x0001, error = FFI::MemoryPointer.new(:pointer)) ) != 0
-           raise Dia::SandBoxException, "Couldn't sandbox #{@app_path}, sandbox_init returned #{ret} with error message: '#{error.get_pointer(0).read_string}'"
-         else
-           yield
-         end
-         exit
+        if ( ret = sandbox_init(@profile, 0x0001, error = FFI::MemoryPointer.new(:pointer)) ) != 0
+          raise Dia::SandBoxException, "Unable to initialize sandbox .. sandbox_init returned #{ret} with error message: '#{error.get_pointer(0).read_string}'"
+        end
+        yield
       end
+      
+      # parent ..
+      Process.detach(@pid)
+    end
+    
+    # The terminate method will send SIGKILL to a process running in a sandbox.
+    # By doing so, it effectively terminates the sandbox.
+    #
+    # @raise  [SystemCallError] It may raise a number of subclasses of SystemCallError if a call to Process.kill was unsuccessful ..
+    # @return [Fixnum]          It will return 1 when successful ..
+    def terminate
+      Process.kill('SIGKILL', @pid)
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dia
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: 1.2.pre
 platform: ruby
 authors: 
 - Robert Gleeson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +00:00
+date: 2010-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- HACKING.md
 - NEWS.md
 - README.md
+- TODO.md
 - lib/dia/commonapi.rb
 - lib/dia/profiles.rb
 - lib/dia/sandbox.rb
@@ -51,25 +53,7 @@ has_rdoc: true
 homepage: 
 licenses: []
 
-post_install_message: |+
-  
-  ----------------------------------------------------------
-  Thanks for taking the time to try out Dia 1.1 (Final)
-  
-  API docs:
-  http://yardoc.org/docs/robgleeson-Dia
-  
-  NEWS & README:
-  http://github.com/robgleeson/Dia/blob/master/NEWS.md
-  http://github.com/robgleeson/Dia/blob/master/README.md
-  
-  IRC:
-  irc.freenode.net / #flowof.info
-  
-  Bug tracker: 
-  http://github.com/robgleeson/dia/issues
-  ----------------------------------------------------------
-  
+post_install_message: "  ********************************************************************\n  Thanks for installing Dia! (1.2.pre)\n  \n  Don't forget to check NEWS.md for what has changed in this release:\n  http://github.com/robgleeson/Dia/blob/experimental/NEWS.md\n  \n  You can chat with us at irc.freenode.net / #flowof.info if you have\n  any problems. Feel free to join us!\n  ********************************************************************\n"
 rdoc_options: []
 
 require_paths: 
@@ -82,9 +66,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []