fluent_command_builder 0.8.6 → 0.8.7

data/lib/fluent_command_builder/path_validator.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/printer')
+
+module FluentCommandBuilder
+  class PathValidator
+
+    def initialize(underlying_builder)
+      @underlying_builder = underlying_builder
+      @printer = Printer.new
+    end
+
+    def validate
+      return unless can_validate?
+      return if is_valid?
+      version = @underlying_builder.version || '(unknown)'
+      message = %Q[Path for command "#{@underlying_builder.command_name}", version "#{version}" does not exist. Path: #{path}]
+      @printer.print_error message
+      raise message
+    end
+
+    private
+
+    def can_validate?
+      !path.nil?
+    end
+
+    def is_valid?
+      File.exist? path
+    end
+
+    def path
+      @underlying_builder.path
+    end
+
+  end
+end

data/lib/fluent_command_builder/underlying_builder.rb

@@ -1,73 +1,45 @@
-require File.expand_path(File.dirname(__FILE__) + '/command_base')
+require File.expand_path(File.dirname(__FILE__) + '/argument_formatter')
 require File.expand_path(File.dirname(__FILE__) + '/execution_context')
-require File.expand_path(File.dirname(__FILE__) + '/path_finder')
 
 module FluentCommandBuilder
   class UnderlyingBuilder
+    include ArgumentFormatter
 
-    attr_accessor :command_name, :path, :passwords
+    attr_reader :command_name, :version, :args, :passwords
+    attr_accessor :path, :actual_version_lambda
 
-    def initialize(command_name=nil)
+    def initialize(command_name, version=nil)
       @command_name = command_name
-      @path = nil
-      @args = ''
+      @version = version
+      @args = nil
       @passwords = []
+      @path = nil
+      @actual_version_lambda = nil
       @execution_context = FluentCommandBuilder.execution_context
     end
 
-    def format(value, delimiter=' ', key_value_separator='=')
-      case
-        when value.kind_of?(CommandBase)
-          value.to_s
-        when value.kind_of?(Hash)
-          format_hash value, delimiter, key_value_separator
-        when value.kind_of?(Array)
-          format_array value, delimiter
-        else
-          quote_if_includes_space value.to_s
-      end
-    end
-
-    def format_password(value)
-      password = quote_if_includes_space value.to_s
-      @passwords << password
-      password
-    end
-
     def append(value)
-      @args << value.to_s
-    end
-
-    def to_s
-      "#{quote_if_includes_space executable} #{args}".strip
-    end
-
-    def args
-      @args.strip
+      v = value.to_s
+      v = @args ? v : v.lstrip
+      @args = @args.to_s + v
     end
 
     def executable
-      executable = @path ? File.join(@path, @command_name) : @command_name
-      executable.gsub! '/', '\\' if executable.include? '\\'
-      executable
+      e = @path ? File.join(@path, @command_name) : @command_name
+      e.gsub! '/', '\\' if e.include? '\\'
+      e
     end
 
     def execute
       @execution_context.execute self
     end
 
-    private
-
-    def format_hash(hash, delimiter, key_value_separator)
-      hash.map { |k, v| quote_if_includes_space(k.to_s) + key_value_separator + quote_if_includes_space(v.to_s) }.join delimiter
+    def actual_version
+      @actual_version_lambda.call @path if @actual_version_lambda
     end
 
-    def format_array(array, delimiter)
-      array.map { |v| quote_if_includes_space v }.join delimiter
-    end
-
-    def quote_if_includes_space(value)
-      value.to_s.include?(' ') ? %Q["#{value}"] : value
+    def to_s
+      "#{quote_if_includes_space executable} #{@args}".strip
     end
 
   end

data/lib/fluent_command_builder/version_validator.rb

@@ -1,57 +1,46 @@
 require File.expand_path(File.dirname(__FILE__) + '/printer')
-require File.expand_path(File.dirname(__FILE__) + '/version')
 
 module FluentCommandBuilder
-
   class VersionValidator
 
-    def initialize(command_builder_class, path)
-      @command_builder_class = command_builder_class
-      @path = path
+    def initialize(underlying_builder)
+      @underlying_builder = underlying_builder
       @printer = Printer.new
     end
 
     def validate
-      unless can_validate?
-        @printer.print_warning %Q[Version validation for command "#{command_name}" aborted. An internal error occurred.]
+      return unless can_validate?
+
+      unless actual_version
+        print_warning 'unable to determine actual version'
         return
       end
 
       unless is_valid?
-        @printer.print_warning %Q[Version validation for command "#{command_name}" failed. Expected version #{version_in_use.to_s(2)} but was #{version_on_path.to_s(2)}.]
+        print_warning actual_version.to_s(2)
       end
     end
 
+    private
+
     def can_validate?
-      begin
-        is_valid?
-        return true
-      rescue
-        return false
-      end
+      @underlying_builder.version && @underlying_builder.actual_version_lambda
     end
 
     def is_valid?
-      version_in_use.compact == version_on_path.compact
-    end
-
-    private
-
-    def version_in_use
-      @version_in_use ||= Version.new(module_at_index(2)::VERSION)
+      actual_version.compact == expected_version.compact
     end
 
-    def version_on_path
-      @version_on_path ||= Version.new(module_at_index(1).version(@path))
+    def expected_version
+      Version.new(@underlying_builder.version)
     end
 
-    def command_name
-      @command_name ||= module_at_index(1)::COMMAND_NAME
+    def actual_version
+      Version.new(@underlying_builder.actual_version) if @underlying_builder.actual_version
     end
 
-    def module_at_index(index)
-      module_name = @command_builder_class.name.split('::').first(index + 1).join('::')
-      eval module_name
+    def print_warning(message)
+      @printer.print_warning %Q[Version validation for command "#{@underlying_builder.command_name}" failed. Expected version #{expected_version} but was #{message}.]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70309445754720 !ruby/object:Gem::Requirement
+  requirement: &70347631048860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309445754720
+  version_requirements: *70347631048860
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70309445754280 !ruby/object:Gem::Requirement
+  requirement: &70347631048420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,13 +32,14 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309445754280
+  version_requirements: *70347631048420
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/fluent_command_builder/argument_formatter.rb
 - lib/fluent_command_builder/command_base.rb
 - lib/fluent_command_builder/command_builders/appcfg_python.rb
 - lib/fluent_command_builder/command_builders/appcfg_python_16.rb
@@ -111,6 +112,7 @@ files:
 - lib/fluent_command_builder/path_finder.rb
 - lib/fluent_command_builder/path_finders/unix_path_finder.rb
 - lib/fluent_command_builder/path_finders/windows_path_finder.rb
+- lib/fluent_command_builder/path_validator.rb
 - lib/fluent_command_builder/printer.rb
 - lib/fluent_command_builder/underlying_builder.rb
 - lib/fluent_command_builder/version.rb