superscript 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b7dee019db4e0c13b9a654eac37c84d4e736254709b2423726ecc8e559ecbe
-  data.tar.gz: 7b7e43e336d1c7ab0a2a60eb1947efcc0afcdc3115f5b5de3f61a950b1dbd4fa
+  metadata.gz: 05b27edffef105a196cb8786e25e3079cc8b3c612f4963f8ba3792db2bc4a5fa
+  data.tar.gz: 470039bbf662e48148d9b3f664b9b22624b116113c44b8a5a15c58c666aea8f3
 SHA512:
-  metadata.gz: 51d7792af18af63fe4f37a18f99d60faa1a231e36c11ae778c11045b568b541ee4d920e63d757344a9e82b551b3969fbc5a24691afdefdb092d6f466ca90ed4b
-  data.tar.gz: 24c1e948e23287751a7a33f6905cba77c20b6ec8672b2b468e4148d5766362a9f220aa07b4e29b461de7802cdab828ad30c24bc9d90b50312227347071465563
+  metadata.gz: 6be2215c8cfd8bfb0476c0805eaeca62eb1902fcb01f114de667b2cc0fe2dc700b00e122a6729a1d423c4d7309e4d8c49351dcad894321546dc4e9ae58c41a24
+  data.tar.gz: 44e017dc745a0c216aa881698057b1299a43da81ddcc3652cc9fa65d67e381df26387cc97ba7fa671653571ff3a802cf27162f11863b11843de9a80f9a55e2e9

data/Gemfile.lock

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

data/e2e/dsls/go.rb

@@ -3,10 +3,25 @@ class Go < Superscript::Dsl
     self.say "Go #{args.join(" ")}!"
   end
 
+  def loop &block
+    ::Kernel.loop do
+      block.call
+      sleep 1
+    end
+  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

data/e2e/test.rb

@@ -1 +1,2 @@
-go "gators"
+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,23 @@ 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
+    next if contents == ""
+
+    if contents == nil
+      puts "\n-- press ^D to end input"
+      contents = $stdin.readlines.join("\n")
+    end
+
+    next if contents == ""
+
     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,33 +1,13 @@
-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 :tp_call_superscript
-      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
+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
@@ -36,6 +16,34 @@ 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
@@ -47,6 +55,10 @@ module Superscript
 
     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
 
       disarm! :at_start
       trace = TracePoint.new do |tp|
@@ -74,7 +86,7 @@ module Superscript
 
         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")
@@ -85,22 +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
+          # 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_class
+            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"
@@ -121,13 +147,18 @@ 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
-            ::Superscript.error :tp_call_superscript
+            error! :tp_call_superscript
           end
           # disable if calling some other file
           # but do not allow call to Superscript.error etc
@@ -157,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.5.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superscript
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matti Paksula
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ homepage: https://github.com/matti/superscript
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: superscript
 test_files: []