coulis 0.1.0 → 0.1.1

data/lib/coulis.rb

@@ -1,136 +1,139 @@
 require "timeout"
 
 class Coulis
-	class << self
-		attr_accessor :args, :_definitions, :_bin, :timeout
-
-		def exec(*args, &block)
-			self.new.exec *args, &block
-		end
-
-		def options(&block)
-			self.new(&block)
-		end
-
-		def bin(p)
-			@_bin = p.to_s
-		end
-
-		def _timeout(t)
-			@timeout = t
-		end
-
-		def adef(name, option=nil, &block)
-			(@_definitions||={})[name.to_sym] = (option || Proc.new { self.instance_eval(&block).flatten })
-		end
-
-		def method_missing(m, args=nil)
-			m = m.to_s.gsub("=", "")
-			@args ||= []
-			definition = @_definitions[m.to_sym] rescue nil
-			
-			#puts "m: #{m}, def: #{definition.inspect} | args:#{args}"
-			if definition.is_a?(Proc)
-				definition.call
-			else
-				if args.to_s.empty?
-					@args << [ definition || "#{"-" if m[0..0] != "-"}#{m}" ]
-				else
-					q = ""
-					q = "'" if args.to_s[0..0] != "'"
-					@args << [ definition || "#{"-" if m[0..0] != "-"}#{m}" , "#{q}#{args}#{q}" ]
-				end
-			end
-		end
-	end
-
-	attr_accessor :args
-
-	def initialize(&block)
-		self.class.instance_eval(&block) if block_given?
-		@args = self.class.args
-		self.class.args = []
-		self
-	end
-
-	def options(&block)
-		self.class.args = @args
-		self.class.new(&block)
-	end
-
-	def remove(*args)
-		new_args = []
-		args.each do |a|
-			@args.select {|b| b[0] == (self.class._definitions[a] || "-#{a}")}.each do |b|
-				@args.delete(b)
-			end
-		end
-		self.class.args = @args
-		self
-	end
-
-	def reset
-		@args = []
-		self.class.args = []
-	end
-
-	def build_args
-		return if @args.nil? or @args.empty?
-		@args.flatten.join(" ")
-	end
-
-	def command
-		"#{self.class._bin || self.class.to_s.downcase} #{build_args}".strip
-	end
-
-	def fire_command(&block)
-		puts command + " (timeout: #{self.class.timeout || -1}) + #{block_given?}" if $DEBUG
-		res = "" unless block_given?
-		IO.popen(command + "  3>&2 2>&1") do |pipe|
-			pipe.each("\r") do |line|
-				if block_given?
-        	yield parse_output(line)
+  class << self
+    attr_accessor :args, :_definitions, :_bin, :timeout
+
+    def exec(*args, &block)
+      self.new.exec *args, &block
+    end
+
+    def options(&block)
+      self.new(&block)
+    end
+
+    def bin(p)
+      @_bin = p.to_s
+    end
+
+    def _timeout(t)
+      @timeout = t
+    end
+
+    def adef(name, option=nil, &block)
+      (@_definitions||={})[name.to_sym] = (option || Proc.new { self.instance_eval(&block).flatten })
+    end
+
+    def method_missing(m, args=nil)
+      m = m.to_s.gsub("=", "")
+      @args ||= []
+      definition = @_definitions[m.to_sym] rescue nil
+
+      #puts "m: #{m}, def: #{definition.inspect} | args:#{args}"
+      if definition.is_a?(Proc)
+        definition.call
+      else
+        arg_name = "#{"-" if m[0..0] != "-"}#{m}"
+        arg_name = "-" + arg_name if arg_name.size > 2
+
+        if args.to_s.empty?
+          @args << [ definition || arg_name ]
         else
-        	res << line
+          q = ""
+          q = "'" if args.to_s[0..0] != "'"
+          @args << [ definition || arg_name , "#{q}#{args}#{q}" ]
         end
       end
-		end
-		return (block_given? ? $? : parse_output(res))
-	end
-
-	def parse_output(output)
-		output
-	end
-
-	def method_missing(m, args=nil)
-		self.class.args = @args
-		self.class.method_missing(m, args)
-		@args = self.class.args
-		self
-	end
-
-	def inspect
-		"#<#{self.class.to_s} command=#{command} timeout=#{self.class.timeout || -1}>"
-	end
-
-	def exec(*args, &block)
-		if args.size > 0
-			i = 0
-			(args.size / 2).times do
-				self.class.send(args[i], args[i+1])
-				i+=2
-			end
-
-			@args = self.class.args
-			self.class.args = []
-		end
-
-		if self.class.timeout
-			Timeout::timeout(self.class.timeout) do
-				fire_command(&block)
-			end
-		else
-			fire_command(&block)
-		end
-	end
-end
+    end
+  end
+
+  attr_accessor :args
+
+  def initialize(&block)
+    self.class.instance_eval(&block) if block_given?
+    @args = self.class.args
+    self.class.args = []
+    self
+  end
+
+  def options(&block)
+    self.class.args = @args
+    self.class.new(&block)
+  end
+
+  def remove(*args)
+    new_args = []
+    args.each do |a|
+      @args.select {|b| b[0] == (self.class._definitions[a] || "-#{a}")}.each do |b|
+        @args.delete(b)
+      end
+    end
+    self.class.args = @args
+    self
+  end
+
+  def reset
+    @args = []
+    self.class.args = []
+  end
+
+  def build_args
+    return if @args.nil? or @args.empty?
+    @args.flatten.join(" ")
+  end
+
+  def command
+    "#{self.class._bin || self.class.to_s.downcase} #{build_args}".strip
+  end
+
+  def fire_command(&block)
+    puts command + " (timeout: #{self.class.timeout || -1}) + #{block_given?}" if $DEBUG
+    res = "" unless block_given?
+    IO.popen(command + "  3>&2 2>&1") do |pipe|
+      pipe.each("\r") do |line|
+        if block_given?
+          yield parse_output(line)
+        else
+          res << line
+        end
+      end
+    end
+    return (block_given? ? $? : parse_output(res))
+  end
+
+  def parse_output(output)
+    output
+  end
+
+  def method_missing(m, args=nil)
+    self.class.args = @args
+    self.class.method_missing(m, args)
+    @args = self.class.args
+    self
+  end
+
+  def inspect
+    "#<#{self.class.to_s} command=#{command} timeout=#{self.class.timeout || -1}>"
+  end
+
+  def exec(*args, &block)
+    if args.size > 0
+      i = 0
+      (args.size / 2).times do
+        self.class.send(args[i], args[i+1])
+        i+=2
+      end
+
+      @args = self.class.args
+      self.class.args = []
+    end
+
+    if self.class.timeout
+      Timeout::timeout(self.class.timeout) do
+        fire_command(&block)
+      end
+    else
+      fire_command(&block)
+    end
+  end
+end

data/test/coulis_test.rb

@@ -2,164 +2,170 @@ require "test/unit"
 require "coulis"
 
 class Ls < Coulis
-	adef :all, "-a"
-	adef :human, "-h"
+  adef :all, "-a"
+  adef :human, "-h"
 
-	adef :full do
-		all; human
-	end
+  adef :full do
+    all; human
+  end
 end
 
 class Ping < Coulis
-	bin `whereis ping`.strip
-	adef :count, "-c"
+  bin `whereis ping`.strip
+  adef :count, "-c"
 end
 
 class NSLookup < Coulis
-	def parse_output(output)
-		output.split("\n").
-			map{|x| x.match(/Address: ([0-9\.]+)/)[1] rescue nil}.
-			compact
-	end
+  def parse_output(output)
+    output.split("\n").
+      map{|x| x.match(/Address: ([0-9\.]+)/)[1] rescue nil}.
+      compact
+  end
 end
 
 class SimpleCliTest < Test::Unit::TestCase
-	def teardown
-		Ls.new.reset
-		Ping.new.reset
-	end
-
-	def test_default_bin
-		assert_equal Ls.new.command, "ls"
-	end
-
-	def test_defined_bin
-		assert_equal Ping.new.command, `whereis ping`.strip
-		assert_equal Ping.new.command, Ping._bin
-	end
-
-	def test_adef
-		assert_equal Ls._definitions[:all], "-a"
-		assert_equal Ls._definitions[:human], "-h"
-	end
-
-	def test_adef_with_block
-		assert_instance_of Proc, Ls._definitions[:full]
-		assert_equal Ls._definitions[:full].call, ["-a", "-h"]
-	end
-
-	def test_argument_added
-		ls = Ls.options { all }
-		assert true, ls.args[0] == "-a"
-	end
-
-	def test_all_arguments_from_adef_added
-		ls = Ls.options { full }
-		assert_equal ls.args.size, 2
-	end
-
-	def test_not_defined_argument
-		ls = Ls.options { s }
-		assert_equal ls.args.size, 1
-		assert_equal ls.args.to_s, "-s"
-	end
-
-	def test_command
-		assert_equal Ls.options { full; s }.command, "ls -a -h -s"
-	end
-
-	def test_add_options
-		ls = Ls.options { a }
-		assert_equal ls.args.flatten.size, 1
-		ls.options { l; h }
-		assert_equal ls.args.flatten.size, 3
-
-		assert_equal ls.command, "ls -a -l -h"
-	end
-
-	def test_add_option
-		ls = Ls.new
-		ls.all
-		assert_equal ls.args.flatten.size, 1
-		assert_equal ls.command, "ls -a"
-
-		ls.l
-		assert_equal ls.args.flatten.size, 2
-		assert_equal ls.command, "ls -a -l"
-	end
-
-	def test_add_option_with_args
-		ping = Ping.options {
-			@args << ["-c", 2] << ["google.com"]
-		}
-
-		assert_equal ping.command, "#{Ping._bin} -c 2 google.com"
-	end
-
-	def test_remove_options
-		ls = Ls.options { a; l; h }
-		ls.remove :a, :h
-		assert_equal ls.command, "ls -l"
-
-		ls.reset
-		ls.all
-		ls.remove :all
-		assert_equal ls.command, "ls"
-	end
-
-	def test_reset
-		ls = Ls.options { a; l; h }
-		assert_equal ls.command, "ls -a -l -h"
-		ls.reset
-		assert_equal ls.command, "ls"
-	end
-
-	def test_exec
-		ls = Ls.options { full }.exec
-		
-		assert_instance_of String, ls
-		assert true, ls.size > 0
-	end
-
-	def test_exec_with_block
-		ls = Ls.options { full }
-		process = ls.exec do |out|
-			assert_instance_of String, out
-			assert true, out.size > 0
-		end
-
-		assert_instance_of Process::Status, process
-		assert_equal process.exitstatus, 0
-	end
-
-	def test_timeout
-		assert_raise Timeout::Error do
-			Ping.options {
-				@args << ["google.com"]
-				_timeout 2
-			}.exec
-		end
-		assert_equal Ping.timeout, 2
-	end
-
-	def test_stdout
-		res = ""
-		Ping.options {
-			count 2
-			@args << ["google.com"]
-		}.exec do |out|
-			res << out
-		end
-
-		assert true, res.size > 0
-	end
-
-	def test_parse_output
-		NSLookup.options {
-			@args = ["google.com"]
-		}.exec do |ips|
-			assert_instance_of Array, ips
-			assert true, ips.size > 1
-		end
-	end
-end
+  def teardown
+    Ls.new.reset
+    Ping.new.reset
+  end
+
+  def test_default_bin
+    assert_equal Ls.new.command, "ls"
+  end
+
+  def test_defined_bin
+    assert_equal Ping.new.command, `whereis ping`.strip
+    assert_equal Ping.new.command, Ping._bin
+  end
+
+  def test_adef
+    assert_equal Ls._definitions[:all], "-a"
+    assert_equal Ls._definitions[:human], "-h"
+  end
+
+  def test_adef_with_block
+    assert_instance_of Proc, Ls._definitions[:full]
+    assert_equal Ls._definitions[:full].call, ["-a", "-h"]
+  end
+
+  def test_argument_added
+    ls = Ls.options { all }
+    assert true, ls.args[0] == "-a"
+  end
+
+  def test_all_arguments_from_adef_added
+    ls = Ls.options { full }
+    assert_equal ls.args.size, 2
+  end
+
+  def test_not_defined_short_argument
+    ls = Ls.options { s }
+    assert_equal ls.args.size, 1
+    assert_equal ls.args.to_s, "-s"
+  end
+  
+  def test_not_defined_long_argument
+    ls = Ls.options { color }
+    assert_equal ls.args.size, 1
+    assert_equal ls.args.to_s, "--color"
+  end
+
+  def test_command
+    assert_equal Ls.options { full; s }.command, "ls -a -h -s"
+  end
+
+  def test_add_options
+    ls = Ls.options { a }
+    assert_equal ls.args.flatten.size, 1
+    ls.options { l; h }
+    assert_equal ls.args.flatten.size, 3
+
+    assert_equal ls.command, "ls -a -l -h"
+  end
+
+  def test_add_option
+    ls = Ls.new
+    ls.all
+    assert_equal ls.args.flatten.size, 1
+    assert_equal ls.command, "ls -a"
+
+    ls.l
+    assert_equal ls.args.flatten.size, 2
+    assert_equal ls.command, "ls -a -l"
+  end
+
+  def test_add_option_with_args
+    ping = Ping.options {
+      @args << ["-c", 2] << ["google.com"]
+    }
+
+    assert_equal ping.command, "#{Ping._bin} -c 2 google.com"
+  end
+
+  def test_remove_options
+    ls = Ls.options { a; l; h }
+    ls.remove :a, :h
+    assert_equal ls.command, "ls -l"
+
+    ls.reset
+    ls.all
+    ls.remove :all
+    assert_equal ls.command, "ls"
+  end
+
+  def test_reset
+    ls = Ls.options { a; l; h }
+    assert_equal ls.command, "ls -a -l -h"
+    ls.reset
+    assert_equal ls.command, "ls"
+  end
+
+  def test_exec
+    ls = Ls.options { full }.exec
+
+    assert_instance_of String, ls
+    assert true, ls.size > 0
+  end
+
+  def test_exec_with_block
+    ls = Ls.options { full }
+    process = ls.exec do |out|
+      assert_instance_of String, out
+      assert true, out.size > 0
+    end
+
+    assert_instance_of Process::Status, process
+    assert_equal process.exitstatus, 0
+  end
+
+  def test_timeout
+    assert_raise Timeout::Error do
+      Ping.options {
+        @args << ["google.com"]
+        _timeout 2
+      }.exec
+    end
+    assert_equal Ping.timeout, 2
+  end
+
+  def test_stdout
+    res = ""
+    Ping.options {
+      count 2
+      @args << ["google.com"]
+    }.exec do |out|
+      res << out
+    end
+
+    assert true, res.size > 0
+  end
+
+  def test_parse_output
+    NSLookup.options {
+      @args = ["google.com"]
+    }.exec do |ips|
+      assert_instance_of Array, ips
+      assert true, ips.size > 1
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bruno Celeste
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +02:00
+date: 2011-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: []