uc 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e5e195bf45efdea58dc9e1295dbed7e8f98b9c
-  data.tar.gz: 3d242b7b38655b6b073be163b67b41dc65c9bc17
+  metadata.gz: 724f9c77ea7473dee5f2f3427b6ae2f279b69a43
+  data.tar.gz: 27e2107ce9b1209162b87f36e95f066dd0b41202
 SHA512:
-  metadata.gz: faab4e5ac9cd599d5f18e0a3f3191d68743463e31880891649463584a7c3813957266926069e4f42db775358b418ca0dcc15f7a5f6b8bc029c0ecaae0fef2707
-  data.tar.gz: 9caa91282070698e9c5f78a6b042e4f52b97706c162cfddcd06d5ef57ac553712c98ff8475190b4934552a6a4a66d0b70ccb3dfa78ad46e78ccc8df5c1feb914
+  metadata.gz: 4cb767292f1156fdbe85a43e2c1b460bff89e5c47a5d891395e3e6f7f8a8f94bb27502bb8338f87382421c80c39d9716461611599b7683833e570e10c62624f2
+  data.tar.gz: 01cd764d07c801328b4deff7c7a05f9c82a7f944856305f50bcc485db9a3509f743e1695924acaa123cb30f5fe0f1a92a6144794d9b3879efb4b6830b959ff34

data/lib/uc/config.rb

@@ -70,6 +70,10 @@ module Uc
       config[:working_dir]
     end
 
+    def skip_clean_env(value)
+      config[:skip_clean_env] = value
+    end
+
     def env_hash
       @env_hash ||= {}
     end

data/lib/uc/event.rb

@@ -1,4 +1,30 @@
 module Uc
   class Event < ::Struct.new(:type, :msg)
+
+    def self.parse(event_str)
+      arr = event_str.split("|", 2)
+      if arr.length == 2
+        type, msg = arr[0], arr[1]
+      else
+        type, msg = "unknown", event_str
+      end
+      new(type, msg)
+    end
+
+    def to_s(size = nil)
+      str = "#{type}|#{msg}"
+      size ? truncate(str, size) : str
+    end
+
+    private
+
+    def truncate(str, size)
+      if  str.size <= size
+        str
+      else
+        "#{str[0, size - 3] }..."
+      end
+    end
+
   end
 end

data/lib/uc/event_stream.rb

@@ -29,30 +29,13 @@ module Uc
     end
 
     def pub(type, msg)
-      tmsg = truncate "#{type}|#{msg}"
-      writer.send tmsg
+      event = Event.new(type, msg)
+      writer.send event.to_s(mq.msg_size)
     rescue Errno::ENOENT, Errno::EAGAIN, Errno::EACCES, Errno::EMSGSIZE => e
       puts "#{e.class} #{e.message}"
     end
 
-    def truncate(msg)
-      if msg.size <= mq.msg_size
-        return msg
-      else
-        msg = "#{msg[0, mq.msg_size - 3] }..."
-      end
-    end
-
     def expect(event_type, timeout: 30, recreate: true, &block)
-      mq.recreate if recreate
-      mq.clear
-      yield
-      wait(event_type, timeout, output: true)
-    rescue => e
-      raise uc_error(e)
-    end
-
-    def expect_in_background(event_type, timeout: 30, recreate: true, &block)
       begin
         mq.recreate if recreate
         mq.clear
@@ -76,7 +59,7 @@ module Uc
         loop do
           r.receive(message, t)
           t = timeout
-          event = parse message
+          event = Event.parse message
           print event if output
           break if event.type == event_type
         end
@@ -117,24 +100,6 @@ module Uc
 
     private  
 
-    def read(timeout)
-      event = ""
-      reader do |r|
-        r.receive(event, timeout)
-        parse event
-      end
-    end
- 
-    def parse(event_str)
-      arr = event_str.split("|",2)
-      if arr.length == 2
-        type, msg = arr[0], arr[1]
-      else
-        type, msg = "unknown", event
-      end
-      event = ::Uc::Event.new(type, msg)
-    end
-
     def mq
       @mq ||= ::Uc::Mqueue.new(@queue_name)
     end

data/lib/uc/server.rb

@@ -29,7 +29,7 @@ module Uc
         return
       end
       ENV["UNICORN_APP_DIR"] = config.app_dir
-      event_stream.expect_in_background :fin do
+      event_stream.expect :fin do
         cmd %{unicorn -c #{uconfig.path} -D -E #{rails_env} }, return_output: false,
           error_msg: "error starting unicorn"
       end

data/lib/uc/templates/unicorn.erb

@@ -22,7 +22,7 @@ before_fork do |server, worker|
   uc.init(server)
   uc.wait_for_worker_ready(server, worker, ready_wait: ready_wait)
   uc.gradual_shutdown(server, worker)
-  sleep 0.3
+  sleep 0.2 if not ready_wait
 end
 
 after_fork do |server, worker|

data/lib/uc/unicorn/api.rb

@@ -75,7 +75,7 @@ module Uc; module Unicorn
     end
 
     def clean_env
-      return if not File.exist? ".clean_env"
+      return if uc_config.config[:skip_clean_env]
       ENV.delete "BUNDLE_BIN_PATH"
       ENV.delete "RUBYLIB"
       ENV.delete "RUBYOPT"
@@ -86,8 +86,7 @@ module Uc; module Unicorn
     end
 
     def load_env
-      config = ::Uc::Config.new(Dir.pwd)
-      config.load_env
+      uc_config.load_env
     end
 
     def cleaned_path
@@ -107,6 +106,10 @@ module Uc; module Unicorn
       @original_env = ENV.to_h
     end
 
+    def uc_config
+      @uc_config ||= ::Uc::Config.new(Dir.pwd)
+    end
+
   end
 
 end; end

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

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