mvn2 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96d64cc9e54b052462726c7f70924c7389856c52
-  data.tar.gz: 0ddc356eb79c6e731e4c4d39533b255a601bb0c0
+  metadata.gz: c72be85209bb1530015bcd6b2eb25e2d426e25c0
+  data.tar.gz: 7c07e923c4bdb1ad8bf1e45bd5335045e47189e7
 SHA512:
-  metadata.gz: 059cf6860c233b75df01bda3550ed84a86a3741823c71199b157db00c5f09dc3fc06c1df3d4333ff1f7e7f74ef5b7781fafa4f86735a6670a1097b8a79902764
-  data.tar.gz: 5e42b3f66b81374682650711bd2a1080579069f76b8ead84cd493a03f09b81fc928e7999001fdc29839bf394fced7a04ec75966b865638f5fc69c0c691c2aa2c
+  metadata.gz: 4ef22f5679a9697663580798ca40473aa527a44380c57d497646fbd767c229d3640aecf124c75fa6c6836dc3c8fd8a931e83eb55101eb281af0efe9a2fee7747
+  data.tar.gz: f360db16d6a98677ca1822642c358339859d5373d34aac49d6c3b0b4d0dc94a70bd0ecfb783c56ab5c7fdaadb070bff3ba4344d7faee4a665ac0f5d2b7aa7c26

data/README.md

@@ -10,6 +10,10 @@ Install it yourself as:
 
 ## Usage
 
+Version 2.0.0 introduces a plugin system.  Other gems can add plugins to mvn2.  The files have to match the pattern `mvn2/plugin/*.plugin.rb` in your gem's `lib/` folder.  If you do that, when the gem is installed, `mvn2` will automatically pick up on it and load it.
+
+Please see the plugin folder in this gem for examples of how to use the plugin system.  I might add an explanation here later, but for now, you'll just have to figure it out.  My `colorconfig` gem also has a plugin for `mvn2`
+
 ###optional parameters:
 * `-t` or `--timer` to display a timer while the build is in progress (default is display nothing)
 * `-s` or `--skip-tests` to skip tests (default is running tests)
@@ -35,8 +39,6 @@ Install it yourself as:
 * `-e` or `--exception` to add the `-e -X` options to the `mvn` call
 * `-0` or `--live-print` to print filtered lines as they are outputted by maven
 * `-1` or `--set-defaults` to set the defaults so you can just run `mvn2` without any parameters
-* `--mobile-number NUM` to use the mobile number `NUM` (with country code and nothing other than digits) (country code for US is 1 so an example phone number would be `--mobile-number "13175649047"`) as the recipient of a text message (from **13179120742**) indicating the success or failure of a build and the name of the immediate folder of the build (requires gem `nexmo`)
-* `-2` or `--advanced-text` to upload the folder name, build time so far, and estimated percent complete (based on stored averages) to a server so that you can text **13179120742** (the number you get the build completion texts from) to get the status(es) of your ongoing build(s).  If you send the exact name of the folder (case-**sensitive**, only 1 at a time), it will only reply with entries matching that build.  If you text anything that does not exactly match a folder name, it will simply reply with all of the ongoing build statuses.  It identifies your builds by your mobile number, so make sure you're texting from the number you used as the parameter to the `--mobile-number NUM` option.
 
 ###displays:
 a Growl notification indicating success or failure

data/lib/mvn2/plugin/avg.plugin.rb

@@ -14,45 +14,16 @@ class AvgPlugin
     pieces.join
   }
 
-  register_type(:block_average) { |list|
-    options = Mvn2::Plugins.get_var :options
-    list.any? { |item|
-      if item[:block].nil?
-        item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-      else
-        item[:block].call(options)
-      end
-    }
-  }
+  register_type(:block_average) { |list| basic_type(list) }
 
   register_type(:block_update) { |list|
-    options = Mvn2::Plugins.get_var :options
     result  = Mvn2::Plugins.get_var :result
     average = Mvn2::Plugins.get_var :average
     diff    = Mvn2::Plugins.get_var :diff
-    list.any? { |item|
-      if item[:block].nil?
-        item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-      else
-        item[:block].call(options, result, average, diff)
-      end
-    }
+    basic_type(list, result, average, diff)
   }
 
-  register_type(:block_full_average) { |list|
-    if Mvn2::Plugins.get(:block_average)
-      true
-    else
-      options = Mvn2::Plugins.get_var :options
-      list.any? { |item|
-        if item[:block].nil?
-          item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-        else
-          item[:block].call(options)
-        end
-      }
-    end
-  }
+  register_type(:block_full_average) { |list| Mvn2::Plugins.get(:block_average) || basic_type(list) }
 
   register :option, sym: :track_average, names: %w(-k --track-average), desc: 'update the average and also display a progress bar while the build is in progress'
 

data/lib/mvn2/plugin.rb

@@ -68,6 +68,17 @@ module Mvn2
     def register_variable(name, value = nil)
       Mvn2::Plugins.instance.register_variable(name, value)
     end
+
+    def basic_type(list, *args)
+      options = Mvn2::Plugins.get_var :options
+      list.any? { |item|
+        if item[:block].nil?
+          item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
+        else
+          item[:block].call(options, *args)
+        end
+      }
+    end
   end
   class DefaultTypes
     extend Mvn2::PluginType
@@ -79,25 +90,19 @@ module Mvn2
     register_variable :cmd_clean
     register_variable :message_text
 
-    register_type(:option) { |list, options|
+    def self.register_option(list, options)
       list.sort_by { |v| v[:options][:sym].to_s }.each { |option|
         id      = option[:options].delete(:sym)
         names   = option[:options].delete(:names)
         default = option[:options].delete(:default) || nil
-        options.option id, names, option[:options]
+        yield(id, names, option)
         options.default_options id => default unless default.nil?
       }
-    }
+    end
 
-    register_type(:option_with_param) { |list, options|
-      list.sort_by { |v| v[:options][:sym].to_s }.each { |option|
-        id      = option[:options].delete(:sym)
-        names   = option[:options].delete(:names)
-        default = option[:options].delete(:default) || nil
-        options.option_with_param id, names, option[:options]
-        options.default_options id => default unless default.nil?
-      }
-    }
+    register_type(:option) { |list, options| register_option(list, options) { |id, names, option| options.option id, names, option[:options] } }
+
+    register_type(:option_with_param) { |list, options| register_option(list, options) { |id, names, option| options.option_with_param id, names, option[:options] } }
 
     register_type(:command_flag) { |list|
       options = Mvn2::Plugins.get_var :options
@@ -165,30 +170,10 @@ module Mvn2
       name
     }
 
-    register_type(:log_file_disable) { |list|
-      options = Mvn2::Plugins.get_var :options
-      list.any? { |item|
-        if item[:block].nil?
-          item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-        else
-          item[:block].call(options)
-        end
-      }
-    }
+    register_type(:log_file_disable) { |list| basic_type(list) }
 
     register_type(:log_file_enable) { |list|
-      if Mvn2::Plugins.get(:log_file_name).nil? || Mvn2::Plugins.get(:log_file_disable)
-        false
-      else
-        options = Mvn2::Plugins.get_var :options
-        list.any? { |item|
-          if item[:block].nil?
-            item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-          else
-            item[:block].call(options)
-          end
-        }
-      end
+      (Mvn2::Plugins.get(:log_file_name).nil? || Mvn2::Plugins.get(:log_file_disable)) ? false : basic_type(list)
     }
 
     register_type(:line_filter) { |list, line|
@@ -209,16 +194,7 @@ module Mvn2
       result
     }
 
-    register_type(:runner_enable) { |list, key|
-      options = Mvn2::Plugins.get_var :options
-      list.select { |v| v[:options][:key] == key }.any? { |item|
-        if item[:block].nil?
-          item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-        else
-          item[:block].call(options)
-        end
-      }
-    }
+    register_type(:runner_enable) { |list, key| basic_type(list.select { |v| v[:options][:key] == key }) }
 
     register_type(:runner) { |list|
       options = Mvn2::Plugins.get_var :options
@@ -234,33 +210,24 @@ module Mvn2
       Mvn2::Plugins.get_var :result
     }
 
-    register_type(:goal_override) { |list|
-      options        = Mvn2::Plugins.get_var :options
-      full_overrides = list.select { |v| v[:options][:override_all] }.sort_by { |v| -v[:options][:priority] }.filtermap { |item|
-        if item[:block].nil?
-          if item[:options].has_key?(:goal) && item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-            item[:options][:goal]
-          else
-            item[:options].has_key?(:option) && !options[item[:options][:option]].nil? ? options[item[:options][:option]] : false
-          end
+    def self.goal_filter(item, options)
+      if item[:block].nil?
+        if item[:options].has_key?(:goal) && item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
+          item[:options][:goal]
         else
-          rval = item[:block].call(options)
-          (rval.nil? || !rval) ? false : rval
+          item[:options].has_key?(:option) && !options[item[:options][:option]].nil? ? options[item[:options][:option]] : false
         end
-      }
+      else
+        rval = item[:block].call(options)
+        (rval.nil? || !rval) ? false : rval
+      end
+    end
+
+    register_type(:goal_override) { |list|
+      options        = Mvn2::Plugins.get_var :options
+      full_overrides = list.select { |v| v[:options][:override_all] }.sort_by { |v| -v[:options][:priority] }.filtermap { |item| goal_filter(item, options) }
       if full_overrides.nil? || full_overrides.empty?
-        goals = list.select { |v| !v[:options][:override_all] }.sort_by { |v| v[:options][:order] }.filtermap { |item|
-          if item[:block].nil?
-            if item[:options].has_key?(:goal) && item[:options].has_key?(:option) && options[item[:options][:option]] == (item[:options].has_key?(:value) ? item[:options][:value] : true)
-              item[:options][:goal]
-            else
-              item[:options].has_key?(:option) && !options[item[:options][:option]].nil? ? options[item[:options][:option]] : false
-            end
-          else
-            rval = item[:block].call(options)
-            (rval.nil? || !rval) ? false : rval
-          end
-        }
+        goals = list.select { |v| !v[:options][:override_all] }.sort_by { |v| v[:options][:order] }.filtermap { |item| goal_filter(item, options) }
         goals = ['install'] if (goals - ['clean']).empty?
         goals = ['clean'] + goals unless goals.include?('clean')
         goals.join(' ')

data/lib/mvn2/version.rb

@@ -1,3 +1,3 @@
 module Mvn2
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvn2
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler