ggem 1.9.0 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb8dc845b435566b7087e4965db63b2f7748a2dad1c71fc23d4a3723716d1a4d
-  data.tar.gz: b6ec3468d1fa99ce0186ce9d2dbe80d22083c10f59ef323c264ef99f8e5c687a
+  metadata.gz: 58d90e351c533deb56deb2c166b2f1bf1952476bf26b152e2f03d9dab41dfadb
+  data.tar.gz: 385e2623bc98636318662f09b8868e450208278e3142fce4e681b55488bf4f34
 SHA512:
-  metadata.gz: c2a6d656edc4b1fa4cd9522c15640653946acb3c4c8430e1c343c80ddc0794e41adad78d7f6270c399685917b1e9e151b9e7c1848c38cb8fd9b96a26b205457c
-  data.tar.gz: 19b1b2c5ca9b4b886d68235309756dcff13cf8e2c026aa10e764a62b7a865f8480ffc812d34febf89707432a6638a3c71b4ea8841b570fcaa0834eb620dc3453
+  metadata.gz: c70525edbbd47ba4e679d136a49ed5d9fd5a21c637f7350b94675d6541dc2759ff9ff72c3ff1fb1c32341138fc96325bde64fb259c2b136feb7651bfe81b9ba3
+  data.tar.gz: 134e0f59d5c2d27ad5363bda4705f68f8cb0a427967c49541a8bb4b8b00049897265e46798991b151c1649f515e511a1bc75e1ed3e1853e279ad633a88fa3fbc

data/Gemfile

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

data/README.md

@@ -58,9 +58,6 @@ The `generate` command creates a folder and files for developing, testing, and r
 * adds `TODO` entries in files where user input is needed
 * source control using [Git](https://git-scm.com/)
 * test using [Assert](https://github.com/redding/assert)
-* CI with CircleCI
-  * see `.circleci/config.yml`
-  * need to replace `/todo_org_name` with the gem's org name (ie `/redding`)
 
 You can also call this command using the `g` alias: `ggem g -h`.
 

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,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -18,11 +20,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '> 1.8'
+  gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("assert", ["~> 2.17.0"])
+  gem.add_development_dependency("assert", ["~> 2.19.2"])
 
-  gem.add_dependency("much-plugin", ["~> 0.2.0"])
+  gem.add_dependency("much-plugin", ["~> 0.2.3"])
   gem.add_dependency("scmd",        ["~> 3.0.3"])
-
 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,63 +1,60 @@
+# frozen_string_literal: true
+
 require "ggem/version"
 require "ggem/cli/clirb"
 require "ggem/cli/commands"
 
-module GGem
-
-  class 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
+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
 
-    def self.run(args)
-      self.new.run(args)
-    end
+  def self.run(args)
+    self.new.run(args)
+  end
 
-    def initialize(kernel = nil, stdout = nil, stderr = nil)
-      @kernel = kernel || Kernel
-      @stdout = stdout || $stdout
-      @stderr = stderr || $stderr
-    end
+  def initialize(kernel = nil, stdout = nil, stderr = nil)
+    @kernel = kernel || Kernel
+    @stdout = stdout || $stdout
+    @stderr = stderr || $stderr
+  end
 
-    def run(args)
-      begin
-        cmd_name = args.shift
-        cmd = COMMANDS[cmd_name]
-        cmd.run(args)
-      rescue CLIRB::HelpExit
-        @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"
-        @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")
-        @kernel.exit 1
-      end
-      @kernel.exit 0
+  def run(args)
+    begin
+      cmd_name = args.shift
+      cmd = COMMANDS[cmd_name]
+      cmd.run(args)
+    rescue CLIRB::HelpExit
+      @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"
+      @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")
+      @kernel.exit 1
     end
+    @kernel.exit 0
+  end
 
-    private
+  private
 
-    def display_debug(exception)
-      if ENV["DEBUG"]
-        @stderr.puts "#{exception.class}: #{exception.message}"
-        @stderr.puts exception.backtrace.join("\n")
-      end
+  def display_debug(exception)
+    if ENV["DEBUG"]
+      @stderr.puts "#{exception.class}: #{exception.message}"
+      @stderr.puts exception.backtrace.join("\n")
     end
-
   end
-
 end

data/lib/ggem/cli/clirb.rb

@@ -1,59 +1,57 @@
-module GGem; end
-class GGem::CLI
-
-  class CLIRB  # Version 1.0.0, https://github.com/redding/cli.rb
-    Error    = Class.new(RuntimeError);
-    HelpExit = Class.new(RuntimeError); VersionExit = Class.new(RuntimeError)
-    attr_reader :argv, :args, :opts, :data
+# frozen_string_literal: true
 
-    def initialize(&block)
-      @options = []; instance_eval(&block) if block
-      require "optparse"
-      @data, @args, @opts = [], [], {}; @parser = OptionParser.new do |p|
-        p.banner = ""; @options.each do |o|
-          @opts[o.name] = o.value; p.on(*o.parser_args){ |v| @opts[o.name] = v }
-        end
-        p.on_tail("--version", ""){ |v| raise VersionExit, v.to_s }
-        p.on_tail("--help",    ""){ |v| raise HelpExit,    v.to_s }
+module GGem; end
+class GGem::CLI; end
+class GGem::CLI::CLIRB # Version 1.1.0, https://github.com/redding/cli.rb
+  Error    = Class.new(RuntimeError);
+  HelpExit = Class.new(RuntimeError); VersionExit = Class.new(RuntimeError)
+  attr_reader :argv, :args, :opts, :data
+
+  def initialize(&block)
+    @options = []; instance_eval(&block) if block
+    require "optparse"
+    @data, @args, @opts = [], [], {}; @parser = OptionParser.new do |p|
+      p.banner = ""; @options.each do |o|
+        @opts[o.name] = o.value; p.on(*o.parser_args){ |v| @opts[o.name] = v }
       end
+      p.on_tail("--version", ""){ |v| raise VersionExit, v.to_s }
+      p.on_tail("--help",    ""){ |v| raise HelpExit,    v.to_s }
     end
+  end
 
-    def option(*args); @options << Option.new(*args); end
-    def parse!(argv)
-      @args = (argv || []).dup.tap do |args_list|
-        begin; @parser.parse!(args_list)
-        rescue OptionParser::ParseError => err; raise Error, err.message; end
-      end; @data = @args + [@opts]
-    end
-    def to_s; @parser.to_s; end
-    def inspect
-      "#<#{self.class}:#{"0x0%x" % (object_id << 1)} @data=#{@data.inspect}>"
-    end
-
-    class Option
-      attr_reader :name, :opt_name, :desc, :abbrev, :value, :klass, :parser_args
+  def option(*args); @options << Option.new(*args); end
+  def parse!(argv)
+    @args = (argv || []).dup.tap do |args_list|
+      begin; @parser.parse!(args_list)
+      rescue OptionParser::ParseError => err; raise Error, err.message; end
+    end; @data = @args + [@opts]
+  end
+  def to_s; @parser.to_s; end
+  def inspect
+    "#<#{self.class}:#{"0x0%x" % (object_id << 1)} @data=#{@data.inspect}>"
+  end
 
-      def initialize(name, *args)
-        settings, @desc = args.last.kind_of?(::Hash) ? args.pop : {}, args.pop || ""
-        @name, @opt_name, @abbrev = parse_name_values(name, settings[:abbrev])
-        @value, @klass = gvalinfo(settings[:value])
-        @parser_args = if [TrueClass, FalseClass, NilClass].include?(@klass)
-          ["-#{@abbrev}", "--[no-]#{@opt_name}", @desc]
-        else
-          ["-#{@abbrev}", "--#{@opt_name} #{@opt_name.upcase}", @klass, @desc]
-        end
+  class Option
+    attr_reader :name, :opt_name, :desc, :abbrev, :value, :klass, :parser_args
+
+    def initialize(name, desc = nil, abbrev: nil, value: nil)
+      @name, @desc = name, desc || ""
+      @opt_name, @abbrev = parse_name_values(name, abbrev)
+      @value, @klass = gvalinfo(value)
+      @parser_args = if [TrueClass, FalseClass, NilClass].include?(@klass)
+        ["-#{@abbrev}", "--[no-]#{@opt_name}", @desc]
+      else
+        ["-#{@abbrev}", "--#{@opt_name} VALUE", @klass, @desc]
       end
+    end
 
-      private
+    private
 
-      def parse_name_values(name, custom_abbrev)
-        [ (processed_name = name.to_s.strip.downcase), processed_name.gsub("_", "-"),
-          custom_abbrev || processed_name.gsub(/[^a-z]/, "").chars.first || "a"
-        ]
-      end
-      def gvalinfo(v); v.kind_of?(Class) ? [nil,gklass(v)] : [v,gklass(v.class)]; end
-      def gklass(k); k == Fixnum ? Integer : k; end
+    def parse_name_values(name, custom_abbrev)
+      [ (processed_name = name.to_s.strip.downcase).gsub("_", "-"),
+        custom_abbrev || processed_name.gsub(/[^a-z]/, "").chars.first || "a"
+      ]
     end
+    def gvalinfo(v); v.kind_of?(Class) ? [nil,v] : [v,v.class]; end
   end
-
 end

data/lib/ggem/cli/commands.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 require "ggem/cli/clirb"
 require "much-plugin"
 
 module GGem; end
 class GGem::CLI
-
   InvalidCommandError = Class.new(ArgumentError)
   CommandExitError    = Class.new(RuntimeError)
 
   class InvalidCommand
-
     attr_reader :name, :clirb
 
     def initialize(name)
@@ -30,18 +30,12 @@ class GGem::CLI
       "Commands:\n" \
       "#{COMMANDS.to_s.split("\n").map{ |l| "  #{l}" }.join("\n")}\n"
     end
-
   end
 
   module ValidCommand
     include MuchPlugin
 
-    plugin_included do
-      include InstanceMethods
-    end
-
-    module InstanceMethods
-
+    plugin_instance_methods do
       def initialize(&clirb_build)
         @clirb = CLIRB.new(&clirb_build)
       end
@@ -57,20 +51,13 @@ class GGem::CLI
       def summary
         ""
       end
-
     end
-
   end
 
   module NotifyCmdCommand
     include MuchPlugin
 
-    plugin_included do
-      include InstanceMethods
-    end
-
-    module InstanceMethods
-
+    plugin_instance_methods do
       private
 
       def notify(success_msg, &cmd_block)
@@ -85,9 +72,7 @@ class GGem::CLI
           @stdout.puts output
         end
       end
-
     end
-
   end
 
   module GitRepoCommand
@@ -96,10 +81,9 @@ class GGem::CLI
     plugin_included do
       include ValidCommand
       include NotifyCmdCommand
-      include InstanceMethods
     end
 
-    module InstanceMethods
+    plugin_instance_methods do
       def initialize(*args)
         super
 
@@ -117,7 +101,6 @@ class GGem::CLI
           raise CommandExitError
         end
       end
-
     end
   end
 
@@ -151,7 +134,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module GemspecCommand
@@ -160,10 +142,9 @@ class GGem::CLI
     plugin_included do
       include ValidCommand
       include NotifyCmdCommand
-      include InstanceMethods
     end
 
-    module InstanceMethods
+    plugin_instance_methods do
       def initialize(*args)
         super
 
@@ -187,7 +168,6 @@ class GGem::CLI
           raise CommandExitError
         end
       end
-
     end
   end
 
@@ -212,7 +192,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class InstallCommand
@@ -242,7 +221,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class PushCommand
@@ -273,7 +251,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module ForceTagOptionCommand
@@ -281,11 +258,9 @@ class GGem::CLI
 
     plugin_included do
       include ValidCommand
-      include InstanceMethods
     end
 
-    module InstanceMethods
-
+    plugin_instance_methods do
       def initialize
         super do
           option "force-tag", "force tagging even with uncommitted files", {
@@ -293,9 +268,7 @@ class GGem::CLI
           }
         end
       end
-
     end
-
   end
 
   class TagCommand
@@ -345,7 +318,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class ReleaseCommand
@@ -376,11 +348,9 @@ class GGem::CLI
       "  #{self.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) }
       @names     = []
@@ -392,7 +362,7 @@ class GGem::CLI
       begin
         cmd = klass.new
       rescue StandardError => err
-        # don"t add any commands you can't init
+        # don't add any commands you can't init
       else
         ([name] + aliases).each{ |n| @lookup[n] = cmd }
         @to_s = nil
@@ -425,7 +395,5 @@ class GGem::CLI
         "#{n.ljust(max_name_size)} #{@aliases[n].ljust(max_alias_size)} #{@summaries[n]}"
       end.join("\n")
     end
-
   end
-
 end