superscript 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b7dee019db4e0c13b9a654eac37c84d4e736254709b2423726ecc8e559ecbe
-  data.tar.gz: 7b7e43e336d1c7ab0a2a60eb1947efcc0afcdc3115f5b5de3f61a950b1dbd4fa
+  metadata.gz: 03fa28470be7d3daf81b57dfd9e87fd02a9a43980f3ef09dde087e044e39de6e
+  data.tar.gz: aa3102b743ef7c70aa6fa87d51536ba47303f5dbed871e8d50aadbf9b9109b94
 SHA512:
-  metadata.gz: 51d7792af18af63fe4f37a18f99d60faa1a231e36c11ae778c11045b568b541ee4d920e63d757344a9e82b551b3969fbc5a24691afdefdb092d6f466ca90ed4b
-  data.tar.gz: 24c1e948e23287751a7a33f6905cba77c20b6ec8672b2b468e4148d5766362a9f220aa07b4e29b461de7802cdab828ad30c24bc9d90b50312227347071465563
+  metadata.gz: 300c1faf4ce94007f9d6bb4077414dcef9d5c5ed2d477027d22c531c7c948913d7969fa6151fa7d0c02b69b08f76f48b7445b4ecbfc5fda58b4e635df3e6c80b
+  data.tar.gz: e0e8aeeb413a3cb079fe11ac30e9933a8770d1e9bea483256951319e92c25ada09bacbda7c9937146672c8e754e5a10707abb643b4833df732edbaa0f8df094b

data/Gemfile.lock

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

data/e2e/dsls/go.rb

@@ -7,6 +7,10 @@ class Go < Superscript::Dsl
     puts message
   end
 
+  def struct
+    Struct.new(:name).new("joe")
+  end
+
   def now
     Time.now
   end

data/e2e/test.rb

@@ -1 +1,5 @@
-go "gators"
+def muna
+
+end
+
+muna

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,10 +29,10 @@ 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
+  runner = Superscript::Runner.new nil, options
   loop do
     print "> "
     contents = STDIN.gets

data/lib/superscript/runner.rb

@@ -1,33 +1,9 @@
 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
-
-    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
+    def initialize path=nil, opts={}
+      @methods = opts[:methods] || false
+      @on_error_exec = opts[:on_error_exec]
+
       @armed = false
       @path = if path
         path
@@ -36,6 +12,33 @@ module Superscript
       end
     end
 
+    def 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
+
+      puts error_message
+      if @on_error_exec
+        system("#{@on_error_exec} #{error_message}")
+      end
+      exit 1
+    end
+
     def arm!(reason=nil)
       p [:arm!, reason] if ENV["SUPERSCRIPT_DEBUG"]
       @armed = true
@@ -74,7 +77,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")
@@ -86,21 +89,28 @@ module Superscript
           puts "< #{tp.path}:#{tp.lineno-1}"
           puts line
         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
-            ::Superscript.error :tp_singleton_method_added, "Deffining methods is not allowed"
+            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 +131,13 @@ 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.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 +167,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.6.0"
 end

metadata

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