nugem 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b9aac101ead8ba12ce81706c0f64f37ed979fa470d424083a8de6ae9635e5f
-  data.tar.gz: 7f470f94df11340de30b1cba0e1d45b335b32f222fd823b676920a22ddff950e
+  metadata.gz: 4c209ec58ac03b1b550972ec5abe2fc6f3846b59dec92b9d8f84f1aedd6f1405
+  data.tar.gz: 525e8795a8b7b4217c0f92f2fc3c08084503f09e776f6e155c52a23afe8074f0
 SHA512:
-  metadata.gz: 8ce715d8f39c3403b7febcec8d381b5de2d2792822cc408acc6fcb721e761249571da1db40dd9f19574eb24a899307590ee3d71663456752fb3ae33553616b06
-  data.tar.gz: 987bee354b52ef35372251fcf68271cef7fef3c9e3e7e9f9b2ede36eb0049bdc3520e68b01e79d19dae54aab3757ebd21e881f27ee55075f3f3dc43e5fda2e0b
+  metadata.gz: 915b02fdcc9176e48ffd0ea85147545140fe5407c3da1a27fb22c02522252de88427b4d0aa4155bafa03214b494bf171778187f4d4745ad952c5d082cd7331c6
+  data.tar.gz: 1b036270d8ba39dbcc9ddf4b8188feb5a5c50c17761fb58c999c461bba369452a838b5b48a0aac451675ab12ec607d4a648facfd3a8eaabfe37dac9ba4dee0ff

data/.rubocop.yml

@@ -23,6 +23,9 @@ Gemspec/DeprecatedAttributeAssignment:
 Gemspec/RequireMFA:
   Enabled: false
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
 Layout/ArgumentAlignment:
   EnforcedStyle: with_first_argument
 
@@ -37,7 +40,8 @@ Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented_relative_to_receiver
 
 Metrics/AbcSize:
-  Max: 45
+  Enabled: false
+  Max: 50
 
 Metrics/BlockLength:
   Exclude:
@@ -79,9 +83,8 @@ Style/TrailingCommaInHashLiteral:
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
   IgnoreMethods: true
-  SpecSuffixOnly: true
 
 RSpec/ExampleLength:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## 0.9.0
+
+* Added `OptionParser` starter for gems in `templates/common/executable_scaffold/lib/%gem_name%/options.rb.tt`.
+* Renamed 'plain' to 'gem'
+* Reorganized generated gem files so they all enhance the same module
+* All generated Ruby files are included on startup
+* Rails apps are deprecated, will be removed soon
+
+
+## 0.8.5
+
+* Added `-y` option to suppress confirmation messages and default to `yes`.
+* Suppresses the huge chunk of JSON that used to be displayed after the remote repository was created.
+
+
+## 0.8.4
+
+* Added `-o` option for specifying output directory
+* Added aliases for class options
+
+
 ## 0.8.3
 
 * Added more files to generated projects.

data/README.md

@@ -17,6 +17,9 @@ This gem generates a new working Visual Studio Code project with the following f
 - Can automatically create a public or private git repository on GitHub for your new gem.
 - Creates a test infrastructure based on `rspec`.
 - Your gem can be publicly released to `rubygems.org`.
+- Optionally create the gem as:
+  - A plain old gem.
+  - A Jekyll plugin (tag or block tag).
 
 The following features are still in development, so they probably do not work yet:
 
@@ -25,8 +28,8 @@ The following features are still in development, so they probably do not work ye
 - Your gem can be privately released to a Geminabox gem server.
 - Your gem can include a [Thor-based executable](https://github.com/rails/thor).
 - Optionally create the gem as:
+  - A Jekyll plugin (filter, generator, or hooks).
   - A Rails plugin, possibly with a mountable engine.
-  - A Jekyll plugin (tag, block tag, filter, generator, or hooks).
 
 
 ## Installation
@@ -50,8 +53,9 @@ $ gem update nugem
 
 ## Subcommands and Options
 
-`Nugem` has 4 subcommands `plain`, `jekyll`, `help` and `rails`.
-Currently, only `plain` and `help` have been properly tested.
+`Nugem` has 4 subcommands `gem`, `jekyll`, `help` and `rails`.
+Currently, only `gem`, `jekyll` and `help` have been properly tested.
+
 
 ### `help` Subcommand
 
@@ -70,7 +74,7 @@ $ nugem help [SUBCOMMAND]
 
 ### Common Options
 
-The `plain`, `jekyll` and `rails` subcommands have common options.
+The `gem`, `jekyll` and `rails` subcommands have common options.
 
 The default option values assume that:
 
@@ -78,7 +82,7 @@ The default option values assume that:
 - The gem project will be hosted on a public GitHub git repository
 - The gem will be released to `rubygems.org`
 
-Common options for the `plain`, `jekyll` and `rails` subcommands are:
+Common options for the `gem`, `jekyll` and `rails` subcommands are:
 
 <dl>
   <dt><code>--executable</code></dt>
@@ -90,6 +94,12 @@ Common options for the `plain`, `jekyll` and `rails` subcommands are:
       <code>github</code> and <code>geminabox</code>.
     </dd>
 
+  <dt><code>--out_dir</code></dt>
+    <dd>
+      specifies the directory to write the generated gem to.
+      The default is <code>generated/</code>.
+    </dd>
+
   <dt><code>--private</code></dt>
     <dd>the remote repository is made private,
         and on release the gem will be pushed to a private Geminabox server.
@@ -105,7 +115,7 @@ Common options for the `plain`, `jekyll` and `rails` subcommands are:
 
 ### Common Behavior
 
-The `plain`, `jekyll` and `rails` subcommands have common behavior.
+The `gem`, `jekyll` and `rails` subcommands have common behavior.
 
 Gem scaffolds are created within the `generated/` directory of the current directory.
 
@@ -118,25 +128,25 @@ Then commit the changes to git and invoke `rake release`,
 and your gem will be published.
 
 
-### `plain` Subcommand
+### `gem` Subcommand
 
 ```shell
-$ nugem plain NAME [COMMON_OPTIONS] [--test-framework=minitest|rspec]
+$ nugem gem NAME [COMMON_OPTIONS] [--test-framework=minitest|rspec]
 ```
 
 `NAME` is the name of the gem to be generated.
 
-The default test framework for the `plain` subcommand is `rspec`,
+The default test framework for the `gem` subcommand is `rspec`,
 but you can specify `minitest` instead like this:
 
 ```shell
-$ nugem plain my_gem --test-framework=minitest
+$ nugem gem my_gem --test-framework=minitest
 ```
 
 
 ### `jekyll` Subcommand
 
-The `jekyll` subcommand extends the `plain` subcommand and creates a new Jekyll plugin with the given NAME:
+The `jekyll` subcommand extends the `gem` subcommand and creates a new Jekyll plugin with the given NAME:
 
 ```shell
 $ nugem jekyll NAME [OPTIONS]
@@ -148,12 +158,13 @@ In addition to the common options, the `jekyll`-specific `OPTIONS` are:
 
 `--block`, `--blockn`, `--filter`, `--hooks`, `--tag`, and `--tagn`.
 
+(Warning: only `--block` and `--tag` been properly tested.)
+
 Each of these options causes `nugem` to prompt the user for additional input.
 
 The test framework for `jekyll` plugins is `rspec`.
 
-All of the above options can be specified more than once,
-except the `--hooks` option.
+All of the above options can be specified more than once, except the `--hooks` option.
 For example:
 
 ```shell
@@ -171,7 +182,7 @@ my_tag2 usage: {% my_tag2 %}
 </pre>
 ```
 
-For more information, type
+For more information, type:
 
 ```shell
 $ nugem help jekyll
@@ -180,7 +191,7 @@ $ nugem help jekyll
 
 ### `rails` Subcommand
 
-The `rails` subcommand extends the `plain` subcommand and creates a new Rails plugin with the given NAME:
+The `rails` subcommand extends the `gem` subcommand and creates a new Rails plugin with the given NAME:
 
 ```shell
 $ nugem rails NAME [OPTIONS]
@@ -197,7 +208,7 @@ Each of these options causes `nugem` to prompt the user for additional input.
 
 The test framework for `rails` gems is `minitest`.
 
-For more information, type
+For more information, type:
 
 ```shell
 $ nugem help rails
@@ -306,7 +317,7 @@ After checking out the repository, run `bin/setup` to install dependencies.
 Then, run `rake test` to run the tests.
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run
+To install this gem onto your local machine, run:
 
 ```shell
 $ bundle exec rake install

data/exe/nugem

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'nugem'
+if ENV['VO_DEBUGGING']
+  require_relative '../lib/nugem'
+else
+  require 'nugem'
+end
 
 Nugem::Cli.start

data/lib/nugem/cli/cli_gem.rb

@@ -4,10 +4,10 @@ module Nugem
   class Cli < Thor
     include Thor::Actions
 
-    desc 'plain NAME', 'Creates a new plain gem scaffold.'
+    desc 'gem NAME', 'Creates a new gem scaffold.'
 
     long_desc <<~END_DESC
-      Creates a new plain gem scaffold with the given NAME,
+      Creates a new gem scaffold with the given NAME,
       by default hosted by GitHub and published on RubyGems.
     END_DESC
 
@@ -17,15 +17,18 @@ module Nugem
     method_option :private, type: :boolean, default: false,
       desc: 'Publish the gem in a private repository.'
 
-    def plain(gem_name)
+    def gem(gem_name)
       # puts set_color("gem_name=#{gem_name}", :yellow)
       super if gem_name.empty?
 
-      @dir = Nugem.dest_root gem_name
+      @executable = options[:executable]
+      @host           = options[:host] # FIXME: conflicts with @host in create_gem_scaffold()
+      @out_dir        = options[:out_dir]
+      @private        = options[:private]
+      @test_framework = options[:test_framework]
+      @yes            = options[:yes]
 
-      @host           = options['host']
-      @private        = options['private']
-      @test_framework = options['test_framework']
+      @dir = Nugem.dest_root @out_dir, gem_name
 
       create_plain_scaffold gem_name
       initialize_repository gem_name
@@ -36,11 +39,8 @@ module Nugem
     # Defines globals for templates
     def create_plain_scaffold(gem_name)
       @gem_name = gem_name
-      puts set_color("Creating a scaffold for a new plain Ruby gem named #{@gem_name} in #{@dir}.", :green)
       @class_name = Nugem.camel_case @gem_name
-      @executable = options[:executable]
-      @host = options[:bitbucket] ? :bitbucket : :github
-      @private = options[:private]
+      @host       = options[:bitbucket] ? :bitbucket : :github # FIXME: conflicts with @host in gem()
       @repository = Nugem::Repository.new(
         host:           @host,
         user:           git_repository_user_name(@host),
@@ -48,6 +48,7 @@ module Nugem
         gem_server_url: gem_server_url(@private),
         private:        @private
       )
+      puts set_color("Creating a scaffold for a new Ruby gem named #{@gem_name} in #{@dir}.", :green)
       exclude_pattern = case @test_framework
                         when 'minitest' then /spec.*/
                         when 'rspec'    then /test.*/

data/lib/nugem/cli/cli_jekyll.rb

@@ -37,29 +37,33 @@ module Nugem
     test_option 'rspec'
 
     def jekyll(gem_name)
-      @gem_name = gem_name
-      @dir = Nugem.dest_root @gem_name
-      @class_name = Nugem.camel_case @gem_name
-      @jekyll   = true
-      @rspec    = true
-
+      # options is frozen, so it cannot be modified.
+      # extracted values are ignored in the case statement below instead.
       @host           = options['host']
+      @out_dir        = options['out_dir']
       @private        = options['private']
       @test_framework = options['test_framework']
       @todos          = options['todos']
+      @yes            = options['yes']
+
+      @gem_name   = gem_name
+      @dir        = Nugem.dest_root @out_dir, @gem_name
+      @class_name = Nugem.camel_case @gem_name
+      @jekyll     = true
+      @rspec      = true
 
       create_plain_scaffold @gem_name
       create_jekyll_scaffold
       options.each do |option|
         case option.first
-        when 'block' then     option[1].each { |name| create_jekyll_block_scaffold        name }
-        when 'blockn' then    option[1].each { |name| create_jekyll_block_no_arg_scaffold name }
-        when 'filter' then    option[1].each { |name| create_jekyll_filter_scaffold       name }
+        when 'block'     then option[1].each { |name| create_jekyll_block_scaffold        name }
+        when 'blockn'    then option[1].each { |name| create_jekyll_block_no_arg_scaffold name }
+        when 'filter'    then option[1].each { |name| create_jekyll_filter_scaffold       name }
         when 'generator' then option[1].each { |name| create_jekyll_generator_scaffold    name }
-        when 'tag' then       option[1].each { |name| create_jekyll_tag_scaffold          name }
-        when 'tagn' then      option[1].each { |name| create_jekyll_tag_no_arg_scaffold   name }
-        when 'hooks' then     create_jekyll_hooks_scaffold option[1]
-        when 'host', 'executable', 'private', 'test_framework', 'todos', 'quiet' then next
+        when 'tag'       then option[1].each { |name| create_jekyll_tag_scaffold          name }
+        when 'tagn'      then option[1].each { |name| create_jekyll_tag_no_arg_scaffold   name }
+        when 'hooks'     then create_jekyll_hooks_scaffold option[1]
+        when 'host', 'executable', 'out_dir', 'private', 'test_framework', 'todos', 'quiet' then next
         else puts "Warning: Unrecognized option: #{option}"
         end
       end
@@ -71,7 +75,7 @@ module Nugem
       # Invoked by directory action when processing Jekyll tags and block tags
       def parse_jekyll_parameters
         content = @jekyll_parameter_names_types.map do |name, _type|
-          "@#{name} = @helper.parameter_specified? '#{name}' # Obtain the value of parameter #{name}"
+          "@#{name} = @helper.parameter_specified?('#{name}') || nil # Obtain the value of parameter #{name}"
         end
         content.join "\n      "
       end
@@ -115,7 +119,7 @@ module Nugem
       puts set_color("Creating Jekyll block tag #{@block_name} scaffold within #{@jekyll_class_name}", :green)
       @mute = true
       directory 'jekyll/block_scaffold', @dir, force: true, mode: :preserve
-      append_to_file "#{Nugem.dest_root gem_name}/demo/index.html", Cli.add_demo_example(block_name, @jekyll_parameter_names_types, :block)
+      append_to_file "#{Nugem.dest_root @out_dir, gem_name}/demo/index.html", Cli.add_demo_example(block_name, @jekyll_parameter_names_types, :block)
     end
 
     def create_jekyll_block_no_arg_scaffold(block_name)
@@ -124,7 +128,7 @@ module Nugem
       puts set_color("Creating Jekyll block tag no_arg #{@block_name} scaffold within #{@jekyll_class_name}", :green)
       @mute = true
       directory 'jekyll/block_no_arg_scaffold', @dir, force: true, mode: :preserve
-      append_to_file "#{Nugem.dest_root gem_name}/demo/index.html", Cli.add_demo_example(block_name, @jekyll_parameter_names_types, :block)
+      append_to_file "#{Nugem.dest_root @out_dir, gem_name}/demo/index.html", Cli.add_demo_example(block_name, @jekyll_parameter_names_types, :block)
     end
 
     def create_jekyll_filter_scaffold(filter_name)
@@ -148,7 +152,7 @@ module Nugem
       directory 'jekyll/filter_scaffold', @dir, force: true, mode: :preserve
 
       tp = ': ' + @filter_params.map { |x| "'#{x}_value'" }.join(', ') unless @filter_params.empty?
-      append_to_file "#{Nugem.dest_root gem_name}/demo/index.html", Cli.add_filter_example(filter_name, tp)
+      append_to_file "#{Nugem.dest_root @out_dir, gem_name}/demo/index.html", Cli.add_filter_example(filter_name, tp)
       # rubocop:enable Style/StringConcatenation
     end
 
@@ -174,7 +178,7 @@ module Nugem
       puts set_color("Creating Jekyll tag no_arg #{@tag_name} scaffold within #{@jekyll_class_name}", :green)
       @mute = true
       directory 'jekyll/tag_no_arg_scaffold', @dir, force: true, mode: :preserve
-      append_to_file "#{Nugem.dest_root gem_name}/demo/index.html", Cli.add_demo_example(tag_name, @jekyll_parameter_names_types, :tag)
+      append_to_file "#{Nugem.dest_root @out_dir, gem_name}/demo/index.html", Cli.add_demo_example(tag_name, @jekyll_parameter_names_types, :tag)
     end
 
     def create_jekyll_tag_scaffold(tag_name)
@@ -186,7 +190,7 @@ module Nugem
       @mute = true
       # puts set_color("@jekyll_parameter_names_types=#{@jekyll_parameter_names_types}", :yellow)
       directory 'jekyll/tag_scaffold', @dir, force: true, mode: :preserve
-      append_to_file "#{Nugem.dest_root gem_name}/demo/index.html", Cli.add_demo_example(tag_name, @jekyll_parameter_names_types, :tag)
+      append_to_file "#{Nugem.dest_root @out_dir, gem_name}/demo/index.html", Cli.add_demo_example(tag_name, @jekyll_parameter_names_types, :tag)
     end
   end
 end

data/lib/nugem/cli/cli_rails.rb

@@ -4,10 +4,10 @@ module Nugem
   class Cli < Thor
     include Thor::Actions
 
-    desc 'rails NAME', 'Creates a new Rails rails scaffold.'
+    desc 'rails NAME', 'Creates a new Rails scaffold.'
 
     long_desc <<~END_DESC
-      Creates a new Rails rails scaffold with the given NAME,
+      Creates a new Rails scaffold with the given NAME,
       by default hosted by GitHub and published on RubyGems.
     END_DESC
 
@@ -24,8 +24,9 @@ module Nugem
       @mountable      = options['mountable']
       @private        = options['private']
       @test_framework = options['test_framework']
+      @yes            = options['yes']
 
-      @dir = Nugem.dest_root gem_name
+      @dir = Nugem.dest_root @out_dir, gem_name
       @engine = @host || @mountable
       @rails = true
 

data/lib/nugem/cli.rb

@@ -19,20 +19,26 @@ module Nugem
 
     check_unknown_options!
 
+    class_option :out_dir, type: :string, default: 'generated',
+                 desc: 'Output directory for the gem.', aliases: :o
+
     class_option :executable, type: :boolean, default: false,
-      desc: 'Include an executable for the gem.'
+                 desc: 'Include an executable for the gem.', aliases: :e
 
     class_option :host, type: :string, default: 'github',
-      enum: %w[bitbucket github], desc: 'Repository host.'
+                 enum: %w[bitbucket github], desc: 'Repository host.', aliases: :h
 
     class_option :private, type: :boolean, default: false,
-      desc: 'Publish the gem on a private repository.'
+                 desc: 'Publish the gem on a private repository.'
 
     class_option :quiet, type: :boolean, default: true,
-      desc: 'Suppress detailed messages.', group: :runtime
+                 desc: 'Suppress detailed messages.', group: :runtime, aliases: :q
 
     class_option :todos, type: :boolean, default: true,
-      desc: 'Generate TODO: messages in generated code.', group: :runtime
+                 desc: 'Generate TODO: messages in generated code.', group: :runtime, aliases: :t
+
+    class_option :yes, type: :boolean, default: false,
+                 desc: 'Answer yes to all questions.', aliases: :y
 
     # Surround gem_name with percent symbols when using the property to name files
     # within the template directory
@@ -62,24 +68,25 @@ module Nugem
     require_relative 'cli/cli_jekyll'
     require_relative 'cli/cli_rails'
 
-    no_tasks do
+    no_tasks do # rubocop:disable Metrics/BlockLength
       def count_todos(filename)
-        filename_fq = "#{Nugem.dest_root gem_name}/#{filename}"
+        filename_fq = "#{Nugem.dest_root @out_dir, gem_name}/#{filename}"
         content = File.read filename_fq
         content.scan('TODO').length
       end
 
       def initialize_repository(gem_name)
-        Dir.chdir Nugem.dest_root(gem_name) do
+        Dir.chdir Nugem.dest_root(@out_dir, gem_name) do
           # puts set_color("Working in #{Dir.pwd}", :green)
           run 'chmod +x bin/*'
           run 'chmod +x exe/*' if @executable
           create_local_git_repository
           FileUtils.rm_f 'Gemfile.lock'
-          # puts set_color("Running 'bundle install'", :green)
+          # puts set_color("Running 'bundle'", :green)
           # run 'bundle', abort_on_failure: false
-          create_remote_git_repository @repository \
-            if yes? set_color("Do you want to create a repository on #{@repository.host.camel_case} named #{gem_name}? (y/N)", :green)
+          create_repo = @yes || yes?(set_color("Do you want to create a repository on #{@repository.host.camel_case} named #{gem_name}? (y/N)",
+                                               :green))
+          create_remote_git_repository @repository if create_repo
         end
         puts set_color("The #{gem_name} gem was successfully created.", :green)
         report_todos gem_name
@@ -89,7 +96,7 @@ module Nugem
         gemspec_todos = count_todos "#{gem_name}.gemspec"
         readme_todos  = count_todos 'README.md'
         if readme_todos.zero? && gemspec_todos.zero?
-          puts set_color("There are no TODOs. You can run 'bundle install' from within your new gem project now.", :blue)
+          puts set_color("There are no TODOs. You can run 'bundle' from within your new gem project now.", :blue)
           return
         end
 

data/lib/nugem/git.rb

@@ -5,7 +5,7 @@ module Nugem
   class Cli < Thor
     include Thor::Actions
 
-    no_tasks do
+    no_tasks do # rubocop:disable Metrics/BlockLength
       def create_local_git_repository
         puts set_color('Creating the local git repository', :green)
         run 'git init'
@@ -29,12 +29,13 @@ module Nugem
           token = gh_config&.dig('github.com', 'oauth_token')
 
           token ||= ask('What is your Github personal access token', echo: false)
-          run <<~END_CURL
+          curl_command = <<~END_CURL
             curl --request POST \
               --user '#{repository.user}:#{token}' \
               https://api.github.com/user/repos \
               -d '{"name":"#{repository.name}", "private":#{repository.private?}}'
           END_CURL
+          run(curl_command, capture: true)
         else # BitBucket
           password = ask('Please enter your Bitbucket password', echo: false)
           fork_policy = repository.public? ? 'allow_forks' : 'no_public_forks'
@@ -64,14 +65,14 @@ module Nugem
       end
 
       def gem_server_url(private_)
-        if private_
+        if private_ && Nugem::FEATURE_GEMINABOX
           global_config = Rugged::Config.global
           git_config_key = 'nugem.gemserver'
           url = global_config[git_config_key]
 
-          if url.to_s.empty?
+          if url.to_s.strip.empty?
             url = ask('What is the url of your Geminabox server?')
-            global_config[git_config_key] = url
+            global_config[git_config_key] = url unless url.to_s.strip.empty?
           end
           url
         else

data/lib/nugem/repository.rb

@@ -1,7 +1,7 @@
 # Nugem::Repository contains informations about the git repository and the git user
 module Nugem
   class Repository
-    attr_reader :gem_server_url, :global_config, :host, :name, :private, :user, :user_name, :user_email
+    attr_reader :gem_server_url, :global_config, :host, :name, :out_dir, :private, :user, :user_name, :user_email
 
     Host = Struct.new(:domain, :camel_case, :id, keyword_init: true)
     HOSTS = [
@@ -12,8 +12,9 @@ module Nugem
     def initialize(options)
       @host = HOSTS.find { |host| host.id == options[:host] }
       @private = options[:private]
-      @name = options[:name]
-      @user = options[:user]
+      @name    = options[:name]
+      @user    = options[:user]
+
       @global_config = Rugged::Config.global
       abort 'Git global config not found' if @global_config.nil?
 

data/lib/nugem/version.rb

@@ -1,3 +1,3 @@
 module Nugem
-  VERSION = '0.8.3'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/nugem.rb

@@ -5,9 +5,11 @@ Signal.trap('INT') { exit }
 
 module Nugem
   # @return Path to the generated gem
-  def self.dest_root(gem_name)
-    File.expand_path "generated/#{gem_name}"
+  def self.dest_root(out_dir, gem_name)
+    File.expand_path "#{out_dir}/#{gem_name}"
   end
+
+  FEATURE_GEMINABOX = false
 end
 
 require_relative 'nugem/git'

data/lib/util.rb

@@ -28,7 +28,7 @@ module Nugem
   end
 
   def self.gem_path(file)
-    spec = self.current_spec(file)
+    spec = current_spec(file)
     spec&.full_gem_path
   end
 

data/nugem.gemspec

@@ -1,28 +1,38 @@
 require_relative 'lib/nugem/version'
 
 Gem::Specification.new do |spec|
+  host = 'https://github.com/mslinn/nugem'
+
+  spec.authors               = ['Igor Jancev', 'Mike Slinn']
+  spec.bindir                = 'exe'
   spec.description = <<~END_DESC
     Nugem creates a scaffold project for new gems. You can choose between Github and Bitbucket,
     Rubygems or Geminabox, with or without an executable, etc.
   END_DESC
-  spec.authors               = ['Igor Jancev', 'Mike Slinn']
-  spec.bindir                = 'exe'
   spec.email                 = ['igor@masterybits.com', 'mslinn@mslinn.com']
   spec.executables           = %w[nugem]
   spec.files                 = Dir[
-                                    '.rubocop.yml',
-                                    'Gemfile',
-                                    'LICENSE.*',
-                                    'Rakefile',
-                                    '{lib,spec,templates}/**/*',
-                                    'templates/**/.*',
-                                    'templates/**/.*/*',
-                                    '*.gemspec',
-                                    '*.md'
-                                  ]
+                                  '.rubocop.yml',
+                                  'Gemfile',
+                                  'LICENSE.*',
+                                  'Rakefile',
+                                  '{lib,spec,templates}/**/*',
+                                  'templates/**/.*',
+                                  'templates/**/.*/*',
+                                  '*.gemspec',
+                                  '*.md'
+                                ]
   spec.homepage              = 'https://github.com/mslinn/nugem'
   spec.license               = 'MIT'
+  spec.metadata = {
+    'allowed_push_host' => 'https://rubygems.org',
+    'bug_tracker_uri'   => "#{host}/issues",
+    'changelog_uri'     => "#{host}/CHANGELOG.md",
+    'homepage_uri'      => spec.homepage,
+    'source_code_uri'   => host,
+  }
   spec.name                  = 'nugem'
+  spec.platform              = Gem::Platform::RUBY
   spec.require_paths         = ['lib']
   spec.required_ruby_version = '>= 3.1.0'
   spec.summary               = 'Nugem creates a scaffold project for new gems.'

data/spec/spec_helper.rb

@@ -1,12 +1,9 @@
 require_relative '../lib/nugem'
 
 RSpec.configure do |config|
-  config.filter_run :focus
+  config.filter_run_when_matching focus: true
   # config.order = "random"
-  config.run_all_when_everything_filtered = true
 
   # See https://relishapp.com/rspec/rspec-core/docs/command-line/only-failures
   config.example_status_persistence_file_path = '../spec/status_persistence.txt'
-
-  config.filter_run_when_matching focus: true
 end

data/templates/common/executable_scaffold/exe/%gem_name%.tt

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require '<%= @gem_name %>/cli'
+require_relative '../lib/<%= @gem_name %>'
 
-<%= @class_name %>::Cli.start
+<%= @class_name %>.main

data/templates/common/executable_scaffold/lib/%gem_name%/cli.rb.tt

@@ -1,13 +1,21 @@
-require 'thor'
-require '<%= @gem_name %>'
+require 'colorator'
+require 'fileutils'
+require 'pathname'
 
-module <%= @class_name %>
-  class Cli < Thor
-    include Thor::Actions
+def require_subdirectory(dir)
+  Dir[File.join(dir, '*.rb')].each do |file|
+    require file unless file == __FILE__
+  end
+end
 
-    desc "do_something NAME", "<%= @todo %>task description"
-    def do_something(name)
-      puts "<%= @todo %>do something with: #{name}"
-    end
+require_subdirectory File.realpath(__dir__) # Require all Ruby files in 'lib/', except this file
+Pathname(__dir__).children.select(&:directory?).each do |directory|
+  require_subdirectory directory.to_s
+end
+
+module <%= @class_name %>
+  def self.main
+    @options = parse_options
+    puts "TODO: write main implementation in lib/<%= @class_name %>/cli.rb".yellow
   end
 end

data/templates/common/executable_scaffold/lib/%gem_name%/options.rb.tt

@@ -0,0 +1,31 @@
+require 'colorator'
+require 'optparse'
+
+def help(msg = nil)
+  printf "Error: #{msg}\n\n".yellow unless msg.nil?
+  msg = <<~END_HELP
+    <%= @gem_name %>: Describe this executable.
+
+    Syntax: <%= @gem_name %> [Options]
+
+    Options:
+      -h       Show this help message
+  END_HELP
+  printf msg.cyan
+  exit 1
+end
+
+def parse_options
+  options = { bpm: 120, overwrite: false }
+  OptionParser.new do |parser|
+    parser.program_name = File.basename __FILE__
+    @parser = parser
+
+    # parser.on('-b',      '--bpm BPM', OptionParser::DecimalInteger, 'Specify BPM (default is 120 bpm)')
+    # parser.on('-f',      '--overwrite',                             'Overwrite output MIDI file if present') {% endcomment %}
+    parser.on_tail('-h', '--help',                                  'Show this message') do
+      help
+    end
+  end.order!(into: options)
+  options
+end

data/templates/common/gem_scaffold/%gem_name%.gemspec.tt

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.authors               = ['<%= @repository.user_name %>']
   <%- if @executable -%>
-  spec.bindir                = 'binstub'
+  spec.bindir                = 'exe'
   spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   <%- end -%>
   spec.description           = <<~END_DESC
@@ -46,12 +46,13 @@ Gem::Specification.new do |spec|
   <%- end -%>
   <%- if @jekyll -%>
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_plugin_support', '>= 0.7.0'
+  spec.add_dependency 'jekyll_plugin_support', '>= 1.0.3'
   <%- end -%>
   <%- if @rails -%>
   spec.add_dependency 'rails', '~> 7.0.5'
   <%- end -%>
   <%- if @executable -%>
-  spec.add_dependency 'thor', '~> 1.2.2'
+  spec.add_dependency 'colorator'
+  spec.add_dependency 'optparse'
   <%- end -%>
 end

data/templates/common/gem_scaffold/.rspec

@@ -1,4 +1,2 @@
 --color
 --format documentation
---order defined
---require spec_helper

data/templates/common/gem_scaffold/.rubocop.yml.tt

@@ -19,7 +19,6 @@ AllCops:
     - vendor/**/*
     - Gemfile*
   NewCops: enable
-  TargetRubyVersion: 3.1.3
 
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: false
@@ -68,9 +67,8 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 <%- if @test_framework == 'rspec' -%>
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
   IgnoreMethods: true
-  SpecSuffixOnly: true
 
 RSpec/ExampleLength:
   Max: 30

data/templates/common/gem_scaffold/.vscode/launch.json

@@ -4,14 +4,51 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+  <%- if @jekyll -%>
     {
-      "name": "Run selected Ruby file",
+      "args": [
+        "serve",
+        "--livereload_port", "35721",
+        "--force_polling",
+        "--host", "0.0.0.0",
+        "--port", "4001",
+        "--future",
+        "--incremental",
+        "--livereload",
+        "--drafts",
+        "--unpublished"
+      ],
+      "cwd": "${workspaceRoot}/demo",
+      "debugPort": "0",
+      "name": "Debug Demo",
+      "request": "launch",
+      "script": "${workspaceRoot}/binstub/jekyll",
+      "type": "rdbg",
+    },
+    <%- end -%>
+    {
+      "args": [],
+      "debugPort": "0",
+      "name": "Debug current file with rdbg",
+      "script": "${file}",
+      "request": "launch",
+      "type": "rdbg",
+      "useBundler": true,
+    },
+    {
+      "name": "Run selected Ruby file with ruby_lsp",
       "program": "ruby ${file}",
       "request": "launch",
       "type": "ruby_lsp"
     },
     {
-      "name": "Attach rdebug-ide",
+      "debugPort": "0",
+      "name": "Attach with rdbg",
+      "request": "attach",
+      "type": "rdbg",
+    },
+    {
+      "name": "Attach with ruby_lsp",
       "request": "attach",
       "type": "ruby_lsp",
     },

data/templates/common/gem_scaffold/Gemfile.tt

@@ -6,9 +6,8 @@ gemspec
 group :test, :development do
   gem 'debug', '>= 1.0.0', require: false
   gem 'gem-release', '>= 2.2.2', require: false
-  <%- if @jekyll -%>
   gem 'rake', require: false
-  <%- end -%>
+  gem 'rspec', require: false
   gem 'rubocop', require: false
   gem 'rubocop-md', require: false
   <%- if @minitest -%>
@@ -19,7 +18,10 @@ group :test, :development do
   <%- if @rspec -%>
   gem 'rubocop-rspec', require: false
   <%- end -%>
-  <%- if @rails -%>
+end
+<%- if @rails -%>
+
+group :test, :development do
   gem 'capybara', '~> 3.39.1', require: false
   gem 'capybara_minitest_spec', '~> 1.0.7', require: false
   <%- if @repository.public? -%>
@@ -36,8 +38,8 @@ group :test, :development do
   gem 'quiet_assets'
   gem 'selenium-webdriver', '~> 4.9.1', require: false
   gem 'sqlite3'
-  <%- end -%>
-end
+  end
+<%- end -%>
 
 group :test do
   gem 'rspec-match_ignoring_whitespace'

data/templates/jekyll/block_no_arg_scaffold/lib/%block_name%.rb.tt

@@ -1,5 +1,5 @@
 require 'jekyll_plugin_support'
-require_relative '<%= @gem_name %>/version.rb'
+require_relative '<%= @gem_name %>/version'
 
 module <%= @class_name %>
   PLUGIN_NAME = '<%= @block_name %>'.freeze unless defined? PLUGIN_NAME

data/templates/jekyll/block_scaffold/lib/%block_name%.rb.tt

@@ -1,8 +1,7 @@
 require 'jekyll_plugin_support'
-require_relative '<%= @gem_name %>/version.rb'
+require 'helper/jekyll_plugin_helper'
+require_relative '<%= @gem_name %>/version'
 
-# This Jekyll block tag plugin is a minimal example.
-#
 # See https://www.mslinn.com/jekyll/10200-jekyll-plugin-background.html
 # See https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html
 #
@@ -16,23 +15,46 @@ require_relative '<%= @gem_name %>/version.rb'
 # You can control the log level when you start Jekyll.
 # To set the log level to :debug, write an entery into _config.yml, like this:
 # plugin_loggers:
-#   MyBlockTag: debug
+#   <%= @jekyll_class_name %>: debug
 
 module <%= @class_name %>
-  # This class implements the Jekyll block tag functionality
+  # This class implements the Jekyll <%= @tag_name %> functionality
   class <%= @jekyll_class_name %> < JekyllSupport::JekyllBlock
     PLUGIN_NAME = '<%= @block_name %>'.freeze
     VERSION = <%= @class_name %>::VERSION
 
-    # Put your plugin logic here.
+    # See https://github.com/mslinn/jekyll_plugin_support#argument-parsing
+    #
     # The following variables are predefined:
-    #   @argument_string, @block_name, @config, @envs, @helper, @layout, @logger, @mode, @page, @paginator, @site and @theme
+    #   @argument_string, @config, @envs, @helper, @layout, @logger, @mode, @page, @paginator, @site and @theme
+    #   @tag_name [String] is the name of the tag, which we already know.
+    #   @argument_string [String] the arguments from the web page.
+    #   @tokens [Liquid::ParseContext] tokenized command line
     #
-    # @return [String]
+    # @helper provides these read-only attributes:
+    #   argv, attribution, keys_values, liquid_context, logger, markup, no_arg_parsing, params, tag_name,
+    #   argv_original, excerpt_caller, keys_values_original, params_original
+    # @helper provides these class methods:
+    #   expand_env, register, remove_quotes
+    # @helper provides these instance methods:
+    #   attribution_string
+    #   default_attribution
+    #   delete_parameter
+    #   dereference_include_variable
+    #   dereference_variable
+    #   lookup_variable
+    #   parameter_specified?('option/keyword name') || 'default value' # parse option value/keyword
+    #   gem_file __FILE__ # Enables attribution
+    #   remaining_markup # unparsed markup passed to this plugin
+    #   reinitialize # Returns markup remaining after `parameter_specified?` has been invoked.
+    #   remaining_markup_original
+    #
+    # @return [string] markup to be rendered on web page
     def render_impl(content)
       <%= parse_jekyll_parameters %>
 
-      # Compute the return value of this Jekyll tag
+      # Put your plugin logic here and modify the following return value.
+
       <<~HEREDOC
         <pre class="example">
           content = '#{content}'
@@ -45,6 +67,6 @@ module <%= @class_name %>
       exit 3
     end
 
-    JekyllPluginHelper.register(self, PLUGIN_NAME)
+    ::JekyllSupport::JekyllPluginHelper.register(self, PLUGIN_NAME)
   end
 end

data/templates/jekyll/demo/demo/_bin/debug

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-# shellcheck disable=SC2086,SC2155,SC2059
-
 function help {
   echo "
 $(basename $0) - Run the demo Jekyll website.
-By default the demo Jekyll website runs without restriction under `debug`,
-and listens on 0.0.0.0:1234.
+By default the demo Jekyll website runs without restriction under debug,
+and listens on 0.0.0.0.
 Options:
   -h  Show this error message
   -r  Run freely, without a debugger
@@ -38,12 +36,10 @@ while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
   [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
-cd "$DIR/.."
-
-# dispatcher-port and dispatcher-port are arbitrarily chosen to prevent conflicts with other instances.
+cd "$DIR/.." || exit
 
 run="serve \
-    --livereload_port 25721 \
+    --livereload-port 25721 \
     --force_polling \
     --host 0.0.0.0 \
     --port 4444 \
@@ -53,19 +49,14 @@ run="serve \
     --drafts \
     --unpublished"
 
-../bin/setup
-
+export BUNDLE_WITH=development
 rm -f Gemfile.lock
 bundle
 bundle exec ../binstub/jekyll clean # Ensure all hooks get called
 
 if [ "$RUN_FREE" ]; then
-  bundle exec ../binstub/jekyll $run
+  bundle exec jekyll $run
 else
-  bundle exec ../binstub/rdebug-ide \
-    --host 0.0.0.0 \
-    --port 1234 \
-    --dispatcher-port 26162 \
-    -- \
+  bundle exec rdbg -O --port=0 -- \
     ../binstub/jekyll $run
 fi

data/templates/jekyll/demo/demo/_layouts/default.html.tt

@@ -49,7 +49,7 @@ layout: compress
         <p class="copyright" id="copyright" xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
           <a rel="license" style="float: left; margin-right: 1em; padding-top: 9px; padding-bottom: 2em;"
               href="http://creativecommons.org/publicdomain/zero/1.0/">
-            <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
+            <img src="/assets/images/favicon.png" style="border-style: none;" alt="CC0" />
           </a>
           To the extent possible under law,
           <a rel="dct:publisher"

data/templates/jekyll/hooks_scaffold/lib/dumpers.rb

@@ -117,7 +117,7 @@ module Dumpers
   #     :unpublished
   #   attr_reader :cache_dir, :config, :dest, :filter_cache, :includes_load_paths,
   #     :liquid_renderer, :profiler, :regenerator, :source
-  def dump_site(logger, msg, site) # rubocop:disable Metrics/AbcSize
+  def dump_site(logger, msg, site)
     logger.info do
       <<~END_INFO
         #{msg} site

data/templates/jekyll/tag_no_arg_scaffold/lib/%tag_name%.rb.tt

@@ -1,5 +1,5 @@
 require 'jekyll_plugin_support'
-require_relative '<%= @gem_name %>/version.rb'
+require_relative '<%= @gem_name %>/version'
 
 module <%= @class_name %>
   class <%= @jekyll_class_name %> < JekyllTag

data/templates/jekyll/tag_scaffold/lib/%tag_name%.rb.tt

@@ -1,8 +1,7 @@
 require 'jekyll_plugin_support'
-require_relative '<%= @gem_name %>/version.rb'
+require 'helper/jekyll_plugin_helper'
+require_relative '<%= @gem_name %>/version'
 
-# This Jekyll tag plugin is a minimal example.
-#
 # See https://www.mslinn.com/jekyll/10200-jekyll-plugin-background.html
 # See https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html
 #
@@ -14,30 +13,58 @@ require_relative '<%= @gem_name %>/version.rb'
 # To set the log level to :debug, write an entry into _config.yml, like this:
 # plugin_loggers:
 #   <%= @jekyll_class_name %>: debug
+#
 module <%= class_name %>
+  <%= @class_name %>Error = ::JekyllSupport.define_error unless const_defined?(:<%= @class_name %>Error)
+
   # This class implements the Jekyll <%= @tag_name %> functionality
   class <%= @jekyll_class_name %> < JekyllSupport::JekyllTag
-    PLUGIN_NAME = '<%= @tag_name %>'.freeze
+    PLUGIN_NAME = '<%= @tag_name %>'.freeze unless const_defined?(:PLUGIN_NAME)
     VERSION = <%= @class_name %>::VERSION
 
-    # Put your plugin logic here.
+    # See https://github.com/mslinn/jekyll_plugin_support#argument-parsing
+    #
     # The following variables are predefined:
-    #   @argument_string, @config, @envs, @helper, @layout, @logger, @mode, @page, @paginator, @site, @tag_name and @theme
+    #   @argument_string, @config, @envs, @helper, @layout, @logger, @mode, @page, @paginator, @site and @theme
+    #   @tag_name [String] is the name of the tag, which we already know.
+    #   @argument_string [String] the arguments from the web page.
+    #   @tokens [Liquid::ParseContext] tokenized command line
     #
-    # @param tag_name [String] is the name of the tag, which we already know.
-    # @param argument_string [String] the arguments from the web page.
-    # @param tokens [Liquid::ParseContext] tokenized command line
-    # @return [void]
+    # @helper provides these read-only attributes:
+    #   argv, attribution, keys_values, liquid_context, logger, markup, no_arg_parsing, params, tag_name,
+    #   argv_original, excerpt_caller, keys_values_original, params_original
+    # @helper provides these class methods:
+    #   expand_env, register, remove_quotes
+    # @helper provides these instance methods:
+    #   attribution_string
+    #   default_attribution
+    #   delete_parameter
+    #   dereference_include_variable
+    #   dereference_variable
+    #   lookup_variable
+    #   parameter_specified?('option/keyword name') || 'default value' # parse option value/keyword
+    #   gem_file __FILE__ # Enables attribution
+    #   remaining_markup # unparsed markup passed to this plugin
+    #   reinitialize # Returns markup remaining after `parameter_specified?` has been invoked.
+    #   remaining_markup_original
+    #
+    # @return [string] markup to be rendered on web page
     def render_impl
       <%= parse_jekyll_parameters %>
+
+      # Put your plugin logic here and modify the following return value.
+
       <<~END_OUTPUT
         <pre class="example">
           <%= dump_jekyll_parameters %>
           Remaining markup: '#{@helper.remaining_markup}'.
         </pre>
       END_OUTPUT
+    rescue StandardError => e
+      @logger.error { "#{self.class} died with a #{e.full_message}" }
+      exit 3
     end
 
-    JekyllPluginHelper.register(self, PLUGIN_NAME)
+    ::JekyllSupport::JekyllPluginHelper.register(self, PLUGIN_NAME)
   end
 end

data/templates/rails/plugin_scaffold/test/dummy/bin/setup

@@ -11,7 +11,7 @@ Dir.chdir APP_ROOT do
 
   puts '== Installing dependencies =='
   system 'gem install bundler --conservative'
-  system 'bundle check || bundle install'
+  system 'bundle check || bundle'
 
   # unless File.exist?('config/database.yml')
   #   puts "\n== Copying sample files =="

data/templates/rails/rails_scaffold/test/dummy/bin/setup

@@ -11,7 +11,7 @@ Dir.chdir APP_ROOT do
 
   puts '== Installing dependencies =='
   system 'gem install bundler --conservative'
-  system 'bundle check || bundle install'
+  system 'bundle check || bundle'
 
   # unless File.exist?('config/database.yml')
   #   puts "\n== Copying sample files =="

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nugem
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Igor Jancev
 - Mike Slinn
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2024-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -83,10 +82,10 @@ files:
 - nugem.gemspec
 - spec/jekyll_tag_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
 - templates/common/LICENCE.txt.tt
 - templates/common/executable_scaffold/exe/%gem_name%.tt
 - templates/common/executable_scaffold/lib/%gem_name%/cli.rb.tt
+- templates/common/executable_scaffold/lib/%gem_name%/options.rb.tt
 - templates/common/gem_scaffold/%gem_name%.gemspec.tt
 - templates/common/gem_scaffold/.bundle/config
 - templates/common/gem_scaffold/.gitignore.tt
@@ -254,8 +253,12 @@ files:
 homepage: https://github.com/mslinn/nugem
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/mslinn/nugem/issues
+  changelog_uri: https://github.com/mslinn/nugem/CHANGELOG.md
+  homepage_uri: https://github.com/mslinn/nugem
+  source_code_uri: https://github.com/mslinn/nugem
 rdoc_options: []
 require_paths:
 - lib
@@ -270,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.0
 specification_version: 4
 summary: Nugem creates a scaffold project for new gems.
 test_files: []