uc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f5b194b95797f2d533561b497e78a6f4db8316
-  data.tar.gz: e6aa5f2d280d2a9aaeba67eec5baa0e043e437a0
+  metadata.gz: 141ad16243a2fb649fb60a99a714a6136932b0c4
+  data.tar.gz: 210b4c5f005409f866e050999c209c61987f8496
 SHA512:
-  metadata.gz: 4272cad7ed70ad7a14df4204e1a1530a0426dc961ce4ca0f93d333587e65f8b7f37a746a483e658741358600a011940347fd273f37df838c726cdb2fa64480a4
-  data.tar.gz: b511b802494945888ccc6d3f4d5e1e08186c7f82c58e34fcf39a69dd256489948f49b3089c8a21f42f00a2d8a136b637c085de4df9049f26235042add85fcafd
+  metadata.gz: 569fe945ce9abb05ce83e2dd83608373b4a59e5ce4c14aa8845d2ba396b8bef91ef4883a19e32842239c4d1396f7a1faba3fd4ba8bbaf43d38fa1feea0d547a3
+  data.tar.gz: 095c00a09327ebf4545f0e1f82d461f6b77447e79031847cb72bc545c299ae700397cb5cd49328eaafb6b42c4d826cc7ff2f639279b4209a6e405a408428f8e9

data/lib/uc/config.rb

@@ -1,5 +1,6 @@
 require 'uc/logger'
 require 'uc/error'
+require 'yaml'
 
 module Uc
   class Config
@@ -27,6 +28,8 @@ module Uc
         ready_wait: 5,
         listen: []
       }
+      load_env_yml "#{app_dir}/config/env.yml"
+      load_env_yml "#{app_dir}/.env.yml"
       read_from_file
       return @config
     end
@@ -79,47 +82,27 @@ module Uc
       config[:skip_clean_env] = value
     end
 
-    def env_hash
-      @env_hash ||= {}
-    end
-
-    def env(key, value)
-      env_hash[key] = value
-    end
-
-    def env_yml(path, safe: false)
-      @skip_autoload = true
-      load_env_yml path, safe: safe
+    def env_yml(path, required: true)
+      load_env_yml(path, required: required)
     end
 
     def load_env
+      # all environment variables will be loaded on config parsing
       config
-      if not @skip_autoload
-        load_env_yml "#{app_dir}/config/env.yml", safe: true, override: false
-      end
-      env_hash.each do |k,v|
-        ENV[k] = v.to_s
-      end
     end
 
-
-    def load_env_yml(path, safe: false, override: true)
+    def load_env_yml(path, required: false)
       if not File.readable? path
+        raise Error, "env file #{path} unreadable" if required
         logger.debug "skipped loading env from #{path}"
+        return {}
       end
-      require 'yaml'
+      logger.debug "loading env from #{path}"
       h = YAML.load_file(path)
-      env_hash.merge!(h) do |key, v1, v2|
-        override ? v2 : v1
-      end
-      logger.debug "loaded env from #{path}"
+      h.each { |k,v| ENV[k] = v.to_s }
     rescue => e
-      error_message = "failed to load env from #{path}: #{e.message}"
-      if not safe
-        raise ::Uc::Error, error_message
-      else
-        logger.debug error_message
-      end
+      raise Error, "failed to load env from #{path} : #{e.message}" if required
+      logger.debug "failed to load env from #{path} : #{e.message}"
     end
 
     def read_from_file

data/lib/uc/server.rb

@@ -32,7 +32,7 @@ module Uc
         puts "wont start 0 instances"
         return
       end
-      ENV["UNICORN_APP_DIR"] = config.app_dir
+      ENV["UNICORN_APP_DIR"] = config[:working_dir]
       event_stream.expect :fin do
         cmd %{unicorn -c #{uconfig.path} -D -E #{rails_env} }, return_output: false,
           error_msg: "error starting unicorn"
@@ -63,7 +63,7 @@ module Uc
       init_once
       if config[:instances] == 0
         puts "0 instances specified: stopping"
-        stop
+        stop if server_status.running?
         return
       end
       uconfig.generate_once
@@ -78,7 +78,7 @@ module Uc
 
     def print_config
       init_once
-      config.to_h.each do |k,v| 
+      config.each do |k,v| 
         v = %{ "#{v}" } if not v.is_a? Numeric
         puts "#{k} #{v}" 
       end
@@ -102,15 +102,15 @@ module Uc
     end
 
     def config
-      @config ||= ::Uc::Config.new(app_dir)
+      @config ||= ::Uc::Config.new(app_dir).to_h
     end
 
     def unicorn_paths
-      @unicorn_paths ||= ::Uc::Unicorn::Paths.new(config.app_dir)
+      @unicorn_paths ||= ::Uc::Unicorn::Paths.new(config[:working_dir])
     end
 
     def uconfig
-      @uconfig ||= ::Uc::Unicorn::Config.new(config.to_h, unicorn_paths)
+      @uconfig ||= ::Uc::Unicorn::Config.new(config, unicorn_paths)
     end
 
     def lock
@@ -121,8 +121,7 @@ module Uc
       paths.validate_required
       Dir.chdir app_dir
       lock.acquire
-      ::Uc::Logger.event_queue = config.event_queue_name
-      config.load_env
+      ::Uc::Logger.event_queue = config[:event_queue]
       event_stream.debug_output = true if @debug
     end
 

data/lib/uc/unicorn/api.rb

@@ -97,6 +97,7 @@ module Uc; module Unicorn
 
     def load_original_env
       return if not @original_env.is_a? Hash
+      # add unicorn specific environment vars like UNICORN_FD
       ENV.select { |k,v| k =~ /\AUNICORN_/ }.each { |k,v| @original_env[k] = v }
       ENV.replace(@original_env)
     end

data/lib/uc/unicorn/paths.rb

@@ -14,27 +14,27 @@ module Uc
       end
 
       def stdout_log
-        rpath "log/unicorn.stdout.log"
+        abs_path "log/unicorn.stdout.log"
       end
 
       def stderr_log
-        rpath "log/unicorn.stderr.log"
+        abs_path "log/unicorn.stderr.log"
       end
 
       def socket
-        rpath "tmp/sockets/unicorn.sock"
+        abs_path "tmp/sockets/unicorn.sock"
       end
 
       def pid_file
-        rpath "tmp/pids/unicorn.pid"
+        abs_path "tmp/pids/unicorn.pid"
       end
 
       def lock_file
-        rpath "tmp/unicorn.lock"
+        abs_path "tmp/unicorn.lock"
       end
 
       def unicorn_config
-        rpath "tmp/unicorn_config.rb"
+        abs_path "tmp/unicorn_config.rb"
       end
 
       def unicorn_template
@@ -43,11 +43,9 @@ module Uc
 
       private
 
-     def rpath(path)
-        "#{app_dir}/#{path}"
-      end
-
-
+     def abs_path(path)
+      "#{app_dir}/#{path}"
+     end
 
     end
   end

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Neeraj