command-builder 0.1.0 → 0.1.1

data/CHANGES.txt

@@ -0,0 +1,7 @@
+
+0.1.1 (2011-07-24)
+* #reset method added
+* internal switch to more modern 'hash-utils'
+
+0.1.0 (2011-02-16) 
+* initial version

data/Gemfile

@@ -1,12 +1,11 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "depq", ">= 0.4"
-   gem "hash-utils", ">= 0.7.0"
+  gem "hash-utils", ">= 0.18.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.5.2"
 end

data/Gemfile.lock

@@ -2,17 +2,17 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    hash-utils (0.8.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hash-utils (0.18.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    rake (0.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  hash-utils (>= 0.7.0)
-  jeweler (~> 1.5.2)
+  bundler (>= 1.0.0)
+  hash-utils (>= 0.18.0)
+  jeweler (>= 1.5.2)

data/README.md

@@ -12,7 +12,7 @@ command line from its arguments. Here is real example of call to
     cmd << :preserve
     cmd << "image.jpg"
     
-    cmd.to_s    # will return 'jpegoptim -m 2 --preserve
+    cmd.to_s    # will return 'jpegoptim -m 2 --preserve image.jpg'
     
 Value escaping and assignments are supported automatically of sure, 
 so call:
@@ -50,5 +50,5 @@ Copyright
 Copyright &copy; 2011 [Martin Kozák][3]. See `LICENSE.txt` for
 further details.
 
-[2]: http://github.com/martinkozak/qrpc/issues
+[2]: http://github.com/martinkozak/command-builder/issues
 [3]: http://www.martinkozak.net/

data/Rakefile

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -8,9 +9,10 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "command-builder"
@@ -25,13 +27,3 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "qrpc #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/command-builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{command-builder}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Kozák"]
-  s.date = %q{2011-02-16}
+  s.authors = [%q{Martin Kozák}]
+  s.date = %q{2011-07-24}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGES.txt",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -28,27 +29,27 @@ Gem::Specification.new do |s|
     "test.rb"
   ]
   s.homepage = %q{https://github.com/martinkozak/command-builder}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Builds call to some command runnable from shell command line from its arguments.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hash-utils>, [">= 0.7.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
-      s.add_dependency(%q<hash-utils>, [">= 0.7.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
-    s.add_dependency(%q<hash-utils>, [">= 0.7.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end
 end
 

data/lib/command-builder.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
 require "hash-utils/object"
+require "hash-utils/array"
 
 ##
 # Represents one command line command with arguments and parameters.
@@ -61,8 +63,7 @@ class CommandBuilder
     def initialize(command, separators = ["-", " ", "--", "="])
         @command = command
         @separators = separators
-        @args = [ ]
-        @params = [ ]
+        self.reset!
     end
     
     ##
@@ -167,9 +168,9 @@ class CommandBuilder
     #
     
     def add(option, value = nil)
-        if option.kind_of? Symbol or not value.nil?
+        if option.symbol? or not value.nil?
             self.argument(option, value)
-        elsif option.kind_of? Array
+        elsif option.array?
             self.parameters(option)
         else
             self.parameter(option)
@@ -253,6 +254,18 @@ class CommandBuilder
         return cmd
     end
     
+    ##
+    # Resets the arguments and parameters so prepares it for new build.
+    # @since 0.1.1
+    #
+    
+    def reset!
+        @args = [ ]
+        @params = [ ]
+    end
+    
+    alias :reset :"reset!"
+    
     
     private
     
@@ -268,18 +281,18 @@ class CommandBuilder
         short = (name.length == 1)
         
         if short
-            cmd << @separators[0]
+            cmd << @separators.first
         else
-            cmd << @separators[2]
+            cmd << @separators.third
         end
         cmd << name
         
         # Value
         if not value.nil?
             if short
-                cmd << @separators[1]
+                cmd << @separators.second
             else
-                cmd << @separators[3]
+                cmd << @separators.fourth
             end
             cmd << self.quote(value.to_s)
         end

data/test.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
 
-require "./jpeg"
+$:.push("./lib")
+require "command-builder"
 
 cmd = CommandBuilder::new(:jpegoptim)
 cmd << :preserve
 cmd << :p
 cmd << "file.jpg"
-cmd << ["1.jpg", "2.jpg"]
+cmd << ["1 1.jpg", "2.jpg"]
 cmd.arg(:max, 3)
 cmd.arg(:m, 3)
 cmd[:other] = "value"
@@ -14,3 +15,6 @@ cmd[:o] = "another '\" value"
 puts cmd
 
 puts cmd[:max].inspect
+
+cmd.reset!
+puts cmd

metadata

@@ -2,7 +2,7 @@
 name: command-builder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +01:00
-default_executable: 
+date: 2011-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hash-utils
@@ -20,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -29,7 +28,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
@@ -40,7 +39,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.5.2
   type: :development
@@ -57,6 +56,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGES.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -66,7 +66,6 @@ files:
 - command-builder.gemspec
 - lib/command-builder.rb
 - test.rb
-has_rdoc: true
 homepage: https://github.com/martinkozak/command-builder
 licenses: 
 - MIT
@@ -80,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3460613354245492068
+      hash: 1643594554722513454
       segments: 
       - 0
       version: "0"
@@ -93,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Builds call to some command runnable from shell command line from its arguments.