utils 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7dab50374f65fbfebaa369f874bae1b77cbf3f3
-  data.tar.gz: 5050f28d2580d785dc911b68f8039e535acaa780
+  metadata.gz: 85ce1623a7e47439352723aa155771aa01fb6736
+  data.tar.gz: ec9ce26f04a73b26c0411b78c210f4d7b3ecabc3
 SHA512:
-  metadata.gz: e2fb669ebfaa45d554cca794eb4d565cbcc920401ec6c2f53dde49fb0cad31ec1c51faf8614968d0b5021b1b8c83d64ee0f5f75138076ad53235d086792f8372
-  data.tar.gz: 39bb05ab6ce216b69d78246f22e8a36d8356a9c6d5fb81a29bd0655a949ecdff9b2e819635f0c3bd692e57ce8bbd2a9982dbd925e003607cd98415241421d486
+  metadata.gz: 255e2546e728afe76ca1a25be1e0241875855341b388b32d8b6b841574393744994983f3b183ab3d8d4f6ba3640aebbcb90f12c8b4dc882b1c7a9ae992e4e092
+  data.tar.gz: 28471e78f74c2023c990cd92fee399b80fe0690a80044e384056443d0fc89a8f8f9c89a58f24de92b4095243f08df327a89b8d322e2815cf65ef804928d50b4a

data/Rakefile

@@ -18,6 +18,7 @@ GemHadar do
   dependency  'tins',           '~>0.6'
   dependency  'term-ansicolor', '~>1.0'
   dependency  'dslkit',         '~>0.2.10'
+  dependency  'pstree'
   dependency  'pry-editline'
 
   install_library do

data/VERSION

@@ -1 +1 @@
-0.0.81
+0.0.82

data/lib/utils/editor.rb

@@ -2,6 +2,7 @@ require 'tins/xt/full'
 require 'tins/deep_const_get'
 require 'fileutils'
 require 'rbconfig'
+require 'pstree'
 
 module Utils
   class Editor
@@ -168,11 +169,12 @@ module Utils
         sleep pause_duration
         edit_remote_send('<ESC>:bw<CR>')
       else
+        pstree = PSTree.new
         switch_to_index =
           `tmux list-panes -F '\#{pane_pid} \#{pane_index}'`.lines.find { |l|
             pid, index = l.split(' ')
-            pid.to_i == $$ and next
-            if `ps -eo ppid,command|grep -v ' grep'|grep ^#{pid}` =~ %r(/edit( |$))
+            pid = pid.to_i
+            if pstree.find { |ps| ps.pid != $$ && ps.ppid == pid && ps.cmd =~ %r(/edit( |$)) }
               break index.to_i
             end
           }

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.81'
+  VERSION         = '0.0.82'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.81"
+  s.version = "0.0.82"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-05-14"
+  s.date = "2013-05-15"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   s.executables = ["chroot-exec", "chroot-libs", "classify", "create_tags", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "myex", "number_files", "on_change", "path", "probe", "remote_copy", "same_files", "search", "sedit", "ssh-tunnel", "strip_spaces", "unquarantine_apps", "untest", "utils-install-config", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]
@@ -26,12 +26,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tins>, ["~> 0.6"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_runtime_dependency(%q<dslkit>, ["~> 0.2.10"])
+      s.add_runtime_dependency(%q<pstree>, [">= 0"])
       s.add_runtime_dependency(%q<pry-editline>, [">= 0"])
     else
       s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_dependency(%q<tins>, ["~> 0.6"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_dependency(%q<dslkit>, ["~> 0.2.10"])
+      s.add_dependency(%q<pstree>, [">= 0"])
       s.add_dependency(%q<pry-editline>, [">= 0"])
     end
   else
@@ -39,6 +41,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tins>, ["~> 0.6"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     s.add_dependency(%q<dslkit>, ["~> 0.2.10"])
+    s.add_dependency(%q<pstree>, [">= 0"])
     s.add_dependency(%q<pry-editline>, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.10
+- !ruby/object:Gem::Dependency
+  name: pstree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-editline
   requirement: !ruby/object:Gem::Requirement