fluent_command_builder 0.7.9 → 0.8.0

data/lib/fluent_command_builder/command_builders/xcodebuild.rb

@@ -1,3 +1,5 @@
+# Generated code. Do not modify.
+
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/xcodebuild_43.rb

@@ -1,3 +1,5 @@
+# Generated code. Do not modify.
+
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
 require File.expand_path(File.dirname(__FILE__) + '/../printer')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')

data/lib/fluent_command_builder/command_builders/xcodebuild_44.rb

@@ -1,3 +1,5 @@
+# Generated code. Do not modify.
+
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
 require File.expand_path(File.dirname(__FILE__) + '/../printer')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')

data/lib/fluent_command_builder/command_executors/backticks_executor.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/executor_base')
+
+module FluentCommandBuilder
+  class BackticksExecutor < ExecutorBase
+
+    def do_execute(underlying_builder)
+      `#{underlying_builder}`
+    end
+
+  end
+end

data/lib/fluent_command_builder/command_executors/dry_run_executor.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/executor_base')
+
+module FluentCommandBuilder
+  class DryRunExecutor < ExecutorBase
+  end
+end

data/lib/fluent_command_builder/command_executors/executor_base.rb

@@ -0,0 +1,25 @@
+module FluentCommandBuilder
+  class ExecutorBase
+
+    def execute(underlying_builder)
+      result = do_execute underlying_builder
+      yield $? if block_given?
+      result
+    end
+
+    def will_print_on_execute?
+      false
+    end
+
+    def will_fail_on_error?
+      false
+    end
+
+    protected
+
+    def do_execute(underlying_builder)
+      # template method
+    end
+
+  end
+end

data/lib/fluent_command_builder/command_executors/rake_sh_executor.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/executor_base')
+require 'rake'
+include Rake::DSL
+
+module FluentCommandBuilder
+  class RakeShExecutor < ExecutorBase
+
+    def do_execute(underlying_builder)
+      sh underlying_builder.to_s
+    end
+
+    def will_print_on_execute?
+      true
+    end
+
+    def will_fail_on_error?
+      true
+    end
+
+  end
+end

data/lib/fluent_command_builder/command_executors/system_executor.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/executor_base')
+
+module FluentCommandBuilder
+  class SystemExecutor < ExecutorBase
+
+    def do_execute(underlying_builder)
+      system underlying_builder.to_s
+    end
+
+  end
+end

data/lib/fluent_command_builder/command_formatters/hidden_password_formatter.rb

@@ -0,0 +1,17 @@
+module FluentCommandBuilder
+  class HiddenPasswordFormatter
+
+    attr_accessor :password_replacement
+
+    def initialize
+      @password_replacement = '***'
+    end
+
+    def format(underlying_builder)
+      command = underlying_builder.to_s
+      underlying_builder.passwords.each { |p| command.gsub! p, @password_replacement }
+      command
+    end
+
+  end
+end

data/lib/fluent_command_builder/command_formatters/null_formatter.rb

@@ -0,0 +1,9 @@
+module FluentCommandBuilder
+  class NullFormatter
+
+    def format(underlying_builder)
+      underlying_builder.to_s
+    end
+
+  end
+end

data/lib/fluent_command_builder/execution_context.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/command_executors/system_executor')
+require File.expand_path(File.dirname(__FILE__) + '/command_formatters/null_formatter')
+
+module FluentCommandBuilder
+  class ExecutionContext
+
+    attr_accessor :executor, :formatter, :should_print_on_execute, :should_fail_on_error
+
+    def initialize(executor)
+      @executor = executor
+      @formatter = NullFormatter.new
+      @should_print_on_execute = true
+      @should_fail_on_error = true
+    end
+
+    def execute(underlying_builder)
+      validate_should_print_on_execute
+      validate_should_fail_on_error
+      visible_command = @formatter.format underlying_builder
+      puts visible_command if @should_print_on_execute && !@executor.will_print_on_execute?
+      @executor.execute(underlying_builder) do |status|
+        raise "Command failed with status (#{status.exitstatus}): [#{visible_command}]" if @should_fail_on_error && !status.success?
+      end
+    end
+
+    private
+
+    def validate_should_print_on_execute
+      raise "should_print_on_execute must be true for #{@executor}." if !@should_print_on_execute && @executor.will_print_on_execute?
+    end
+
+    def validate_should_fail_on_error
+      raise "should_fail_on_error must be true for #{@executor}." if !@should_fail_on_error && @executor.will_fail_on_error?
+    end
+
+  end
+end
+
+module FluentCommandBuilder
+
+  def self.execution_context
+    @execution_context ||= ExecutionContext.new(SystemExecutor.new)
+  end
+
+  def self.execution_context=(value)
+    @execution_context = value
+  end
+
+end

data/lib/fluent_command_builder/underlying_builder.rb

@@ -1,76 +1,74 @@
-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
+require File.expand_path(File.dirname(__FILE__) + '/command_base')
+require File.expand_path(File.dirname(__FILE__) + '/execution_context')
+require File.expand_path(File.dirname(__FILE__) + '/path_finder')
+
+module FluentCommandBuilder
+  class UnderlyingBuilder
+
+    attr_accessor :command_name, :path, :passwords
+
+    def initialize(command_name=nil)
+      @command_name = command_name
+      @path = nil
+      @args = ''
+      @passwords = []
+      @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
+    end
+
+    def executable
+      executable = @path ? File.join(@path, @command_name) : @command_name
+      executable.gsub! '/', '\\' if executable.include? '\\'
+      executable
+    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
+    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_detectors/osx_version_detector.rb

@@ -3,8 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '/standard_version_detector')
 module FluentCommandBuilder
   class OsxVersionDetector
 
+    attr_accessor :backticks_executor
+
     def version(path=nil)
       d = StandardVersionDetector.new 'sw_vers', '-productVersion'
+      d.backticks_executor = @backticks_executor if @backticks_executor
       d.version
     end
 

data/lib/fluent_command_builder/version_detectors/standard_version_detector.rb

@@ -1,11 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/../version')
+require File.expand_path(File.dirname(__FILE__) + '/../command_executors/backticks_executor')
 
 module FluentCommandBuilder
   class StandardVersionDetector
 
+    attr_accessor :backticks_executor
+
     def initialize(command_name, command_arg=nil)
       @command_name = command_name
       @command_arg = command_arg
+      @backticks_executor = BackticksExecutor.new
     end
 
     def version(path=nil)
@@ -13,7 +17,7 @@ module FluentCommandBuilder
       return unless path
       executable = File.join path, @command_name
       command = %Q["#{executable}" #{@command_arg} 2>&1]
-      output = FluentCommandBuilder.executor.execute_backticks command
+      output = @backticks_executor.execute command
       v = Version.match(output)
       v ? v.version : nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70139262250900 !ruby/object:Gem::Requirement
+  requirement: &70350655361380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139262250900
+  version_requirements: *70350655361380
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70139262250460 !ruby/object:Gem::Requirement
+  requirement: &70350655360940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139262250460
+  version_requirements: *70350655360940
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []
@@ -98,11 +98,14 @@ 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/command_executors/backticks_executor.rb
+- lib/fluent_command_builder/command_executors/dry_run_executor.rb
+- lib/fluent_command_builder/command_executors/executor_base.rb
+- lib/fluent_command_builder/command_executors/rake_sh_executor.rb
+- lib/fluent_command_builder/command_executors/system_executor.rb
+- lib/fluent_command_builder/command_formatters/hidden_password_formatter.rb
+- lib/fluent_command_builder/command_formatters/null_formatter.rb
+- lib/fluent_command_builder/execution_context.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
@@ -113,7 +116,6 @@ files:
 - lib/fluent_command_builder/version_detectors/default_version_detector.rb
 - lib/fluent_command_builder/version_detectors/osx_version_detector.rb
 - lib/fluent_command_builder/version_detectors/standard_version_detector.rb
-- lib/fluent_command_builder/version_detectors/version_detector_init.rb
 - lib/fluent_command_builder/version_detectors/windows_version_detector.rb
 - lib/fluent_command_builder/version_validator.rb
 - lib/fluent_command_builder.rb

data/lib/fluent_command_builder/executor.rb

@@ -1,44 +0,0 @@
-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