ggem 1.8.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 78af14258ae315c8ee616b840770779d1084d591
-  data.tar.gz: 227aff8e65f1aca57f6a9b18e30fd67da6c967f2
-SHA512: 
-  metadata.gz: 9652f4d234a556ce6259f83aad0208b1b6ab175ef07b1a426408873ec01d669c55463daf7e91e8d50d840ad0fcc552eafe5934489a2db1320e3af518975d6ff9
-  data.tar.gz: adbb62ae9184ec3ddf508b7a80a6633154de627c41ed60b212567ab026d28642ed6a8827a9ecff82995466e6fc32fb6077711b7a0fec070df65ac168d1fd2d24
+---
+SHA256:
+  metadata.gz: fe73b45d444a8f7ff488f19259fc7a0668c681db033d19f2eb1b221d004edac5
+  data.tar.gz: 5ea32d246eafec3af4fd01f17e6ed94c05c95b4a53a667d8966114cff59d387c
+SHA512:
+  metadata.gz: acf33a27c2b503dc4d6233a3d6afb05dd34b86d326d19f9202b37aeb82b44cef1e70a901e140eff2a34528699e619f761c84caeabdc5029cb62f40227a026ac0
+  data.tar.gz: 00c64f8c24b4de4f2858994d59ff6b52b62474103e2865709a89bc62e48ae8a0d69b700bd967e669c04dd4b8ce24cda86c2f2c61707411370a97fd17776ba051

data/Gemfile

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

data/README.md

@@ -114,7 +114,7 @@ To override the default `https://rubygems.org` push host, add a metadata entry t
 
 ```ruby
 # ...
-gem.metadata['allowed_push_host'] = "https://gems.example.com"
+gem.metadata["allowed_push_host"] = "https://gems.example.com"
 # ...
 ```
 
@@ -175,6 +175,6 @@ $ gem install ggem
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am "Added some feature"`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/bin/ggem

@@ -3,5 +3,5 @@
 # Copyright (c) 2008-Present Kelly Redding
 #
 
-require 'ggem/cli'
+require "ggem/cli"
 GGem::CLI.run ARGV

data/ggem.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ggem/version"
 
@@ -11,16 +11,18 @@ Gem::Specification.new do |gem|
   gem.summary     = %q{"Juh Gem", baby! (a gem utility CLI)}
   gem.description = %q{"Juh Gem", baby! (a gem utility CLI)}
   gem.homepage    = "http://github.com/redding/ggem"
-  gem.license     = 'MIT'
+  gem.license     = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files | grep "^[^.]"`.split($/)
   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.add_development_dependency("assert", ["~> 2.16.1"])
+  gem.required_ruby_version = "~> 2.5"
 
-  gem.add_dependency("much-plugin", ["~> 0.1.0"])
-  gem.add_dependency("scmd",        ["~> 3.0.1"])
+  gem.add_development_dependency("assert", ["~> 2.18.2"])
+
+  gem.add_dependency("much-plugin", ["~> 0.2.2"])
+  gem.add_dependency("scmd",        ["~> 3.0.3"])
 
 end

data/lib/ggem.rb

@@ -1,2 +1,2 @@
-require 'ggem/version'
-require 'ggem/gem'
+require "ggem/version"
+require "ggem/gem"

data/lib/ggem/cli.rb

@@ -1,63 +1,58 @@
-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
+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")
+    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

@@ -1,14 +1,12 @@
-require 'ggem/cli/clirb'
-require 'much-plugin'
+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)
@@ -21,7 +19,7 @@ class GGem::CLI
     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, "`#{self.name}` is not a command."
     end
 
     def help
@@ -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
@@ -55,22 +47,15 @@ class GGem::CLI
       end
 
       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)
@@ -80,14 +65,12 @@ class GGem::CLI
 
       def cmd(&cmd_block)
         cmd, status, output = cmd_block.call
-        if ENV['DEBUG']
+        if ENV["DEBUG"]
           @stdout.puts cmd
           @stdout.puts output
         end
       end
-
     end
-
   end
 
   module GitRepoCommand
@@ -96,14 +79,13 @@ class GGem::CLI
     plugin_included do
       include ValidCommand
       include NotifyCmdCommand
-      include InstanceMethods
     end
 
-    module InstanceMethods
+    plugin_instance_methods do
       def initialize(*args)
         super
 
-        require 'ggem/git_repo'
+        require "ggem/git_repo"
         @repo = GGem::GitRepo.new(Dir.pwd)
       end
 
@@ -117,7 +99,6 @@ class GGem::CLI
           raise CommandExitError
         end
       end
-
     end
   end
 
@@ -128,7 +109,7 @@ class GGem::CLI
       super
 
       begin
-        require 'ggem/gem'
+        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
@@ -151,7 +132,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module GemspecCommand
@@ -160,14 +140,13 @@ class GGem::CLI
     plugin_included do
       include ValidCommand
       include NotifyCmdCommand
-      include InstanceMethods
     end
 
-    module InstanceMethods
+    plugin_instance_methods do
       def initialize(*args)
         super
 
-        require 'ggem/gemspec'
+        require "ggem/gemspec"
         begin
           @spec = GGem::Gemspec.new(Dir.pwd)
         rescue GGem::Gemspec::NotFoundError => exception
@@ -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
@@ -225,7 +202,8 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @build_command.run(argv)
+      @build_command.run([])
+
       notify("#{@spec.name} #{@spec.version} installed to system gems") do
         @spec.run_install_cmd
       end
@@ -241,7 +219,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class PushCommand
@@ -254,7 +231,7 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @build_command.run(argv)
+      @build_command.run([])
 
       @stdout.puts "Pushing #{@spec.gem_file_name} to #{@spec.push_host}..."
       notify("#{@spec.gem_file_name} received.") do
@@ -272,7 +249,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   module ForceTagOptionCommand
@@ -280,21 +256,17 @@ 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', {
-            :abbrev => 'f'
+          option "force-tag", "force tagging even with uncommitted files", {
+            :abbrev => "f"
           }
         end
       end
-
     end
-
   end
 
   class TagCommand
@@ -310,7 +282,7 @@ class GGem::CLI
         cmd{ @repo.run_validate_committed_cmd }
       rescue GGem::GitRepo::CmdError => err
         @stderr.puts "There are files that need to be committed first."
-        if self.clirb.opts['force-tag']
+        if self.clirb.opts["force-tag"]
           @stderr.puts "Forcing tag anyway..."
         else
           raise CommandExitError
@@ -344,7 +316,6 @@ class GGem::CLI
       "Description:\n" \
       "  #{self.summary}"
     end
-
   end
 
   class ReleaseCommand
@@ -359,8 +330,8 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @tag_command.run(argv)
-      @push_command.run(argv)
+      @tag_command.run(self.clirb.opts["force-tag"] ? ["--force-tag"] : [])
+      @push_command.run([])
     end
 
     def summary
@@ -375,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     = []
@@ -396,8 +365,8 @@ class GGem::CLI
         ([name] + aliases).each{ |n| @lookup[n] = cmd }
         @to_s = nil
         @names << name
-        @aliases[name] = aliases.empty? ? '' : "(#{aliases.join(', ')})"
-        @summaries[name] = cmd.summary.to_s.empty? ? '' : "# #{cmd.summary}"
+        @aliases[name] = aliases.empty? ? "" : "(#{aliases.join(", ")})"
+        @summaries[name] = cmd.summary.to_s.empty? ? "" : "# #{cmd.summary}"
       end
     end
 
@@ -424,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