mux 0.0.1 → 0.0.3

data/Rakefile

@@ -0,0 +1,37 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/gempackagetask'
+
+PKG_NAME = 'mux'
+PKG_VERSION = '0.0.3'
+
+desc "Default task"
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = true
+end
+
+GEM_SPEC = eval(File.read("#{File.dirname(__FILE__)}/#{PKG_NAME}.gemspec"))
+
+Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  p.gem_spec = GEM_SPEC
+  p.need_tar = true
+  p.need_zip = true
+end
+
+desc "Clean up generated files"
+task :clean do
+  rm_rf "pkg"
+  rm_rf "doc/mux.1.gz"
+end
+
+desc "Zip manpage"
+task :man do
+  sh "gzip -c doc/mux.1 >doc/mux.1.gz"
+end
+
+desc "Build and package for release"
+task :release => [:man, :package]

data/bin/mux

@@ -28,7 +28,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-require 'rubygems'
+#require 'rubygems'
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mux'
 
-Mux.run(ARGV)
+Mux.new.run(ARGV)

data/lib/mux.rb

@@ -30,47 +30,39 @@
 require 'optparse'
 require 'ostruct'
 
-class Mux 
-  def self.run(args)
+class Mux
+  
+  M = { :pipe => {:class => 'IO', :method => 'popen', :mode => 'w'},
+        :funnel => {:class => 'File', :method => 'open', :mode => 'w'},
+        :append => {:class => 'File', :method => 'open', :mode => 'a'} }
+  
+  def run(args)
     options = Mux::Options.parse(args)
     
-    streams = []
+    streams = options.to_stdout ? [$stdout] : []
     
-    if options.to_stdout
-      streams << $stdout
+    # this is silly and rather non-intuitive (at least tonight), but is fun
+    # nonetheless... i'll keep it around for a while and see what i think.
+    # ps. IT TOTALLY WORKS!
+    M.each_key do |k|
+      o = lambda { eval("options.#{k}s") }
+      streams.concat(open_streams(o.call, k)) if o.call
     end
-    
-    streams.concat(open_streams(options.pipes, 'pipe'))
-    streams.concat(open_streams(options.funnels, 'funnel'))
-    streams.concat(open_streams(options.appends, 'append'))
 
-    while buffer = $stdin.gets
-      streams.each do |stream|
-        stream.puts buffer
-      end
+    $stdin.each_line do |b|
+      streams.each {|s| s.write b }
     end
 
-    streams.each do |stream|
-      stream.close
-    end
-    
+    streams.each {|s| s.close }    
   end
   
-  def self.open_streams(targets, type)
-    handles = []
-    targets.each do |target|
-      case type
-        when 'pipe'
-          handles << IO.popen(target, 'w')
-        when 'funnel'
-          handles << File.open(target, 'w')
-        when 'append'
-          handles << File.open(target, 'a')
-      end
-    end
-    handles
+  def open_streams(targets, type)
+    targets.map {|t| open_stream(t,type) }
   end
   
+  def open_stream(target, type)
+    eval("#{M[type][:class]}.#{M[type][:method]}(target,'#{M[type][:mode]}')")
+  end
 end
 
 class Mux::Options
@@ -78,9 +70,6 @@ class Mux::Options
     options = OpenStruct.new
     options.verbose = false
     options.to_stdout = false
-    options.pipes = []
-    options.appends = []
-    options.funnels = []
     
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: mux [options]"
@@ -118,6 +107,6 @@ class Mux::Options
     end
     
     opts.parse!(args)
-    options 
+    return options 
   end  
 end

data/mux.gemspec

@@ -0,0 +1,17 @@
+require 'rake'
+
+
+Gem::Specification.new do |s|
+  s.name = 'mux'
+  s.version = PKG_VERSION
+  s.platform = Gem::Platform::RUBY
+  s.summary = 'tee(1) on crack'
+  s.files = FileList['Rakefile', 'bin/mux', 'lib/*.rb', 'README', 'doc/mux.1.gz', 'test/*.rb', 'mux.gemspec']
+  s.require_path = 'lib'
+  s.autorequire = 'mux'
+  s.bindir = 'bin'
+  s.executables << 'mux'
+  s.author = 'Jerome Harrington'
+  s.email = 'jharrington@awk-fu.com'
+  s.homepage = 'http://www.awk-fu.com/software/mux'
+end

data/test/executable_test.rb

@@ -0,0 +1,51 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+require 'mux'
+
+class Mux::ExecutableTest < Test::Unit::TestCase
+  
+  MUX = 'ruby ' + File.join(File.dirname(__FILE__), '..', 'bin', 'mux')
+
+  OUT_FILE = '/tmp/mux_executable_test.txt'
+
+  def setup
+    remove_out_file
+  end
+
+  def teardown
+    remove_out_file
+  end
+
+  def remove_out_file
+    if File.exists?(OUT_FILE)
+      File.delete(OUT_FILE)
+    end
+  end
+
+  def test_pipe
+    r = `echo "blah" | #{MUX} -p 'cat'`
+    assert_equal "blah\n", r
+  end
+
+  def test_stdout
+    r = `echo "blah" | #{MUX} -s`
+    assert_equal "blah\n", r
+  end
+
+  def test_funnel
+    r = `echo "blah" | #{MUX} -f #{OUT_FILE}`
+    r = File.read(OUT_FILE)
+    assert_equal "blah\n", r
+  end
+
+  def test_append
+    2.times do
+      `echo "blah" | #{MUX} -a #{OUT_FILE}`
+    end
+
+    r = File.read(OUT_FILE)
+    assert_equal "blah\nblah\n", r
+  end
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: mux
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-11-05 00:00:00 -05:00
+  version: 0.0.3
+date: 2007-02-08 00:00:00 -05:00
 summary: tee(1) on crack
 require_paths: 
 - lib
@@ -29,9 +29,13 @@ post_install_message:
 authors: 
 - Jerome Harrington
 files: 
+- Rakefile
 - bin/mux
 - lib/mux.rb
 - README
+- doc/mux.1.gz
+- test/executable_test.rb
+- mux.gemspec
 test_files: []
 
 rdoc_options: []