rbbt-util 5.17.81 → 5.17.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbcb3c91e224e6ad020154b1cf11a2a6b4274271
-  data.tar.gz: 5da8992b0fe6c5477e35f97a6f58984e2c895662
+  metadata.gz: 06179bbff3dd8c45a91bd877fe23adef43e2299b
+  data.tar.gz: 5bf1cd04f279300d4c4bf2ce91f831f1d675c123
 SHA512:
-  metadata.gz: 6d647f7fa974f11ae7084299c3a945effbfda8f37fe197aa3fe4da783cb409a2a06ee9d71fa39727ffdbe517a978a1151dad563537b8b93659721887648d471b
-  data.tar.gz: a63ea4a95ff076713d745b4350dcb124971eeee3647a9aece335dba388aa37e6ace616d245639f2c48cd5310b82f3b804ff67c118a01796d9758ee8f83807abb
+  metadata.gz: 1042bfebbe214dd1a9ef60c704bfc1bdc209e300fe46c759ee766b7a40c71049e545a7b229a490c1207890c16ce73d890f2cef722f8cfa3a6e0c0c1d434bce3a
+  data.tar.gz: 51734367f0342e5ba6dc2e3432b0892ec99f01951704d65b2c6a8201413f21e9fb5e853f32233134d69d7123b2bf9b9afe8c711d1418eae0b90dddc2348ba819

data/lib/rbbt/tsv/stream.rb

@@ -63,7 +63,7 @@ module TSV
         input_options << parser.options
         preambles     << parser.preamble      if preamble and not parser.preamble.empty?
 
-        if fix_flat and parser.type == :flat
+        if fix_flat and parser.type == :flat and parser.first_line
           parts = lines[-1].split("\t")
           lines[-1] = [parts[0], parts[1..-1]*"|"] * "\t"
           TSV.stream_flat2double(parser.stream).stream

data/lib/rbbt/util/misc/development.rb

@@ -321,4 +321,31 @@ module Misc
   def self.memory_use(pid=nil)
     `ps -o rss -p #{pid || $$}`.strip.split.last.to_i
   end
+
+  PUSHBULLET_KEY=begin
+                   if ENV["PUSHBULLET_KEY"]
+                     ENV["PUSHBULLET_KEY"] 
+                   else
+                     config_api = File.join(ENV['HOME'], 'config/apps/pushbullet/apikey')
+                     if File.exists? config_api
+                       File.read(config_api).strip
+                     else
+                       nil
+                     end
+                   end
+                 end
+
+  def self.notify(description, event='notification', key = nil)
+    if PUSHBULLET_KEY.nil? and key.nil?
+      Log.warn "Could not notify, no PUSHBULLET_KEY"
+      return
+    end
+
+    Thread.new do
+      application = 'rbbt'
+      event ||= 'notification'
+      key ||= PUSHBULLET_KEY
+      `curl -s --header "Authorization: Bearer #{key}" -X POST https://api.pushbullet.com/v2/pushes --header 'Content-Type: application/json' --data-binary '{"type": "note", "title": "#{event}", "body": "#{description}"}'`
+    end
+  end
 end

data/lib/rbbt/util/misc/format.rb

@@ -56,7 +56,7 @@ module Misc
   def self.format_definition_list_item(dt, dd, size = 80, indent = 20, color = :yellow)
     dd = "" if dd.nil?
     dt = Log.color color, dt if color
-    dt = dt.to_s + ":" unless dd.empty?
+    dt = dt.to_s  unless dd.empty?
     len = Log.uncolor(dt).length
 
     if indent < 0

data/lib/rbbt/util/misc/pipes.rb

@@ -267,6 +267,7 @@ module Misc
             lock_options[:lock].unlock
           end
           FileUtils.touch path if File.exists? path
+          Open.notify_write(path) 
         rescue Aborted
           Log.medium "Aborted sensiblewrite -- #{ Log.reset << Log.color(:blue, path) }"
           content.abort if content.respond_to? :abort

data/lib/rbbt/util/open.rb

@@ -427,6 +427,20 @@ module Open
     end
   end
 
+  def self.notify_write(file)
+    begin
+      notification_file = file + '.notify'
+      if File.exists? notification_file
+        key = Open.read(notification_file).strip
+        key = nil if key.empty?
+        Misc.notify("Wrote " << file, nil, key)
+        FileUtils.rm notification_file
+      end
+    rescue
+      Log.warn "Error notifying write of #{ file }"
+    end
+  end
+
   def self.write(file, content = nil, options = {})
     options = Misc.add_defaults options, :mode => 'w'
 
@@ -463,5 +477,6 @@ module Open
       end
       content.close
     end
+    notify_write(file) 
   end
 end

data/lib/rbbt/util/simpleopt/doc.rb

@@ -47,7 +47,10 @@ module SOPT
   def self.input_doc(inputs, input_types = nil, input_descriptions = nil, input_defaults = nil, input_shortcuts = nil)
     type = description = default = nil
     shortcut = ""
+    seen = []
     inputs.collect do |name|
+      next if seen.include? name
+      seen << name
 
       type = input_types[name] unless input_types.nil?
       description = input_descriptions[name] unless input_descriptions.nil?

data/lib/rbbt/workflow.rb

@@ -171,17 +171,29 @@ module Workflow
 
   #{{{ ATTR DEFAULTS
   
+  
+  def self.workdir=(path)
+    path = Path.setup path.dup unless Path === path
+    @@workdir = path
+  end
+
+  def self.workdir
+    @@workdir ||= if defined? Rbbt
+                   Rbbt.var.jobs.find
+                 else
+                   Path.setup('var/jobs')
+                 end
+  end
+
   def workdir=(path)
     path = Path.setup path.dup unless Path === path
     @workdir = path
   end
 
   def workdir
-    @workdir ||= if defined? Rbbt
+    @workdir ||= begin
                    text = Module === self ? self.to_s : "Misc"
-                   Rbbt.var.jobs[text].find
-                 else
-                   Path.setup('var/jobs')
+                   Workflow.workdir[text].find
                  end
   end
 

data/share/rbbt_commands/watch

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'rbbt-util'
+require 'rbbt/util/simpleopt'
+
+$0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Notify on completion of file
+
+$ rbbt notify [options] <filename>
+
+Creates a <filename>.notify that will trigger a notification when a process creates it
+
+-h--help Print this help
+-k--key* Pushbullet apikey (optinal)
+
+EOF
+if options[:help]
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.usage
+  end
+  exit 0
+end
+
+key = options[:key] || ''
+file = ARGV.shift
+notify_file = file + '.notify'
+Open.write(notify_file, key)
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.81
+  version: 5.17.82
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -326,6 +326,7 @@ files:
 - share/rbbt_commands/tsv/subset
 - share/rbbt_commands/tsv/unzip
 - share/rbbt_commands/tsv/values
+- share/rbbt_commands/watch
 - share/rbbt_commands/workflow/cmd
 - share/rbbt_commands/workflow/example
 - share/rbbt_commands/workflow/info