superscript 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12ad2456097931fa8ae7d7ceb5870ded64f9f13d4602568e3696b9af55b1ae8
-  data.tar.gz: 920979e9fce25c924a51e83c2b830bafb50532659f2a7fbcb70216dc4e226fa6
+  metadata.gz: b2b7dee019db4e0c13b9a654eac37c84d4e736254709b2423726ecc8e559ecbe
+  data.tar.gz: 7b7e43e336d1c7ab0a2a60eb1947efcc0afcdc3115f5b5de3f61a950b1dbd4fa
 SHA512:
-  metadata.gz: 59c7e83257e769ae2456305fb3c25ae16decc905314a931a1cbf156575775eec38c1ea0c6e30a959868ab58dae48f5e70aa262494e3b75c566bf6b5e3abd9ae6
-  data.tar.gz: da64fb8f666dd4ff92ddc2d54b7cd4940435f4c8f5bbae5729b23b424feab31d98548fa7cc04ead529963b3a78660c0839b9ee343c880c618a0404ccdd222e59
+  metadata.gz: 51d7792af18af63fe4f37a18f99d60faa1a231e36c11ae778c11045b568b541ee4d920e63d757344a9e82b551b3969fbc5a24691afdefdb092d6f466ca90ed4b
+  data.tar.gz: 24c1e948e23287751a7a33f6905cba77c20b6ec8672b2b468e4148d5766362a9f220aa07b4e29b461de7802cdab828ad30c24bc9d90b50312227347071465563

data/Gemfile.lock

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

data/e2e/dsls/go.rb

@@ -1,6 +1,14 @@
 class Go < Superscript::Dsl
   def go(*args)
-    puts "Go #{args.join(" ")}"
+    self.say "Go #{args.join(" ")}!"
+  end
+
+  def say(message)
+    puts message
+  end
+
+  def now
+    Time.now
   end
 
   def explode!

data/e2e/test.rb

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

data/lib/superscript/runner.rb

@@ -8,6 +8,8 @@ module Superscript
       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
@@ -26,6 +28,7 @@ module Superscript
   end
   class Runner
     def initialize path=nil
+      @armed = false
       @path = if path
         path
       else
@@ -33,25 +36,38 @@ module Superscript
       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
 
-      @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
@@ -71,7 +87,10 @@ module Superscript
           puts line
         when :c_call
           # allow calls to these classes
-          next if ["Array", "String","Float", "Integer"].include? tp.defined_class.name
+          if ["Array", "String","Float", "Integer"].include? tp.defined_class.name
+            disarm! :safe_class
+            next
+          end
 
           case tp.method_id
           when :singleton_method_added
@@ -106,13 +125,22 @@ module Superscript
             end
           end
         when :call
+          if tp.defined_class.ancestors.first.to_s == "#<Class:Superscript>"
+            tp.disable
+            ::Superscript.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
 

data/lib/superscript/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superscript
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Matti Paksula