optparse-plus 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6f4cc35a11290f599df1ac89b367308b7de55d367f99d882287093ecdeeefc
-  data.tar.gz: 96d1296f77e31242ee8f3bde8cc2b952cf57cb778fc920ba698963942394630e
+  metadata.gz: 2dc6a69b65fdd0706c484c857cd303b37d6c1703a12603ec8a01a2c87bc22702
+  data.tar.gz: 2f18e76a559a7513531167e58d0400cfab7974f9ef88d27439a772bf2c0b3c62
 SHA512:
-  metadata.gz: 4583ffcc8828e30bd8c633946a41ead8511b4bef0b74451328c3b4dbedcc4fdd6a380ba5d5419acf6d1a0a6ea750eb68f113c876d9035d63474004c691847839
-  data.tar.gz: 4cb6b962216b09ddb41f77817b2f3b9e5c086ad6b49378252ec23e1697bbe48f04b87d0213b087931dc3b2a09b1cc929a7d7f289dc7c8ef3a1a5163946e8f27d
+  metadata.gz: 9f916f4467a36335099d0428d3d2ccf8dba208c8f0d69860dc1cfe9008807dec94b576ab83283cf07a03c74db5e6875fa77bd28bcfded9a4948132e572de5b0e
+  data.tar.gz: a18fd5c85dc54229ac61e5884789c7941f0e8cec82023a95a1d20f6eb6825afc6054c2c69b42b58b45d60deb53b8191995f5bfd1816f45451735da4422b23681

data/.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2.1
+orbs:
+  # See https://circleci.com/developer/orbs/orb/circleci/ruby
+  ruby: circleci/ruby@1.1.2
+jobs:                # keyword
+  test:              # my name for the job
+    parameters:      # keyword
+      ruby-version:  # my parameter name
+        type: string # type is a keyword
+    docker:          # keyword
+      - image: cimg/base:stable
+    steps:                                       # keyword
+      - checkout                                 # magic name
+      - ruby/install:                            # ruby/ is from the orb name, install is a command in that orb
+          version: << parameters.ruby-version >> # magic nonsense for param subst (version param to the command)
+      - run:
+          command: "bin/setup"
+      - run:
+          command: "bin/ci"
+workflows:              # keyword
+  all-rubies:           # my name for the workflow
+    jobs:               # keyword
+      - test:           # my name for the job
+          matrix:       # keyword
+            parameters: # keyword
+              # All rubies being maintained per this page:
+              # https://www.ruby-lang.org/en/downloads/branches/
+              ruby-version: [ "2.5", "2.6", "2.7", "3.0" ]

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.0

data/README.rdoc

@@ -16,12 +16,12 @@ Toward that end, this gem provides:
 * Simplified zero-config logging that is a better-than-<tt>puts</tt> <tt>puts</tt>.
 * Support for integration-testing your CLI using Test::Unit
 
+{Read about the name change if you care}[https://github.com/davetron5000/optparse-plus/wiki/Name-Change]
+
 == Platforms
 
 This library only supports the latest versions of Ruby. JRuby support has been too difficult to keep up with, though the library should work for JRuby.
 
-See the {Travis config file}[./.travis.yml] for specifics.
-
 == Bootstrapping a new CLI App
 
 The +optparse_plus+ command-line app will bootstrap a new command-line app, setting up a proper gem structure, unit tests, and integration tests.

data/bin/ci

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+echo "[bin/ci] Running unit tests"
+bundle exec rake test
+
+echo "[bin/ci] Running integration tests"
+bundle exec rake test:integration

data/bin/optparse_plus

@@ -1,130 +1,29 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'fileutils'
-require 'optparse'
-require 'optparse_plus'
-require 'optparse_plus/cli'
+#
+# This file was generated by Bundler.
+#
+# The application 'optparse_plus' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-include FileUtils
-include OptparsePlus::Main
-include OptparsePlus::CLILogging
-include OptparsePlus::CLI
-include OptparsePlus::SH
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-main do |app_name|
-  check_and_prepare_basedir!(app_name,options[:force])
-  using_readme = options[:readme]
+bundle_binstub = File.expand_path("../bundle", __FILE__)
 
-  gemname = File.basename(app_name)
-  module_name = gemname.split(/-/).map(&:capitalize).collect{ |segment| segment.split(/_/).map(&:capitalize).join('') }.join('::')
-
-  debug "Creating project for gem #{gemname}"
-
-  chdir File.dirname(app_name)
-
-  require_file = nil
-  sh! "bundle gem #{gemname} --no-color" do |stdout|
-    require_file = stdout.split(/\n/).select { |file|
-      file =~ /\.rb$/ && file !~ /version.rb$/
-    }.first
-  end
-  rm_rf "#{gemname}/spec"   # Don't want the default RSpec droppings
-  rm_rf "#{gemname}/.rspec"
-
-  require_file = gemname if require_file.nil?
-  require_file.gsub!(/^.*lib\//,'')
-
-  chdir gemname
-
-  template_dirs_in(:full).each  { |dir| mkdir_p dir }
-
-  rspec = options[:rspec]
-
-  ["Rakefile", ".gitignore", ].each do |file|
-    copy_file file, :binding => binding
-  end
-
-  if rspec
-    template_dirs_in(:rspec).each  { |dir| mkdir_p dir }
-    copy_file "spec/something_spec.rb", :from => :rspec, :binding => binding
-  else
-    template_dirs_in(:test_unit).each  { |dir| mkdir_p dir }
-    copy_file "test/unit/test_something.rb", :from => :test_unit, :binding => binding
-    copy_file "test/integration/test_cli.rb", :from => :test_unit, :binding => binding
-  end
-
-
-  gemspec = "#{gemname}.gemspec"
-  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
-
-  license = options[:license]
-  warn "warning: your app has no license" unless license
-  license = nil if license == 'NONE'
-  if license
-    copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt"
-  else
-    #Remove the MIT license generated by `bundle gem`
-    debug "Making sure no LICENSE.txt file exists at the root of the repo"
-    FileUtils.rm_f "LICENSE.txt"
-  end
-
-  #Ensure the gemspec file mentions the correct license
-  gemspec_content = File.read(gemspec)
-  if gemspec_content =~ /(^\s*#{gem_variable}\.license\s*=\s*).*/
-    gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
   else
-    gemspec_content.gsub!(/(^\s*#{gem_variable}\.name\s*=\s*.*)/,"\\1\n#{"  #{gem_variable}.license".ljust(20)} = #{license.to_s.inspect.upcase}")
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
   end
-  # RubyGems won't deal with a gemspec in this state and so Bundler won't even
-  # work at all.  This is not helpful, so replace the magic keys its looking for
-  # with something else
-  gemspec_content.gsub!(/TODO/,"to-do")
-  gemspec_content.gsub!(/FIXME/,"fix me")
-  gemspec_content.gsub!(/^.*\.homepage.*$/,"")
-  File.open(gemspec,'w') {|f| f.write gemspec_content }
-
-
-  copy_file "README.rdoc", :binding => binding if using_readme
-
-  copy_file "bin/executable", :as => gemname, :executable => true, :binding => binding
-
-  add_to_file gemspec, [
-    "  #{gem_variable}.add_development_dependency('rdoc')",
-    "  #{gem_variable}.add_dependency('optparse_plus', '~> #{OptparsePlus::VERSION}')",
-  ], :before => /^end\s*$/
-  ruby_major,ruby_minor,ruby_patch = RUBY_VERSION.split(/\./).map(&:to_i)
-
-  if ruby_major >= 2 && ruby_minor >= 2
-    add_to_file gemspec, [
-      "  #{gem_variable}.add_development_dependency('test-unit')",
-    ], :before => /^end\s*$/
-  end
-
-  if rspec
-    add_to_file gemspec, [
-    "  #{gem_variable}.add_development_dependency('rspec', '~> 3')",
-    ], :before => /^end\s*$/
-  end
-  FileUtils.rm_f "README.md", verbose: true
-
-  sh! %q(git add --all .)
 end
 
-options[:readme] = true
-
-description "Kick the bash habit by bootstrapping your Ruby command-line apps"
-
-on("--force","Overwrite files if they exist")
-on("--[no-]readme","[Do not ]produce a README file")
-on("--rspec", "Generate RSpec unit tests instead of Test::Unit")
-
-licenses = %w(mit apache gplv2 gplv3 custom NONE)
-on("-l LICENSE","--license",licenses,"Specify the license for your project",'(' + licenses.join('|') + ')')
-
-use_log_level_option
-
-arg :app_name, :required, "Name of your app, which is used for the gem name and executable name"
-
-version OptparsePlus::VERSION, :compact => true
+require "rubygems"
+require "bundler/setup"
 
-go!
+load Gem.bin_path("optparse-plus", "optparse_plus")

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+bundle check || bundle install

data/exe/optparse_plus

@@ -0,0 +1,130 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'optparse'
+require 'optparse_plus.rb'
+require 'optparse_plus/cli'
+
+include FileUtils
+include OptparsePlus::Main
+include OptparsePlus::CLILogging
+include OptparsePlus::CLI
+include OptparsePlus::SH
+
+main do |app_name|
+  check_and_prepare_basedir!(app_name,options[:force])
+  using_readme = options[:readme]
+
+  gemname = File.basename(app_name)
+  module_name = gemname.split(/-/).map(&:capitalize).collect{ |segment| segment.split(/_/).map(&:capitalize).join('') }.join('::')
+
+  debug "Creating project for gem #{gemname}"
+
+  chdir File.dirname(app_name)
+
+  require_file = nil
+  sh! "bundle gem #{gemname} --no-color" do |stdout|
+    require_file = stdout.split(/\n/).select { |file|
+      file =~ /\.rb$/ && file !~ /version.rb$/
+    }.first
+  end
+  rm_rf "#{gemname}/spec"   # Don't want the default RSpec droppings
+  rm_rf "#{gemname}/.rspec"
+
+  require_file = gemname if require_file.nil?
+  require_file.gsub!(/^.*lib\//,'')
+
+  chdir gemname
+
+  template_dirs_in(:full).each  { |dir| mkdir_p dir }
+
+  rspec = options[:rspec]
+
+  ["Rakefile", ".gitignore", ].each do |file|
+    copy_file file, :binding => binding
+  end
+
+  if rspec
+    template_dirs_in(:rspec).each  { |dir| mkdir_p dir }
+    copy_file "spec/something_spec.rb", :from => :rspec, :binding => binding
+  else
+    template_dirs_in(:test_unit).each  { |dir| mkdir_p dir }
+    copy_file "test/unit/test_something.rb", :from => :test_unit, :binding => binding
+    copy_file "test/integration/test_cli.rb", :from => :test_unit, :binding => binding
+  end
+
+
+  gemspec = "#{gemname}.gemspec"
+  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
+
+  license = options[:license]
+  warn "warning: your app has no license" unless license
+  license = nil if license == 'NONE'
+  if license
+    copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt"
+  else
+    #Remove the MIT license generated by `bundle gem`
+    debug "Making sure no LICENSE.txt file exists at the root of the repo"
+    FileUtils.rm_f "LICENSE.txt"
+  end
+
+  #Ensure the gemspec file mentions the correct license
+  gemspec_content = File.read(gemspec)
+  if gemspec_content =~ /(^\s*#{gem_variable}\.license\s*=\s*).*/
+    gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
+  else
+    gemspec_content.gsub!(/(^\s*#{gem_variable}\.name\s*=\s*.*)/,"\\1\n#{"  #{gem_variable}.license".ljust(20)} = #{license.to_s.inspect.upcase}")
+  end
+  # RubyGems won't deal with a gemspec in this state and so Bundler won't even
+  # work at all.  This is not helpful, so replace the magic keys its looking for
+  # with something else
+  gemspec_content.gsub!(/TODO/,"to-do")
+  gemspec_content.gsub!(/FIXME/,"fix me")
+  gemspec_content.gsub!(/^.*\.homepage.*$/,"")
+  File.open(gemspec,'w') {|f| f.write gemspec_content }
+
+
+  copy_file "README.rdoc", :binding => binding if using_readme
+
+  copy_file "bin/executable", :as => gemname, :executable => true, :binding => binding
+
+  add_to_file gemspec, [
+    "  #{gem_variable}.add_development_dependency('rdoc')",
+    "  #{gem_variable}.add_dependency('optparse-plus', '~> #{OptparsePlus::VERSION}')",
+  ], :before => /^end\s*$/
+  ruby_major,ruby_minor,ruby_patch = RUBY_VERSION.split(/\./).map(&:to_i)
+
+  if ruby_major >= 2 && ruby_minor >= 2
+    add_to_file gemspec, [
+      "  #{gem_variable}.add_development_dependency('test-unit')",
+    ], :before => /^end\s*$/
+  end
+
+  if rspec
+    add_to_file gemspec, [
+    "  #{gem_variable}.add_development_dependency('rspec', '~> 3')",
+    ], :before => /^end\s*$/
+  end
+  FileUtils.rm_f "README.md", verbose: true
+
+  sh! %q(git add --all .)
+end
+
+options[:readme] = true
+
+description "Kick the bash habit by bootstrapping your Ruby command-line apps"
+
+on("--force","Overwrite files if they exist")
+on("--[no-]readme","[Do not ]produce a README file")
+on("--rspec", "Generate RSpec unit tests instead of Test::Unit")
+
+licenses = %w(mit apache gplv2 gplv3 custom NONE)
+on("-l LICENSE","--license",licenses,"Specify the license for your project",'(' + licenses.join('|') + ')')
+
+use_log_level_option
+
+arg :app_name, :required, "Name of your app, which is used for the gem name and executable name"
+
+version OptparsePlus::VERSION, :compact => true
+
+go!

data/lib/optparse_plus/version.rb

@@ -1,3 +1,3 @@
 module OptparsePlus #:nodoc:
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/optparse_plus.gemspec

@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = "optparse_plus"
+  s.bindir        = "exe"
   s.require_paths = ["lib"]
   s.add_dependency("bundler")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc","~> 6.0")
   s.add_development_dependency("sdoc")
-  s.add_development_dependency("simplecov", "~> 0.5")
   s.add_development_dependency("clean_test", "~> 1.0.1")
   s.add_development_dependency("mocha")
   s.add_development_dependency("rspec") # needed for testing the generated tests

data/test/integration/test_bootstrap.rb

@@ -38,6 +38,7 @@ class TestBootstrap < BaseIntegrationTest
       gemspec = File.read("newgem/newgem.gemspec")
       refute_match(/TODO/,gemspec)
       refute_match(/FIXME/,gemspec)
+      refute_match(/optparse_plus/,gemspec)
     }
   end
 

data/test/unit/base_test.rb

@@ -1,12 +1,3 @@
-if RUBY_PLATFORM == 'java'
-  puts "Simplecov seems to cause JRuby to barf, so use another ruby if you want to check coverage"
-else
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/test"
-  end
-end
-
 require 'test/unit'
 require 'rspec/expectations'
 require 'clean_test/test_case'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optparse-plus
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - davetron5000
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: clean_test
   requirement: !ruby/object:Gem::Requirement
@@ -147,17 +133,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- bin/ci
 - bin/optparse_plus
-- fix.rb
+- bin/rake
+- bin/setup
+- exe/optparse_plus
 - lib/optparse-plus.rb
 - lib/optparse_plus.rb
 - lib/optparse_plus/argv_parser.rb
@@ -217,7 +205,7 @@ files:
 homepage: http://github.com/davetron5000/optparse-plus
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Wrapper around the Standard Library's Option Parser to make CLIs Easier
 test_files:

data/.ruby-gemset

@@ -1 +0,0 @@
-methadone

data/.ruby-version

@@ -1 +0,0 @@
-2.5.1

data/.travis.yml

@@ -1,7 +0,0 @@
-notifications:
-  email:
-    on_success: always
-script: 'bundle exec rake'
-rvm:
-  - 2.4.3
-  - 2.5.1

data/fix.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-
-require "pathname"
-require "fileutils"
-
-
-ARGV.each do |filename|
-  filename = Pathname(filename)
-
-  contents = File.read(filename).split(/\n/)
-  File.open(filename,"w") do |file|
-    contents.each do |line|
-      file.puts line.gsub(/methadone/,"optparse_plus").gsub(/Methadone/,"OptparsePlus")
-    end
-  end
-
-  if filename.split.any? { |_| _ == "methadone" }
-    new_filename = filename.split.map { |_|
-      if _ == "methadone"
-        "optparse_plus"
-      else
-        _
-      end
-    }.join
-    FileUtils.mkdir_p new_filename.dirname
-    FileUtils.mv filename new_filename
-  end
-
-end