uc 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4717340033c85eeb1adf64c4cdb0f6ef1e7ba84f
-  data.tar.gz: 0ca0e36885ee79e4c1244a83de351b06cbec859e
+  metadata.gz: c14e77816fc0c5a32bdbefd2bfd3097bbb66ff0c
+  data.tar.gz: b3e4a340c82a8f6dffbc1c208878394e9c3ef40e
 SHA512:
-  metadata.gz: 6e75211aa953c5d9717d3fc83f1b8482772168f91af4df5b8bb3f3d4e982206bdde72a994085bf5d93b12dd09faec98ed9a0c48f3fc8d20ceac017fbddefa770
-  data.tar.gz: 3ef2b11dca8e4a1fb70e7d9e7031ff4ba60ebf03a7ac7d72b7d1751d247b34bce9323e2b1ec7cf7a1529e2a6d4766be328e1dccadabf96468976f4ff999f22f1
+  metadata.gz: 2b0c938f9efb57fd9acc096a43aadfa8abfab8784d0cadf149b18c058da5d63d7873d253af2f26df684531f51ad33bfd63cf696fc0e0e2b3ad8c3a9cfdd19a12
+  data.tar.gz: 1f1efb7e70788334b5fc014b7073af9305f5b2cf2cabfda0d4efffaf7ba71e4756edd7dce04e52dc640fdd644422ddd66bc0ccd4ececbd87536dd85eccb8f479

data/lib/uc/templates/unicorn.erb

@@ -1,5 +1,6 @@
 require 'uc/unicorn/api'
 uc = ::Uc::Unicorn::Api.new("<%= config.fetch :event_queue %>")
+uc.init_original_env
 worker_processes <%= config.fetch :instances %>
 working_directory "<%= paths.app_dir %>"
 timeout <%= config.fetch :timeout %>
@@ -39,6 +40,7 @@ after_fork do |server, worker|
 end
 
 before_exec do |server|
+  uc.load_original_env
   uc.clean_env
   uc.load_env
 end

data/lib/uc/unicorn/api.rb

@@ -11,7 +11,7 @@ module Uc; module Unicorn
  
   class Api
 
-    attr_reader :run_id
+    attr_reader :run_id, :original_env
     attr_accessor :queue_name
 
     def initialize(event_queue)
@@ -75,11 +75,14 @@ module Uc; module Unicorn
     end
 
     def clean_env
+      return if not File.exist? ".clean_env"
       ENV.delete "BUNDLE_BIN_PATH"
       ENV.delete "RUBYLIB"
       ENV.delete "RUBYOPT"
       ENV.delete "GEM_HOME"
       ENV.delete "GEM_PATH"
+      ENV.delete "BUNDLE_GEMFILE"
+      ENV["PATH"] = cleaned_path
     end
 
     def load_env
@@ -87,6 +90,22 @@ module Uc; module Unicorn
       config.load_env
     end
 
+    def cleaned_path
+      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
+      paths.reject! { |x| x =~ /vendor\/bundle\/ruby/ }
+      paths.uniq.join(File::PATH_SEPARATOR)
+    end
+
+    def load_original_env
+      return if not @original_env.is_a? Hash
+      ENV.replace(@original_env)
+    end
+
+    def init_original_env
+      return if @original_env
+      @original_env = ENV.to_h
+    end
+
   end
 
 end; end

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler