ggem 1.9.5 → 1.10.4

data/lib/ggem/git_repo.rb

@@ -4,6 +4,7 @@ require "pathname"
 require "scmd"
 
 module GGem; end
+
 class GGem::GitRepo
   NotFoundError = Class.new(ArgumentError)
   CmdError      = Class.new(RuntimeError)
@@ -48,7 +49,7 @@ class GGem::GitRepo
     cmd_string = "cd #{@path} && #{cmd_string}"
     cmd = Scmd.new(cmd_string)
     cmd.run
-    if !cmd.success?
+    unless cmd.success?
       raise CmdError, "#{cmd_string}\n" \
                       "#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
     end

data/lib/ggem/template.rb

@@ -4,6 +4,7 @@ require "erb"
 require "fileutils"
 
 module GGem; end
+
 class GGem::Template
   def initialize(ggem)
     @ggem = ggem
@@ -18,12 +19,15 @@ class GGem::Template
     save_folder "log"
     save_folder "tmp"
 
+    save_file("l.yml.erb",        ".l.yml")
+    save_file("t.yml.erb",        ".t.yml")
+    save_file("rubocop.yml.erb",  ".rubocop.yml")
     save_file("ruby-version.erb", ".ruby-version")
-    save_file("gitignore.erb", ".gitignore")
-    save_file("Gemfile.erb",   "Gemfile")
-    save_file("gemspec.erb",   "#{@ggem.name}.gemspec")
-    save_file("README.md.erb", "README.md")
-    save_file("LICENSE.erb",   "LICENSE")
+    save_file("gitignore.erb",    ".gitignore")
+    save_file("Gemfile.erb",      "Gemfile")
+    save_file("gemspec.erb",      "#{@ggem.name}.gemspec")
+    save_file("README.md.erb",    "README.md")
+    save_file("LICENSE.erb",      "LICENSE")
 
     save_file("lib.rb.erb",         "lib/#{@ggem.ruby_name}.rb")
     save_file("lib_version.rb.erb", "lib/#{@ggem.ruby_name}/version.rb")
@@ -39,7 +43,7 @@ class GGem::Template
 
   private
 
-  def save_folder(relative_path=nil)
+  def save_folder(relative_path = nil)
     path = File.join([@ggem.path, relative_path].compact)
     FileUtils.mkdir_p(path)
   end
@@ -53,10 +57,10 @@ class GGem::Template
     source_file = File.join(File.dirname(__FILE__), "template_file", source)
     output_file = File.join(@ggem.root_path, @ggem.name, output)
 
-    if File.exists?(source_file)
+    if File.exist?(source_file)
       FileUtils.mkdir_p(File.dirname(output_file))
       erb = ERB.new(File.read(source_file))
-      File.open(output_file, "w") {|f| f << erb.result(binding) }
+      File.open(output_file, "w"){ |f| f << erb.result(binding) }
     else
       raise ArgumentError, "the source file `#{source_file}` does not exist"
     end

data/lib/ggem/template_file/gemspec.erb

@@ -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.ruby_name %>/version"
@@ -15,14 +15,16 @@ Gem::Specification.new do |gem|
   gem.homepage    = "TODO: homepage"
   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"])
 
   # TODO: gem.add_dependency("gem-name", ["~> 0.0.0"])
 end

data/lib/ggem/template_file/gitignore.erb

@@ -4,6 +4,7 @@
 .rbx/
 .bundle
 .config
+.rubocop-*-yml
 .yardoc
 Gemfile.lock
 InstalledFiles

data/lib/ggem/template_file/l.yml.erb

@@ -0,0 +1,8 @@
+# https://github.com/redding/l.rb
+
+linters:
+  - name: "Rubocop"
+    cmd: "bundle exec rubocop"
+    extensions:
+      - ".rb"
+    cli_abbrev: "u"

data/lib/ggem/template_file/rubocop.yml.erb

@@ -0,0 +1,3 @@
+inherit_gem:
+  much-style-guide:
+    - "lib/much-style-guide/rubocop.yml"

data/lib/ggem/template_file/ruby-version.erb

@@ -1 +1 @@
-2.5.5
+2.5.8

data/lib/ggem/template_file/t.yml.erb

@@ -0,0 +1,6 @@
+# https://github.com/redding/t.rb
+
+default_cmd: "bundle exec assert"
+test_dir: "test"
+test_file_suffixes:
+  - "_tests.rb"

data/lib/ggem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GGem
-  VERSION = "1.9.5"
+  VERSION = "1.10.4"
 end

data/test/support/cmd_tests_helpers.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require "much-plugin"
+require "much-mixin"
 require "scmd"
 
 module GGem; end
+
 module GGem::CmdTestsHelpers
-  include MuchPlugin
+  include MuchMixin
 
-  plugin_included do
+  mixin_included do
     setup do
       ENV["SCMD_TEST_MODE"] = "1"
 
@@ -39,12 +40,11 @@ module GGem::CmdTestsHelpers
         cmd.stderr     = Factory.string
         @cmd_spy       = cmd
       end
-      err = nil
-      begin; run_cmd_block.call; rescue StandardError => err; end
 
-      assert_kind_of cmd_error_class, err
+      ex =
+        assert_that{ run_cmd_block.call }.raises(cmd_error_class)
       exp = "#{@cmd_spy.cmd_str}\n#{@cmd_spy.stderr}"
-      assert_equal exp, err.message
+      assert_equal exp, ex.message
     end
   end
 end

data/test/support/gem1/gem1.gemspec

@@ -1,18 +1,17 @@
+# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
-# -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "gem1"
   gem.version     = "0.1.0"
   gem.authors     = []
   gem.email       = []
-  gem.summary     = %q{Gem 1 summary}
-  gem.description = %q{Gem 1 description}
+  gem.summary     = "Gem 1 summary"
+  gem.description = "Gem 1 description"
   gem.license     = "MIT"
 
   gem.files         = []
   gem.executables   = []
   gem.test_files    = []
   gem.require_paths = []
-
 end

data/test/support/gem2/gem2.gemspec

@@ -1,13 +1,13 @@
+# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
-# -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "gem2"
   gem.version     = "0.2.0"
   gem.authors     = []
   gem.email       = []
-  gem.summary     = %q{Gem 2 summary}
-  gem.description = %q{Gem 2 description}
+  gem.summary     = "Gem 2 summary"
+  gem.description = "Gem 2 description"
   gem.license     = "MIT"
 
   gem.metadata["allowed_push_host"] = "http://gems.example.com"
@@ -16,5 +16,4 @@ Gem::Specification.new do |gem|
   gem.executables   = []
   gem.test_files    = []
   gem.require_paths = []
-
 end

data/test/support/name_set.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 module GGem; end
+
 module GGem::NameSet
   class Base
     attr_reader :variations, :name, :module_name, :ruby_name
 
     def expected_folders
-      [ "",
+      [
+        "",
         "lib",
         "lib/#{@ruby_name}",
         "test",
@@ -14,12 +16,13 @@ module GGem::NameSet
         "test/system",
         "test/unit",
         "log",
-        "tmp"
+        "tmp",
       ]
     end
 
     def expected_files
-      [ ".ruby-version",
+      [
+        ".ruby-version",
         ".gitignore",
         "Gemfile",
         "#{@name}.gemspec",

data/test/system/ggem_tests.rb

@@ -7,7 +7,6 @@ require "test/support/name_set"
 
 module GGem
   class SystemTests < Assert::Context
-
     NS_SIMPLE = GGem::NameSet::Simple
     NS_UNDER  = GGem::NameSet::Underscored
     NS_HYPHEN = GGem::NameSet::HyphenatedOther
@@ -18,7 +17,8 @@ module GGem
   class GemTests < SystemTests
     desc "Gem"
 
-    should "know its name attrs for various name styles (simple/underscored/hyphenated)" do
+    should "know its name attrs for various name styles "\
+           "(simple/underscored/hyphenated)" do
       [NS_SIMPLE, NS_UNDER, NS_HYPHEN].each do |ns|
         assert_gem_name_set(ns.new)
       end
@@ -45,7 +45,8 @@ module GGem
       FileUtils.rm_rf(TMP_PATH)
     end
 
-    should "save gems with various name styles (simple/underscored/hyphenated)" do
+    should "save gems with various name styles "\
+           "(simple/underscored/hyphenated)" do
       [NS_SIMPLE, NS_UNDER, NS_HYPHEN].each do |ns|
         init_gem = GGem::Gem.new(TMP_PATH, ns.new.variations.first)
         gem_from_save = init_gem.save!
@@ -59,11 +60,11 @@ module GGem
 
     def assert_gem_created(name_set)
       folders = name_set.expected_folders
-      files   = name_set.expected_files
-      paths   = (folders + files).collect{ |p| File.join(TMP_PATH, name_set.name, p) }
+      files = name_set.expected_files
+      paths = (folders + files).map{ |p| File.join(TMP_PATH, name_set.name, p) }
 
       paths.flatten.each do |path|
-        assert File.exists?(path), "`#{path}` does not exist"
+        assert File.exist?(path), "`#{path}` does not exist"
       end
     end
   end

data/test/unit/cli_tests.rb

@@ -8,7 +8,7 @@ require "ggem/cli/commands"
 require "ggem/gem"
 require "ggem/gemspec"
 require "ggem/git_repo"
-require "much-plugin"
+require "much-mixin"
 
 class GGem::CLI
   class UnitTests < Assert::Context
@@ -147,7 +147,7 @@ class GGem::CLI
   class RunWithHelpTests < RunSetupTests
     desc "and run with the help switch"
     setup do
-      @cli.run([ "--help" ])
+      @cli.run(["--help"])
     end
 
     should "output the invalid command's help" do
@@ -163,7 +163,7 @@ class GGem::CLI
   class RunWithVersionTests < RunSetupTests
     desc "and run with the version switch"
     setup do
-      @cli.run([ "--version" ])
+      @cli.run(["--version"])
     end
 
     should "have output its version" do
@@ -217,8 +217,8 @@ class GGem::CLI
     end
 
     should "parse its argv on run" do
-      assert_raises(CLIRB::HelpExit){ subject.new.run([ "--help" ]) }
-      assert_raises(CLIRB::VersionExit){ subject.new.run([ "--version" ]) }
+      assert_raises(CLIRB::HelpExit){ subject.new.run(["--help"]) }
+      assert_raises(CLIRB::VersionExit){ subject.new.run(["--version"]) }
     end
 
     should "raise a help exit if its name is empty" do
@@ -268,9 +268,10 @@ class GGem::CLI
     end
 
     should "take custom CLIRB build procs" do
-      cmd = @command_class.new do
-        option "test", "testing", :abbrev => "t"
-      end
+      cmd =
+        @command_class.new do
+          option "test", "testing", abbrev: "t"
+        end
       cmd.run(["-t"], @stdout, @stderr)
       assert_true cmd.clirb.opts["test"]
     end
@@ -284,7 +285,7 @@ class GGem::CLI
     desc "GitRepoCommand"
     setup do
       @gem1_root_path = TEST_SUPPORT_PATH.join("gem1")
-      Assert.stub(Dir, :pwd){ @gem1_root_path}
+      Assert.stub(Dir, :pwd){ @gem1_root_path }
 
       @command_class = Class.new{ include GitRepoCommand }
       @cmd = @command_class.new
@@ -305,9 +306,9 @@ class GGem::CLI
   end
 
   module RootPathTests
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       setup do
         @root_path = Factory.path
         Assert.stub(Dir, :pwd){ @root_path }
@@ -316,14 +317,16 @@ class GGem::CLI
   end
 
   module GitRepoSpyTests
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include RootPathTests
 
       setup do
         @repo_spy = nil
-        Assert.stub(GGem::GitRepo, :new){ |*args| @repo_spy = GitRepoSpy.new(*args) }
+        Assert.stub(GGem::GitRepo, :new) do |*args|
+          @repo_spy = GitRepoSpy.new(*args)
+        end
       end
     end
   end
@@ -383,17 +386,15 @@ class GGem::CLI
 
     should "re-raise a specific argument error on gem 'no name' errors" do
       Assert.stub(@gem_class, :new){ raise GGem::Gem::NoNameError }
-      err = nil
-      begin
-        cmd = @command_class.new
-        cmd.run([])
-      rescue ArgumentError => err
-      end
 
-      assert_not_nil err
+      ex =
+        assert_that{
+          cmd = @command_class.new
+          cmd.run([])
+        }.raises(ArgumentError)
       exp = "GEM-NAME must be provided"
-      assert_equal exp, err.message
-      assert_not_empty err.backtrace
+      assert_equal exp, ex.message
+      assert_not_empty ex.backtrace
     end
   end
 
@@ -401,7 +402,7 @@ class GGem::CLI
     desc "GemspecCommand"
     setup do
       @gem1_root_path = TEST_SUPPORT_PATH.join("gem1")
-      Assert.stub(Dir, :pwd){ @gem1_root_path}
+      Assert.stub(Dir, :pwd){ @gem1_root_path }
 
       @command_class = Class.new{ include GemspecCommand }
       @cmd = @command_class.new
@@ -424,25 +425,23 @@ class GGem::CLI
       root = Factory.path
       Assert.stub(Dir, :pwd){ root }
 
-      begin
-        cmd = @command_class.new
-      rescue ArgumentError => err
-      end
-      assert_not_nil err
+      ex = assert_that{ @command_class.new }.raises(ArgumentError)
       exp = "There are no gemspecs at #{Dir.pwd}"
-      assert_equal exp, err.message
+      assert_equal exp, ex.message
     end
   end
 
   module GemspecSpyTests
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include RootPathTests
 
       setup do
         @spec_spy = nil
-        Assert.stub(GGem::Gemspec, :new){ |*args| @spec_spy = GemspecSpy.new(*args) }
+        Assert.stub(GGem::Gemspec, :new) do |*args|
+          @spec_spy = GemspecSpy.new(*args)
+        end
       end
     end
   end
@@ -481,7 +480,9 @@ class GGem::CLI
       assert_true @spec_spy.run_build_cmd_called
 
       exp = ENV["DEBUG"] == "1" ? "build\nbuild cmd was run\n" : ""
-      exp += "#{@spec_spy.name} #{@spec_spy.version} built to #{@spec_spy.gem_file}\n"
+      exp +=
+        "#{@spec_spy.name} #{@spec_spy.version} built to "\
+        "#{@spec_spy.gem_file}\n"
       assert_equal exp, @stdout.read
 
       ENV["DEBUG"] = nil
@@ -489,7 +490,9 @@ class GGem::CLI
 
     should "handle cmd errors when run" do
       err_msg = Factory.string
-      Assert.stub(@spec_spy, :run_build_cmd){ raise GGem::Gemspec::CmdError, err_msg }
+      Assert.stub(@spec_spy, :run_build_cmd) do
+        raise GGem::Gemspec::CmdError, err_msg
+      end
 
       assert_raises(CommandExitError){ subject.run([], @stdout, @stderr) }
       assert_equal "#{err_msg}\n", @stderr.read
@@ -502,7 +505,9 @@ class GGem::CLI
     desc "InstallCommand"
     setup do
       @build_spy = nil
-      Assert.stub(BuildCommand, :new){ |*args| @build_spy = CommandSpy.new(*args) }
+      Assert.stub(BuildCommand, :new) do |*args|
+        @build_spy = CommandSpy.new(*args)
+      end
 
       @command_class = InstallCommand
       @cmd = @command_class.new
@@ -529,7 +534,8 @@ class GGem::CLI
       assert @build_spy
     end
 
-    should "run the build command and call the spec's run install cmds when run" do
+    should "run the build command and call the spec's run install cmds when "\
+           "run" do
       ENV["DEBUG"] = [nil, "1"].sample
       subject.run(@argv, @stdout, @stderr)
 
@@ -546,7 +552,9 @@ class GGem::CLI
 
     should "handle cmd errors when run" do
       err_msg = Factory.string
-      Assert.stub(@spec_spy, :run_install_cmd){ raise GGem::Gemspec::CmdError, err_msg }
+      Assert.stub(@spec_spy, :run_install_cmd) do
+        raise GGem::Gemspec::CmdError, err_msg
+      end
 
       assert_raises(CommandExitError){ subject.run(@argv, @stdout, @stderr) }
       assert_equal "#{err_msg}\n", @stderr.read
@@ -559,7 +567,9 @@ class GGem::CLI
     desc "PushCommand"
     setup do
       @build_spy = nil
-      Assert.stub(BuildCommand, :new){ |*args| @build_spy = CommandSpy.new(*args) }
+      Assert.stub(BuildCommand, :new) do |*args|
+        @build_spy = CommandSpy.new(*args)
+      end
 
       @command_class = PushCommand
       @cmd = @command_class.new
@@ -604,7 +614,9 @@ class GGem::CLI
 
     should "handle cmd errors when run" do
       err_msg = Factory.string
-      Assert.stub(@spec_spy, :run_push_cmd){ raise GGem::Gemspec::CmdError, err_msg }
+      Assert.stub(@spec_spy, :run_push_cmd) do
+        raise GGem::Gemspec::CmdError, err_msg
+      end
 
       assert_raises(CommandExitError){ subject.run(@argv, @stdout, @stderr) }
       assert_equal "#{err_msg}\n", @stderr.read
@@ -670,13 +682,14 @@ class GGem::CLI
       assert_true @repo_spy.run_push_cmd_called
       assert_nil @repo_spy.run_rm_tag_cmd_called_with
 
-      exp = if ENV["DEBUG"] == "1"
-        "validate clean\nvalidate clean cmd was run\n" \
-        "validate committed\nvalidate committed cmd was run\n" \
-        "add tag\nadd tag cmd was run\n"
-      else
-        ""
-      end
+      exp =
+        if ENV["DEBUG"] == "1"
+          "validate clean\nvalidate clean cmd was run\n" \
+          "validate committed\nvalidate committed cmd was run\n" \
+          "add tag\nadd tag cmd was run\n"
+        else
+          ""
+        end
       exp += "Tagged #{@spec_spy.version_tag}.\n"
       exp += ENV["DEBUG"] == "1" ? "push\npush cmd was run\n" : ""
       exp += "Pushed git commits and tags.\n"
@@ -717,7 +730,9 @@ class GGem::CLI
 
     should "remove the version tag on push errors" do
       err_msg = Factory.string
-      Assert.stub(@repo_spy, :run_push_cmd){ raise GGem::GitRepo::CmdError, err_msg }
+      Assert.stub(@repo_spy, :run_push_cmd) do
+        raise GGem::GitRepo::CmdError, err_msg
+      end
 
       assert_raises(CommandExitError){ subject.run([], @stdout, @stderr) }
       assert_equal "#{err_msg}\n", @stderr.read
@@ -727,9 +742,13 @@ class GGem::CLI
     end
 
     should "handle tag removal cmd errors when run" do
-      Assert.stub(@repo_spy, :run_push_cmd){ raise GGem::GitRepo::CmdError, Factory.string }
+      Assert.stub(@repo_spy, :run_push_cmd) do
+        raise GGem::GitRepo::CmdError, Factory.string
+      end
       err_msg = Factory.string
-      Assert.stub(@repo_spy, :run_rm_tag_cmd){ raise GGem::GitRepo::CmdError, err_msg }
+      Assert.stub(@repo_spy, :run_rm_tag_cmd) do
+        raise GGem::GitRepo::CmdError, err_msg
+      end
 
       assert_raises(CommandExitError){ subject.run([], @stdout, @stderr) }
       assert_equal "#{err_msg}\n", @stderr.read
@@ -745,7 +764,9 @@ class GGem::CLI
       Assert.stub(TagCommand, :new){ |*args| @tag_spy = CommandSpy.new(*args) }
 
       @push_spy = nil
-      Assert.stub(PushCommand, :new){ |*args| @push_spy = CommandSpy.new(*args) }
+      Assert.stub(PushCommand, :new) do |*args|
+        @push_spy = CommandSpy.new(*args)
+      end
 
       @command_class = ReleaseCommand
       @cmd = @command_class.new
@@ -757,8 +778,9 @@ class GGem::CLI
     end
 
     should "know its summary" do
-      exp = "Tag #{@spec_spy.version_tag} and push built #{@spec_spy.gem_file_name} to " \
-               "#{@spec_spy.push_host}"
+      exp =
+        "Tag #{@spec_spy.version_tag} and push built "\
+        "#{@spec_spy.gem_file_name} to #{@spec_spy.push_host}"
       assert_equal exp, subject.summary
     end
 
@@ -937,7 +959,8 @@ class GGem::CLI
 
   class GemspecSpy
     attr_reader :name, :version, :version_tag, :push_host
-    attr_reader :run_build_cmd_called, :run_install_cmd_called, :run_push_cmd_called
+    attr_reader :run_build_cmd_called, :run_install_cmd_called
+    attr_reader :run_push_cmd_called
 
     def initialize(root_path)
       @root        = Pathname.new(File.expand_path(root_path))
@@ -952,15 +975,15 @@ class GGem::CLI
     end
 
     def path
-      @root.join("#{self.name}.gemspec")
+      @root.join("#{name}.gemspec")
     end
 
     def gem_file_name
-      "#{self.name}-#{self.version}.gem"
+      "#{name}-#{version}.gem"
     end
 
     def gem_file
-      File.join(GGem::Gemspec::BUILD_TO_DIRNAME, self.gem_file_name)
+      File.join(GGem::Gemspec::BUILD_TO_DIRNAME, gem_file_name)
     end
 
     def run_build_cmd
@@ -982,8 +1005,10 @@ class GGem::CLI
   class GitRepoSpy
     attr_reader :path
     attr_reader :run_init_cmd_called
-    attr_reader :run_validate_clean_cmd_called, :run_validate_committed_cmd_called
-    attr_reader :run_add_version_tag_cmd_called_with, :run_rm_tag_cmd_called_with
+    attr_reader :run_validate_clean_cmd_called
+    attr_reader :run_validate_committed_cmd_called
+    attr_reader :run_add_version_tag_cmd_called_with
+    attr_reader :run_rm_tag_cmd_called_with
     attr_reader :run_push_cmd_called
 
     def initialize(path)