utils 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f84a7cb62fc30ec50975afed3993c85e1e75f85
-  data.tar.gz: 05bd623454afa06895fe78afe24a887dce12aec4
+  metadata.gz: deaf61a0df60f65e04301eb84fa27629fceef709
+  data.tar.gz: 16cc2ea9dbd7444a678a50933c116ec3ec81e8ae
 SHA512:
-  metadata.gz: 51e718468925a4976022cf87a58ec13db90fce4b7ce241d024e0110fabf939010b0724fe449159ebd6514e21906136d9c65d074f174e9642b4dd02642cc64916
-  data.tar.gz: a99d6d83f9bcac7ae21b74818d4f6b6b9d85544b092221d470a49f86b4e7a72d13b032ef9d3ccbc5ea35df1264e2fe528eefff995f2ab4130974cabd16f2f2ec
+  metadata.gz: 1d31164ba3abf67beb45d57b3d549fafcd10e459cf139b657d48f582d6b8a1da9c6152af8ab26dbf6ee8ad553159be0ce4b2e369372f1478800324bbe14b19fa
+  data.tar.gz: ad04f5f16545cb81cb1fe086250dbf333983eeee4c4600267237ae4e62488cd7ad2070bc1bd9d772aaf8bc7c8291cc16618b54e801946563c48383cde193214e

data/VERSION

@@ -1 +1 @@
-0.0.73
+0.0.74

data/bin/edit

@@ -29,11 +29,14 @@ end
 $opt = go 'p:S:wsmh'
 $opt['h'] and usage
 
-editor = Editor.new do |config|
-  config.wait           = $opt['w']
-  config.pause_duration = ($opt['p'] || 1).to_i
-  s = $opt['S'] and config.servername = s
-  config.mkdir = $opt['m']
+config = Utils::Config::ConfigFile.new
+config.configure_from_paths
+
+editor = Editor.new do |c|
+  c.wait           = $opt['w']
+  c.pause_duration = ($opt['p'] || 1).to_i
+  s = $opt['S'] and c.servername = s
+  c.mkdir = $opt['m']
 end
 
 if $opt['s']
@@ -49,7 +52,7 @@ if $opt['s']
 else
   argv = ARGV.dup
   if argv.empty?
-    if !STDIN.tty?
+    unless STDIN.tty?
       file = File.new(File.join(Dir.tmpdir, "edit_tmp.#$$"), 'w')
       until STDIN.eof?
         buffer = STDIN.read(8192)
@@ -57,8 +60,6 @@ else
       end
       file.close
       argv << file.path
-    else
-      editor.ensure_running
     end
   end
   unless argv.empty?

data/lib/utils/config/config_file.rb

@@ -229,6 +229,19 @@ class Utils::Config::ConfigFile
     @ssh_tunnel ||= SshTunnel.new
   end
 
+  class Edit < BlockConfig
+    config :vim_path do `which vim`.chomp end
+
+    config :vim_default_args, nil
+  end
+
+  def edit(&block)
+    if block
+      @edit = Edit.new(&block)
+    end
+    @edit ||= Edit.new
+  end
+
   def to_ruby
     result = "# vim: set ft=ruby:\n"
     for bc in %w[search discover strip_spaces probe ssh_tunnel]

data/lib/utils/editor.rb

@@ -50,6 +50,9 @@ module Utils
       self.wait           = false
       self.pause_duration = 1
       self.servername     = ENV['VIM_SERVER'] || "G#{ENV['USER'].upcase}"
+      config = Utils::Config::ConfigFile.new
+      config.configure_from_paths
+      self.config = config.edit
       yield self if block_given?
     end
 
@@ -61,23 +64,12 @@ module Utils
 
     attr_accessor :mkdir
 
+    attr_accessor :config
+
     alias wait? wait
 
     def vim
-      vim_in_path = [`which gvim`, `which vim`].map(&:chomp).find(&:full?)
-      @vim ||=
-        case `uname -s`
-        when /\Adarwin/i
-          if File.directory?(path = File.expand_path('~/Applications/MacVim.app')) or
-            File.directory?(path = File.expand_path('/Applications/MacVim.app'))
-          then
-            File.join(path, 'Contents/MacOS/Vim')
-          else
-            vim_in_path
-          end
-        else
-          vim_in_path
-        end
+      ([ config.vim_path ] + Array(config.vim_default_args))
     end
 
     def cmd(*parts)
@@ -96,7 +88,7 @@ module Utils
     end
 
     def fullscreen=(enabled)
-      started? or start
+      start
       sleep pause_duration
       if enabled
         edit_remote_send '<ESC>:set fullscreen<CR>'
@@ -118,8 +110,7 @@ module Utils
       if filenames.size == 1 and
         source_location = filenames.first.source_location
       then
-        edit_source_location(source_location) ||
-          edit_file(expand_globs(source_location[0, 1]))
+        edit_source_location(source_location) # || edit_file(expand_globs(source_location[0, 1]))
       elsif source_locations = filenames.map(&:source_location).compact.full?
         filenames = expand_globs(source_locations.map(&:first))
         edit_file(*filenames)
@@ -136,25 +127,16 @@ module Utils
     private :make_dirs
 
     def edit_file(*filenames)
-      make_dirs *filenames
-      if gui
-        edit_remote_file(*filenames)
-      else
-        cmd(vim, *filenames)
-      end
+      make_dirs(*filenames)
+      edit_remote_file(*filenames)
     end
 
     def edit_file_linenumber(filename, linenumber)
       make_dirs filename
       if wait?
-        edit_remote(filename)
-        sleep pause_duration
-        edit_remote_send("<ESC>:#{linenumber}<CR>")
-        edit_remote_wait(filename)
+        edit_remote_wait("+#{linenumber}", filename)
       else
-        edit_remote(filename)
-        sleep pause_duration
-        edit_remote_send("<ESC>:#{linenumber}<CR>")
+        edit_remote("+#{linenumber}", filename)
       end
     end
 
@@ -167,12 +149,8 @@ module Utils
       self
     end
 
-    def gui
-      ENV['TERM'] =~ /xterm/ ? '-g' : nil
-    end
-
     def start
-      cmd(vim, gui, '--servername', servername)
+      started? or cmd(*vim, '--servername', servername)
     end
 
     def stop
@@ -180,13 +158,17 @@ module Utils
     end
 
     def activate
-      edit_remote("stupid_trick#{rand}")
-      sleep pause_duration
-      edit_remote_send('<ESC>:bw<CR>')
+      if Array(config.vim_default_args).include?('-g')
+        edit_remote("stupid_trick#{rand}")
+        sleep pause_duration
+        edit_remote_send('<ESC>:bw<CR>')
+      else
+        # TODO use tmux to switch to editor pane?
+      end
     end
 
     def serverlist
-      @serverlist ||= `#{vim} #{gui} --serverlist`.split
+      @serverlist ||= `#{vim.map(&:inspect) * ' '} --serverlist`.split
     end
 
     def started?(name = servername)
@@ -194,19 +176,19 @@ module Utils
     end
 
     def edit_remote(*args)
-      gui and cmd(vim, gui, '--servername', servername, '--remote', *args)
+      cmd(*vim, '--servername', servername, '--remote', *args)
     end
 
     def edit_remote_wait(*args)
-      gui and cmd(vim, gui, '--servername', servername, '--remote-wait', *args)
+      cmd(*vim, '--servername', servername, '--remote-wait', *args)
     end
 
     def edit_remote_send(*args)
-      gui and cmd(vim, gui, '--servername', servername, '--remote-send', *args)
+      cmd(*vim, '--servername', servername, '--remote-send', *args)
     end
 
     def edit_remote_file(*filenames)
-      if gui && wait?
+      if wait?
         edit_remote_wait(*filenames)
       else
         edit_remote(*filenames)

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.73'
+  VERSION         = '0.0.74'
   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.73"
+  s.version = "0.0.74"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-03-08"
+  s.date = "2013-03-11"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   s.executables = ["create_tags", "untest", "chroot-libs", "edit_wait", "chroot-exec", "irb_connect", "number_files", "search", "strip_spaces", "path", "enum", "edit", "git-empty", "classify", "utils-install-config", "xmp", "discover", "ssh-tunnel", "myex", "probe", "remote_copy", "errf", "same_files", "utils-utilsrc", "unquarantine_apps", "vacuum_firefox_sqlite", "on_change", "sedit"]
@@ -15,7 +15,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.0"
+  s.rubygems_version = "2.0.2"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.74
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities