pluginator 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2f6f47f0d693c563203fc44681649b38a96cd4ed
-  data.tar.gz: a6c768ee9de70c1bdb77b321435f6a03c80ffd4a
-SHA512:
-  metadata.gz: '08a0ec7df1937dd3e3e83bc0977c5cec827aa4e3d9922a1d3074abfe321abbf8b581e772acedea4fcf83dd5b02b787d51dd5e37ac995ad6ec17e97fa97c63fc4'
-  data.tar.gz: d3c53fbace3c4dac9cc2ef106b4ea8be13d3f2ff35a4f2592d5863c56c282c4f5ac2920f5038e2501ef2d9e2e46a03deab1d9b22cf4f471c7cbbfb96442a56ab
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGRhZTE5NDM4MmRjNWI2MmZhNDE2ZDRiZTY3MjVlZWI4NmY5MjVkZQ==
+  data.tar.gz: !binary |-
+    NWM5MjgzMzI5ZTBhMGRhMWQ1ZDkwNjQ1MTUwNGJlM2Q4ZThiOTMxNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjJjMzQ0YzZmYmJmYTdlZDIxNWEzMDVlOWU4NjM1ZmU4NDllOGI0YmE0MjE1
+    YWM0Yjk4ODQ4YmViMjhmNjZiYmYzN2ZkMTg1YjhmNmU4MjM3ZTYyM2NjYjlk
+    Y2I3YjYyZmU2NWNlNDYyNTkzM2RkODM3ZDAzZjY4MGZhMjAxMmM=
+  data.tar.gz: !binary |-
+    NmUzMzVlMTAyYzQ3ZTI1MzJjZTU3NTQ4Y2Q3NjY5NmJlMmE1YzlkMjM1MTNj
+    ZjIzZjdiNjAzMGM5YWVhMmYyNDc5OTdjZjc0N2Y1NWJkN2QyNTk3MjZhZGQ2
+    MWViMWJmZjk5MDlmMTkxMDI0Njg4M2U2NmRhZTkzYzAzYmVjYjY=

data/Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.5.0
+date: 2017-06-12
+
+- add /lib prefix check, it can be changed with `prefix: "/(lib|local_lib)"`
+- allow dashes in directory names for plugin paths
+- fix older rubygems compatibility
+- updated ruby and rubygems versions
+
 ## 1.4.1
 date: 2017-05-23
 

data/README.md

@@ -12,7 +12,7 @@
 Gem plugin system management, detects plugins using `Gem.find_file`,
 `$LOAD_PATH` and `$LOADED_FEATURES`.
 
-It is only supposed to work with ruby 1.9.3+ (some tests fail on 1.9.2)
+Pluginator works with *ruby 1.9.3+* and *rubygems 2.0.0+*.
 
 Pluginator tries to stay out of your way, you do not have to include or inherit anything.
 Pluginator only finds and groups plugins, rest is up to you,
@@ -46,14 +46,15 @@ types = rvm2plugins.types
 
 ```ruby
 Pluginator.find("<group>") => Pluginator object
-plugins = Pluginator.find("<group>", type: "<type>", extends: %i[<extensions>])
+plugins = Pluginator.find("<group>", type: "<type>", prefix: "/(lib|local_lib)", extends: %i[<extensions>])
 plugins["<type>"] => Array of plugins
 plugins.type      => Array of plugins for type defined with `type: "<type>"`
 plugins.types     => Array of types
 ```
 
 - `"<group>"` - Load plugins for given group.
-- `type: "<type>"` - Load plugins only of given type, makes `type` method accessible.
+- `type: "<type>"` - Load plugins only of given type, optional, makes `type` method accessible.
+- `prefix: "/prefix"` - Load plugins only from this paths, optional, default `/lib`.
 - `extends: %i[<extensions>]` - Extend pluginator with given extensions.
 
 ## Extensions

data/lib/pluginator.rb

@@ -18,6 +18,7 @@ along with pluginator.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require "pluginator/extendable_autodetect"
+require "pluginator/rubygems_fixes"
 require "pluginator/version"
 
 # A simple plugin system based on Gem.find_files
@@ -27,6 +28,9 @@ module Pluginator
   # @param group   [String] name of plugins group
   # @param options [Hash]   options to pass to creating Pluginator instance
   # @option type   [String] name of type to load
+  # @option prefix [String] a prefix for finding plugins if forcing,
+  #                         by default only `/lib` is checked,
+  #                         regexp notation is allowed, for example `/(lib|local_lib)`
   # @option extend [Array<Symbol>|Symbol] list of extension to extend into pluginator instance
   # @return [Pluginator::ExtendableAutodetect] instance of Pluginator
   def self.find(group, options={})

data/lib/pluginator/autodetect.rb

@@ -38,9 +38,14 @@ module Pluginator
     # @param group   [String] name of the plugins group
     # @param options [Hash]   options to pass to creating Pluginator instance
     # @option type   [String] name of the plugin type
+    # @option prefix [String] a prefix for finding plugins if forcing,
+    #                         by default only `/lib` is checked,
+    #                         regexp notation is allowed, for example `/(lib|local_lib)`
+
     def initialize(group, options={})
       super(group)
-      @force_type = options[:type]
+      @force_prefix = options[:prefix]
+      @force_type   = options[:type]
       refresh
     end
 
@@ -50,7 +55,7 @@ module Pluginator
     #
     # Use it after gem list change, for example after `Gem.install("new_gem")`
     def refresh
-      plugin_lists = FormattedFinder.new(@group, @force_type)
+      plugin_lists = FormattedFinder.new(@force_prefix, @group, @force_type)
       register_plugins(plugin_lists.loaded_plugins_path)
       load_plugins(plugin_lists.load_path_plugins_paths)
       activate_plugins(plugin_lists.gem_plugins_paths)

data/lib/pluginator/autodetect/finder.rb

@@ -27,20 +27,24 @@ module Pluginator
 
       # Automatically load plugins for given group (and type)
       #
-      # @param group      [String] name of the plugins group
-      # @param force_type [String] name of the plugin type if forcing
-      def initialize(group, force_type)
-        @group      = group
-        @force_type = force_type
-        @pattern    = file_name_pattern(@group, @force_type)
+      # @param force_prefix [String] a prefix for finding plugins if forcing,
+      #                              by default only `/lib` is checked,
+      #                              regexp notation is allowed, for example `/[lib|]`
+      # @param group        [String] name of the plugins group
+      # @param force_type   [String] name of the plugin type if forcing
+      def initialize(force_prefix, group, force_type)
+        @force_prefix = force_prefix
+        @group        = group
+        @force_type   = force_type
+        @pattern      = file_name_pattern
         find_paths
       end
 
     private
 
       # group => pattern
-      def file_name_pattern(group, type=nil)
-        "plugins/#{group}/#{type || "**"}/*.rb"
+      def file_name_pattern
+        "plugins/#{@group}/#{@force_type || "**"}/*.rb"
       end
 
       def find_paths
@@ -69,15 +73,16 @@ module Pluginator
 
       def split_file_names(file_names)
         file_names.map do |file_name|
-          split_file_name(file_name, @group, @force_type)
+          split_file_name(file_name)
         end
       end
 
-      # file_name, group, type => [ path, full_name, type ]
-      def split_file_name(file_name, group, type=nil)
-        type ||= ".*"
-        match = file_name.match(%r{.*/(plugins/(#{group}/(#{type})/[^/]*)\.rb)$})
-        match[1..3] if match
+      # file_name => [ path, full_name, type ]
+      def split_file_name(file_name)
+        prefix = @force_prefix || "/lib"
+        type   = @force_type   || ".*"
+        match = file_name.match(%r{.*#{prefix}/(plugins/(#{@group}/(#{type})/[^/]*)\.rb)$})
+        match[-3..-1] if match
       end
 
     end

data/lib/pluginator/autodetect/formatted_finder.rb

@@ -27,7 +27,7 @@ module Pluginator
     class FormattedFinder < Finder
 
       # Reformat plugin lists
-      def initialize(group, force_type)
+      def initialize(force_prefix, group, force_type)
         super
         map_loaded_plugins
         map_gem_plugins

data/lib/pluginator/name_converter.rb

@@ -27,7 +27,7 @@ module Pluginator
       klass = Kernel
       name.to_s.split(%r{/}).each do |part|
         klass = klass.const_get(
-          part.capitalize.gsub(/_(.)/) { |match| match[1].upcase }
+          part.capitalize.gsub(/[_-](.)/) { |match| match[1].upcase }
         )
       end
       klass

data/lib/pluginator/rubygems_fixes.rb

@@ -0,0 +1,15 @@
+unless Gem.respond_to? :find_files_from_load_path
+  # older versions of rubygems od not have separate method for finding only on $LOAD_PATH
+  # this is copy/paste from rubygems 2.0.0 code
+  # :nocov: not testing as it runs only on old rubygems, it's not even our code
+  module Gem
+    def self.find_files_from_load_path(glob)
+      $LOAD_PATH.map do |load_path|
+        Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
+      end.flatten.select do |file| # rubocop:disable Style/MultilineBlockChain
+        File.file? file.untaint
+      end
+    end
+  end
+  # :nocov:
+end

data/lib/pluginator/version.rb

@@ -19,5 +19,5 @@ along with pluginator.  If not, see <http://www.gnu.org/licenses/>.
 
 module Pluginator
   # Version of Pluginator
-  VERSION = "1.4.1".freeze
+  VERSION = "1.5.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluginator
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Michal Papis
@@ -11,62 +11,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -79,25 +65,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- COPYING
-- COPYING.LESSER
-- Changelog.md
-- README.md
 - lib/pluginator.rb
-- lib/pluginator/autodetect.rb
+- lib/pluginator/version.rb
+- lib/pluginator/group.rb
+- lib/pluginator/name_converter.rb
+- lib/pluginator/errors.rb
 - lib/pluginator/autodetect/finder.rb
 - lib/pluginator/autodetect/formatted_finder.rb
-- lib/pluginator/errors.rb
+- lib/pluginator/rubygems_fixes.rb
 - lib/pluginator/extendable_autodetect.rb
-- lib/pluginator/group.rb
-- lib/pluginator/name_converter.rb
-- lib/pluginator/version.rb
-- lib/plugins/pluginator/extensions/class_exist.rb
-- lib/plugins/pluginator/extensions/conversions.rb
+- lib/pluginator/autodetect.rb
+- lib/plugins/pluginator/extensions/matching.rb
 - lib/plugins/pluginator/extensions/first_ask.rb
 - lib/plugins/pluginator/extensions/first_class.rb
-- lib/plugins/pluginator/extensions/matching.rb
+- lib/plugins/pluginator/extensions/class_exist.rb
 - lib/plugins/pluginator/extensions/plugins_map.rb
+- lib/plugins/pluginator/extensions/conversions.rb
+- README.md
+- Changelog.md
+- COPYING.LESSER
+- COPYING
 homepage: https://github.com/rvm/pluginator
 licenses:
 - LGPL v3
@@ -108,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Rubygems plugin system using Gem.find_files, $LOAD_PATH and $LOADED_FEATURES.