console-mux 2.0.2 → 2.0.6

data/lib/console/mux.rb

@@ -58,7 +58,7 @@ module Console
     end
 
     def self.run(options)
-      Console.new(options)
+      Console.new(options).startup
     end
   end
-end
+end

data/lib/console/mux/command.rb

@@ -74,6 +74,10 @@ module Console
       # `[new_command, new_opts]`.
       def initialize(opts)
         @opts = opts.dup
+        # one-level-deep dup, required to properly dup :env, possibly others
+        opts.each do |k,v|
+          @opts[k] = v.dup if v.kind_of?(Hash)
+        end
 
         self.env ||= {}
         self.run_with ||= []
@@ -131,4 +135,4 @@ module Console
       end
     end
   end
-end
+end

data/lib/console/mux/console.rb

@@ -40,9 +40,10 @@ module Console
 
       BUFFER_LINES = 10000
 
-      attr_reader :commands, :default_options, :formatter, :buffer, :logger
+      attr_reader :commands, :options, :default_options, :formatter, :buffer, :logger
 
       def initialize(options={})
+        @options = options
         @commands = CommandSet.new
         @default_options = Hash.new
         @base_dir = '.'
@@ -58,7 +59,9 @@ module Console
                                       BUFFER_LINES,
                                       :formatter => formatter)
         logger.add @buffer
+      end
 
+      def startup
         EventMachine.run do
           logger.info { 'Initializing' }
 
@@ -149,16 +152,20 @@ module Console
       #           {:command => 'ls'})
       #
       # @param [Hash] *opts one or more option hashes passed to +Command.new+.
-      def run(*optses)
-        names = optses.map do |opts|
+      def run(*opts_hashes)
+        names = add(*opts_hashes).compact
+        seq_names(names)
+      end
+
+      # Like #run, but does not start any processes.
+      def add(*opts_hashes)
+        opts_hashes.map do |opts|
           if opts.kind_of? Array
             opts.map { |o| make_command_and_add(o) }
           else
             make_command_and_add(opts)
           end
         end
-
-        seq_names(names.compact)
       end
 
       def make_command(opts)
@@ -188,6 +195,13 @@ module Console
       end
       private :make_command_and_add
 
+      # Run a sequence of names where each name is the name of a
+      # process that may be started.  Each process identified by
+      # +names+ will be started, and only after it exits will the
+      # remaining processes be started.
+      #
+      # Each element of +names+ may be a single name or an array of
+      # names, in which case all are started in parallel.
       def seq_names(names)
         return unless names.size > 0
 
@@ -285,4 +299,4 @@ module Console
       end
     end
   end
-end
+end

data/lib/console/mux/run_with.rb

@@ -71,4 +71,4 @@ module Console
       end
     end
   end
-end
+end

data/lib/console/mux/shell.rb

@@ -62,6 +62,7 @@ module Console
                              :status,
                              :lastlog,
                              :run,
+                             :add,
                              :start,
                              :stop,
                              :restart,
@@ -82,4 +83,4 @@ module Console
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console-mux
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -99,21 +99,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/console/mux/events.rb
-- lib/console/mux/console.rb
-- lib/console/mux/pty_handler.rb
-- lib/console/mux/command.rb
-- lib/console/mux/rolling_array.rb
-- lib/console/mux/env_with_merged.rb
 - lib/console/mux/buffer_outputter.rb
-- lib/console/mux/console_outputter.rb
+- lib/console/mux/color_formatter.rb
+- lib/console/mux/command.rb
 - lib/console/mux/command_set.rb
-- lib/console/mux/util.rb
-- lib/console/mux/run_with.rb
+- lib/console/mux/console.rb
+- lib/console/mux/console_outputter.rb
+- lib/console/mux/env_with_merged.rb
+- lib/console/mux/events.rb
 - lib/console/mux/object_compose.rb
 - lib/console/mux/process.rb
-- lib/console/mux/color_formatter.rb
+- lib/console/mux/pty_handler.rb
+- lib/console/mux/rolling_array.rb
+- lib/console/mux/run_with.rb
 - lib/console/mux/shell.rb
+- lib/console/mux/util.rb
 - lib/console/mux.rb
 - lib/console/mux/bundle_exec.sh
 - bin/console-mux
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2589698380893334747
+      hash: -1687027767931669956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2589698380893334747
+      hash: -1687027767931669956
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23