fedux_org-stdlib 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3c74f2e817987c3344c6fc427fe3aecab95dd5
-  data.tar.gz: 2861de2ac0abae4df1a9a56a4281d7c3c1193bc8
+  metadata.gz: b3620db0d8a2e9c953b9f301958a36df12ca6bf6
+  data.tar.gz: 32d8f81fb9168468a6dfddb5da3a60274e3f3b11
 SHA512:
-  metadata.gz: 6f910d7792719da8152274a147c11a0983910eb26f8c8ef055b2c57fadfc384f95c1e07fdcc34dd4bbcb9dce058b7b0881a29c916b9118ce0728474f62b70cf6
-  data.tar.gz: 042b8f37317e6569b47c169d3c33946b8ce9790e3bcf7f445e4d19a8bac7633de2b1a450f48b8cb489c6ea23c8ca8aa9c94f39382974b003fca618220d135673
+  metadata.gz: 6f869c2fe0adfa38bd8e471ee82c19bbdce4e69c580ac25fa0a7caa42e866cf3a61cf3351ad3c5f30c4314c740727bb325f9df357b1c60e8407fd2cd2dfb2c3e
+  data.tar.gz: 875b121ef2709c192360252f53973a8a64ca870a497cc655ef128aa05f5f8b3140b2b9aecff2261851c806a1e7f85d83a5d21406c366a27e59ff4a1e3cf76ca7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.7.13)
+    fedux_org-stdlib (0.7.14)
       activesupport
 
 PATH

data/lib/fedux_org_stdlib/core_ext/array/list.rb

@@ -1,6 +1,13 @@
 # encoding: utf-8
 class Array
-  def to_list
-    self.map { |l| format('"%s"', l) }.join(", ")
+  def to_list(separator: ', ', last_separator: separator, around: '"')
+    items = self.map { |l| format("#{around}%s#{around}", l) }
+
+    return items.join(last_separator) if items.size <= 2
+
+    result = items.slice(1..-1).join(separator) << last_separator
+    result << items.last
+
+    result
   end
 end

data/lib/fedux_org_stdlib/gem_plugins/plugin.rb

@@ -1,4 +1,8 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
+require 'fedux_org_stdlib/core_ext/array/list'
+require_library %w{ active_support/core_ext/object/blank }
+
 module FeduxOrgStdlib
   module GemPlugins
     class Plugin
@@ -8,15 +12,17 @@ module FeduxOrgStdlib
 
       attr_accessor :enabled, :active
       attr_writer   :gem_name
+      attr_reader   :prefix
 
       public
 
       attr_reader :name, :gem_name
 
-      def initialize(name, gem_name:, enabled:)
+      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
@@ -36,16 +42,24 @@ module FeduxOrgStdlib
       # disabled)
       # Does not reload plugin if it's already active.
       def activate
+
+        variants = []
+        variants << gem_name
+        variants << gem_name.gsub(/-/, '/')
+        variants << prefix.source.sub(/-$/, '') if prefix
+
         begin 
           if !active?
             begin
-              require gem_name
+              require variants.shift
             rescue LoadError
-              require gem_name.gsub(/-/, '/')
+              retry unless variants.blank?
+
+              raise LoadError
             end
           end
         rescue LoadError => e
-          warn "Found plugin #{gem_name}, but could not require '#{gem_name}' or '#{gem_name.gsub(/-/, '/')}'"
+          warn "Found plugin #{gem_name}, but could not require '#{variants.to_list(last_separator: ' or ')}'"
           warn e
         rescue StandardError => e
           warn "require '#{gem_name}' # Failed, saying: #{e}"

data/lib/fedux_org_stdlib/gem_plugins/plugin_manager.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require 'fedux_org_stdlib/gem_plugins/no_plugin'
 require 'fedux_org_stdlib/gem_plugins/plugin'
 require 'fedux_org_stdlib/gem_plugins/exceptions'
@@ -140,6 +141,7 @@ module FeduxOrgStdlib
             name,
             gem_name: gem.name, 
             enabled: enabled,
+            prefix: prefix,
           )
         end
 

data/lib/fedux_org_stdlib/list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require_library %w( hirb )
 
 module FeduxOrgStdlib

data/lib/fedux_org_stdlib/models/base_model.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require 'fedux_org_stdlib/logging'
 require 'fedux_org_stdlib/models/exceptions'
 require_library %w{ set }

data/lib/fedux_org_stdlib/rake/shell_task.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require 'fedux_org_stdlib/rake/task'
 require 'fedux_org_stdlib/require_files'
 require_library %w{ erubis }

data/lib/fedux_org_stdlib/rake_tasks/documentation/yard.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require 'fedux_org_stdlib/ci'
 
 unless ci?

data/lib/fedux_org_stdlib/support_information.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fedux_org_stdlib/require_files'
 require_library %w{ facter }
 
 module FeduxOrgStdlib

data/lib/fedux_org_stdlib/version.rb

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

data/spec/core_ext/array/list_spec.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'fedux_org_stdlib/core_ext/array/list'
+
+RSpec.describe Array do
+  context '#to_list' do
+    it 'handles single value' do
+      input = %w{ asdf }
+
+      expect(input.to_list).to eq '"asdf"'
+    end
+
+    it 'handles two values' do
+      input = %w{ test1 test2 }
+
+      expect(input.to_list).to eq '"test1", "test2"'
+    end
+
+    it 'converts array to a list of values' do
+      input = %w{ asdf asdf asdf}
+
+      expect(input.to_list).to eq '"asdf", "asdf", "asdf"'
+    end
+
+    it 'supports to change the last separator' do
+      input = %w{ asdf asdf asdf}
+
+      expect(input.to_list(last_separator: ' or ')).to eq '"asdf", "asdf" or "asdf"'
+    end
+
+    it 'supports to change the separator' do
+      input = %w{ asdf asdf asdf}
+
+      expect(input.to_list(separator: ':')).to eq '"asdf":"asdf":"asdf"'
+    end
+
+    it 'change multiple things' do
+      input = %w{ asdf asdf asdf}
+
+      expect(input.to_list(around: '', separator: ':')).to eq 'asdf:asdf:asdf'
+    end
+
+    it 'supports to change the string to surround items' do
+      input = %w{ asdf asdf asdf}
+
+      expect(input.to_list(around: '$')).to eq '$asdf$, $asdf$, $asdf$'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Max Meyer
@@ -157,7 +157,7 @@ files:
 - spec/colors/html_color_spec.rb
 - spec/command/run_command_spec.rb
 - spec/command/which_spec.rb
-- spec/core_ext/array/list.rb
+- spec/core_ext/array/list_spec.rb
 - spec/core_ext/hash/list_spec.rb
 - spec/core_ext/hash/options_spec.rb
 - spec/core_ext/shellwords/clean_spec.rb
@@ -234,7 +234,7 @@ test_files:
 - spec/colors/html_color_spec.rb
 - spec/command/run_command_spec.rb
 - spec/command/which_spec.rb
-- spec/core_ext/array/list.rb
+- spec/core_ext/array/list_spec.rb
 - spec/core_ext/hash/list_spec.rb
 - spec/core_ext/hash/options_spec.rb
 - spec/core_ext/shellwords/clean_spec.rb

data/spec/core_ext/array/list.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'fedux_org_stdlib/core_ext/array/list'
-
-RSpec.describe Array do
-  context '#to_list' do
-    it 'converts array to a list of values' do
-      input = %w{ asdf asdf asdf}
-
-      expect(input.to_list).to eq '"asdf", "asdf", "asdf"'
-    end
-  end
-end