secure 0.1.1 → 0.2.0

data/Rakefile

@@ -1,12 +1,11 @@
 require 'bundler/gem_tasks'
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts << "--colour --format specdoc --loadby mtime --reverse"
-  t.spec_opts << "-r spec/spec_helper"
-  t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.rspec_opts = "--colour --format documentation -r spec/spec_helper"
+  t.pattern = 'spec/**/*.rb'
 end
 
 task :default => :spec

data/lib/secure.rb

@@ -9,9 +9,12 @@ require "secure/runner"
 module Secure
   class << self
     def run(opts = {}, *args)
-      Runner.new(opts).run do
-        yield *args
+      response = Runner.new(opts, *args).run do |*a|
+        yield *a
       end
+
+      raise response.error unless response.success?
+      response.value
     end
 
     alias :ly :run

data/lib/secure/runner.rb

@@ -1,7 +1,8 @@
 module Secure
   class Runner
-    def initialize(opts)
+    def initialize(opts = {}, *args)
       @opts = opts
+      @args = args
     end
 
     def run
@@ -9,7 +10,7 @@ module Secure
 
       child = fork do
         begin
-          ChildProcess.new(@opts, read_file, write_file).execute { yield }
+          ChildProcess.new(@opts, read_file, write_file).execute { yield *@args }
         ensure
           exit
         end

data/lib/secure/version.rb

@@ -1,3 +1,3 @@
 module Secure
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/secure.gemspec

@@ -17,4 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('rake')
 end

data/spec/secure/runner_spec.rb

@@ -0,0 +1,107 @@
+module Secure
+  describe Runner do
+    it "should execute normal code as expected" do
+      response = Runner.new.run do
+        4 + 4
+      end
+      response.should be_success
+      response.value.should == 8
+    end
+
+    it "should kill all threads after running" do
+      response = Runner.new.run do
+        10
+      end
+      response.should be_success
+      Thread.list.should have(1).things
+    end
+
+    it "should take parameters" do
+      response = Runner.new({}, 4, 2).run do |a, b|
+        a + b
+      end
+      response.should be_success
+      response.value.should == 6
+    end
+
+    context "safe value" do
+      it "should be set to 3" do
+        response = Runner.new.run do
+          $SAFE
+        end
+        response.should be_success
+        response.value.should == 3
+      end
+
+      it "should not be affected in the parent thread" do
+        response = Runner.new.run {}
+        response.should be_success
+        $SAFE.should == 0
+      end
+    end
+
+    context "security violations" do
+      it "should not allow an eval to be called" do
+        response = Runner.new.run do
+          eval "45"
+        end
+        response.should_not be_success
+        response.error.should be_a(SecurityError)
+      end
+
+      it "should not allow system calls" do
+        response = Runner.new.run do
+          system("echo hi")
+        end
+        response.should_not be_success
+        response.error.should be_a(SecurityError)
+      end
+
+      it "should kill infinite loops" do
+        response = Runner.new(:timeout => 0.005).run do
+          while true; end
+        end
+        response.should_not be_success
+        response.error.should be_a(Secure::TimeoutError)
+      end
+
+      it "should not be able to open a file" do
+        response = Runner.new.run do
+          File.open("/etc/passwd")
+        end
+        response.should_not be_success
+        response.error.should be_a(SecurityError)
+      end
+    end
+
+    context "allowed syntax" do
+      it "should allow eval on an untainted string" do
+        string = "45".untaint
+        response = Runner.new({}, string).run do |str|
+          eval(str)
+        end
+        response.should be_success
+        response.value.should == 45
+      end
+
+      it "should be able to read from an open file" do
+        file = File.open("/etc/hosts")
+        response = Runner.new({}, file).run do |file|
+          file.readline
+        end
+        response.should be_success
+      end
+    end
+
+    context "error information" do
+      it "should know where the syntax is invalid" do
+        string = "while true; end; end"
+        response = Runner.new({}, string).run do |string|
+          eval(string)
+        end
+        response.should_not be_success
+        response.error.should be_a(SyntaxError)
+      end
+    end
+  end
+end

data/spec/secure_spec.rb

@@ -1,105 +1,11 @@
 describe Secure do
-  it "should execute normal code as expected" do
-    response = Secure.ly do
-      4 + 4
-    end
-    response.should be_success
-    response.value.should == 8
-  end
-
-  it "should kill all threads after running" do
-    response = Secure.ly do
-      10
-    end
-    response.should be_success
-    Thread.list.should have(1).things
-  end
-
-  it "should take parameters" do
-    response = Secure.ly({}, 4, 2) do |a, b|
+  it "should execute a block with params" do
+    Secure.ly({}, 4, 2) do |a, b|
       a + b
-    end
-    response.should be_success
-    response.value.should == 6
-  end
-
-  context "safe value" do
-    it "should be set to 3" do
-      response = Secure.ly do
-        $SAFE
-      end
-      response.should be_success
-      response.value.should == 3
-    end
-
-    it "should not be affected in the parent thread" do
-      response = Secure.ly {}
-      response.should be_success
-      $SAFE.should == 0
-    end
-  end
-
-  context "security violations" do
-    it "should not allow an eval to be called" do
-      response = Secure.ly do
-        eval "45"
-      end
-      response.should_not be_success
-      response.error.should be_a(SecurityError)
-    end
-
-    it "should not allow system calls" do
-      response = Secure.ly do
-        system("echo hi")
-      end
-      response.should_not be_success
-      response.error.should be_a(SecurityError)
-    end
-
-    it "should kill infinite loops" do
-      response = Secure.ly :timeout => 0.005 do
-        while true; end
-      end
-      response.should_not be_success
-      response.error.should be_a(Secure::TimeoutError)
-    end
-
-    it "should not be able to open a file" do
-      response = Secure.ly do
-        File.open("/etc/passwd")
-      end
-      response.should_not be_success
-      response.error.should be_a(SecurityError)
-    end
-  end
-
-  context "allowed syntax" do
-    it "should allow eval on an untainted string" do
-      string = "45".untaint
-      response = Secure.ly({}, string) do |str|
-        eval(str)
-      end
-      response.should be_success
-      response.value.should == 45
-    end
-
-    it "should be able to read from an open file" do
-      file = File.open("/etc/hosts")
-      response = Secure.ly({}, file) do |file|
-        file.readline
-      end
-      response.should be_success
-    end
+    end.should eq(6)
   end
 
-  context "error information" do
-    it "should know where the syntax is invalid" do
-      string = "while true; end; end"
-      response = Secure.ly({}, string) do |string|
-        eval(string)
-      end
-      response.should_not be_success
-      response.error.should be_a(SyntaxError)
-    end
+  it "should throw an exception if block fails" do
+    lambda { Secure.ly(:timeout => 0.1) { while true; end } }.should raise_error(Secure::TimeoutError)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: secure
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tejas Dinkar
@@ -15,10 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +05:30
+date: 2011-09-02 00:00:00 +05:30
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: see summary
 email: 
 - tejas@gja.in
@@ -42,6 +69,7 @@ files:
 - lib/secure/version.rb
 - secure.gemspec
 - spec/secure/response_spec.rb
+- spec/secure/runner_spec.rb
 - spec/secure_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -80,5 +108,6 @@ specification_version: 3
 summary: gem to do things securely using ruby $SAFE
 test_files: 
 - spec/secure/response_spec.rb
+- spec/secure/runner_spec.rb
 - spec/secure_spec.rb
 - spec/spec_helper.rb