utils 0.0.94 → 0.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f305d8f5b4e73105aab4d04fb8d8f532fa7315a
-  data.tar.gz: 5805f755e522eb42e7c6beb1f54ba05991af74a3
+  metadata.gz: b2dac1f83a4dd6b72644ff55a4e8a25739ddf72c
+  data.tar.gz: ad875a032b04323d2eb2680f01e66cd8fa30fe09
 SHA512:
-  metadata.gz: ba6e73af147acc19a600c722d9c5e974cb1c15b7502d0d7d9a4f0878d13a9555f7ec83749be2b4753df2c50970009c5ec3e6e719d33079d413dd944c2cf5bb0c
-  data.tar.gz: 914eb916619c1bcd932ca240c01bff12902701bacb04bd29317ff18fb383a02637060fb5fe0c0d3ef93572de891244b7064961179e211b9b11c6675b5c196d63
+  metadata.gz: b10aefc8448a99346cb51093d3061d655f734f37c668908544b538e87e7e9c25b4c6e31f1a812f96237608ccc4be81e43f532c825a10b7ed41ed28880d1a4789
+  data.tar.gz: 88d34d3d0e82ecf2408fbd10d3910aa546767faf4c6e0f0dd9bca4f0172a48c6771903981f4f8c0125ef3022471831b5ee094acd8c0273b07166779e7a34eee4

data/Rakefile

@@ -16,7 +16,7 @@ GemHadar do
   readme      'README.rdoc'
 
   dependency  'tins',           '~>0.8', '>=0.8.3'
-  dependency  'term-ansicolor', '~>1.0'
+  dependency  'term-ansicolor', '~>1.2', '>=1.2.2'
   dependency  'dslkit',         '~>0.2.10'
   dependency  'pstree'
   dependency  'pry-editline'

data/VERSION

@@ -1 +1 @@
-0.0.94
+0.0.95

data/bin/edit

@@ -17,6 +17,8 @@ Options are
   -w          open a buffer in vim and wait until it is deleted
   -s          read files and files:linenumbers from stdin and open them
   -m          make intermediate non existing directories to file
+  -c COMMAND  send ex command to the current running editor
+  -C COMMAND  send visual command to the current running editor
   -p DURATION pause for this many seconds to wait for vim's reaction
   -S SERVER   specify the server for this edit command
   -h          display this help
@@ -26,7 +28,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-$opt = go 'p:S:wsmh'
+$opt = go 'p:S:c:wsmh'
 $opt['h'] and usage
 
 config = Utils::Config::ConfigFile.new
@@ -49,31 +51,36 @@ if $opt['s']
   rescue Interrupt
     exit 1
   end
-else
-  argv = ARGV.dup
-  if argv.empty?
-    unless STDIN.tty?
-      file = File.new(File.join(Dir.tmpdir, "edit_tmp.#$$"), 'w')
-      until STDIN.eof?
-        buffer = STDIN.read(8192)
-        file.write buffer
-      end
-      file.close
-      argv << file.path
+  exit 0
+elsif command = $opt['c']
+  editor.edit_remote_send "\e:#{command}\n"
+elsif command = $opt['C']
+  editor.edit_remote_send command
+end
+
+argv = ARGV.dup
+if argv.empty?
+  unless STDIN.tty?
+    file = File.new(File.join(Dir.tmpdir, "edit_tmp.#$$"), 'w')
+    until STDIN.eof?
+      buffer = STDIN.read(8192)
+      file.write buffer
     end
+    file.close
+    argv << file.path
   end
-  if argv.empty?
-    editor.start
-  else
-    if editor.file_linenumber?(argv.first)
-      editor.wait = argv.size > 1
-      for current_file in argv
-        STDOUT.puts "Edit #{current_file}"
-        editor.edit current_file
-      end
-    else
-      editor.edit(*argv)
+end
+if argv.empty?
+  editor.start
+else
+  if editor.file_linenumber?(argv.first)
+    editor.wait = argv.size > 1
+    for current_file in argv
+      STDOUT.puts "Edit #{current_file}"
+      editor.edit current_file
     end
+  else
+    editor.edit(*argv)
   end
 end
 exit 0

data/bin/probe

@@ -17,6 +17,7 @@ Options are
   -n TESTNAME   run the test TESTNAME in file FILENAME
   -t FRAMEWORK  use test framework FRAMEWORK (rspec, test-unit or cucumber)
   -c            start probe as a client
+  -C            start probe as a client console
   -l            start probe as a server
   -p PORT       listen on/connect to local port PORT
   -h            display this help
@@ -41,26 +42,26 @@ $config.configure_from_paths
 testrunner_args = []
 if i = ARGV.index('--')
   testrunner_args.concat ARGV[(i + 1)..-1]
-  args = ARGV[0...i]
+  $args = ARGV[0...i]
 else
-  args = ARGV.dup
+  $args = ARGV.dup
 end
-$opt = go 'lcp:t:n:h', args
+$opt = go 'lcCp:t:n:h', $args
 $opt['h'] and usage
 
-uri = "druby://localhost:#{$opt['p'] || 6623}"
+$uri = "druby://localhost:#{$opt['p'] || 6623}"
 
-if $opt['l']
+def start_server
   Thread.abort_on_exception = $DEBUG
 
   begin
     DRb.start_service
-    DRbObject.new_with_uri(uri).shutdown
+    DRbObject.new_with_uri($uri).shutdown
   rescue DRb::DRbConnError
   end
 
-  puts "Starting probe server listening to #{uri.inspect}."
-  DRb.start_service(uri, ProbeServer.new)
+  puts "Starting probe server listening to #{$uri.inspect}."
+  DRb.start_service($uri, Utils::ProbeServer.new)
   begin
     DRb.thread.join
   rescue Interrupt
@@ -69,28 +70,41 @@ if $opt['l']
   end
 end
 
-if $opt['c']
-  puts "Connecting probe server on #{uri.inspect}."
+def connect_server
+  puts "Connecting probe server on #{$uri.inspect}."
   DRb.start_service
-  probe_server = DRbObject.new_with_uri(uri)
-  unless args.empty?
-    opts = $opt.subhash('n', 't').map { |k, v| v.full? { %W[-#{k} #{v}] } }.compact.flatten
-    probe_server.enqueue opts + args
+  probe_server = DRbObject.new_with_uri($uri)
+  if $opt['c']
+    opts = $opt.subhash('n', 't').map { |k, v|
+      v.full? { "-#{k} #{v.inspect}" }
+    }.compact
+    probe_server.enqueue opts + $args
+    exit
+  elsif $opt['C']
+    ARGV.clear
+    Tins::IRB.examine probe_server
+    exit
   end
-  exit
 end
 
-args.empty? and fail "require filename or filename:linenumber as arguments"
-puts "Running tests in #{args.inspect}"
+case
+when $opt['l']
+  start_server
+else
+  connect_server
+end
+
+$args.empty? and fail "require filename or filename:linenumber as arguments"
+puts "Running tests in #{$args.inspect}"
 
 case ($opt['t'] || $config.probe.test_framework).to_sym
 when :rspec
   rspec = find_cmd('rspec', 'spec')
   if linenumber = $opt['n']
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, rspec, '-l',
-      linenumber, *(args + testrunner_args)
+      linenumber, *($args + testrunner_args)
   else
-    args = args.map do |a|
+    $args = $args.map do |a|
       if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
         $~.captures * ':'
       else
@@ -98,15 +112,15 @@ when :rspec
       end
     end
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, rspec,
-      *(args + testrunner_args)
+      *($args + testrunner_args)
   end
 when :'test-unit'
   testrb = find_cmd('testrb')
   if testname = $opt['n']
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, testrb,
-      '-n', testname, *(args + testrunner_args)
+      '-n', testname, *($args + testrunner_args)
   else
-    for filename in args
+    for filename in $args
       sl = filename.source_location
       if sl.linenumber
         lf = Tins::LinesFile.for_filename(*sl)
@@ -126,9 +140,9 @@ when :cucumber
   cucumber = find_cmd('cucumber')
   if linenumber = $opt['n']
     cmd 'ruby', cucumber, '-r', $config.probe.include_dirs_argument, '-l',
-      linenumber, *(args + testrunner_args)
+      linenumber, *($args + testrunner_args)
   else
-    args = args.map do |a|
+    $args = $args.map do |a|
       if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
         $~.captures * ':'
       else
@@ -136,6 +150,6 @@ when :cucumber
       end
     end
     cmd 'ruby', cucumber, '-r', $config.probe.include_dirs_argument,
-      *(args + testrunner_args)
+      *($args + testrunner_args)
   end
 end

data/lib/utils/probe_server.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'tins/xt'
 require 'term/ansicolor'
 class String
@@ -8,51 +6,107 @@ end
 
 module Utils
   class ProbeServer
+    class Job
+      def initialize(probe_server, args)
+        @id           = probe_server.next_job_id
+        @args         = args
+      end
+
+      attr_reader :id
+
+      attr_reader :args
+
+      def inspect
+        "#<#{self.class}: id=#{id} args=#{args.inspect}>"
+      end
+    end
+
     def initialize
-      @jobs    = Queue.new
+      @jobs_queue = Queue.new
+      @current_job_id = 0
       Thread.new { work_loop }
     end
 
-    def enqueue(job)
-      output_message "Job #{job.inspect} enqueued.".black.on_yellow
-      @jobs.push job
+    def next_job_id
+      @current_job_id += 1
+    end
+
+    def enqueue(job_args)
+      job = Job.new(self, job_args)
+      output_message "#{job.inspect} enqueued."
+      @jobs_queue.push job
     end
     alias run enqueue
 
+    def stop
+      @pid and Process.kill :STOP, @pid
+    end
+
+    def continue
+      @pid and Process.kill :CONT, @pid
+    end
+
     def shutdown
-      output_message "Server was shutdown down – HARD!".white.on_red.blink
+      output_message "Server was shutdown down – HARD!", :type => :warn
       exit! 23
     end
 
+    def list_jobs
+      @jobs_queue.instance_variable_get(:@que)
+    end
+
+    def clear_jobs
+      queue_synchronize do
+        unless @jobs_queue.empty?
+          @jobs_queue.clear
+          output_message "Cleared all queued jobs.", :type => :warn
+          true
+        else
+          false
+        end
+      end
+    end
+
     private
 
-    def output_message(msg)
+    def queue_synchronize(&block)
+      @jobs_queue.instance_variable_get(:@mutex).synchronize(&block)
+    end
+
+    def output_message(msg, opts = { :type => :info })
+      msg =
+        case opts[:type]
+        when :success
+          msg.on_green.black
+        when :info, nil
+          msg.on_color(118).black
+        when :warn
+          msg.on_color(166).black
+        when :failure
+          msg.on_red.blink.white
+        end
       STDOUT.puts msg
       STDOUT.flush
     end
 
     def run_job(job)
-      message = "Job #{job.inspect} about to run now:".black
-      message = message.ask_and_send(:on_color, 166) || message.on_yellow
-      output_message message
-      fork do
-        exec(*cmd(job))
-      end
-      Process.wait
-      message = "Job #{job.inspect} was just run"
+      output_message "#{job.inspect} about to run now.", :type => :info
+      @pid = fork { exec(*cmd(job.args)) }
+      output_message "#{job.inspect} now running with pid #@pid.", :type => :info
+      Process.wait @pid
+      message = "#{job.inspect} was just run"
       if $?.success?
         message << " successfully."
-        message = message.black.on_green
+        output_message message, :type => :success
       else
         message << " and failed with exit status #{$?.exitstatus}!"
-        message = message.white.on_red.blink
+        output_message message, :type => :failure
       end
-      output_message message
     end
 
     def work_loop
       loop do
-        job = @jobs.shift
+        job = @jobs_queue.shift
         run_job job
       end
     end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.94'
+  VERSION         = '0.0.95'
   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

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
+# stub: utils 0.0.95 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.94"
+  s.version = "0.0.95"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-08-16"
+  s.date = "2013-09-30"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   s.executables = ["brakeman2err", "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"]
@@ -15,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/flori/utils"
   s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.4"
+  s.rubygems_version = "2.1.4"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then
@@ -24,14 +25,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_runtime_dependency(%q<tins>, [">= 0.8.3", "~> 0.8"])
-      s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
       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.8.3", "~> 0.8"])
-      s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
+      s.add_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
       s.add_dependency(%q<dslkit>, ["~> 0.2.10"])
       s.add_dependency(%q<pstree>, [">= 0"])
       s.add_dependency(%q<pry-editline>, [">= 0"])
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
     s.add_dependency(%q<tins>, [">= 0.8.3", "~> 0.8"])
-    s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
+    s.add_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
     s.add_dependency(%q<dslkit>, ["~> 0.2.10"])
     s.add_dependency(%q<pstree>, [">= 0"])
     s.add_dependency(%q<pry-editline>, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.94
+  version: 0.0.95
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -50,14 +50,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: dslkit
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities