instant 0.0.2 → 0.0.3

data/Gemfile

@@ -5,7 +5,7 @@ gem "ruby_parser", "~> 2.3.1"
 
 group :development do
   gem "rspec", "~> 2.9.0"
-  gem "rake", "~> 1.1"
+  gem "rake"
   gem "echoe"
   gem "autotest"
   gem "pry"

data/README.md

@@ -4,15 +4,6 @@ An experiment on real time visualize development tool, inspired by
 [Bret Victor's Inventing on Principle](http://vimeo.com/36579366) 
 talk and [@ermau  C# Implementation](https://github.com/ermau/Instant).
 
-## Install as gem
-
-    gem install instant
-    
-    require 'instant'
-    
-    runner = Instant::Runner.new
-    runner.run "def hello(a); a = 10 + a; end; hello(20)"
-
 ## Run a demo
 
 ![](http://f.cl.ly/items/0m2o252A3n1C032R2s0X/%E8%9E%A2%E5%B9%95%E5%BF%AB%E7%85%A7%202012-04-19%20%E4%B8%8A%E5%8D%8812.23.58.png)
@@ -21,11 +12,29 @@ You can run it live at [instant-ruby.herokuapp.com](http://instant-ruby.herokuap
 
 ## Run locally
 
+First clone the source code from [github.com/siuying/instant](https://github.com/siuying/instant).
+
+In the app folder, run following commands:
+
     bundle install
     foreman start
     
 then open your browser at http://127.0.0.1:5000/
 
+## Install as gem
+
+Install the Gem:
+
+    gem install instant
+    
+Then in your program:
+    
+    require 'rubygems'
+    require 'instant'
+    
+    runner = Instant::Runner.new
+    runner.run "def hello(a); a = 10 + a; end; hello(20)"
+
 ## Credits
 
 - [Bret Victor's Inventing on Principle](http://vimeo.com/36579366) - this talk is just eyes opening!

data/instant.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "instant"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Chong"]
-  s.date = "2012-04-19"
+  s.date = "2012-04-22"
   s.description = "An experiment on real time visualize development tool."
   s.email = "francis@ignition.hk"
   s.extra_rdoc_files = ["README.md", "lib/instant.rb", "lib/instant/context.rb", "lib/instant/processor.rb", "lib/instant/runner.rb", "lib/instant/version.rb"]

data/lib/instant/runner.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'timeout'
 
 module Instant
   class Runner
@@ -6,13 +7,16 @@ module Instant
       @processor = processor
     end
 
-    def run(source)      
+    def run(source, timeout=1)      
       begin
         @processed = @processor.process(source)
         context = Context.new
-        
-        begin
-          return_value = context.instance_eval(@processed)
+        return_value = nil
+
+        begin          
+          Timeout::timeout(timeout) do
+            return_value = context.instance_eval(@processed)
+          end
         ensure
           context.close
         end
@@ -23,6 +27,8 @@ module Instant
         {:status => :error, :cause => :parse_error, :message => format_error(e), :result => context.to_s }
       rescue Instant::LoopTooDeepError => e
         {:status => :error, :cause => :loop_too_deep, :message => "Loop too deep", :result => context.to_s }
+      rescue Timeout::Error => e
+        {:status => :error, :cause => :timeout, :message => "Timeout: code take more than #{timeout}s to run.", :result => context.to_s }
       rescue StandardError => e
         {:status => :error, :cause => :unknown, :message => format_error(e), :result => context.to_s }        
       end

data/lib/instant/version.rb

@@ -1,3 +1,3 @@
 module Instant
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/instant/runner_spec.rb

@@ -57,7 +57,6 @@ describe Instant::Runner do
       result = runner.run(source)
       result[:status].should == :ok
       results = result[:result].split("\n")
-      puts results
 
       results.length.should == 4
 
@@ -65,6 +64,21 @@ describe Instant::Runner do
       results[1].strip.should =~ /i        =   2/
       results[2].strip.should =~ /k        =   0  | -1  | -2  | -3  | -4/
       results[3].strip.should =~ /i        =   0  |  1  |  2  |  3  |  4/
-    end    
+    end
+    
+    it "should guard against slow code" do
+      source = "def hello
+    k = 1
+    sleep(10)
+  end; hello"
+
+      runner = Instant::Runner.new
+      result = runner.run(source)
+      result[:status].should == :error
+      result[:cause].should == :timeout
+
+      results = result[:result].split("\n")
+      results[0].strip.should =~ /k        =   1/
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instant
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &70096086954740 !ruby/object:Gem::Requirement
+  requirement: &70272864264440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096086954740
+  version_requirements: *70272864264440
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70096086954240 !ruby/object:Gem::Requirement
+  requirement: &70272864263620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096086954240
+  version_requirements: *70272864263620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096086953720 !ruby/object:Gem::Requirement
+  requirement: &70272864263040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70096086953720
+  version_requirements: *70272864263040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70096086953200 !ruby/object:Gem::Requirement
+  requirement: &70272864262320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70096086953200
+  version_requirements: *70272864262320
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &70096086952740 !ruby/object:Gem::Requirement
+  requirement: &70272864261780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096086952740
+  version_requirements: *70272864261780
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70096086952280 !ruby/object:Gem::Requirement
+  requirement: &70272864260820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096086952280
+  version_requirements: *70272864260820
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70096086951760 !ruby/object:Gem::Requirement
+  requirement: &70272864259600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096086951760
+  version_requirements: *70272864259600
 description: An experiment on real time visualize development tool.
 email: francis@ignition.hk
 executables: []