fluent_command_builder 0.6.0 → 0.7.0

data/lib/fluent_command_builder/executor.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/executors/backticks_executor')
+require File.expand_path(File.dirname(__FILE__) + '/executors/dry_run_executor')
+require File.expand_path(File.dirname(__FILE__) + '/executors/rake_sh_executor')
+require File.expand_path(File.dirname(__FILE__) + '/executors/system_executor')
+
+module FluentCommandBuilder
+  class Executor
+
+    attr_accessor :backticks_executor, :dry_run_executor, :rake_sh_executor, :system_executor
+
+    def initialize
+      @backticks_executor = BackticksExecutor.new
+      @dry_run_executor = DryRunExecutor.new
+      @rake_sh_executor = RakeShExecutor.new
+      @system_executor = SystemExecutor.new
+    end
+
+    def execute_backticks(command)
+      @backticks_executor.execute command
+    end
+
+    def execute_dry_run(command)
+      @dry_run_executor.execute command
+    end
+
+    def execute_rake_sh(command)
+      @rake_sh_executor.execute command
+    end
+
+    def execute_system(command)
+      @system_executor.execute command
+    end
+
+  end
+
+  def self.executor
+    @executor ||= Executor.new
+  end
+
+  def self.executor=(value)
+    @executor = value
+  end
+
+end

data/lib/fluent_command_builder/executors/backticks_executor.rb

@@ -0,0 +1,7 @@
+module FluentCommandBuilder
+  class BackticksExecutor
+    def execute(command)
+      `#{command}`
+    end
+  end
+end

data/lib/fluent_command_builder/executors/dry_run_executor.rb

@@ -0,0 +1,7 @@
+module FluentCommandBuilder
+  class DryRunExecutor
+    def execute(command)
+      puts command
+    end
+  end
+end

data/lib/fluent_command_builder/executors/rake_sh_executor.rb

@@ -0,0 +1,10 @@
+require 'rake'
+include Rake::DSL
+
+module FluentCommandBuilder
+  class RakeShExecutor
+    def execute(command)
+      sh command
+    end
+  end
+end

data/lib/fluent_command_builder/executors/system_executor.rb

@@ -0,0 +1,7 @@
+module FluentCommandBuilder
+  class SystemExecutor
+    def execute(command)
+      system command
+    end
+  end
+end

data/lib/fluent_command_builder/path_finder.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/path_finders/unix_path_finder')
+require File.expand_path(File.dirname(__FILE__) + '/path_finders/windows_path_finder')
+
+module FluentCommandBuilder
+
+  def self.path_finder
+    @path_finder ||= is_windows? ? WindowsPathFinder.new : UnixPathFinder.new
+  end
+
+  def self.path_finder=(value)
+    @path_finder = value
+  end
+
+  private
+
+  def self.is_windows?
+    !ENV['WINDIR'].nil?
+  end
+
+end

data/lib/fluent_command_builder/path_finders/unix_path_finder.rb

@@ -0,0 +1,13 @@
+module FluentCommandBuilder
+  class UnixPathFinder
+
+    def find_path(executable_name)
+      executable = `which #{executable_name}`
+      real_executable = `readlink #{executable}`.strip
+      result = real_executable == '' ? executable : real_executable
+      return unless result
+      File.dirname result
+    end
+
+  end
+end

data/lib/fluent_command_builder/path_finders/windows_path_finder.rb

@@ -0,0 +1,14 @@
+module FluentCommandBuilder
+  class WindowsPathFinder
+
+    def find_path(executable_name)
+      paths =  ENV['PATH'].split ';'
+      extensions = ENV['PATHEXT'].split ';'
+      possibilities = paths.map { |path| extensions.map { |ext| File.join(path, executable_name + ext.downcase).gsub('/', '\\') } }.flatten
+      executable = possibilities.select { |exe| File.exist? exe }.first
+      return unless executable
+      File.dirname executable
+    end
+
+  end
+end

data/lib/fluent_command_builder/underlying_builder.rb

@@ -1,60 +1,76 @@
-require File.expand_path(File.dirname(__FILE__) + '/command_base')
-
-module FluentCommandBuilder
-  class UnderlyingBuilder
-
-    attr_accessor :command_name, :path
-
-    def initialize(command_name=nil)
-      @command_name = command_name
-      @path = nil
-      @args = ''
-    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 append(value)
-      @args << value.to_s
-    end
-
-    def to_s
-      "#{quote_if_includes_space executable} #{args}".strip
-    end
-
-    def args
-      @args.strip
-    end
-
-    def executable
-      executable = @path ? File.join(@path, @command_name) : @command_name
-      executable.gsub! '/', '\\' if executable.include? '\\'
-      executable
-    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
-    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
-    end
-
-  end
+require File.expand_path(File.dirname(__FILE__) + '/command_base')
+require File.expand_path(File.dirname(__FILE__) + '/executor')
+require File.expand_path(File.dirname(__FILE__) + '/path_finder')
+
+module FluentCommandBuilder
+
+  def self.default_executor
+    @default_executor ||= self.executor.rake_sh_executor
+  end
+
+  def self.default_executor=(value)
+    @default_executor = value
+  end
+
+  class UnderlyingBuilder
+
+    attr_accessor :command_name, :path, :executor
+
+    def initialize(command_name=nil)
+      @command_name = command_name
+      @path = nil
+      @executor = FluentCommandBuilder.default_executor
+      @args = ''
+    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 append(value)
+      @args << value.to_s
+    end
+
+    def to_s
+      "#{quote_if_includes_space executable} #{args}".strip
+    end
+
+    def args
+      @args.strip
+    end
+
+    def executable
+      executable = @path ? File.join(@path, @command_name) : @command_name
+      executable.gsub! '/', '\\' if executable.include? '\\'
+      executable
+    end
+
+    def execute
+      @executor.execute to_s
+    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
+    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
+    end
+
+  end
 end

data/lib/fluent_command_builder/version.rb

@@ -0,0 +1,40 @@
+module FluentCommandBuilder
+  class Version
+
+    attr_accessor :version
+
+    def initialize(version)
+      raise "#{version} is not a valid version." unless Version.is_valid? version
+      @version = version
+    end
+
+    def compact
+      @version.match(/^\d+\.\d+/)[0].sub('.', '')
+    end
+
+    def to_s(precision=nil)
+      return @version unless precision
+      @version.split('.').first(precision).join('.')
+    end
+
+    def self.is_valid?(version)
+      version =~ /^(?:\d+\.)+(?:\d+)$/
+    end
+
+    def self.match(value)
+      version = value.match(/(?:\d+\.)+(?:\d+)/) { |m| m[0] }
+      version ? Version.new(version) : nil
+    end
+  end
+
+  def version_module(command_module)
+    version = command_module.respond_to?(:version) ? Version.new(command_module.version) : nil
+    raise "Unable to determine version for #{command_module::COMMAND_NAME}." unless version
+    module_name = "#{command_module.name}::V#{version.compact}"
+    begin
+      eval module_name
+    rescue
+      raise "Unable to load #{module_name}. Please consider contributing."
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/lib/appengine_python_version_detector.rb

@@ -1,11 +1,10 @@
 require 'yaml'
-require File.expand_path(File.dirname(__FILE__) + '/path_finder')
 
 module FluentCommandBuilder
   class AppEnginePythonVersionDetector
 
     def self.version(executable_name, path=nil)
-      path ||= PathFinder.find_path executable_name
+      path ||= FluentCommandBuilder.path_finder.find_path executable_name
       return unless path
       version_file = File.join path, 'VERSION'
       version_hash = YAML::load_file version_file

data/lib/fluent_command_builder/version_detectors/lib/standard_version_detector.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/path_finder')
-
-module FluentCommandBuilder
-  class StandardVersionDetector
-    def self.version(executable_name, executable_args, path=nil)
-      path ||= PathFinder.find_path executable_name
-      return unless path
-      executable = File.join path, executable_name
-      command = %Q["#{executable}" #{executable_args} 2>&1]
-      output = `#{command}`
-      output.match(/(?:\d+\.)(?:\d+\.?)+/) { |m| m[0] }
-    end
-  end
+require File.expand_path(File.dirname(__FILE__) + '/../../version')
+
+module FluentCommandBuilder
+  class StandardVersionDetector
+    def self.version(executable_name, executable_args, path=nil)
+      path ||= FluentCommandBuilder.path_finder.find_path executable_name
+      return unless path
+      executable = File.join path, executable_name
+      command = %Q["#{executable}" #{executable_args} 2>&1]
+      output = FluentCommandBuilder.executor.execute_backticks command
+      Version.match(output).version
+    end
+  end
 end

data/lib/fluent_command_builder/version_validator.rb

@@ -0,0 +1,37 @@
+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
+    end
+
+    def is_valid?
+      version_in_use.compact == version_on_path.compact
+    end
+
+    def validate
+      is_valid = version_in_use.compact == version_on_path.compact
+      puts "WARNING: Command Builder version #{version_in_use} does not match tool version #{version_on_path}." unless is_valid
+    end
+
+    def version_in_use
+      @version_in_use ||= Version.new(module_at_index(2)::VERSION)
+    end
+
+    def version_on_path
+      @version_on_path ||= Version.new(module_at_index(1).version(@path))
+    end
+
+    private
+
+    def module_at_index(index)
+      module_name = @command_builder_class.name.split('::').first(index + 1).join('::')
+      eval module_name
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213346205840 !ruby/object:Gem::Requirement
+  requirement: &70355872904220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,14 +21,13 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213346205840
+  version_requirements: *70355872904220
 description: Fluent Command Builder makes building command lines easy and intuitive.
 email: matthew-github@matthewriley.name
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/command_version_detector.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
@@ -67,6 +66,8 @@ files:
 - lib/fluent_command_builder/command_builders/mstest_90.rb
 - lib/fluent_command_builder/command_builders/netsh.rb
 - lib/fluent_command_builder/command_builders/netsh_61.rb
+- lib/fluent_command_builder/command_builders/nuget.rb
+- lib/fluent_command_builder/command_builders/nuget_20.rb
 - lib/fluent_command_builder/command_builders/nunit.rb
 - lib/fluent_command_builder/command_builders/nunit_25.rb
 - lib/fluent_command_builder/command_builders/nunit_26.rb
@@ -85,8 +86,16 @@ files:
 - lib/fluent_command_builder/command_builders/xcodebuild.rb
 - lib/fluent_command_builder/command_builders/xcodebuild_43.rb
 - lib/fluent_command_builder/command_builders/xcodebuild_44.rb
+- lib/fluent_command_builder/executor.rb
+- lib/fluent_command_builder/executors/backticks_executor.rb
+- lib/fluent_command_builder/executors/dry_run_executor.rb
+- lib/fluent_command_builder/executors/rake_sh_executor.rb
+- lib/fluent_command_builder/executors/system_executor.rb
+- 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/underlying_builder.rb
-- lib/fluent_command_builder/util.rb
+- lib/fluent_command_builder/version.rb
 - lib/fluent_command_builder/version_detectors/appcfg_python.rb
 - lib/fluent_command_builder/version_detectors/aspnet_compiler.rb
 - lib/fluent_command_builder/version_detectors/bundle.rb
@@ -95,7 +104,6 @@ files:
 - lib/fluent_command_builder/version_detectors/dotcover.rb
 - lib/fluent_command_builder/version_detectors/installutil.rb
 - lib/fluent_command_builder/version_detectors/lib/appengine_python_version_detector.rb
-- lib/fluent_command_builder/version_detectors/lib/path_finder.rb
 - lib/fluent_command_builder/version_detectors/lib/standard_version_detector.rb
 - lib/fluent_command_builder/version_detectors/msbuild.rb
 - lib/fluent_command_builder/version_detectors/msdeploy.rb
@@ -107,6 +115,7 @@ files:
 - lib/fluent_command_builder/version_detectors/sevenzip.rb
 - lib/fluent_command_builder/version_detectors/team_foundation.rb
 - lib/fluent_command_builder/version_detectors/xcodebuild.rb
+- lib/fluent_command_builder/version_validator.rb
 - lib/fluent_command_builder.rb
 homepage: http://rubygems.org/gems/fluent_command_builder
 licenses: []