ggem 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2b2454ea3387abee594818c98c363e60a4583504ff889a682295100498f1a81
-  data.tar.gz: 582a50960b9bd9d696d9817521274cd2d360575246413423d28f83eb7a1df795
+  metadata.gz: fe73b45d444a8f7ff488f19259fc7a0668c681db033d19f2eb1b221d004edac5
+  data.tar.gz: 5ea32d246eafec3af4fd01f17e6ed94c05c95b4a53a667d8966114cff59d387c
 SHA512:
-  metadata.gz: 6900afe18a1a61ca1056aab174faa57bebfdb7eb943d2e3185e5e6c7913fc238a5070cb924e4b7823b81d09830c1535b3f4d473602e193a418bc73d1690b3c15
-  data.tar.gz: 1dafa08bf81466d5469038cdea1b2dbf95115a38f79944623acbb4d2e5c9dc96e00defd6888a1fcbce3dd67b57db1bb0316d3a843aea293f42c6ccb89751154f
+  metadata.gz: acf33a27c2b503dc4d6233a3d6afb05dd34b86d326d19f9202b37aeb82b44cef1e70a901e140eff2a34528699e619f761c84caeabdc5029cb62f40227a026ac0
+  data.tar.gz: 00c64f8c24b4de4f2858994d59ff6b52b62474103e2865709a89bc62e48ae8a0d69b700bd967e669c04dd4b8ce24cda86c2f2c61707411370a97fd17776ba051

data/Gemfile

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

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/ggem.gemspec

@@ -18,11 +18,11 @@ 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.18.2"])
 
-  gem.add_dependency("much-plugin", ["~> 0.2.0"])
+  gem.add_dependency("much-plugin", ["~> 0.2.2"])
   gem.add_dependency("scmd",        ["~> 3.0.3"])
 
 end

data/lib/ggem/cli.rb

@@ -2,62 +2,57 @@ 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,55 @@
 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
-
-    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 }
+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

@@ -3,12 +3,10 @@ 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 +28,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 +49,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 +70,7 @@ class GGem::CLI
           @stdout.puts output
         end
       end
-
     end
-
   end
 
   module GitRepoCommand
@@ -96,10 +79,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 +99,6 @@ class GGem::CLI
           raise CommandExitError
         end
       end
-
     end
   end
 
@@ -151,7 +132,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module GemspecCommand
@@ -160,10 +140,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 +166,6 @@ class GGem::CLI
           raise CommandExitError
         end
       end
-
     end
   end
 
@@ -212,7 +190,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class InstallCommand
@@ -242,7 +219,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class PushCommand
@@ -273,7 +249,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module ForceTagOptionCommand
@@ -281,11 +256,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 +266,7 @@ class GGem::CLI
           }
         end
       end
-
     end
-
   end
 
   class TagCommand
@@ -345,7 +316,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class ReleaseCommand
@@ -376,11 +346,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     = []
@@ -425,7 +393,5 @@ class GGem::CLI
         "#{n.ljust(max_name_size)} #{@aliases[n].ljust(max_alias_size)} #{@summaries[n]}"
       end.join("\n")
     end
-
   end
-
 end

data/lib/ggem/gem.rb

@@ -1,58 +1,58 @@
 require "fileutils"
 require "ggem/template"
 
-module GGem
+module GGem; end
+class GGem::Gem
+  NoNameError = Class.new(ArgumentError)
 
-  class Gem
+  attr_reader :root_path, :name
 
-    attr_reader :root_path, :name
+  def initialize(path, name)
+    raise NoNameError if name.to_s.empty?
+    @root_path, self.name = path, name
+  end
 
-    def initialize(path, name)
-      raise NoNameError if name.to_s.empty?
-      @root_path, self.name = path, name
-    end
+  def save!
+    GGem::Template.new(self).save
+    self
+  end
 
-    def save!
-      Template.new(self).save
-      self
-    end
+  def path
+    File.join(@root_path, @name)
+  end
 
-    def path; File.join(@root_path, @name); end
-    def name=(name); @name = normalize_name(name); end
+  def name=(name)
+    @name = normalize_name(name)
+  end
 
-    def module_name
-      transforms = {
-        "_" => "",
-        "-" => ""
-      }
-      @module_name ||= transform_name(transforms){ |part| part.capitalize }
-    end
+  def module_name
+    transforms = {
+      "_" => "",
+      "-" => ""
+    }
+    @module_name ||= transform_name(transforms){ |part| part.capitalize }
+  end
 
-    def ruby_name
-      @ruby_name ||= transform_name{ |part| part.downcase }
-    end
+  def ruby_name
+    @ruby_name ||= transform_name{ |part| part.downcase }
+  end
 
-    private
+  private
 
-    def normalize_name(name)
-      und_camelcs = [ /([A-Z])([a-z])/, '_\1\2' ]
-      rm_dup_und  = [ /_+/, "_" ]
-      rm_lead_und = [ /^_/, ""  ]
-      name.gsub(*und_camelcs).gsub(*rm_dup_und).sub(*rm_lead_und).downcase
-    end
+  def normalize_name(name)
+    und_camelcs = [/([A-Z])([a-z])/, '_\1\2']
+    rm_dup_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)
-      conditions.each do |on, glue|
-        if (a = n.split(on)).size > 1
-          n = a.map{ |part| block.call(part) if block }.join(glue)
-        end
+  def transform_name(conditions = {}, &block)
+    n = (block ? block.call(self.name) : self.name)
+    conditions.each do |on, glue|
+      if (a = n.split(on)).size > 1
+        n = a.map{ |part| block.call(part) if block }.join(glue)
       end
-      n
     end
-
-    NoNameError = Class.new(ArgumentError)
-
+    n
   end
-
 end