rbbt-util 5.5.55 → 5.5.56

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjE4OWJkNTMxYTY2NTE1ZDhjMWZlNzYwZmIwMDM3OTQwY2U3MzIzMw==
+    YTdmNTRiNGE5OWE1NGU0MTY4MTRkYzE0MTM3NWIzOGI3ODk1M2ZlZA==
   data.tar.gz: !binary |-
-    ODAzNjMyMDhiZDhjYjI3ZDAxMzczMjIxY2ZmOWViMjgyYzFiOGQ2MA==
+    Y2UyNzkwM2MyOTU1MDM4YWU0Nzg3YjdjNjhjM2EzNmUxMDg1NTZhOQ==
 SHA512:
   metadata.gz: !binary |-
-    NDUyZTI5YWYxZjdjY2FiODM1NTQ5MzU5ZWJlZjAyNTM3ZTc2NDM4MjlmMTdh
-    NGY0MzJjOGIzM2JlNGFlNzliNDkwMzFkY2IxMWI3MjM1N2JkZWE4ZWEyMjY0
-    NmUwMzY3MGNhZWIzZDg3MDU4ZWIyYzAyNmI3NjRiZDdiZGNhYzU=
+    N2FkOTZiZWJhYmU1ODZhYmJkYWMwOTcxZjVjZWU0ZjMyNDc0ODkyZDVkNjgw
+    MzYyMDZiMDZhMzk0YzNiNGQ0ZDk4OTg2NGM2M2IyMjc0MjJlOWJmMDcwYjI0
+    OTY5MThlNDAxZWYyZjE1MThkNjM1MTQ4OTAwM2M4MjJkMzViMmY=
   data.tar.gz: !binary |-
-    MTdjNDViZjJkYWI3NGMzNjE5Y2M4ZDU0N2FhMzllMzEzMWQ5YzNjODczYWE0
-    NmRmYmY0ZDQ4Yjk5MWJkMzk4NGYzZDNkMzYyOWJhMmNmOThkYmY2NGViMmZh
-    YjhkYjM0OTBkNTYyOWQxYTQ0MmUyOGY2Y2M4YjViYThkNDNjYjU=
+    YTNkOWQ1YmYwZmI3MWI4NTc2MDg5OTAzMWEwMDkyZjZkMzIyMDljMTA3YWRl
+    NGU3NzRkZWRhODk2NzY5ZWIxNzI4YTdhMGUzMjhkOGZjNTA1MDAzMGJkNGU2
+    NWZlZjViMWQ5MTUzZTE5YmFlMWNiN2E5MTQ4YWE5MzM2MDJlMWI=

data/lib/rbbt/resource.rb

@@ -111,44 +111,46 @@ module Resource
     if not File.exists? final_path or force
       Log.medium "Producing: #{ final_path }"
       Misc.lock final_path + '.produce' do
-        (remote_server and get_from_server(path, final_path)) or
-        begin
-          case type
-          when :string
-            Open.write(final_path, content)
-          when :url
-            Open.write(final_path, Open.open(content))
-          when :proc
-            data = case content.arity
-                   when 0
-                     content.call
-                   when 1
-                     content.call final_path
-                   end
-            Open.write(final_path, data) unless data.nil?
-          when :rake
-            run_rake(path, content, rake_dir)
-          when :install
-            Log.debug "Installing software: #{path}"
-            software_dir = path.resource.root.software.find :user
-            preamble = <<-EOF
+        if not File.exists? final_path or force
+          (remote_server and get_from_server(path, final_path)) or
+          begin
+            case type
+            when :string
+              Open.write(final_path, content)
+            when :url
+              Open.write(final_path, Open.open(content))
+            when :proc
+              data = case content.arity
+                     when 0
+                       content.call
+                     when 1
+                       content.call final_path
+                     end
+              Open.write(final_path, data) unless data.nil?
+            when :rake
+              run_rake(path, content, rake_dir)
+            when :install
+              Log.debug "Installing software: #{path}"
+              software_dir = path.resource.root.software.find :user
+              preamble = <<-EOF
 #!/bin/bash
 
 RBBT_SOFTWARE_DIR="#{software_dir}"
 
 INSTALL_HELPER_FILE="#{Rbbt.share.install.software.lib.install_helpers.find :lib, caller_lib_dir(__FILE__)}"
 source "$INSTALL_HELPER_FILE"
-            EOF
+              EOF
 
-            CMD.cmd('bash', :in => preamble + "\n" + Open.read(content))
+              CMD.cmd('bash', :in => preamble + "\n" + Open.read(content))
 
-            set_software_env(software_dir)
-          else
-            raise "Could not produce #{ resource }. (#{ type }, #{ content })"
+              set_software_env(software_dir)
+            else
+              raise "Could not produce #{ resource }. (#{ type }, #{ content })"
+            end
+          rescue
+            FileUtils.rm_rf final_path if File.exists? final_path
+            raise $!
           end
-        rescue
-          FileUtils.rm_rf final_path if File.exists? final_path
-          raise $!
         end
       end
     end

data/lib/rbbt/util/cmd.rb

@@ -41,7 +41,7 @@ module CMD
     end
 
     def close
-      self.original_read unless self.eof?
+      self.original_read unless self.closed? or self.eof?
 
       wait_and_status
 
@@ -67,9 +67,9 @@ module CMD
     end
 
     def read(*args)
-      data = original_read(*args) unless self.eof?
+      data = original_read(*args) unless self.closed? or self.eof?
 
-      self.close if self.eof?
+      self.close if self.eof? and not self.closed?
 
       data
     end

data/share/unicorn.rb

@@ -1,5 +1,5 @@
 worker_processes 4
-timeout 30
+timeout 600
 preload_app true
 
 @app_path = Dir.pwd

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.55
+  version: 5.5.56
 platform: ruby
 authors:
 - Miguel Vazquez