fluent_command_builder 0.7.4 → 0.7.5

data/lib/fluent_command_builder/command_base.rb

@@ -33,7 +33,15 @@ module FluentCommandBuilder
 
     def validate_version
       validator = VersionValidator.new self.class, @b.path
-      print yellow, %Q[WARNING: Version validation for command "#{@b.command_name}" failed. Expected version #{validator.version_in_use.to_s(2)} but was #{validator.version_on_path.to_s(2)}.], reset, "\n" unless validator.is_valid?
+
+      if !validator.can_validate?
+        print yellow, %Q[WARNING: Version validation for command "#{@b.command_name}" aborted. An internal error occurred.], reset, "\n"
+        return
+      end
+
+      if !validator.is_valid?
+        print yellow, %Q[WARNING: Version validation for command "#{@b.command_name}" failed. Expected version #{validator.version_in_use.to_s(2)} but was #{validator.version_on_path.to_s(2)}.], reset, "\n"
+      end
     end
 
   end

data/lib/fluent_command_builder/version.rb

@@ -1,6 +1,9 @@
 module FluentCommandBuilder
   class Version
 
+    VERSION_REGEX = '(?:\d+\.)+(?:\d+)'
+    SEQUENCE_SEPARATOR = '.'
+
     attr_accessor :version
 
     def initialize(version)
@@ -9,22 +12,33 @@ module FluentCommandBuilder
     end
 
     def compact
-      @version.match(/^\d+\.\d+/)[0].sub('.', '')
+      sequences(2).join
     end
 
-    def to_s(precision=nil)
-      return @version unless precision
-      @version.split('.').first(precision).join('.')
+    def to_s(count=nil)
+      count ? truncate(count) : @version
     end
 
     def self.is_valid?(version)
-      version.scan(/^(?:\d+\.)+(?:\d+)$/)[0] != nil
+      exp = Regexp.new "^#{VERSION_REGEX}$"
+      version.scan(exp)[0] != nil
     end
 
     def self.match(value)
-      version = value.scan(/(?:\d+\.)+(?:\d+)/)[0]
+      exp = Regexp.new VERSION_REGEX
+      version = value.scan(exp)[0]
       version ? Version.new(version) : nil
     end
+
+    private
+
+    def sequences(count)
+      @version.split(SEQUENCE_SEPARATOR).first(count)
+    end
+
+    def truncate(count)
+      sequences(count).join(SEQUENCE_SEPARATOR)
+    end
   end
 
   def version_module(command_module)

data/lib/fluent_command_builder/version_validator.rb

@@ -9,13 +9,17 @@ module FluentCommandBuilder
       @path = path
     end
 
-    def is_valid?
-      version_in_use.compact == version_on_path.compact
+    def can_validate?
+      begin
+        is_valid?
+        return true
+      rescue
+        return false
+      end
     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
+    def is_valid?
+      version_in_use.compact == version_on_path.compact
     end
 
     def version_in_use

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70111080000440 !ruby/object:Gem::Requirement
+  requirement: &70124100388640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111080000440
+  version_requirements: *70124100388640
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70111080000000 !ruby/object:Gem::Requirement
+  requirement: &70124100388200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111080000000
+  version_requirements: *70124100388200
 description: Fluent Command Builder makes building command lines easy and intuitive.
 email: matthew-github@matthewriley.name
 executables: []