console-mux 2.0.7 → 2.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 52f90b608b800c986fb3eba38f8977584a590f9a
+  data.tar.gz: 35f9a160bb52d9407535e5e53978fd5c31ebad0e
+SHA512:
+  metadata.gz: e06a46cf0cf7e3c62cee109a95167f7c63c4e0b6068e755ad11ab396d6a6d721c62ae0084f242770618741aeddbe35eecbaaa95ae0ead7221c44118f5a800daa
+  data.tar.gz: 5737dfaa9893cac325ed3e67f6acb22c05c89600deaa705130473e4b8d14b2c1f9773f656725b1c1bc1fc06b50d6024f4448aef90ecae3db8c0928f7dbfae443

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

data/lib/console/mux.rb

@@ -39,7 +39,7 @@ module Console
         :init_file => nil
       }
 
-      OptionParser.new do |opts|
+      oparser = OptionParser.new do |opts|
         opts.banner = "Usage: console-mux <init_file>"
         opts.on_tail('-h', '--help', 'Show this message') do
           puts opts
@@ -52,7 +52,14 @@ module Console
           puts VERSION
           exit
         end
-      end.parse!(args)
+      end
+      oparser.parse!(args)
+
+      options[:init_file] ||= args.shift
+      unless options[:init_file]
+        $stderr.puts oparser
+        exit 1
+      end
 
       begin
         run(options)

data/lib/console/mux/command_set.rb

@@ -31,16 +31,15 @@ module Console
         # waits for an +:exit+ event from each.
         #
         # @param [Array<Process>] processes
-        def join(processes)
-          pending_exit = processes.size
+        def join(processes, &block)
+          q = EventMachine::Queue.new
+
           processes.each do |proc|
-            proc.on(:exit) do
-              pending_exit -= 1
-              if pending_exit == 0 && block_given?
-                yield
-              end
-            end
+            proc.on(:exit) { q.push :exit }
           end
+
+          (processes.size - 1).times { q.pop {} }
+          q.pop { block.call }  # all have exited
         end
       end
 

data/lib/console/mux/console.rb

@@ -92,33 +92,6 @@ module Console
         end
       end
 
-      def run_commands()
-        next_command = commands.command_q.shift
-        if (!next_command.nil?)
-          commands.startCommand( next_command )
-
-#          if next_command.opts[:blocking]
-#            EventMachine.next_tick do
-#              check_command(next_command) 
-#            end
-#          else
-#          end
-
-          if (!(commands.command_q.empty?))
-            EventMachine.next_tick do
-              run_commands() 
-            end
-          end
-        end
-
-        # EM::Iterator requires the beta version of eventmachine
-#        EM::Iterator.new(commands.command_q).each do |command,iter| 
-#          commands.start( commands.command_q.shift )
-#          iter.next
-#        end
-      end
-
-
       # Using set_ rather than '=' style accessor so config file needn't
       # use self.default_options =.
       def set_default_options(opts)
@@ -250,19 +223,22 @@ module Console
       end
 
       def shutdown
-        if commands.stopped?
+        timer = EventMachine.add_timer(30) do
+          logger.error { "could not halt all processes; giving up :(" }
           EventMachine.stop_event_loop
-        else
-          timer = EventMachine.add_timer(30) do
-            logger.error { "could not halt all processes; giving up :(" }
-            EventMachine.stop_event_loop
-          end
+        end
+        
+        commands.on(:stopped) do
+          EventMachine.cancel_timer(timer)
 
-          commands.on(:stopped) do
-            EventMachine.cancel_timer(timer)
-            EventMachine.stop_event_loop
-          end
+          # If not wrapped in next_tick, EventMachine doesn't exit
+          # immediately (bug?)
+          EventMachine.next_tick { EventMachine.stop_event_loop }
+        end
 
+        if commands.stopped?
+          EventMachine.stop_event_loop
+        else
           commands.stop_all
         end
       end

data/lib/console/mux/process.rb

@@ -64,9 +64,6 @@ module Console
 
       # Called by the child handler
       def unbind
-        @stdin.close rescue nil
-        @stdout.close rescue nil
-
         pid2, status = ::Process.waitpid2(pid, ::Process::WNOHANG)
         if pid2
           on_exit(status)
@@ -135,22 +132,18 @@ module Console
 
         @started_at = Time.now
 
-        stdin, stdout, pid = Dir.chdir command.dir do
+        @stdin, @stdout, @pid = Dir.chdir(command.dir) do
           with_clean_env(command.env) do
             PTY.spawn(command.commandline)
           end
         end
-
-        @stdin = stdin
-        @stdout = stdout
-        @pid = pid
         
         logger.info { "in #{File.expand_path(command.dir)}" }
         logger.info { "with #{command.env.to_a.map{|k,v| "#{k}=#{v}"}.join(' ')}" }
         logger.info { command }
         logger.info { "started process #{pid}" }
         
-        @handler = EventMachine.attach(stdout, PTYHandler, self)
+        @handler = EventMachine.attach(@stdout, PTYHandler, self)
       end
 
       def try_kill(signals)
@@ -197,10 +190,13 @@ module Console
             logger.warn { "process #{pid} exited #{status.inspect}" }
           end
         ensure
+          @stdin.close rescue nil
+          @stdout.close rescue nil
+
           @handler = nil
           fire(:exit)
         end
       end
     end
   end
-end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: console-mux
 version: !ruby/object:Gem::Version
-  version: 2.0.7
-  prerelease: 
+  version: 2.0.8
 platform: ruby
 authors:
-- CG Labs
+- Patrick Mahoney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ripl-readline-em
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,14 +76,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 description: Multiplex several commands on one console
 email:
-- eng@commongroundpublishing.com
+- pat@polycrystal.org
 executables:
 - console-mux
 extensions: []
@@ -120,32 +109,25 @@ files:
 - bin/console-mux
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1031871365713465132
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1031871365713465132
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Multiplex several commands on one console
 test_files: []