fluent_command_builder 0.8.7 → 0.8.8

data/lib/fluent_command_builder/command_builders/xcodebuild.rb

@@ -1,5 +1,6 @@
 # Generated code. Do not modify.
 
+require File.expand_path(File.dirname(__FILE__) + '/../command_builder_factory')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
@@ -18,7 +19,8 @@ module FluentCommandBuilder
       self.version_detector.version path
     end
     def self.create(&block)
-      version_module(XCodeBuild).create &block
+      f = CommandBuilderFactory.new XCodeBuild
+      f.create &block
     end
   end
 end

data/lib/fluent_command_builder/command_builders/xcodebuild_43.rb

@@ -1,7 +1,7 @@
 # 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__) + '/../default_path_validator')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
@@ -11,20 +11,22 @@ module FluentCommandBuilder
   module XCodeBuild
     module V43
       VERSION = '4.3'
+      def self.exact_version
+        @exact_version ||= VERSION
+      end
+      def self.exact_version=(value)
+        @exact_version = value
+      end
       def self.default_path
         @default_path ||= nil
       end
       def self.default_path=(value)
-        printer = FluentCommandBuilder::Printer.new
-        begin
-          printer.print_warning %Q[Default Path for command "#{FluentCommandBuilder::XCodeBuild::COMMAND_NAME}", version "#{VERSION}" does not exist. Path: #{value}] unless File.exist? value
-        rescue
-          printer.print_warning %Q[Failed to determine whether Default Path for command "#{FluentCommandBuilder::XCodeBuild::COMMAND_NAME}", version "#{VERSION}" exists. An internal error occurred.]
-        end
+        validator = DefaultPathValidator.new value, FluentCommandBuilder::XCodeBuild::COMMAND_NAME, exact_version
+        validator.validate
         @default_path = value
       end
       def self.create
-        b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, VERSION
+        b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
         b.actual_version_lambda = lambda { |path| FluentCommandBuilder::XCodeBuild.version path }
         c = XCodeBuild.new(b)

data/lib/fluent_command_builder/command_builders/xcodebuild_44.rb

@@ -1,7 +1,7 @@
 # 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__) + '/../default_path_validator')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
@@ -11,20 +11,22 @@ module FluentCommandBuilder
   module XCodeBuild
     module V44
       VERSION = '4.4'
+      def self.exact_version
+        @exact_version ||= VERSION
+      end
+      def self.exact_version=(value)
+        @exact_version = value
+      end
       def self.default_path
         @default_path ||= nil
       end
       def self.default_path=(value)
-        printer = FluentCommandBuilder::Printer.new
-        begin
-          printer.print_warning %Q[Default Path for command "#{FluentCommandBuilder::XCodeBuild::COMMAND_NAME}", version "#{VERSION}" does not exist. Path: #{value}] unless File.exist? value
-        rescue
-          printer.print_warning %Q[Failed to determine whether Default Path for command "#{FluentCommandBuilder::XCodeBuild::COMMAND_NAME}", version "#{VERSION}" exists. An internal error occurred.]
-        end
+        validator = DefaultPathValidator.new value, FluentCommandBuilder::XCodeBuild::COMMAND_NAME, exact_version
+        validator.validate
         @default_path = value
       end
       def self.create
-        b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, VERSION
+        b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
         b.actual_version_lambda = lambda { |path| FluentCommandBuilder::XCodeBuild.version path }
         c = XCodeBuild.new(b)

data/lib/fluent_command_builder/command_formatters/hidden_password_formatter.rb

@@ -8,9 +8,9 @@ module FluentCommandBuilder
     end
 
     def format(underlying_builder)
-      command = underlying_builder.to_s
-      underlying_builder.passwords.each { |p| command.gsub! p, @password_replacement }
-      command
+      c = underlying_builder.to_s
+      underlying_builder.passwords.each { |p| c.gsub! p, @password_replacement }
+      c
     end
 
   end

data/lib/fluent_command_builder/default_path_validator.rb

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

data/lib/fluent_command_builder/execution_context.rb

@@ -7,13 +7,14 @@ require File.expand_path(File.dirname(__FILE__) + '/command_formatters/null_form
 module FluentCommandBuilder
   class ExecutionContext
 
-    attr_accessor :executor, :formatter, :should_print_on_execute, :should_fail_on_error
+    attr_accessor :executor, :formatter, :should_print_on_execute, :should_fail_on_error, :should_fail_on_unexpected_version
 
     def initialize(executor)
       @executor = executor
       @formatter = NullFormatter.new
       @should_print_on_execute = true
       @should_fail_on_error = true
+      @should_fail_on_unexpected_version = false
       @printer = FluentCommandBuilder::Printer.new
     end
 
@@ -41,6 +42,7 @@ module FluentCommandBuilder
 
     def validate_version(underlying_builder)
       v = VersionValidator.new underlying_builder
+      v.should_fail_on_unexpected_version = @should_fail_on_unexpected_version
       v.validate
     end
 

data/lib/fluent_command_builder/version.rb

@@ -12,13 +12,17 @@ module FluentCommandBuilder
     end
 
     def compact
-      sequences(2).join
+      to_a.first(2).join
     end
 
     def to_s(count=nil)
       count ? truncate(count) : @version
     end
 
+    def to_a
+      @version.split SEQUENCE_SEPARATOR
+    end
+
     def self.is_valid?(version)
       exp = Regexp.new "^#{VERSION_REGEX}$"
       version.scan(exp)[0] != nil
@@ -31,25 +35,16 @@ module FluentCommandBuilder
       Version.new(version)
     end
 
-    private
-
-    def sequences(count)
-      @version.split(SEQUENCE_SEPARATOR).first(count)
+    def self.version_or_nil(version)
+      return unless version
+      is_valid?(version) ? Version.new(version) : nil
     end
 
+    private
+
     def truncate(count)
-      sequences(count).join(SEQUENCE_SEPARATOR)
+      to_a.first(count).join(SEQUENCE_SEPARATOR)
     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_validator.rb

@@ -3,21 +3,26 @@ require File.expand_path(File.dirname(__FILE__) + '/printer')
 module FluentCommandBuilder
   class VersionValidator
 
+    attr_accessor :should_fail_on_unexpected_version
+
     def initialize(underlying_builder)
       @underlying_builder = underlying_builder
       @printer = Printer.new
+      @should_fail_on_unexpected_version = false
     end
 
     def validate
       return unless can_validate?
 
       unless actual_version
-        print_warning 'unable to determine actual version'
+        @printer.print_warning error_message('unable to determine actual version')
         return
       end
 
       unless is_valid?
-        print_warning actual_version.to_s(2)
+        message = error_message actual_version.to_s(expected_version.to_a.length)
+        @should_fail_on_unexpected_version ? @printer.print_error(message) : @printer.print_warning(message)
+        raise message if @should_fail_on_unexpected_version
       end
     end
 
@@ -28,19 +33,19 @@ module FluentCommandBuilder
     end
 
     def is_valid?
-      actual_version.compact == expected_version.compact
+      actual_version.to_a.first(expected_version.to_a.length) == expected_version.to_a
     end
 
     def expected_version
-      Version.new(@underlying_builder.version)
+      @expected_version ||= Version.new(@underlying_builder.version)
     end
 
     def actual_version
-      Version.new(@underlying_builder.actual_version) if @underlying_builder.actual_version
+      @actual_version ||= Version.new(@underlying_builder.actual_version) if @underlying_builder.actual_version
     end
 
-    def print_warning(message)
-      @printer.print_warning %Q[Version validation for command "#{@underlying_builder.command_name}" failed. Expected version #{expected_version} but was #{message}.]
+    def error_message(actual_version)
+      %Q[Version validation for command "#{@underlying_builder.command_name}" failed. Expected version #{expected_version} but was #{actual_version}.]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70347631048860 !ruby/object:Gem::Requirement
+  requirement: &70171055089580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70347631048860
+  version_requirements: *70171055089580
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70347631048420 !ruby/object:Gem::Requirement
+  requirement: &70171055089140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70347631048420
+  version_requirements: *70171055089140
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []
@@ -41,6 +41,7 @@ extra_rdoc_files: []
 files:
 - lib/fluent_command_builder/argument_formatter.rb
 - lib/fluent_command_builder/command_base.rb
+- lib/fluent_command_builder/command_builder_factory.rb
 - lib/fluent_command_builder/command_builders/appcfg_python.rb
 - lib/fluent_command_builder/command_builders/appcfg_python_16.rb
 - lib/fluent_command_builder/command_builders/appcfg_python_17.rb
@@ -108,6 +109,7 @@ files:
 - 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/default_path_validator.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