pult 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f5719e4a10fd6f1f1421c62042838d6e2af00bdba247d55960ee837d0c2d89
-  data.tar.gz: 44a7c5e29feac0dd68400a6820258a161b0292d335eb0f0a17e59f1ef2214717
+  metadata.gz: fd367496b6d462a76af84c19e96ad15319fce3fae5f67d34670d66db4660a118
+  data.tar.gz: 84058482ed79fcad8f7967d98a35b9cd9483e19ac6b618e7c992127fc051f58e
 SHA512:
-  metadata.gz: 0e4c22b4885c63d09b2bdef97b481d96cd66163377f007099fb029429731740784f6c0b6a3fa4f73f04b455a71535e91d3101f945546cc04a64ffd858a09718b
-  data.tar.gz: 3d36c7748749278bedd87f2053fde930700fb78074c2a8540b2f24152a06b0c7bf0d91c77192402b54045f4cdb12330c053d5b7fcc6ffc620bcc0dfb56b3af5a
+  metadata.gz: 2704d2fc2c0a748d2a03ae6a045654370da7ff5bee9bf9f5c6a30e63927353c572dd03c5a84b631f02d5986ae02bdbe70b27ca295ffc3bfa9198343604a177c0
+  data.tar.gz: 861c1ab8c9846dfd9586f163f23fa1f2fd6190578a804acd5afd9763bfe63ce9ec9ec4c5d153692bd585025b4e9527f34a00035ffe62db324885c2e0b0264877

data/lib/init/req-proj.rb

@@ -1,4 +1,5 @@
 require_relative '../pult/version'
+require_relative '../pult/cli'
 require_relative '../pult/executor'
 require_relative '../pult/executor/enver'
 require_relative '../pult/executor/screener'

data/lib/init/struct.rb

@@ -1,4 +1,6 @@
 module Pult
+  class Cli; end
+
   class Executor
     class Job < ActiveJob::Base; end
     module Enver; end

data/lib/pult/{cli_runner.rb → cli.rb}

@@ -1,4 +1,4 @@
-class Pult::CliRunner
+class Pult::Cli
 
   def self.start
 

data/lib/pult/executor/enver.rb

@@ -1,31 +1,62 @@
 module Pult::Executor::Enver
 
-  # TODO
-  DEFENV = ENV.to_h
+  CURRENT = ENV.to_h
 
-  def with_env env=ENV.to_h, env_base=DEFENV
-    env_delete_diff! env, env_base
-    
-    yield
+  ENVS = ENV['PULT_ENV_DEFAULT'] || ENV['PULT_ENV_BASE']
+
+  ENV_BASE = !!ENV['PULT_ENV_BASE']
+
+  DEFAULT_VARS = ENVS&.split(/=.+?"?\n/)
+
+  DEFAULT = DEFAULT_VARS ?
+    CURRENT.select{|k, v| DEFAULT_VARS.include?(k) } : CURRENT
+
+  RESOLVER = {
+    default: DEFAULT,
+    current: CURRENT
+  }
+
+  def with_env resolver_or_env
+    env = RESOLVER[resolver_or_env] || resolver_or_env
     
-    env_set_diff! env, env_base
+    if env.is_a?(Hash)
+      ENV_BASE ? env_set!(env) : env_set(env)
+      
+      yield
+      
+      env_set!(CURRENT)
+    else
+      raise ArgumentError, 'Env not resolved'
+    end
   end
 
-  def env_delete_diff! env, env_base
-    env_diff(env, env_base).each do |var|
+  private
+
+  def env_set env
+    ENV.keys.each do |var|
+      ENV[var] = env[var] if env[var]
+    end
+  end
+
+  def env_set! env
+    ENV.keys.each do |var|
+      env[var] ? ENV[var] = env[var] : ENV.delete(var)
+    end
+  end
+
+  def env_delete_diff! env1, env2
+    diff(env1, env2).each do |var|
       ENV.delete(var)
     end
   end
 
-  def env_set_diff! env, env_base
-    env_diff(env, env_base).each do |var|
+  def env_set_diff! env1, env2
+    diff(env1, env2).each do |var|
       ENV[var] = env[var]
     end
   end
 
-  private
-
-  def env_diff env, env_base
-    env_base.keys - env.keys
+  def diff env1, env2
+    env2.keys - env1.keys
   end
 end

data/lib/pult/executor.rb

@@ -50,7 +50,7 @@ class Pult::Executor
   def execute_here!
     params = [ @params, @command, chdir: @dir ]
 
-    with_env do
+    with_env :default do
       Open3.popen3( *params ) do |stdin, stdout, stderr, thr|
         @runner = {
           stdout: stdout.read,

data/lib/pult/version.rb

@@ -1,3 +1,3 @@
 module Pult
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ files:
 - lib/init/req-proj.rb
 - lib/init/struct.rb
 - lib/pult.rb
-- lib/pult/cli_runner.rb
+- lib/pult/cli.rb
 - lib/pult/executor.rb
 - lib/pult/executor/enver.rb
 - lib/pult/executor/screener.rb