script_core 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc4a16cf06d2962a37e47bea35c60f12f5f633322de6870e325b4f960788699
-  data.tar.gz: 7bbfe4e82affb630ed5e1689b04dc03c80075488eef9e47cb5036ee3ab99083c
+  metadata.gz: bfb29eda17a289a639eaeda3bd447732d774ea5c9a6f7ec5e3d71406891d3376
+  data.tar.gz: 4245f1728f35920db4d370805ad38951f9ae9695807a7a090ba799207f8a6acf
 SHA512:
-  metadata.gz: d52a8137ca745d1a7c8f7a8791df4b26f5ba8ba338a7562ab308c7bef576e799d81d89c22ad00ff1ea006daa1adc56f0a359b90c0bf50915fd34c6d31dc9bb3e
-  data.tar.gz: c046025045f9b7d4eabc86828dfdaea75afefe19bf073446c1f2b356fad54974691d9d8313162a6b521e268ea295f2ab6449998ba599bd3a7a2a258d087eb0f9
+  metadata.gz: c9d7e1a4acfe78e4a05371e44955bc6032b4844384eacac24a188bd3f9a2737be592f0ee39845d16bec1ee18244a63d5627492275593a2953844f57f6b9fbe7f
+  data.tar.gz: 463bfd37532feea17dbad1c91e3cd5c35aecb93162c1fe40209198f7fdd4d43b4fe5f899d24a37f79fd39ff75afba5969a3eb90c04ee247b60d2b7671cba2564

data/lib/script_core/engine.rb

@@ -20,7 +20,7 @@ module ScriptCore
       @instructions = File.exist?(preload_instructions_path) ? File.binread(preload_instructions_path) : nil
     end
 
-    def eval(sources, input: nil, instruction_quota_start: nil)
+    def eval(sources, input: nil, instruction_quota_start: nil, environment_variables: {})
       @executable.run(
         input: input || {},
         sources: sources,
@@ -28,7 +28,8 @@ module ScriptCore
         timeout: @timeout,
         instruction_quota: @instruction_quota,
         instruction_quota_start: instruction_quota_start || @instruction_quota_start,
-        memory_quota: @memory_quota
+        memory_quota: @memory_quota,
+        environment_variables: environment_variables
       )
     end
   end

data/lib/script_core/executable.rb

@@ -12,7 +12,9 @@ module ScriptCore
       @executable_path = executable_path.to_s
     end
 
-    def run(input:, sources:, instructions: nil, timeout: 1, instruction_quota: 100_000, instruction_quota_start: 0, memory_quota: 8 << 20)
+    def run(input:, sources:, instructions: nil,
+            timeout: 1, instruction_quota: 100_000, instruction_quota_start: 0, memory_quota: 8 << 20,
+            environment_variables: {})
       packer = ScriptCore::Protocol.packer_factory.packer
 
       payload = {input: input, sources: sources}
@@ -28,7 +30,8 @@ module ScriptCore
         spawner,
         instruction_quota,
         instruction_quota_start,
-        memory_quota
+        memory_quota,
+        environment_variables
       )
       runner = ScriptCore::Runner.new(
         timeout: timeout,

data/lib/script_core/service_process.rb

@@ -2,14 +2,15 @@
 
 module ScriptCore
   class ServiceProcess
-    attr_reader(:path, :spawner, :instruction_quota, :instruction_quota_start, :memory_quota)
+    attr_reader(:path, :spawner, :instruction_quota, :instruction_quota_start, :memory_quota, :environment_variables)
 
-    def initialize(path, spawner, instruction_quota, instruction_quota_start, memory_quota)
+    def initialize(path, spawner, instruction_quota, instruction_quota_start, memory_quota, environment_variables = {})
       @path = path
       @spawner = spawner
       @instruction_quota = instruction_quota
       @instruction_quota_start = instruction_quota_start
       @memory_quota = memory_quota
+      @environment_variables = environment_variables
     end
 
     def open
@@ -17,6 +18,7 @@ module ScriptCore
       out_reader, out_writer = IO.pipe
 
       pid = spawner.spawn(
+        environment_variables,
         path,
         "-i", instruction_quota.to_s,
         "-C", instruction_quota_start.to_s,

data/lib/script_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ScriptCore
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/script_core/service_process_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe(ScriptCore::ServiceProcess) do
   let(:pid) { rand(1 << 16) }
+  let(:environment_variables) { {"TZ" => "US/Pacific"} }
   let(:service_path) { "bin/my-subprocess" }
   let(:pipe_pairs) { [] }
 
@@ -13,13 +14,14 @@ RSpec.describe(ScriptCore::ServiceProcess) do
   end
 
   let(:service_process) do
-    ScriptCore::ServiceProcess.new(service_path, spawner, 100_000, 2, 4 << 20)
+    ScriptCore::ServiceProcess.new(service_path, spawner, 100_000, 2, 4 << 20, environment_variables)
   end
 
   it "creates a channel to communicate with the subprocess" do
     in_reader = nil
     out_writer = nil
-    expect(spawner).to receive(:spawn) do |path, **options|
+    expect(spawner).to receive(:spawn) do |env, path, **options|
+      expect(env).to eq(environment_variables)
       expect(path).to eq(service_path)
       in_reader = options[:in].dup
       expect(in_reader).to be_an(IO)
@@ -41,7 +43,7 @@ RSpec.describe(ScriptCore::ServiceProcess) do
 
   it "open passes arguments to process" do
     expect(spawner)
-      .to receive(:spawn).once.with(instance_of(String), "-i", 100_000.to_s, "-C", 2.to_s, "-m", (4 << 20).to_s, instance_of(Hash))
+      .to receive(:spawn).once.with(instance_of(Hash), instance_of(String), "-i", 100_000.to_s, "-C", 2.to_s, "-m", (4 << 20).to_s, instance_of(Hash))
     service_process.open do |c|
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: script_core
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -3597,7 +3597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A script engine powered by a mruby sandboxie, It's forked by Shopify's ESS.