superscript 0.4.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12ad2456097931fa8ae7d7ceb5870ded64f9f13d4602568e3696b9af55b1ae8
-  data.tar.gz: 920979e9fce25c924a51e83c2b830bafb50532659f2a7fbcb70216dc4e226fa6
+  metadata.gz: 0bc0b05122c192f2a84ec91cadc082732fed684193b8188f8199bba45028325a
+  data.tar.gz: d984d3bf79427a748d7eff8fe5eb52e9be1b79cf8fa4eb2c296876d1e86619e1
 SHA512:
-  metadata.gz: 59c7e83257e769ae2456305fb3c25ae16decc905314a931a1cbf156575775eec38c1ea0c6e30a959868ab58dae48f5e70aa262494e3b75c566bf6b5e3abd9ae6
-  data.tar.gz: da64fb8f666dd4ff92ddc2d54b7cd4940435f4c8f5bbae5729b23b424feab31d98548fa7cc04ead529963b3a78660c0839b9ee343c880c618a0404ccdd222e59
+  metadata.gz: 35ae9ec98919157414db881ab46c8f37038bba5464592539ecb51459d1769d183fa9c734412ca26935444819c0281a8f444d5acbb262bc981511c585a05a439c
+  data.tar.gz: 3d17e452859eaea0861b5971dd7f04077689e7920c446a504b6ecacb4034d4092520ba32f99f2b674071376d736cc0f227575f860ca9622eb06b8d27f74e5aee

data/Gemfile.lock

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

data/e2e/dsls/go.rb

@@ -1,6 +1,22 @@
 class Go < Superscript::Dsl
   def go(*args)
-    puts "Go #{args.join(" ")}"
+    self.say "Go #{args.join(" ")}!"
+  end
+
+  def hang
+    sleep 9999
+  end
+
+  def say(message)
+    puts message
+  end
+
+  def struct
+    Struct.new(:name).new("joe")
+  end
+
+  def now
+    Time.now
   end
 
   def explode!

data/e2e/test.rb

@@ -1,3 +1,2 @@
-go "gators"
-
-explode!
+a = struct
+go a.name

data/exe/superscript

@@ -4,11 +4,18 @@ $stdout.sync = true
 
 require "bundler/setup"
 require "superscript"
+require "optparse"
 
-if ARGV.length == 0
-  puts "USAGE: superscript dsl.rb [script.rb]"
-  exit 1
-end
+options = {
+  methods: false,
+  on_error_exec: nil
+}
+ARGV << "-h" if ARGV.empty?
+
+optparse = OptionParser.new do |opt|
+  opt.on('--allow-methods') { |o| options[:methods] = true }
+  opt.on('--on-error-exec CMD') { |o| options[:on_error_exec] = o }
+end.parse!
 
 best_guess_path = if ARGV[0].start_with? "/"
   ARGV[0]
@@ -22,13 +29,15 @@ ctx_classname = File.basename(ARGV[0]).split(".").first.capitalize
 ctx = (eval "#{ctx_classname}").new
 
 if ARGV[1]
-  runner = Superscript::Runner.new ARGV[1]
+  runner = Superscript::Runner.new ARGV[1], options
   runner.run! ctx
 else
-  runner = Superscript::Runner.new
+  require "readline"
+
+  runner = Superscript::Runner.new nil, options
   loop do
-    print "> "
-    contents = STDIN.gets
+    contents = Readline.readline "> ", true
+
     value = runner.run! ctx, contents: contents
     puts " => #{value.inspect}"
   end

data/lib/superscript/ctx.rb

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

data/lib/superscript/runner.rb

@@ -1,31 +1,14 @@
-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
+Signal.trap "TERM" do
+  exit 0
+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
+module Superscript
   class Runner
-    def initialize path=nil
+    def initialize path=nil, opts={}
+      @methods = opts[:methods] || false
+      @on_error_exec = opts[:on_error_exec]
+
+      @armed = false
       @path = if path
         path
       else
@@ -33,32 +16,77 @@ module Superscript
       end
     end
 
+    def error!(where, *args)
+      puts "-- [ superscript error ] --"
+      error_message = ""
+      case where
+      when :exception
+        exception = args.first
+        error_message = exception
+      when :tp_call_superscript, :tp_call_superscript_global
+        error_message = "Can't touch this"
+      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 @on_error_exec
+        system("#{@on_error_exec} #{error_message}")
+      end
+
+      unless @path == "<interactive>"
+        exit 1
+      end
+    end
+
+    def arm!(reason=nil)
+      p [:arm!, reason] if ENV["SUPERSCRIPT_DEBUG"]
+      @armed = true
+    end
+    def disarm!(reason=nil)
+      p [:disarm!, reason] if ENV["SUPERSCRIPT_DEBUG"]
+      @armed = false
+    end
+
     def run!(ctx, contents:nil)
       contents = File.read(@path) unless contents
+      $__superscript_none_of_yer_business = self
+      ctx.define_singleton_method "method_missing" do |*args|
+        $__superscript_none_of_yer_business.error! :ctx_method_missing, "No such command or variable '#{args.first}'"
+      end
 
-      @armed = false
+      disarm! :at_start
       trace = TracePoint.new do |tp|
         if ENV["SUPERSCRIPT_DEBUG"]
           p [@armed, tp.path, tp.lineno, tp.method_id, tp.event, tp.defined_class]
         end
 
+        if tp.event == :line && tp.path == @path && !@armed
+          arm!
+        end
+
         if tp.defined_class&.name == "BasicObject" && tp.method_id == :instance_eval
           if tp.event == :script_compiled
-            @armed = true
+            arm! :script_compiled
           elsif tp.event == :c_return
-            @armed = false
+            disarm! :script_done
           end
         end
 
-        if tp.event == :return && tp.defined_class.ancestors.include?(Superscript::Ctx)
-          @armed = true
+        if tp.path == @path && tp.event == :return && tp.defined_class.ancestors.include?(Superscript::Ctx)
+          arm! :return_to_script_from_dsl_calling_another_dsl_method
         end
 
         next unless @armed
 
         case tp.event
         when :class
-          ::Superscript.error :tp_module_define, "Defining modules is not allowed"
+          error! :tp_module_define, "Defining modules is not allowed"
         when :line
           lines = if tp.path == "<interactive>"
             contents.split("\n")
@@ -69,19 +97,36 @@ module Superscript
           line = lines[tp.lineno-1].lstrip
           puts "< #{tp.path}:#{tp.lineno-1}"
           puts line
+
+          if line.match(/\$__superscript_none_of_yer_business/)
+            tp.disable
+            error! :tp_call_superscript_global
+          end
         when :c_call
-          # allow calls to these classes
-          next if ["Array", "String","Float", "Integer"].include? tp.defined_class.name
+          # allow calls to these instances
+          if tp.defined_class.ancestors.at(1) == Struct
+            disarm! :safe_instance
+            next
+          end
+          if ["Array", "String","Float", "Integer"].include? tp.defined_class.name
+            disarm! :safe_instance
+            next
+          end
 
           case tp.method_id
           when :singleton_method_added
+            if @methods
+              next
+            end
+            trace.disable
+            error! :tp_singleton_method_added, "Deffining methods is not allowed"
+          when :method_missing
             trace.disable
-            ::Superscript.error :tp_singleton_method_added, "Deffining methods is not allowed"
           else
             trace.disable
             case tp.defined_class.name
             when "Class"
-              ::Superscript.error :tp_class_define, "Defining classes is not allowed"
+              error! :tp_class_define, "Defining classes is not allowed"
             else
               class_name = case tp.defined_class.inspect
               when "Kernel"
@@ -102,17 +147,31 @@ module Superscript
                 "#{class_name}.#{tp.method_id}"
               end
 
-              ::Superscript.error :tp_command_not_found, "Command not found '#{command_name}'"
+              error! :tp_command_not_found, "Command not found '#{command_name}'"
             end
           end
         when :call
+          if tp.method_id == :method_missing
+            tp.disable
+            next
+          end
+
+          if tp.defined_class.ancestors.first.to_s == "#<Class:Superscript>"
+            tp.disable
+            error! :tp_call_superscript
+          end
           # disable if calling some other file
-          unless tp.path == @path
-            @armed = false
+          # but do not allow call to Superscript.error etc
+          if tp.path != @path
+            disarm! :calling_other_file
           end
-          if tp.defined_class.ancestors.include? Superscript::Ctx
-            @armed = false
+          tp.defined_class.ancestors.each do |ancestor|
+            if ancestor.to_s == "Superscript::Dsl"
+              disarm! :dsl_method
+              break
+            end
           end
+
         end
       end
 
@@ -129,7 +188,7 @@ module Superscript
           print "#{@path}:#{ex.backtrace_locations.first.lineno} "
           puts ex.message.split(" for ").first
         else
-          ::Superscript.error :exception, ex
+          error! :exception, ex
         end
       ensure
         trace.disable

data/lib/superscript/version.rb

@@ -1,3 +1,3 @@
 module Superscript
-  VERSION = "0.4.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superscript
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler