cmd_tools 2.0.5 → 2.1.0

data/lib/cmd_tools/command/emacs_launch.rb

@@ -2,6 +2,8 @@ module ::CmdTools::Command::EmacsLaunch
   require 'ruby_patch'
   extend ::RubyPatch::AutoLoad
 
+  EMACSCLIENT_OPEN = lambda{|files| spawn "emacsclient -n #{files}"}
+
   # Open +files+ by +mode+ (:gui/:cui) mode.
   # Launch emacs daemon if necessary.
   # Create new frame if necessary.
@@ -10,17 +12,18 @@ module ::CmdTools::Command::EmacsLaunch
   #   - :emacs: emacs
   #   + :emacs: /Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs
   def self.run(mode, *files)
-    system "#{::CmdTools::Config.emacs} --daemon" unless daemon_running?
+    Process.waitpid(spawn "#{::CmdTools::Config.emacs} --daemon") unless daemon_running?
 
     files = files.flatten.join(' ')
     case mode
     when :gui
       if number_of_frames() <= 1 # emacs daemon has one (invisible) frame.
-        exec "emacsclient -c -n #{files}"
+        spawn "emacsclient -c -n #{files}"
       else
-        exec "emacsclient -n #{files}"
+        EMACSCLIENT_OPEN[files]
       end
     when :cui
+      Process.waitpid(EMACSCLIENT_OPEN[files])
       exec "emacsclient -t #{files}"
     else
       raise ArgumentError, "Expected :gui or :cui, but got #{mode}."
@@ -29,13 +32,13 @@ module ::CmdTools::Command::EmacsLaunch
 
   # Stop emacs daemon.
   def self.stop
-    exec "emacsclient -e '(kill-emacs)'"
+    exec "emacsclient -e '(kill-emacs)'" if daemon_running?
   end
 
   private
 
   def self.daemon_running?
-    system "emacsclient -e '()' > /dev/null 2>&1"
+    system "emacsclient -e '()' > #{File::NULL} 2>&1"
   end
 
   def self.number_of_frames

data/lib/cmd_tools/config.rb

@@ -17,9 +17,9 @@ module ::CmdTools::Config
               else
                 FileUtils.mkdir_p(CONFIG_DIR)
                 open(CONFIG_FILE, 'w'){|io|
-        io.write(CONFIG_DEFAULT.to_yaml)
-        io.flush
-      }
+                  io.write(CONFIG_DEFAULT.to_yaml)
+                  io.flush
+                }
                 CONFIG_DEFAULT
               end
 

data/lib/cmd_tools/version.rb

@@ -1,3 +1,3 @@
 module CmdTools
-  VERSION = '2.0.5'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmd_tools
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &2156566300 !ruby/object:Gem::Requirement
+  requirement: &73308010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2156566300
+  version_requirements: *73308010
 description: ! 'Command line tools. Please type
 
 
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Command line tools.