superscript 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac52387838919d5e3aca631bd1d4f01a3e95388cf9606089f2a68af59194a10e
-  data.tar.gz: 57ad91b5dbe5520d2b1e5e1b90f1a697f75459eaa46431b207ccb9c0bdb50d3d
+  metadata.gz: 1b9eb09b767191fff8dbd2b482c5b39ed0fe6a05d58604544e0e6c8d3db05660
+  data.tar.gz: 7a4e5dbb72eaa3c7e663ece42ca090116ae58f222309fb5d900408873bf7cb6e
 SHA512:
-  metadata.gz: b96b4bfac46ace0e24b3b07e60b7b66871f0ad1bb9fe26bb41913b1e56caed4b08a9077121ec1f3adf1dde48d23a318857ca10dd1a97af38de78f5523990f56f
-  data.tar.gz: 162333d3db399c975ededd7892376c3bc6cff253af6482247a56c32dda0f50aaa110fd7877a50b8d8829da35cfcc642146b670500757ee8ca5bc16c451fa27d3
+  metadata.gz: ad60a7b3cbfea6f5f45438afa190dd8dbe2be4f200355f345486643ba3368f3133e5639cd74b0728ba5ab7be20a8ac0eadfa94b7bf8555d174db0bf570f13b42
+  data.tar.gz: 5d539f831d963e171ab9d6d4e7050b6ccf5af35c0358e46d188d27a3953e872b43adb9760c615d7ed73ad5d9472adbb76450167956d58d62306acb59550f8836

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superscript (0.3.3)
+    superscript (0.4.1)
 
 GEM
   remote: https://rubygems.org/

data/e2e/dsls/go.rb

@@ -3,6 +3,10 @@ class Go < Superscript::Dsl
     puts "Go #{args.join(" ")}"
   end
 
+  def explode!
+    asdf
+  end
+
   def exit
     Kernel.exit
   end

data/e2e/test.rb

@@ -1 +1,3 @@
 go "gators"
+
+explode!

data/lib/superscript/ctx.rb

@@ -1,8 +1,7 @@
 module Superscript
   class Ctx
     def method_missing(*args)
-      puts "Error: No such command or variable '#{args.first}'"
-      exit 1
+      ::Superscript.error :ctx_method_missing, "No such command or variable '#{args.first}'"
     end
   end
 end

data/lib/superscript/runner.rb

@@ -1,4 +1,29 @@
 module Superscript
+  def self.error(where, *args)
+    puts "-- [ superscript error ] --"
+    error_message = ""
+    case where
+    when :exception
+      exception = args.first
+      pp exception
+      pp exception.backtrace_locations
+      error_message = exception
+    when :ctx_method_missing, :tp_singleton_method_added, :tp_command_not_found
+      error_message = args.first
+    when :tp_class_define, :tp_module_define
+      error_message = args.first
+    else
+      pp [:unknown_where, where, args]
+      error_message = args.join(" ")
+    end
+
+    puts error_message
+    if ENV["SUPERSCRIPT_ERROR_EXEC"]
+      error_exec_pid = spawn ENV["SUPERSCRIPT_ERROR_EXEC"], error_message
+      Process.wait error_exec_pid
+    end
+    exit 1
+  end
   class Runner
     def initialize path=nil
       @path = if path
@@ -29,24 +54,67 @@ module Superscript
           @armed = true
         end
 
+        # when returns to execute our script, always force armed
+        if tp.path == @path
+          @armed = true
+        end
+
         next unless @armed
 
         case tp.event
+        when :class
+          ::Superscript.error :tp_module_define, "Defining modules is not allowed"
         when :line
-          puts "< " + contents.split("\n")[tp.lineno - 1]
+          lines = if tp.path == "<interactive>"
+            contents.split("\n")
+          else
+            File.read(tp.path).split("\n")
+          end
+
+          line = lines[tp.lineno-1].lstrip
+          puts "< #{tp.path}:#{tp.lineno-1}"
+          puts line
         when :c_call
-          next if ["String","Float", "Integer"].include? tp.defined_class.name
+          # allow calls to these classes
+          next if ["Array", "String","Float", "Integer"].include? tp.defined_class.name
+
           case tp.method_id
           when :singleton_method_added
-            puts "Error: Deffining methods is not allowed"
             trace.disable
-            exit 1
+            ::Superscript.error :tp_singleton_method_added, "Deffining methods is not allowed"
           else
-            puts "Error: Command not found '#{tp.method_id}'"
             trace.disable
-            exit 1
+            case tp.defined_class.name
+            when "Class"
+              ::Superscript.error :tp_class_define, "Defining classes is not allowed"
+            else
+              class_name = case tp.defined_class.inspect
+              when "Kernel"
+                "Kernel"
+              when "Module"
+                "Module"
+              when "Exception"
+                "Exception"
+              else
+                class_name_matches = tp.defined_class.inspect.match(/^#<.*:(.*)>$/)
+                class_name_matches[1]
+              end
+
+              command_name = case class_name
+              when "Kernel", "Module", "Exception"
+                tp.method_id
+              else
+                "#{class_name}.#{tp.method_id}"
+              end
+
+              ::Superscript.error :tp_command_not_found, "Command not found '#{command_name}'"
+            end
           end
         when :call
+          # disable if calling some other file
+          unless tp.path == @path
+            @armed = false
+          end
           if tp.defined_class.ancestors.include? Superscript::Ctx
             @armed = false
           end
@@ -66,7 +134,7 @@ module Superscript
           print "#{@path}:#{ex.backtrace_locations.first.lineno} "
           puts ex.message.split(" for ").first
         else
-          p [:exception, ex]
+          ::Superscript.error :exception, ex
         end
       ensure
         trace.disable

data/lib/superscript/version.rb

@@ -1,3 +1,3 @@
 module Superscript
-  VERSION = "0.3.3"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superscript
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: superscript