ggem 1.9.3 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48965215e38e1840ec8b4b3bf1480cbceb0d86eab560b36f81dbebb258d17330
-  data.tar.gz: b25db4250efee3239408378bc44cb7ae0663995f30dccbe90ab5a770f50e728c
+  metadata.gz: def73e1c484bc3f53187ff0794b383268a5757b66b63412cde998df88157ba72
+  data.tar.gz: dc06c2753531740179a2c5863851cef0de7c5663a264f6f249d1c53425fbe0c3
 SHA512:
-  metadata.gz: a8447f11f20b90554e8804f06c3de1e3d0522dafc6808b93a2e926e74dccdc1a09c60bad6f51c4461f28d37268aa77d63380338fbd3db7fc1cfd1e60d6363f13
-  data.tar.gz: 0bba44fe414eef3d9d5c5da9e1f512f75a68c8d67af4d638079aad7eedc66489018dc32c25073041cb5f952d38c3f43a9436a65afcd4266a9ea4ec678f37ab4c
+  metadata.gz: 00dcde4ad715b9ff52a7455080e077cfdc2b1b64584db75cf5c7e5dbc85f5d3b241ca94cf188423a098aac942e365a002f7d021941a15780587ba5228d6413c6
+  data.tar.gz: 89e1324ad76a38e5fe606fb91d655db0d2564c9903142814fda6a7fdd22ed502853d5fb72171d20804c9cfaf5c46307cf8fd51cad453821ecbe43052ff87fcc0

data/Gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 ruby "~> 2.5"
 
 gemspec
 
-gem "pry", "~> 0.12.2"
+gem "pry"

data/bin/ggem

@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2008-Present Kelly Redding
 #
+# frozen_string_literal: true
 
 require "ggem/cli"
 GGem::CLI.run ARGV

data/ggem.gemspec

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ggem/version"
@@ -8,21 +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.0"])
-
-  gem.add_dependency("much-plugin", ["~> 0.2.2"])
-  gem.add_dependency("scmd",        ["~> 3.0.3"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
+  gem.add_development_dependency("assert",           ["~> 2.19.4"])
 
+  gem.add_dependency("much-mixin", ["~> 0.2.4"])
+  gem.add_dependency("scmd",       ["~> 3.0.4"])
 end

data/lib/ggem.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "ggem/version"
 require "ggem/gem"

data/lib/ggem/cli.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "ggem/version"
 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")
@@ -14,7 +17,7 @@ class GGem::CLI
   end
 
   def self.run(args)
-    self.new.run(args)
+    new.run(args)
   end
 
   def initialize(kernel = nil, stdout = nil, stderr = nil)
@@ -32,16 +35,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/clirb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GGem; end
 class GGem::CLI; end
 class GGem::CLI::CLIRB # Version 1.1.0, https://github.com/redding/cli.rb

data/lib/ggem/cli/commands.rb

@@ -1,7 +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)
@@ -14,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
@@ -31,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)
@@ -53,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)
@@ -64,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
@@ -74,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
 
@@ -94,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
@@ -112,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
 
@@ -130,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
@@ -161,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
@@ -188,7 +195,7 @@ class GGem::CLI
       "Usage: ggem build [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -217,7 +224,7 @@ class GGem::CLI
       "Usage: ggem install [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -247,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
@@ -280,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
@@ -301,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
 
@@ -314,7 +321,7 @@ class GGem::CLI
       "Usage: ggem tag [options]\n\n" \
       "Options: #{@clirb}\n" \
       "Description:\n" \
-      "  #{self.summary}"
+      "  #{summary}"
     end
   end
 
@@ -330,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
 
@@ -343,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 = {}
@@ -359,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 }
@@ -386,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

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "ggem/template"
 
 module GGem; end
+
 class GGem::Gem
   NoNameError = Class.new(ArgumentError)
 
@@ -28,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
@@ -42,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