fluent_command_builder 0.8.17 → 0.8.18

data/lib/fluent_command_builder/command_builder_config.rb

@@ -27,5 +27,25 @@ module FluentCommandBuilder
       v.validate validation_level
     end
 
+    def tidy_path
+      return unless @path
+      is_windows? ? @path.gsub('/', '\\') : @path.gsub('\\', '/')
+    end
+
+    def evaluated_path
+      return unless @path
+      is_windows? ? windows_path : @path
+    end
+
+    private
+
+    def windows_path
+      `echo #{tidy_path}`.strip
+    end
+
+    def is_windows?
+      !ENV['WINDIR'].nil?
+    end
+
   end
 end

data/lib/fluent_command_builder/path_validator.rb

@@ -4,13 +4,13 @@ module FluentCommandBuilder
   class PathValidator
 
     def initialize(command_builder_config)
-      @command_builder_config = command_builder_config
+      @c = command_builder_config
       @printer = Printer.new
     end
 
     def validate(validation_level=:warn)
-      return if File.exist? path
-      message = %Q[Path for command "#{command_name}", version "#{version}" does not exist. Path: #{path}]
+      return if File.exist? @c.evaluated_path
+      message = %Q[Path for command "#{@c.command_name}", version "#{@c.version}" does not exist. Path: #{@c.evaluated_path}]
 
       case validation_level
         when :warn
@@ -23,27 +23,5 @@ module FluentCommandBuilder
       end
     end
 
-    private
-
-    def path
-      is_windows? ? windows_path : @command_builder_config.path
-    end
-
-    def windows_path
-      `echo #{@command_builder_config.path}`.strip
-    end
-
-    def command_name
-      @command_builder_config.command_name
-    end
-
-    def version
-      @command_builder_config.version
-    end
-
-    def is_windows?
-      !ENV['WINDIR'].nil?
-    end
-
   end
 end

data/lib/fluent_command_builder/underlying_builder.rb

@@ -5,10 +5,10 @@ module FluentCommandBuilder
   class UnderlyingBuilder
     include ArgumentFormatter
 
-    attr_reader :command_builder_config, :args, :passwords
+    attr_reader :args, :passwords
 
     def initialize(command_builder_config)
-      @command_builder_config = command_builder_config
+      @c = command_builder_config
       @args = nil
       @passwords = []
       @execution_context = FluentCommandBuilder.execution_context
@@ -21,45 +21,20 @@ module FluentCommandBuilder
     end
 
     def executable
-      e = path ? File.join(path, command_name) : command_name
-      e.gsub! '/', '\\' if is_windows?
-      e
+      @c.path ? File.join(@c.tidy_path, @c.command_name) : @c.command_name
     end
 
     def execute
-      @command_builder_config.validate_path :fatal
-      @command_builder_config.validate_version
+      @c.validate_path :fatal
+      @c.validate_version
       visible_command = @execution_context.formatter.format self
       @execution_context.execute to_s, visible_command
     end
 
     def to_s
-      quoted_executable = evaluated_path.to_s.include?(' ') ? %Q["#{executable}"] : executable
+      quoted_executable = @c.evaluated_path.to_s.include?(' ') ? %Q["#{executable}"] : executable
       "#{quoted_executable} #{@args}".strip
     end
 
-    private
-
-    def path
-      @command_builder_config.path
-    end
-
-    def command_name
-      @command_builder_config.command_name
-    end
-
-    def evaluated_path
-      return unless path
-      is_windows? ? windows_path : @command_builder_config.path
-    end
-
-    def windows_path
-      `echo #{@command_builder_config.path}`.strip
-    end
-
-    def is_windows?
-      !ENV['WINDIR'].nil?
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70287098551400 !ruby/object:Gem::Requirement
+  requirement: &70335087153820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287098551400
+  version_requirements: *70335087153820
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70287098550960 !ruby/object:Gem::Requirement
+  requirement: &70335087153380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287098550960
+  version_requirements: *70335087153380
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []