scout-gear 8.0.0 → 9.0.0

data/lib/scout/open/stream.rb

@@ -3,7 +3,7 @@ module Open
 
   class << self
     attr_accessor :sensible_write_lock_dir
-    
+
     def sensible_write_lock_dir
       @sensible_write_lock_dir ||= Path.setup("tmp/sensible_write_locks").find
     end
@@ -18,7 +18,7 @@ module Open
 
   def self.consume_stream(io, in_thread = false, into = nil, into_close = true, &block)
     return if Path === io
-    return unless io.respond_to? :read 
+    return unless io.respond_to? :read
 
     if io.respond_to? :closed? and io.closed?
       io.join if io.respond_to? :join
@@ -46,12 +46,12 @@ module Open
       begin
         into = into.find if Path === into
 
-        if String === into 
+        if String === into
           dir = File.dirname(into)
           Open.mkdir dir unless File.exist?(dir)
-          into_path, into = into, File.open(into, 'w') 
+          into_path, into = into, File.open(into, 'w')
         end
-        
+
         into_close = false unless into.respond_to? :close
 
         while c = io.read(BLOCK_SIZE)
@@ -81,7 +81,7 @@ module Open
         into.close if into.respond_to?(:closed?) && ! into.closed?
         into_path = into if into_path.nil? && String === into
         if into_path and File.exist?(into_path)
-          FileUtils.rm into_path 
+          FileUtils.rm into_path
         end
         raise exception
       end
@@ -92,7 +92,7 @@ module Open
     force = IndiferentHash.process_options options, :force
 
     if File.exist?(path) and not force
-      Open.consume_stream content 
+      Open.consume_stream content
       return
     end
 
@@ -107,10 +107,11 @@ module Open
 
       if File.exist? path and not force
         Log.warn "Path exists in sensible_write, not forcing update: #{ path }"
-        Open.consume_stream content 
+        Open.consume_stream content
       else
         FileUtils.mkdir_p File.dirname(tmp_path) unless File.directory?(File.dirname(tmp_path))
         FileUtils.rm_f tmp_path if File.exist? tmp_path
+        Log.low "Sensible write stream #{Log.fingerprint content} -> #{Log.fingerprint path}" if IO === content
         begin
           case
           when block_given?
@@ -122,7 +123,7 @@ module Open
               while block = content.read(BLOCK_SIZE)
                 f.write block
                 break if content.closed?
-              end 
+              end
             end
           else
             File.open(tmp_path, 'wb') do |f|  end
@@ -139,8 +140,7 @@ module Open
           Open.touch path if File.exist? path
           content.join if content.respond_to?(:join) and not Path === content and not (content.respond_to?(:joined?) && content.joined?)
 
-          Open.notify_write(path) 
-          Log.debug "Done sensible write: [#{Process.pid}] -- #{ path }"
+          Open.notify_write(path)
         rescue Aborted
           Log.low "Aborted sensible_write -- #{ Log.reset << path }"
           content.abort if content.respond_to? :abort
@@ -174,7 +174,7 @@ module Open
 
       [sout, sin]
     end
-    Log.debug{"Creating pipe #{[Log.fingerprint(res.last), Log.fingerprint(res.first)] * " => "}"}
+    Log.low{"Creating pipe #{[Log.fingerprint(res.last), Log.fingerprint(res.first)] * " -> "}"}
     res
   end
 
@@ -214,14 +214,13 @@ module Open
 
     if do_fork
 
-      #parent_pid = Process.pid
       pid = Process.fork {
         begin
           purge_pipes(sin)
           sout.close
 
           yield sin
-          sin.close if close and not sin.closed? 
+          sin.close if close and not sin.closed?
 
         rescue Exception
           Log.exception $!
@@ -237,34 +236,20 @@ module Open
       ConcurrentStream.setup sin, :pair => sout
       ConcurrentStream.setup sout, :pair => sin
 
-      thread = Thread.new do 
+      thread = Thread.new do
         begin
-          Thread.current.report_on_exception = false
-          Thread.current["name"] = "Pipe input #{Log.fingerprint sin} => #{Log.fingerprint sout}"
-
-          yield sin
+          ConcurrentStream.process_stream(sin, :message => "Open pipe") do
+            Thread.current.report_on_exception = false
+            Thread.current["name"] = "Pipe input #{Log.fingerprint sin} => #{Log.fingerprint sout}"
 
-          sin.close if close and not sin.closed? and not sin.aborted?
-        rescue Aborted
-          Log.low "Aborted open_pipe: #{$!.message}"
-          raise $!
-        rescue Exception
-          Log.low "Exception in open_pipe: #{$!.message}"
-          begin
-            sout.threads.delete(Thread.current)
-            sout.pair = []
-            sout.abort($!) if sout.respond_to?(:abort)
-            sin.threads.delete(Thread.current)
-            sin.pair = []
-            sin.abort($!) if sin.respond_to?(:abort)
-          ensure
-            raise $!
+            yield sin
           end
         end
       end
 
       sin.threads = [thread]
       sout.threads = [thread]
+
       Thread.pass until thread["name"]
     end
 
@@ -274,12 +259,14 @@ module Open
   def self.tee_stream_thread_multiple(stream, num = 2)
     in_pipes = []
     out_pipes = []
-    num.times do 
+    num.times do
       sout, sin = Open.pipe
       in_pipes << sin
       out_pipes << sout
     end
 
+    Log.low("Tee stream #{Log.fingerprint stream} -> #{Log.fingerprint out_pipes}")
+
     filename = stream.filename if stream.respond_to? :filename
 
     splitter_thread = Thread.new(Thread.current) do |parent|
@@ -291,7 +278,7 @@ module Open
         while block = stream.read(BLOCK_SIZE)
 
           in_pipes.each_with_index do |sin,i|
-            begin 
+            begin
               sin.write block
             rescue IOError
               Log.warn("Tee stream #{i} #{Log.fingerprint stream} IOError: #{$!.message} (#{Log.fingerprint sin})");
@@ -299,13 +286,12 @@ module Open
             rescue
               Log.warn("Tee stream #{i} #{Log.fingerprint stream} Exception: #{$!.message} (#{Log.fingerprint sin})");
               raise $!
-            end unless skip[i] 
+            end unless skip[i]
           end
           break if stream.closed?
         end
 
         stream.join if stream.respond_to? :join
-        stream.close unless stream.closed?
         in_pipes.first.close unless in_pipes.first.closed?
       rescue Aborted, Interrupt
         stream.abort if stream.respond_to?(:abort) && ! stream.aborted?
@@ -348,18 +334,32 @@ module Open
       end
     end
 
-    out_pipes.each do |sout|
-      ConcurrentStream.setup sout, :threads => splitter_thread, :filename => filename, :pair => stream
-    end
     Thread.pass until splitter_thread["name"]
 
     main_pipe = out_pipes.first
-    main_pipe.autojoin = true
 
-    main_pipe.callback = Proc.new do 
-      stream.join if stream.respond_to? :join
-      in_pipes[1..-1].each do |sin|
-        sin.close unless sin.closed?
+    ConcurrentStream.setup(main_pipe, :threads => [splitter_thread], :filename => filename, :autojoin => true)
+
+    out_pipes[1..-1].each do |sout|
+      ConcurrentStream.setup sout, :filename => filename, :threads => [splitter_thread]
+    end
+
+    main_pipe.callback = proc do
+      begin
+        stream.join if stream.respond_to?(:join) && ! stream.joined?
+        in_pipes[1..-1].each do |sin|
+          sin.close unless sin.closed?
+        end
+      rescue
+        main_pipe.abort_callback.call($!)
+        raise $!
+      end
+    end
+
+    main_pipe.abort_callback = proc do |exception|
+      stream.abort(exception)
+      out_pipes[1..-1].each do |sout|
+        sout.abort(exception)
       end
     end
 
@@ -378,7 +378,7 @@ module Open
     str = nil
     Thread.pass while IO.select([stream],nil,nil,1).nil?
     while not str = stream.read(size)
-      IO.select([stream],nil,nil,1) 
+      IO.select([stream],nil,nil,1)
       Thread.pass
       raise ClosedStream if stream.eof?
     end
@@ -403,102 +403,89 @@ module Open
     str
   end
 
-  def self.sort_stream(stream, header_hash = "#", cmd_args = "-u")
-    Open.open_pipe do |sin|
-      line = stream.gets
-      while line =~ /^#{header_hash}/ do
-        sin.puts line
+  def self.sort_stream(stream, header_hash: "#", cmd_args: "-u", memory: false)
+    sout = Open.open_pipe do |sin|
+      ConcurrentStream.process_stream(stream) do
         line = stream.gets
-      end
+        while line && line.start_with?(header_hash) do
+          sin.puts line
+          line = stream.gets
+        end
 
-      line_stream = Open.open_pipe do |line_stream_in|
-        line_stream_in.puts line
-        begin
+        line_stream = Open.open_pipe do |line_stream_in|
+          line_stream_in.puts line if line
           Open.consume_stream(stream, false, line_stream_in)
-        rescue
-          raise $!
         end
-      end
+        Log.low "Sub-sort stream #{Log.fingerprint stream} -> #{Log.fingerprint line_stream}"
 
-      sorted = CMD.cmd("env LC_ALL=C sort #{cmd_args || ""}", :in => line_stream, :pipe => true)
-
-      begin
-        Open.consume_stream(sorted, false, sin)
-      rescue
-        Log.exception $!
-        begin
-          sorted.raise($!) if sorted.respond_to? :raise
-          stream.raise($!) if stream.respond_to? :raise
-        ensure
-          raise $!
+        if memory
+          line_stream.read.split("\n").sort.each do |line|
+            sin.puts line
+          end
+        else
+          io = CMD.cmd("env LC_ALL=C sort #{cmd_args || ""}", :in => line_stream, :pipe => true)
+          Open.consume_stream(io, false, sin)
         end
       end
     end
+    Log.low "Sort #{Log.fingerprint stream} -> #{Log.fingerprint sout}"
+    sout
   end
 
-  def self.process_stream(s)
-    begin
-      yield s
-      s.close if s.respond_to?(:close) && ! s.closed?
-      s.join if s.respond_to?(:join)
-    rescue
-      s.abort($!) if s.respond_to? :abort
-      raise $!
-    end
-  end
-
+  #def self.sort_stream(stream, header_hash = "#", cmd_args = "-u")
+  #  StringIO.new stream.read.split("\n").sort.uniq * "\n"
+  #end
 
   def self.collapse_stream(s, line: nil, sep: "\t", header: nil, &block)
     sep ||= "\t"
     Open.open_pipe do |sin|
+
       sin.puts header if header
-      process_stream(s) do |s|
-        line ||= s.gets
 
-        current_parts = []
-        while line 
-          key, *parts = line.chomp.split(sep, -1)
-          case
-          when key.nil?
-          when current_parts.nil?
-            current_parts = parts
-            current_key = key
-          when current_key == key
-            parts.each_with_index do |part,i|
-              if current_parts[i].nil?
-                current_parts[i] = "|" << part
-              else
-                current_parts[i] = current_parts[i] << "|" << part
-              end
+      line ||= s.gets
+
+      current_parts = []
+      while line
+        key, *parts = line.chomp.split(sep, -1)
+        case
+        when key.nil?
+        when current_parts.nil?
+          current_parts = parts
+          current_key = key
+        when current_key == key
+          parts.each_with_index do |part,i|
+            if current_parts[i].nil?
+              current_parts[i] = "|" << part
+            else
+              current_parts[i] = current_parts[i] << "|" << part
             end
+          end
 
-            (parts.length..current_parts.length-1).to_a.each do |pos|
-              current_parts[pos] = current_parts[pos] << "|" << ""
-            end
-          when current_key.nil?
-            current_key = key
-            current_parts = parts
-          when current_key != key
-            if block_given?
-              res = block.call(current_parts)
-              sin.puts [current_key, res] * sep
-            else
-              sin.puts [current_key, current_parts].flatten * sep
-            end 
-            current_key = key
-            current_parts = parts
+          (parts.length..current_parts.length-1).to_a.each do |pos|
+            current_parts[pos] = current_parts[pos] << "|" << ""
           end
-          line = s.gets
+        when current_key.nil?
+          current_key = key
+          current_parts = parts
+        when current_key != key
+          if block_given?
+            res = block.call(current_parts)
+            sin.puts [current_key, res] * sep
+          else
+            sin.puts [current_key, current_parts].flatten * sep
+          end
+          current_key = key
+          current_parts = parts
         end
-
-        if block_given?
-          res = block.call(current_parts)
-          sin.puts [current_key, res] * sep
-        else
-          sin.puts [current_key, current_parts].flatten * sep
-        end unless current_key.nil?
+        line = s.gets
       end
+
+      if block_given?
+        res = block.call(current_parts)
+        sin.puts [current_key, res] * sep
+      else
+        sin.puts [current_key, current_parts].flatten * sep
+      end unless current_key.nil?
     end
   end
-
 end

data/lib/scout/open/util.rb

@@ -68,6 +68,15 @@ module Open
     !! (file =~ /\.zip$/)
   end
 
+  def self.is_stream?(obj)
+    IO === obj || StringIO === obj
+  end
+
+  def self.has_stream?(obj)
+    obj.respond_to?(:stream)
+  end
+
+
   def self.notify_write(file)
     begin
       notification_file = file + '.notify'

data/lib/scout/open.rb

@@ -20,19 +20,21 @@ module Open
     end
   end
 
-  def self.get_stream(file, mode = 'r')
+  def self.get_stream(file, mode = 'r', options = {})
+    return file if Open.is_stream?(file)
+    return file.stream if Open.has_stream?(file)
     file = file.find if Path === file
 
-    return Open.ssh(file) if Open.ssh?(file)
-    return Open.wget(file) if Open.remote?(file)
+    return Open.ssh(file, options) if Open.ssh?(file)
+    return Open.wget(file, options) if Open.remote?(file)
 
     File.open(file, mode)
   end
 
-  def self.file_open(file, grep = false, mode = 'r', invert_grep = false)
+  def self.file_open(file, grep = false, mode = 'r', invert_grep = false, options = {})
     Open.mkdir File.dirname(file) if mode.include? 'w'
 
-    stream = get_stream(file, mode)
+    stream = get_stream(file, mode, options)
 
     if grep
       grep(stream, grep, invert_grep)
@@ -56,11 +58,11 @@ module Open
   def self.open(file, options = {})
     if IO === file || StringIO === file
       if block_given?
-        res = yield file 
+        res = yield file, options
         file.close
         return res
       else
-        return file 
+        return file
       end
     end
 
@@ -70,7 +72,7 @@ module Open
 
     options[:noz] = true if mode.include? "w"
 
-    io = file_open(file, options[:grep], mode, options[:invert_grep])
+    io = file_open(file, options[:grep], mode, options[:invert_grep], options)
 
     io = unzip(io)   if ((String === file and zip?(file))   and not options[:noz]) or options[:zip]
     io = gunzip(io)  if ((String === file and gzip?(file))  and not options[:noz]) or options[:gzip]
@@ -86,7 +88,7 @@ module Open
       rescue DontClose
         res = $!.payload
       rescue Exception
-        io.abort if io.respond_to? :abort
+        io.abort $! if io.respond_to? :abort
         io.join if io.respond_to? :join
         raise $!
       ensure
@@ -163,7 +165,6 @@ module Open
       raise "Content unknown #{Log.fingerprint content}"
     end
 
-    notify_write(file) 
+    notify_write(file)
   end
-
 end

data/lib/scout/path/find.rb

@@ -34,6 +34,7 @@ module Path
 
   def self.follow(path, map, map_name = nil)
     file = map.sub('{PKGDIR}', path.pkgdir.respond_to?(:pkgdir) ? path.pkgdir.pkgdir || Path.default_pkgdir : path.pkgdir || Path.default_pkgdir).
+      sub('{HOME}', ENV["HOME"]).
       sub('{RESOURCE}', path.pkgdir.to_s).
       sub('{PWD}', FileUtils.pwd).
       sub('{TOPLEVEL}', path._toplevel).
@@ -59,16 +60,17 @@ module Path
 
   def self.path_maps
     @@path_maps ||= IndiferentHash.setup({
-      :current => File.join("{PWD}", "{TOPLEVEL}", "{SUBPATH}"),
-      :user    => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
-      :global  => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :usr     => File.join('/usr/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :local   => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :fast    => File.join('/fast', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :cache   => File.join('/cache', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :bulk    => File.join('/bulk', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-      :lib     => File.join('{LIBDIR}', "{TOPLEVEL}", "{SUBPATH}"),
-      :base    => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}", "{SUBPATH}"),
+      :current => "{PWD}/{TOPLEVEL}/{SUBPATH}",
+      :user    => "{HOME}/.{PKGDIR}/{TOPLEVEL}/{SUBPATH}",
+      :global  => '/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :usr     => '/usr/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :local   => '/usr/local/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :fast    => '/fast/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :cache   => '/cache/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :bulk    => '/bulk/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
+      :lib     => '{LIBDIR}/{TOPLEVEL}/{SUBPATH}',
+      :scout_gear => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}/{SUBPATH}"),
+      :tmp     => '/tmp/{PKGDIR}/{TOPLEVEL}/{SUBPATH}',
       :default => :user
     })
   end
@@ -127,6 +129,9 @@ module Path
   def follow(map_name = :default, annotate = true)
     IndiferentHash.setup(path_maps)
     map = path_maps[map_name] || Path.path_maps[map_name]
+    if map.nil? && String === map_name
+      map = File.join(map_name, '{TOPLEVEL}/{SUBPATH}')
+    end
     raise "Map not found #{Log.fingerprint map_name} not in #{Log.fingerprint path_maps.keys}" if map.nil?
     while Symbol === map
       map_name = map

data/lib/scout/path/util.rb

@@ -82,6 +82,11 @@ module Path
     self.annotate(self + ".#{extension}")
   end
 
+  def unset_extension
+    self.annotate(self.split(".")[0..-2] * ".")
+  end
+
+
   # Is 'file' newer than 'path'? return non-true if path is newer than file
   def self.newer?(path, file, by_link = false)
     return true if not Open.exists?(file)

data/lib/scout/path.rb

@@ -32,7 +32,7 @@ module Path
     prevpath = prevpath.to_s if Symbol === prevpath
 
     subpath = File.join(prevpath.to_s, subpath) if prevpath
-    new = self.empty? ? subpath : File.join(self, subpath)
+    new = self.empty? ? subpath.dup : File.join(self, subpath)
     self.annotate(new)
     new
   end

data/lib/scout/persist/serialize.rb

@@ -20,7 +20,7 @@ module Persist
     type = type.to_sym if String === type
     type = SERIALIZER if type == :serializer
     case type
-    when nil, :string, :integer, :float, :boolean, :file, :path, :select, :folder
+    when nil, :string, :text, :integer, :float, :boolean, :file, :path, :select, :folder, :binary
       if IO === content || StringIO === content
         content.read
       else
@@ -49,7 +49,7 @@ module Persist
     type = SERIALIZER if type == :serializer
 
     case type
-    when nil, :string, :file, :stream, :select, :folder
+    when nil, :string, :text, :file, :stream, :select, :folder
       serialized
     when :path
       Path.setup(serialized)
@@ -58,7 +58,7 @@ module Persist
     when :float
       serialized.to_f
     when :boolean
-      TRUE_STRINGS.include? serialized
+      TRUE_STRINGS.include? serialized.strip
     when :array
       serialized.split("\n")
     when :yaml
@@ -104,7 +104,7 @@ module Persist
 
     if type == :binary
       content.force_encoding("ASCII-8BIT") if content.respond_to? :force_encoding
-      Open.open(path, :mode => 'wb') do |f|
+      Open.open(file, :mode => 'wb') do |f|
         f.puts content
       end
       content

data/lib/scout/persist.rb

@@ -80,7 +80,7 @@ module Persist
             pres = Persist.save(res, file, type)
             res = pres unless pres.nil?
           end
-        rescue
+        rescue Exception
           Thread.handle_interrupt(Exception => :never) do
             if Open.exist?(file)
               Log.debug "Failed persistence #{file} - erasing"

data/lib/scout/resource/open.rb

@@ -0,0 +1,8 @@
+class << Open
+  alias _just_open open
+
+  def open(file, *args, **kwargs, &block)
+    file.produce if Path === file
+    _just_open(file, *args, **kwargs, &block)
+  end
+end

data/lib/scout/resource/path.rb

@@ -3,7 +3,7 @@ module Path
     return self if ! force && (Open.exist?(self) || @produced)
     begin
       if Resource === self.pkgdir
-        self.pkgdir.produce self
+        self.pkgdir.produce self, force
       else
         false
       end
@@ -13,7 +13,7 @@ module Path
       message = $!.message
       message = "No exception message" if message.nil? || message.empty?
       Log.warn "Error producing #{self}: #{message}"
-      false
+      raise $!
     ensure
       @produced = true
     end
@@ -33,13 +33,16 @@ module Path
   end
 
   def produce_and_find(extension = nil, *args)
-    if extension
-      found = find_with_extension(extension, *args)
-      found.exists? ? found : produce_with_extension(extension, *args)
-    else
-      found = find
-      found.exists? ? found : produce(*args)
-    end
+    found = if extension
+              found = find_with_extension(extension, *args)
+              found.exists? ? found : produce_with_extension(extension, *args)
+            else
+              found = find
+              found.exists? ? found : produce(*args)
+            end
+    raise "Not found: #{self}" unless found
+
+    found
   end
 
   def relocate
@@ -47,6 +50,10 @@ module Path
     Resource.relocate(self)
   end
 
+  def identify
+    Resource.identify(self)
+  end
+
   def open(*args, &block)
     produce
     Open.open(self, *args, &block)