command-builder 0.2.2 → 0.3.0

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+0.2.2 (2011-12-13)
+* switch to 'jeweler2' gem
+* switch to STL's Shellwords class for arguments escaping
+
 0.2.1 (2011-10-18)
 * #execute yields both output and done indicator
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/command-builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "command-builder"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2011-12-13"
+  s.date = "2012-01-22"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/martinkozak/command-builder"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.12"
+  s.rubygems_version = "1.8.15"
   s.summary = "Builds command runnable from shell by simple and ellegant way. Also allows both synchronous executing or asynchronous one using EventMachine."
 
   if s.respond_to? :specification_version then

data/lib/command-builder.rb

@@ -94,6 +94,7 @@ class CommandBuilder
     
     def argument(name, value = nil)
         @args << [name, value]
+        @order << :argument
     end
     
     alias :arg :argument
@@ -117,6 +118,7 @@ class CommandBuilder
     
     def parameter(value)
         @params << value
+        @order << :parameter
     end
     
     alias :param :parameter
@@ -139,6 +141,8 @@ class CommandBuilder
             return @params
         else
             @params += values
+            orders = [:parameter] * values.length
+            @order.push(*orders)
         end
     end
     
@@ -236,17 +240,19 @@ class CommandBuilder
 
     def to_s
         cmd = @command.to_s.gsub(" ", "\\ ")
+        args = @args.dup
+        params = @params.dup
         
-        # Arguments
-        @args.each do |name, value|
-            __add_arg(cmd, name, value)
-        end
-        
-        # Parameters
-        @params.each do |param|
-            cmd << " " << self.quote(param.to_s)
+        @order.each do |type|
+            if type == :argument
+                name, value = args.shift
+                __add_arg(cmd, name, value)
+            else
+                param = params.shift
+                cmd << " " << self.quote(param.to_s)
+            end
         end
-        
+
         return cmd
     end
     
@@ -260,6 +266,7 @@ class CommandBuilder
     def reset!
         @args = [ ]
         @params = [ ]
+        @order = [ ]
         self
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &8465080 !ruby/object:Gem::Requirement
+  requirement: &70274993164260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *8465080
+  version_requirements: *70274993164260
 - !ruby/object:Gem::Dependency
   name: pipe-run
-  requirement: &8463340 !ruby/object:Gem::Requirement
+  requirement: &70274993163780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *8463340
+  version_requirements: *70274993163780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8462660 !ruby/object:Gem::Requirement
+  requirement: &70274993163300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8462660
+  version_requirements: *70274993163300
 - !ruby/object:Gem::Dependency
   name: jeweler2
-  requirement: &8461920 !ruby/object:Gem::Requirement
+  requirement: &70274993162820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8461920
+  version_requirements: *70274993162820
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4070120530091503344
+      hash: -3964241019989183183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Builds command runnable from shell by simple and ellegant way. Also allows