fedux_org-stdlib 0.7.31 → 0.7.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70c223e8656a9b251f1a25b9db2f62986be294d
-  data.tar.gz: 8ff92d609064964c9f6ccd88fc5ae2531f429a44
+  metadata.gz: 2df3bafb3b745bddbd69a9f0537867eedec950b6
+  data.tar.gz: 0b1051884555097787efc2771df1479eae33f1d8
 SHA512:
-  metadata.gz: 80d241b3183f2c016f523e25909f37b34d0d0eecd544bdd35f72e04800f98336571de603ef681919cf8c6575119e89f81a1d9f2d369f36c208e33c104fff7d9b
-  data.tar.gz: 81814907df2acfc5162c774fe6a970b1e630e0edcd76b162ff626820bcd131b8c6007fe796918f5504708324c4d8ab4452422ab9b38cad432e0d99ae516858ef
+  metadata.gz: e9f5967d86a4a088582bcc535ba777d90bc9e912414e3db8db9f4464142c17a5b9ed041bfddde2a650ff693e892651e5f54007e3009fee2811bfe4438df42abb
+  data.tar.gz: 7567209863dbd40e9491b691fc571e4fcddaee1f703e4845b4bbcc624b4e0b7a120a272de106781cac2878f84eeb12dddc1beb30acfedb79a35c781f45f33adf

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'pry', require: false
+  gem 'pry'
   gem 'pry-doc', require: false
 
   if RUBY_VERSION < '2.0.0'
@@ -41,7 +41,8 @@ group :development, :test do
   gem 'travis-lint'
   gem 'facter'
   gem 'hirb'
+  #gem 'tty'
 
-  gem 'fedux_org_stdlib-fixtures-plugin_manager-plugin-load', require: false, path: File.expand_path('../fixtures/plugin-load-app', __FILE__)
-  gem 'fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load', require: false, path: File.expand_path('../fixtures/plugin-no_load-app', __FILE__)
+  gem 'fedux_org_stdlib-fixtures-plugin_manager-load', require: false, path: File.expand_path('../fixtures/plugin-load-app', __FILE__)
+#  gem 'fedux_org_stdlib-fixtures-plugin_manager-no_load', require: false, path: File.expand_path('../fixtures/plugin-no_load-app', __FILE__)
 end

data/Gemfile.lock

@@ -1,18 +1,13 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.7.30)
+    fedux_org-stdlib (0.7.32)
       activesupport
 
 PATH
   remote: fixtures/plugin-load-app
   specs:
-    fedux_org_stdlib-fixtures-plugin_manager-plugin-load (0.0.1)
-
-PATH
-  remote: fixtures/plugin-no_load-app
-  specs:
-    fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load (0.0.1)
+    fedux_org_stdlib-fixtures-plugin_manager-load (0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -35,11 +30,11 @@ GEM
     awesome_print (1.2.0)
     blockenspiel (0.4.5)
     builder (3.2.2)
-    byebug (3.4.0)
+    byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     columnize (0.8.9)
@@ -53,7 +48,7 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    cucumber (1.3.16)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -65,7 +60,7 @@ GEM
     erubis (2.7.0)
     facter (2.2.0)
       CFPropertyList (~> 2.2.6)
-    ffi (1.9.3)
+    ffi (1.9.5)
     filegen (0.4.3)
       activesupport
     fuubar (2.0.0)
@@ -73,7 +68,7 @@ GEM
       ruby-progressbar (~> 1.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    github-markup (1.2.1)
+    github-markup (1.3.0)
       posix-spawn (~> 0.3.8)
     hirb (0.7.2)
     i18n (0.6.11)
@@ -83,12 +78,12 @@ GEM
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.3)
+    mime-types (2.4.1)
     minitest (5.4.2)
     multi_json (1.10.1)
     multi_test (0.1.1)
     netrc (0.7.7)
-    parser (2.2.0.pre.4)
+    parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     posix-spawn (0.3.9)
@@ -113,27 +108,27 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
+    rspec-core (3.1.6)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
     rspec-legacy_formatters (1.0.0)
       rspec-core (>= 3.0.0.beta2)
       rspec-support (>= 3.0.0.beta2)
-    rspec-mocks (3.1.0)
+    rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    rubocop (0.26.0)
+    rspec-support (3.1.2)
+    rubocop (0.26.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.4, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
-    simplecov (0.9.0)
+    ruby-progressbar (1.6.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
@@ -145,7 +140,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.4)
-    tins (1.3.2)
+    tins (1.3.3)
     tmrb (1.2.7)
       thor
     travis-lint (2.0.0)
@@ -171,8 +166,7 @@ DEPENDENCIES
   erubis
   facter
   fedux_org-stdlib!
-  fedux_org_stdlib-fixtures-plugin_manager-plugin-load!
-  fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load!
+  fedux_org_stdlib-fixtures-plugin_manager-load!
   filegen
   fuubar
   github-markup

data/fixtures/plugin-load-app/{fedux_org_stdlib-fixtures-plugin_manager-plugin-load.gemspec → fedux_org_stdlib-fixtures-plugin_manager-load.gemspec}

@@ -3,12 +3,12 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = 'fedux_org_stdlib-fixtures-plugin_manager-plugin-load'
+  spec.name          = 'fedux_org_stdlib-fixtures-plugin_manager-load'
   spec.version       = '0.0.1'
   spec.authors       = ['Blub']
   spec.email         = ['email@example.com']
   spec.summary       = 'Summary'
-  spec.homepage      = ''
+  spec.homepage      = 'http://example.com'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/fixtures/plugin-load-app/lib/fedux_org_stdlib-fixtures-plugin_manager-load-plugin.rb

@@ -0,0 +1 @@
+require 'fedux_org_stdlib-fixtures-plugin_manager-plugin-load'

data/lib/fedux_org_stdlib/gem_plugins/plugin.rb

@@ -9,33 +9,14 @@ module FeduxOrgStdlib
     class Plugin
       include Comparable
 
-      private
+      attr_reader :name, :version, :author, :homepage
 
-      attr_accessor :enabled, :active
-      attr_writer :gem_name
-      attr_reader :prefix
-
-      public
-
-      attr_reader :name, :gem_name, :required_file
-
-      def initialize(name, gem_name:, enabled:, prefix: nil)
-        @name     = name
-        @gem_name = gem_name
-        @enabled  = enabled
-        @prefix   = prefix
-      end
-
-      # Disable a plugin. (prevents plugin from being loaded, cannot
-      # disable an already activated plugin)
-      def disable
-        self.enabled = false
-      end
-
-      # Enable a plugin. (does not load it immediately but puts on
-      # 'white list' to be loaded)
-      def enable
-        self.enabled = true
+      def initialize(spec:)
+        @name        = spec.name
+        @author      = Array(spec.authors).zip(Array(spec.email)).map { |a, e| format( '%s (%s)', a, e) }.to_list
+        @version     = spec.version
+        @homagepage  = spec.homepage
+        @active      = false
       end
 
       # Activate the plugin (require the gem - enables/loads the
@@ -43,38 +24,23 @@ module FeduxOrgStdlib
       # disabled)
       # Does not reload plugin if it's already active.
       def activate
-        begin
-          unless active?
-            begin
-              required_file = variants.shift
-              require required_file
+        return if active?
 
-              @required_file = required_file
-            rescue LoadError
-              retry unless variants.blank?
-
-              raise LoadError
-            end
-          end
+        begin
+          require name
         rescue LoadError => e
-          warn "Found plugin #{gem_name}, but could not require '#{variants.to_list(last_separator: ' or ')}'"
+          warn "Found plugin \"#{name}\", but could not require \"#{require_file}\""
           warn e
         rescue StandardError => e
-          warn "require '#{gem_name}' # Failed, saying: #{e}\n#{e.backtrace.join("\n")}"
+          warn "Require plugin \"#{name}\" failed, saying: #{e}\n#{e.backtrace.join("\n")}"
         end
 
-        self.active  = true
-        self.enabled = true
+        @active = true
       end
 
       # Is plugin active?
       def active?
-        active == true
-      end
-
-      # Is plugin enabled?
-      def enabled?
-        enabled == true
+        @active == true
       end
 
       # Is an existing plugin
@@ -82,26 +48,15 @@ module FeduxOrgStdlib
         false
       end
 
+      # Path of require file
+      def require_file
+        "#{name}.rb"
+      end
+
       # @private
       def <=>(other)
         name <=> other.name
       end
-
-      private
-
-      def local_variant; end
-
-      def variants
-        return @__v if @__v
-
-        @__v = []
-        @__v << gem_name
-        @__v << gem_name.gsub(/-/, '/')
-        @__v << local_variant if local_variant
-        @__v << prefix.source.sub(/-$/, '') if prefix
-
-        @__v
-      end
     end
   end
 end

data/lib/fedux_org_stdlib/gem_plugins/plugin_manager.rb

@@ -13,8 +13,9 @@ module FeduxOrgStdlib
     #
     # To use the plugin manager you should build the plugins for your
     # application as rubygems. How you name the plugins is up to you, but it is
-    # recommended to use something like `your-application-<plugin>`, where
-    # `your-application-` is the prefix (please mind the dash at the end).
+    # recommended to use something like `your-application-<plugin>`. For
+    # the plugin to be found, it needs to include the so called plugin file
+    # `your-application-extension.rb`.
     #
     # @example PluginManager-class
     #
@@ -31,7 +32,7 @@ module FeduxOrgStdlib
     #    # -- main.rb --
     #    # main module
     #    module YourApplication
-    #      # The manager uses "#{self.name.underscore.gsub(/\//, '-')}-" as prefix
+    #      # The manager uses "#{self.name.underscore.gsub(/\//, '-')}-plugin.rb" as plugin-file
     #      @plugin_manager = PluginManager.new
     #
     #      class << self
@@ -44,12 +45,12 @@ module FeduxOrgStdlib
     #    end
     #
     #
-    # @example Use different prefix
+    # @example Use different plugin file
     #    # -- main.rb --
     #    # main module
     #    module YourApplication
-    #      # The manager uses 'asdf-' as prefix
-    #      @plugin_manager = PluginManager.new(prefix: 'asdf-')
+    #      # The manager uses 'asdf-plugin1.rb' to find plugins
+    #      @plugin_manager = PluginManager.new(plugin_file: 'asdf-plugin1.rb')
     #
     #      [...]
     #    end
@@ -65,87 +66,84 @@ module FeduxOrgStdlib
     class PluginManager
       private
 
-      attr_reader :plugins, :prefix, :whitelist, :blacklist, :creator
+      attr_reader :plugins, :creator, :plugin_file
 
       public
 
-      def initialize(prefix: __plugin_prefix, whitelist: [], blacklist: [], creator: Plugin)
-        @prefix    = Regexp.new(prefix)
-        @whitelist = Array(whitelist)
-        @blacklist = Array(blacklist)
-        @creator   = creator
+      def initialize(creator: Plugin, plugin_file: File.join('lib', __plugin_prefix + 'plugin.rb'))
+        @creator     = creator
+        @plugin_file = plugin_file
 
         # needs variables above
-        @plugins   = locate_plugins
-      end
-
-      # Disable a plugin
-      def disable_plugin(name)
-        plugin = plugins.find(NoPlugin.new(name)) { |p| p.name == name }
-
-        return if plugin.blank?
-
-        plugin.disable
+        @plugins   = plugins_in_rubygems_path
       end
 
       # Enable a plugin
-      def enable_plugin(name)
-        plugin = plugins.find(NoPlugin.new(name)) { |p| p.name == name }
+      def activate_plugin(*names)
+        names.flatten.each do |n|
+          plugin = plugins.find(NoPlugin.new(n)) { |p| p.name == n }
 
-        return if plugin.blank?
+          return if plugin.blank?
 
-        plugin.enable
-      end
-
-      # Require all enabled plugins, disabled plugins are skipped.
-      def load_plugins
-        each_enabled_plugin(&:activate)
+          plugin.activate
+        end
       end
 
       # String representation
       def to_s
-        data = plugins.sort.reduce([]) { |a, e| a << { name: e.name, enabled: e.enabled?, gem_name: e.gem_name, required_file: e.required_file } }
+        data = plugins.sort.reduce([]) do |a, e| 
+          a << { 
+            name: e.name,
+            version: e.version,
+            author: e.author,
+            homepage: e.homepage,
+            activated: e.active?,
+            require_file: e.require_file 
+          } 
+        end
 
         List.new(data).to_s(
-          fields: [:name, :gem_name, :enabled, :required_file]
+          fields: [:name, :version, :author, :homepage, :activated, :require_file]
         )
       end
 
       private
 
-      def each_enabled_plugin(&block)
-        plugins.select(&:enabled?).each(&block)
-      end
-
       # Find all installed plugins and store them in an internal array.
-      def locate_plugins
-        plgs = []
-
+      def plugins_in_rubygems_path
+        require 'rubygems'
         Gem.refresh
 
-        (Gem::Specification.respond_to?(:each) ? Gem::Specification : Gem.source_index.find_name('')).each do |gem|
-          name = gem.name.sub(prefix, '')
-
-          next if gem.name !~ prefix
-          next if plgs.any? { |plugin| plugin.name == name }
-
-          enabled = if !whitelist.blank? && !whitelist.include?(name)
-                      false
-                    elsif !blacklist.blank? && blacklist.include?(name)
-                      false
-                    else
-                      true
-                    end
-
-          plgs << creator.new(
-            name,
-            gem_name: gem.name,
-            enabled: enabled,
-            prefix: prefix
-          )
+        specs = rubygems_latest_specs.select { |s| spec_has_file?(s) }
+
+        specs.map do |s|
+          creator.new(spec: s)
         end
+      end
+
+      # Where a given Gem::Specification has a specific file. Used
+      # to discover plugins.
+      #
+      # @private
+      # @param [Gem::Specification] spec
+      # @param [String] path Path to look for
+      # @return [Boolean] Whether the file exists
+      def spec_has_file?(spec)
+        File.exist? File.join(spec.full_gem_path, plugin_file)
+      end
 
-        plgs
+      # Backwards compatible means of finding all the latest gemspecs
+      # available on the system
+      #
+      # @private
+      # @return [Array] Array of latest Gem::Specification
+      def rubygems_latest_specs
+        # If newer Rubygems
+        if ::Gem::Specification.respond_to? :latest_specs
+          ::Gem::Specification.latest_specs(true)
+        else
+          ::Gem.source_index.latest_specs
+        end
       end
 
       def __plugin_prefix

data/lib/fedux_org_stdlib/list.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'fedux_org_stdlib/require_files'
 require_library %w( hirb )
+#require_library %w( tty )
 
 module FeduxOrgStdlib
   # A list

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.7.31'
+  VERSION = '0.7.33'
 end

data/spec/gem_plugins/plugin_manager_spec.rb

@@ -3,42 +3,48 @@ require 'spec_helper'
 require 'fedux_org_stdlib/gem_plugins/plugin_manager'
 
 RSpec.describe GemPlugins::PluginManager do
-  context '#load_plugins' do
-    it 'loads available plugins' do
-      manager = GemPlugins::PluginManager.new prefix: 'fedux_org_stdlib-fixtures-plugin_manager-'
-      manager.disable_plugin 'plugin-no_load'
-      manager.load_plugins
-
-      expect('FeduxOrgStdlib::Fixtures::PluginManager::Plugin::Load').to be_defined
+  module FeduxOrgStdlib
+    module Fixtures
+      module PluginManager
+        module Load
+          class PluginManager < GemPlugins::PluginManager
+          end
+        end
+      end
     end
   end
 
-  context '#disable' do
-    it 'disable plugin' do
-      manager = GemPlugins::PluginManager.new prefix: 'fedux_org_stdlib-fixtures-plugin_manager-'
-      manager.disable_plugin 'plugin-no_load'
-      manager.load_plugins
+  context '#activate_plugin' do
+    it 'loads available plugins by its name' do
+      FeduxOrgStdlib::Fixtures::PluginManager::Load::PluginManager.new
 
-      expect('FeduxOrgStdlib::Fixtures::PluginManager::Plugin::NoLoad').not_to be_defined
+      expect('FeduxOrgStdlib::Fixtures::PluginManager::Plugin::Load').not_to be_defined
     end
 
-    it 'outputs warning if plugin cannout be found' do
-      manager = GemPlugins::PluginManager.new prefix: 'fedux_org_stdlib-fixtures-plugin_manager-'
-      result = capture :stderr do
-        manager.disable_plugin 'plugin-blub'
-      end
+    it 'loads available plugins only on request' do
+      manager = FeduxOrgStdlib::Fixtures::PluginManager::Load::PluginManager.new
+      manager.activate_plugin 'fedux_org_stdlib-fixtures-plugin_manager-load'
+
+      expect('FeduxOrgStdlib::Fixtures::PluginManager::Plugin::Load').to be_defined
+    end
+  end
 
-      expect(result).to include 'plugin-blub'
+  it 'outputs warning if plugin cannout be found' do
+    manager = FeduxOrgStdlib::Fixtures::PluginManager::Load::PluginManager.new
+
+    result = capture :stderr do
+      manager.activate_plugin 'plugin-blub'
     end
+
+    expect(result).to include 'plugin-blub'
   end
 
   context '#to_s' do
     it 'has a string representation' do
-      manager = GemPlugins::PluginManager.new prefix: 'fedux_org_stdlib-fixtures-plugin_manager-'
-      manager.disable_plugin 'plugin-no_load'
-      manager.load_plugins
+      manager = FeduxOrgStdlib::Fixtures::PluginManager::Load::PluginManager.new
+      manager.activate_plugin 'fedux_org_stdlib-fixtures-plugin_manager-load'
 
-      expect(manager.to_s).to include 'plugin'
+      expect(manager.to_s).to include '1 row in set'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.7.31
+  version: 0.7.33
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,10 +50,9 @@ files:
 - doc/logic_converters.md
 - doc/models.md
 - fedux_org-stdlib.gemspec
-- fixtures/plugin-load-app/fedux_org_stdlib-fixtures-plugin_manager-plugin-load.gemspec
-- fixtures/plugin-load-app/lib/fedux_org_stdlib/fixtures/plugin_manager/plugin/load.rb
-- fixtures/plugin-no_load-app/fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load.gemspec
-- fixtures/plugin-no_load-app/lib/fedux_org_stdlib/fixtures/plugin_manager/plugin/no_load.rb
+- fixtures/plugin-load-app/fedux_org_stdlib-fixtures-plugin_manager-load.gemspec
+- fixtures/plugin-load-app/lib/fedux_org_stdlib-fixtures-plugin_manager-load-plugin.rb
+- fixtures/plugin-load-app/lib/fedux_org_stdlib-fixtures-plugin_manager-load.rb
 - lib/fedux_org_stdlib.rb
 - lib/fedux_org_stdlib/app_config.rb
 - lib/fedux_org_stdlib/app_config/exceptions.rb

data/fixtures/plugin-no_load-app/fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load.gemspec

@@ -1,21 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = 'fedux_org_stdlib-fixtures-plugin_manager-plugin-no_load'
-  spec.version       = '0.0.1'
-  spec.authors       = ['blub']
-  spec.email         = ['example@email.com']
-  spec.summary       = 'Summary'
-  spec.homepage      = ''
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-end

data/fixtures/plugin-no_load-app/lib/fedux_org_stdlib/fixtures/plugin_manager/plugin/no_load.rb

@@ -1,13 +0,0 @@
-module FeduxOrgStdlib
-  module Fixtures
-    module PluginManager
-      module Plugin
-        module NoLoad
-          def self.test1
-            'test1'
-          end
-        end
-      end
-    end
-  end
-end