nib 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c94574ceb002f4a62bae9dae565d4a9eb0f87cb
-  data.tar.gz: 4240d6bce285b3fec1f54d8620dc4728c4e101ca
+SHA256:
+  metadata.gz: b69fb8eb3b9ba8f08e35a98aecb2334e6ed064202851793609a2611928ac047f
+  data.tar.gz: f60ce60ae0b32ebd7bfe6adfa68aded161d3d35f3a038bc036121f86a9c2ddd7
 SHA512:
-  metadata.gz: 8127154d0d106487d3b6e6b27f4527bf4e8c07bd61d73b1bbbb0ad4745597296791e74f40e8a8b76fefacc18356375eb1718a91a4506f2fb5751a93e9fd8aeab
-  data.tar.gz: a89ecbee23a910e2ca8f8eec41144df1d5c2afc7049a83a74c6e98d5ae2254b8578038420c865f30d388d0e8be9ba3e66a7d39856c734be237c26ec6203357ac
+  metadata.gz: 9f487437d32af8de8e5f4cd31664a11f70661bd4290f9c6314b146f1f73cf382e47af8e2101826586214b8bbb2ecbc1efb34c91ddaaf9cd9fb594cdf06c677d8
+  data.tar.gz: 8bf1f908a299ea019744b92e7c0dd72a9f276ff2f45b119ca01e1cd8e186cf946b5954597aacff42ed9b9f5eb49c2636052ca64104b976fd893f6dd82b530c74

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.1

data/bin/nib

@@ -37,6 +37,7 @@ post do |global, command, options, args|
   # Use skips_post before a command to skip this
   # block on that command only
   if command.is_a? GLI::Commands::Help
+    Nib::Plugins.execute(options, args)
     Nib::UnrecognizedHelp.execute(options, args)
     Nib::CheckForUpdate.execute(options, args)
   end

data/config/commands/shell/pryrc

@@ -15,3 +15,5 @@ Pry.config.ls.heading_color = :magenta
 Pry.config.ls.public_method_color = :green
 Pry.config.ls.protected_method_color = :yellow
 Pry.config.ls.private_method_color = :bright_black
+# Disable paging - paging is broken in when using Alpine `less`
+Pry.config.pager = false

data/lib/core_extensions/hash.rb

@@ -1,7 +1,7 @@
 module CoreExtensions
   module Hash
     def symbolize_keys!
-      map { |k, v| [k.to_sym, v] }.to_h
+      transform_keys(&:to_sym)
     end
   end
 end

data/lib/core_extensions/psych.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module CoreExtensions
+  # Handle the fact that we are loading potentially "unsafe" YAML while still
+  # supporting Ruby 2.7 and 3.0.
+  module Psych
+    def flexible_load(string)
+      load_with = if ::Psych.respond_to?(:unsafe_load)
+        :unsafe_load
+      else
+        :load
+      end
+
+      ::Psych.send(load_with, string)
+    end
+
+    def flexible_load_file(path)
+      load_with = if ::Psych.respond_to?(:unsafe_load_file)
+        :unsafe_load_file
+      else
+        :load_file
+      end
+
+      ::Psych.send(load_with, path)
+    end
+  end
+end
+
+Psych.extend CoreExtensions::Psych

data/lib/core_extensions/string.rb

@@ -0,0 +1,6 @@
+class String
+  # Implementation from active_support https://git.io/vNVlN
+  def strip_heredoc
+    gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, ''.freeze)
+  end
+end

data/lib/nib/check_for_update.rb

@@ -4,10 +4,10 @@ class Nib::CheckForUpdate
   def self.execute(_, _)
     return if installed == latest
 
-    puts <<-MESSAGE
+    puts <<-MESSAGE.strip_heredoc
 
-    An update is available for nib: #{latest}
-    Use 'nib update' to install the latest version
+      An update is available for nib: #{latest}
+      Use 'nib update' to install the latest version
     MESSAGE
   end
 

data/lib/nib/debug.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 class Nib::Debug
   include Nib::Command
 
@@ -18,11 +16,15 @@ class Nib::Debug
   end
 
   def host
-    if ENV.key?('DOCKER_HOST_URL') && ENV['DOCKER_HOST_URL'] != ''
+    return @host if @host
+
+    @host = if ENV.key?('DOCKER_HOST_URL') && ENV['DOCKER_HOST_URL'] != ''
       URI.parse(ENV['DOCKER_HOST_URL']).host
     else
-      `ip route | awk 'NR==1 {print $3}'`.chomp
+      `ip route | head -n 1`.chomp
     end
+
+    @host = @host == '' ? '0.0.0.0' : @host
   end
 
   def compose_file

data/lib/nib/history/compose.rb

@@ -28,7 +28,9 @@ class Nib::History::Compose
   end
 
   def original_config
-    @original_config ||= YAML.safe_load(docker_compose_config.gsub(/\$/, '$$'))
+    @original_config ||= Psych.flexible_load(
+      docker_compose_config.gsub(/\$/, '$$')
+    )
   end
 
   def file
@@ -55,8 +57,8 @@ class Nib::History::Compose
     end
 
     def config
-      original_config.each_with_object({}) do |(name, definition), extended|
-        extended[name] = Service.new(volume_name, definition).config
+      original_config.transform_values do |definition|
+        Service.new(volume_name, definition).config
       end
     end
   end

data/lib/nib/history/config.rb

@@ -30,7 +30,7 @@ class Nib::History::Config
   def config_file
     @config_file ||= File.open("#{PATH}/#{type}", 'w+') do |file|
       file.write(config)
-      file.write(history_command + "\n")
+      file.write("#{history_command}\n")
       file
     end
   end

data/lib/nib/options.rb

@@ -2,7 +2,9 @@ module Nib::Options
   module_function
 
   def config
-    @config ||= YAML.load_file("#{Nib::GEM_ROOT}/config/options.yml")
+    return @config if @config
+
+    @config = Psych.flexible_load_file("#{Nib::GEM_ROOT}/config/options.yml")
   end
 
   def options_for(type, name)

data/lib/nib/plugin.rb

@@ -0,0 +1,31 @@
+class Nib::Plugin
+  attr_reader :path
+
+  def initialize(path)
+    @path = path
+  end
+
+  def basename
+    @basename ||= File.basename(path, '_plugin.rb')
+  end
+
+  def name
+    @name ||= basename.tr('_', '-')
+  end
+
+  def constant
+    @constant ||= Object.const_get(name.split('-').map(&:capitalize).join('::'))
+  end
+
+  def applies?
+    @applies ||= begin
+      require path
+
+      constant.applies?
+    end
+  end
+
+  def binstub
+    "#{path[0..-"/lib/#{basename}_plugin.rb".length]}bin/#{name}"
+  end
+end

data/lib/nib/plugins.rb

@@ -0,0 +1,20 @@
+class Nib::Plugins
+  def self.execute(_, _)
+    puts ''
+    puts(
+      (['Installed plugins:'] | potential_plugins.map(&:name))
+      .join("\r\n  - ")
+    )
+  end
+
+  def self.potential_plugins
+    @potential_plugins ||= Gem
+      .find_files('nib*_plugin.rb')
+      .sort
+      .map { |plugin_path| Nib::Plugin.new(plugin_path) }
+  end
+
+  def self.available_plugins
+    @available_plugins ||= potential_plugins.select(&:applies?)
+  end
+end

data/lib/nib/unrecognized_help.rb

@@ -1,6 +1,6 @@
 class Nib::UnrecognizedHelp
   def self.execute(_, _)
-    puts <<-MESSAGE
+    puts <<-MESSAGE.strip_heredoc
 
       Note:
         Unrecognized commands will be delegated to docker-compose.

data/lib/nib/version.rb

@@ -1,3 +1,3 @@
 module Nib
-  VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).freeze
+  VERSION = File.read(File.expand_path('../../VERSION', __dir__)).freeze
 end

data/lib/nib.rb

@@ -1,11 +1,16 @@
 require 'nib/version'
 
 require 'core_extensions/hash'
+require 'core_extensions/string'
+require 'core_extensions/psych'
 
 require 'nib/options'
 require 'nib/options/augmenter'
 require 'nib/options/parser'
 
+require 'nib/plugins'
+require 'nib/plugin'
+
 require 'nib/command'
 require 'nib/history'
 require 'nib/history/compose'
@@ -22,26 +27,16 @@ require 'nib/shell'
 require 'nib/update'
 
 module Nib
-  GEM_ROOT = File.expand_path('../..', __FILE__)
+  GEM_ROOT = File.expand_path('..', __dir__)
 
   module_function
 
-  def available_plugins
-    Gem.find_files('nib*_plugin.rb').sort.map do |plugin_path|
-      name = File.basename plugin_path, '_plugin.rb'
-
-      require plugin_path
-
-      next unless const_for(name).applies?
-
-      plugin_base_path = plugin_path[0..-"/lib/#{name}_plugin.rb".length]
-
-      "#{plugin_base_path}bin/#{name.tr('_', '-')}"
-    end.compact
+  def installed_plugins
+    Nib::Plugins.potential_plugins.map(&:name)
   end
 
-  def const_for(name)
-    Nib.const_get(name.split('_').map(&:capitalize).join('::'))
+  def available_plugins
+    Nib::Plugins.available_plugins.map(&:binstub)
   end
 
   def load_default_config(command, file_name)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nib
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - John Allen
 - Zach Blankenship
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.7
+- !ruby/object:Gem::Dependency
+  name: did_you_mean
+  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: guard
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,8 @@ files:
 - config/commands/shell/pryrc
 - config/options.yml
 - lib/core_extensions/hash.rb
+- lib/core_extensions/psych.rb
+- lib/core_extensions/string.rb
 - lib/nib.rb
 - lib/nib/check_for_update.rb
 - lib/nib/code_climate.rb
@@ -165,6 +181,8 @@ files:
 - lib/nib/options.rb
 - lib/nib/options/augmenter.rb
 - lib/nib/options/parser.rb
+- lib/nib/plugin.rb
+- lib/nib/plugins.rb
 - lib/nib/run.rb
 - lib/nib/setup.rb
 - lib/nib/shell.rb
@@ -173,8 +191,9 @@ files:
 - lib/nib/version.rb
 homepage: https://github.com/technekes/nib
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,16 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: The tip of the pen (compose)
 test_files: []