ggem 1.9.5 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d90e351c533deb56deb2c166b2f1bf1952476bf26b152e2f03d9dab41dfadb
-  data.tar.gz: 385e2623bc98636318662f09b8868e450208278e3142fce4e681b55488bf4f34
+  metadata.gz: 45eb4dacea143c3b186a3ae2ec76ec01990fdf602f3d0a7d64c1f83d29ce0771
+  data.tar.gz: e9bedb479b361a24597449322250da74a12313875ad0ddc7a53a3b9870bd4aaf
 SHA512:
-  metadata.gz: c70525edbbd47ba4e679d136a49ed5d9fd5a21c637f7350b94675d6541dc2759ff9ff72c3ff1fb1c32341138fc96325bde64fb259c2b136feb7651bfe81b9ba3
-  data.tar.gz: 134e0f59d5c2d27ad5363bda4705f68f8cb0a427967c49541a8bb4b8b00049897265e46798991b151c1649f515e511a1bc75e1ed3e1853e279ad633a88fa3fbc
+  metadata.gz: '0680e6ccd2bf26a2b8521364e206ea049f712e0de44f814fcc9fa9621d42c69a826c192ef4a1f9f30c450618d830c183c39bf38ffdc26ef1572156175bd1f73f'
+  data.tar.gz: 48c14bda11865bde52b80cf1967ef3cfaf9727a33439680ecbaf9fd8a9f6ad0b622a794654b1c99cc75b737d2c506a8571fb1ebbb9b082ae133cea798a49a7f0

data/ggem.gemspec

@@ -1,6 +1,6 @@
+# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
-# -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ggem/version"
@@ -10,20 +10,22 @@ Gem::Specification.new do |gem|
   gem.version     = GGem::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.summary     = %q{"Juh Gem", baby! (a gem utility CLI)}
-  gem.description = %q{"Juh Gem", baby! (a gem utility CLI)}
+  gem.summary     = '"Juh Gem", baby! (a gem utility CLI)'
+  gem.description = '"Juh Gem", baby! (a gem utility CLI)'
   gem.homepage    = "http://github.com/redding/ggem"
   gem.license     = "MIT"
 
-  gem.files         = `git ls-files | grep "^[^.]"`.split($/)
+  gem.files = `git ls-files | grep "^[^.]"`.split($INPUT_RECORD_SEPARATOR)
+
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("assert", ["~> 2.19.2"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.4"])
+  gem.add_development_dependency("assert",           ["~> 2.19.6"])
 
-  gem.add_dependency("much-plugin", ["~> 0.2.3"])
-  gem.add_dependency("scmd",        ["~> 3.0.3"])
+  gem.add_dependency("much-mixin", ["~> 0.2.4"])
+  gem.add_dependency("scmd",       ["~> 3.0.4"])
 end

data/lib/ggem/cli.rb

@@ -5,18 +5,20 @@ require "ggem/cli/clirb"
 require "ggem/cli/commands"
 
 module GGem; end
+
 class GGem::CLI
-  COMMANDS = CommandSet.new{ |unknown| InvalidCommand.new(unknown) }.tap do |c|
-    c.add(GenerateCommand, "generate", "g")
-    c.add(BuildCommand,    "build",    "b")
-    c.add(InstallCommand,  "install",  "i")
-    c.add(PushCommand,     "push",     "p")
-    c.add(TagCommand,      "tag",      "t")
-    c.add(ReleaseCommand,  "release",  "r")
-  end
+  COMMANDS =
+    CommandSet.new{ |unknown| InvalidCommand.new(unknown) }.tap do |c|
+      c.add(GenerateCommand, "generate", "g")
+      c.add(BuildCommand,    "build",    "b")
+      c.add(InstallCommand,  "install",  "i")
+      c.add(PushCommand,     "push",     "p")
+      c.add(TagCommand,      "tag",      "t")
+      c.add(ReleaseCommand,  "release",  "r")
+    end
 
   def self.run(args)
-    self.new.run(args)
+    new.run(args)
   end
 
   def initialize(kernel = nil, stdout = nil, stderr = nil)
@@ -34,16 +36,16 @@ class GGem::CLI
       @stdout.puts cmd.help
     rescue CLIRB::VersionExit
       @stdout.puts GGem::VERSION
-    rescue CLIRB::Error, ArgumentError, InvalidCommandError => exception
-      display_debug(exception)
-      @stderr.puts "#{exception.message}\n\n"
+    rescue CLIRB::Error, ArgumentError, InvalidCommandError => ex
+      display_debug(ex)
+      @stderr.puts "#{ex.message}\n\n"
       @stdout.puts cmd.help
       @kernel.exit 1
     rescue CommandExitError
       @kernel.exit 1
-    rescue StandardError => exception
-      @stderr.puts "#{exception.class}: #{exception.message}"
-      @stderr.puts exception.backtrace.join("\n")
+    rescue => ex
+      @stderr.puts "#{ex.class}: #{ex.message}"
+      @stderr.puts ex.backtrace.join("\n")
       @kernel.exit 1
     end
     @kernel.exit 0

data/lib/ggem/cli/commands.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require "ggem/cli/clirb"
-require "much-plugin"
+require "much-mixin"
 
 module GGem; end
+
 class GGem::CLI
   InvalidCommandError = Class.new(ArgumentError)
   CommandExitError    = Class.new(RuntimeError)
@@ -16,12 +17,14 @@ class GGem::CLI
       @clirb = CLIRB.new
     end
 
-    def new; self; end
+    def new
+      self
+    end
 
     def run(argv)
       @clirb.parse!([@name, argv].flatten.compact)
       raise CLIRB::HelpExit if @name.to_s.empty?
-      raise InvalidCommandError, "`#{self.name}` is not a command."
+      raise InvalidCommandError, "`#{name}` is not a command."
     end
 
     def help
@@ -33,14 +36,16 @@ class GGem::CLI
   end
 
   module ValidCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize(&clirb_build)
         @clirb = CLIRB.new(&clirb_build)
       end
 
-      def clirb; @clirb; end
+      def clirb
+        @clirb
+      end
 
       def run(argv, stdout = nil, stderr = nil)
         @clirb.parse!(argv)
@@ -55,9 +60,9 @@ class GGem::CLI
   end
 
   module NotifyCmdCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       private
 
       def notify(success_msg, &cmd_block)
@@ -66,7 +71,7 @@ class GGem::CLI
       end
 
       def cmd(&cmd_block)
-        cmd, status, output = cmd_block.call
+        cmd, _status, output = cmd_block.call
         if ENV["DEBUG"]
           @stdout.puts cmd
           @stdout.puts output
@@ -76,14 +81,14 @@ class GGem::CLI
   end
 
   module GitRepoCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include ValidCommand
       include NotifyCmdCommand
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize(*args)
         super
 
@@ -96,8 +101,8 @@ class GGem::CLI
       def notify(*args, &block)
         begin
           super
-        rescue GGem::GitRepo::CmdError => exception
-          @stderr.puts exception.message
+        rescue GGem::GitRepo::CmdError => ex
+          @stderr.puts ex.message
           raise CommandExitError
         end
       end
@@ -114,9 +119,9 @@ class GGem::CLI
         require "ggem/gem"
         path = GGem::Gem.new(Dir.pwd, @clirb.args.first).save!.path
         @stdout.puts "created gem in #{path}"
-      rescue GGem::Gem::NoNameError => exception
+      rescue GGem::Gem::NoNameError => ex
         error = ArgumentError.new("GEM-NAME must be provided")
-        error.set_backtrace(exception.backtrace)
+        error.set_backtrace(ex.backtrace)
         raise error
       end
 
@@ -132,28 +137,28 @@ class GGem::CLI
       "Usage: ggem generate [options] GEM-NAME\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
   module GemspecCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include ValidCommand
       include NotifyCmdCommand
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize(*args)
         super
 
         require "ggem/gemspec"
         begin
           @spec = GGem::Gemspec.new(Dir.pwd)
-        rescue GGem::Gemspec::NotFoundError => exception
+        rescue GGem::Gemspec::NotFoundError => ex
           error = ArgumentError.new("There are no gemspecs at #{Dir.pwd}")
-          error.set_backtrace(exception.backtrace)
+          error.set_backtrace(ex.backtrace)
           raise error
         end
       end
@@ -163,8 +168,8 @@ class GGem::CLI
       def notify(*args, &block)
         begin
           super
-        rescue GGem::Gemspec::CmdError => exception
-          @stderr.puts exception.message
+        rescue GGem::Gemspec::CmdError => ex
+          @stderr.puts ex.message
           raise CommandExitError
         end
       end
@@ -190,7 +195,7 @@ class GGem::CLI
       "Usage: ggem build [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -219,7 +224,7 @@ class GGem::CLI
       "Usage: ggem install [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -249,22 +254,22 @@ class GGem::CLI
       "Usage: ggem push [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
   module ForceTagOptionCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include ValidCommand
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize
         super do
           option "force-tag", "force tagging even with uncommitted files", {
-            :abbrev => "f"
+            abbrev: "f",
           }
         end
       end
@@ -282,9 +287,9 @@ class GGem::CLI
       begin
         cmd{ @repo.run_validate_clean_cmd }
         cmd{ @repo.run_validate_committed_cmd }
-      rescue GGem::GitRepo::CmdError => err
+      rescue GGem::GitRepo::CmdError
         @stderr.puts "There are files that need to be committed first."
-        if self.clirb.opts["force-tag"]
+        if clirb.opts["force-tag"]
           @stderr.puts "Forcing tag anyway..."
         else
           raise CommandExitError
@@ -303,8 +308,8 @@ class GGem::CLI
       end
 
       @stdout.puts "Pushed git commits and tags."
-    rescue GGem::GitRepo::CmdError => err
-      @stderr.puts err.message
+    rescue GGem::GitRepo::CmdError => ex
+      @stderr.puts ex.message
       raise CommandExitError
     end
 
@@ -316,7 +321,7 @@ class GGem::CLI
       "Usage: ggem tag [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -332,7 +337,7 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @tag_command.run(self.clirb.opts["force-tag"] ? ["--force-tag"] : [])
+      @tag_command.run(clirb.opts["force-tag"] ? ["--force-tag"] : [])
       @push_command.run([])
     end
 
@@ -345,14 +350,14 @@ class GGem::CLI
       "Usage: ggem release [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}\n" \
+      "  #{summary}\n" \
       "  (macro for running `ggem tag && ggem push`)"
     end
   end
 
   class CommandSet
     def initialize(&unknown_cmd_block)
-      @lookup    = Hash.new{ |h,k| unknown_cmd_block.call(k) }
+      @lookup    = Hash.new{ |_h, k| unknown_cmd_block.call(k) }
       @names     = []
       @aliases   = {}
       @summaries = {}
@@ -361,7 +366,7 @@ class GGem::CLI
     def add(klass, name, *aliases)
       begin
         cmd = klass.new
-      rescue StandardError => err
+      rescue
         # don't add any commands you can't init
       else
         ([name] + aliases).each{ |n| @lookup[n] = cmd }
@@ -388,12 +393,13 @@ class GGem::CLI
     end
 
     def to_s
-      max_name_size  = @names.map{ |n| n.size }.max || 0
-      max_alias_size = @aliases.values.map{ |v| v.size }.max || 0
+      max_name_size  = @names.map(&:size).max || 0
+      max_alias_size = @aliases.values.map(&:size).max || 0
 
-      @to_s ||= @names.map do |n|
-        "#{n.ljust(max_name_size)} #{@aliases[n].ljust(max_alias_size)} #{@summaries[n]}"
-      end.join("\n")
+      @to_s ||= @names.map{ |n|
+        "#{n.ljust(max_name_size)} #{@aliases[n].ljust(max_alias_size)} "\
+        "#{@summaries[n]}"
+      }.join("\n")
     end
   end
 end

data/lib/ggem/gem.rb

@@ -4,6 +4,7 @@ require "fileutils"
 require "ggem/template"
 
 module GGem; end
+
 class GGem::Gem
   NoNameError = Class.new(ArgumentError)
 
@@ -30,13 +31,13 @@ class GGem::Gem
   def module_name
     transforms = {
       "_" => "",
-      "-" => ""
+      "-" => "",
     }
-    @module_name ||= transform_name(transforms){ |part| part.capitalize }
+    @module_name ||= transform_name(transforms, &:capitalize)
   end
 
   def ruby_name
-    @ruby_name ||= transform_name{ |part| part.downcase }
+    @ruby_name ||= transform_name(&:downcase)
   end
 
   private
@@ -44,15 +45,15 @@ class GGem::Gem
   def normalize_name(name)
     und_camelcs = [/([A-Z])([a-z])/, '_\1\2']
     rm_dup_und  = [/_+/, "_"]
-    rm_lead_und = [/^_/, "" ]
+    rm_lead_und = [/^_/, ""]
     name.gsub(*und_camelcs).gsub(*rm_dup_und).sub(*rm_lead_und).downcase
   end
 
   def transform_name(conditions = {}, &block)
-    n = (block ? block.call(self.name) : self.name)
+    n = (block ? block.call(name) : name)
     conditions.each do |on, glue|
       if (a = n.split(on)).size > 1
-        n = a.map{ |part| block.call(part) if block }.join(glue)
+        n = a.map{ |part| block&.call(part) }.join(glue)
       end
     end
     n

data/lib/ggem/gemspec.rb

@@ -4,10 +4,11 @@ require "pathname"
 require "scmd"
 
 module GGem; end
+
 class GGem::Gemspec
   PUSH_HOST_META_KEY = "allowed_push_host"
-  DEFAULT_PUSH_HOST  = "https://rubygems.org".freeze
-  BUILD_TO_DIRNAME   = "pkg".freeze
+  DEFAULT_PUSH_HOST  = "https://rubygems.org"
+  BUILD_TO_DIRNAME   = "pkg"
 
   NotFoundError = Class.new(ArgumentError)
   LoadError     = Class.new(ArgumentError)
@@ -55,25 +56,34 @@ class GGem::Gemspec
   def run_cmd(cmd_string)
     cmd = Scmd.new(cmd_string)
     cmd.run
-    if !cmd.success?
-      raise CmdError, "#{cmd_string}\n" \
-                      "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
+    unless cmd.success?
+      raise(
+        CmdError,
+        "#{cmd_string}\n#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}",
+      )
     end
     [cmd_string, cmd.exitstatus, cmd.stdout]
   end
 
   def load_gemspec(path)
-    eval(path.read, TOPLEVEL_BINDING, path.expand_path.to_s)
-  rescue ScriptError, StandardError => e
-    original_line = e.backtrace.find{ |line| line.include?(path.to_s) }
-    msg = "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
+    eval( # rubocop:disable Security/Eval
+      path.read,
+      TOPLEVEL_BINDING,
+      path.expand_path.to_s,
+    )
+  rescue ScriptError, StandardError => ex
+    original_line = ex.backtrace.find{ |line| line.include?(path.to_s) }
+    msg =
+      "There was a #{ex.class} while loading #{path.basename}: \n#{ex.message}"
     msg << " from\n  #{original_line}" if original_line
     msg << "\n"
     raise LoadError, msg
   end
 
   def get_push_host(spec)
-    ENV["GGEM_PUSH_HOST"] || get_meta(spec)[PUSH_HOST_META_KEY] || DEFAULT_PUSH_HOST
+    ENV["GGEM_PUSH_HOST"] ||
+    get_meta(spec)[PUSH_HOST_META_KEY] ||
+    DEFAULT_PUSH_HOST
   end
 
   def get_meta(spec)