bones 3.8.5 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae61d7e3455091c7a579eb743beb58a2f420105978d1f82c652918df3cecd0d
-  data.tar.gz: 7bda1f37c9f3a8775c81228432d6fe6b7ebf622f85a0b36604f45f1227b2379c
+  metadata.gz: 27c3824dec2977a60b838ff4473dbb68963f13dc101c1eb9841f03192a06e8f5
+  data.tar.gz: 2c6ebdb1e83bee76d51a47658472ed65b64503581911783ecd3e562664d67ea7
 SHA512:
-  metadata.gz: 7d45ee086cbc272d690e50ef1fa081867e3b9ced46307edc71c3011ce89a27d1dae1246fe28c0270736a93d02434bc4c642d8362b066867c5adfd5a5091209ed
-  data.tar.gz: 2cea0c0569519433f6db551bfec267ecef661c40ce73e255dbf96bd75b97769e53e387f59722b4c5ac87ab4d1cf7b98911ac871c44517fdef7b188ef6e8e14b2
+  metadata.gz: 6999ffc409afbc2d09539ffae0bb98e6646d17074217ab9b32fcecd14e0931ce6047095349b535380c294d641d3032442ed83ffe7019d046760aeb72096a18a1
+  data.tar.gz: '0195eaf178b36cbeb5d90e4cc3e611c4e57dc9b9ea88097d465f57121ffc34cf5378ba321e4d4c13341ac66bb3d9f03b37e996ad7a6a5a4f448093f30013363d'

data/.gitignore

@@ -0,0 +1,14 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg
+manual.txt
+vendor
+.yardoc
+.tool-versions

data/History.txt

@@ -1,3 +1,13 @@
+== 3.9.0 / 2022-05-26
+
+Enhancements
+  - use feature detection for rubygems package loading - #45 [thanks @kares]
+  - adding license option to the top-level bones configuration - #49
+
+Bug Fixes
+  - fixing gem naming issue on Ruby 3 - #48
+  - fixing the plugins command - #50
+
 == 3.8.5 / 2020-09-27
 
 Bug Fixes

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2007-2022 Tim Pease
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -12,6 +12,7 @@ Bones {
   authors      'Tim Pease'
   email        'tim.pease@gmail.com'
   url          'http://rubygems.org/gems/bones'
+  license      'MIT'
 
   spec.opts.concat %w[--color --format documentation]
   notes.exclude %w[^README\.rdoc$ ^data/]

data/bones.gemspec

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+# stub: bones 3.9.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "bones".freeze
+  s.version = "3.9.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Tim Pease".freeze]
+  s.date = "2022-05-27"
+  s.description = "Mr Bones is a handy tool that creates new Ruby projects from a code\nskeleton. The skeleton contains some starter code and a collection of rake\ntasks to ease the management and deployment of your source code. Several Mr\nBones plugins are available for creating git repositories, creating GitHub\nprojects, running various test suites and source code analysis tools.".freeze
+  s.email = "tim.pease@gmail.com".freeze
+  s.executables = ["bones".freeze]
+  s.extra_rdoc_files = ["History.txt".freeze, "README.rdoc".freeze, "bin/bones".freeze, "default/version.txt".freeze, "spec/data/markdown.txt".freeze, "spec/data/rdoc.txt".freeze]
+  s.files = [".autotest".freeze, ".gitignore".freeze, "History.txt".freeze, "LICENSE".freeze, "README.rdoc".freeze, "Rakefile".freeze, "bin/bones".freeze, "default/.bnsignore".freeze, "default/History.txt.bns".freeze, "default/LICENSE.bns".freeze, "default/README.md.bns".freeze, "default/Rakefile.bns".freeze, "default/bin/NAME.bns".freeze, "default/lib/NAME.rb.bns".freeze, "default/spec/NAME_spec.rb.bns".freeze, "default/spec/spec_helper.rb.bns".freeze, "default/test/test_NAME.rb".freeze, "default/version.txt".freeze, "lib/bones.rb".freeze, "lib/bones/annotation_extractor.rb".freeze, "lib/bones/app.rb".freeze, "lib/bones/app/command.rb".freeze, "lib/bones/app/create.rb".freeze, "lib/bones/app/file_manager.rb".freeze, "lib/bones/app/freeze.rb".freeze, "lib/bones/app/info.rb".freeze, "lib/bones/app/plugins.rb".freeze, "lib/bones/app/unfreeze.rb".freeze, "lib/bones/colors.rb".freeze, "lib/bones/gem_package_task.rb".freeze, "lib/bones/helpers.rb".freeze, "lib/bones/plugins/ann.rb".freeze, "lib/bones/plugins/bones_plugin.rb".freeze, "lib/bones/plugins/gem.rb".freeze, "lib/bones/plugins/notes.rb".freeze, "lib/bones/plugins/rdoc.rb".freeze, "lib/bones/plugins/test.rb".freeze, "lib/bones/rake_override_task.rb".freeze, "script/bootstrap".freeze, "spec/bones/app/file_manager_spec.rb".freeze, "spec/bones/app_spec.rb".freeze, "spec/bones/helpers_spec.rb".freeze, "spec/bones_spec.rb".freeze, "spec/data/default/.bnsignore".freeze, "spec/data/default/.rvmrc.bns".freeze, "spec/data/default/History".freeze, "spec/data/default/NAME/NAME.rb.bns".freeze, "spec/data/default/README.md.bns".freeze, "spec/data/default/Rakefile.bns".freeze, "spec/data/default/bin/NAME.bns".freeze, "spec/data/default/lib/NAME.rb.bns".freeze, "spec/data/foo/README.md".freeze, "spec/data/foo/Rakefile".freeze, "spec/data/markdown.txt".freeze, "spec/data/rdoc.txt".freeze, "spec/spec_helper.rb".freeze, "version.txt".freeze]
+  s.homepage = "http://rubygems.org/gems/bones".freeze
+  s.licenses = ["MIT".freeze]
+  s.post_install_message = "--------------------------\n Keep rattlin' dem bones!\n--------------------------\n".freeze
+  s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
+  s.rubygems_version = "3.1.2".freeze
+  s.summary = "Mr Bones is a handy tool that creates new Ruby projects from a code skeleton.".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<rake>.freeze, ["~> 13.0"])
+    s.add_runtime_dependency(%q<rdoc>.freeze, ["~> 6.0"])
+    s.add_runtime_dependency(%q<little-plugger>.freeze, ["~> 1.1"])
+    s.add_runtime_dependency(%q<loquacious>.freeze, ["~> 1.9"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5"])
+  else
+    s.add_dependency(%q<rake>.freeze, ["~> 13.0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 6.0"])
+    s.add_dependency(%q<little-plugger>.freeze, ["~> 1.1"])
+    s.add_dependency(%q<loquacious>.freeze, ["~> 1.9"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5"])
+  end
+end

data/default/LICENSE.bns

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) <%= Time.now.year %> FIXME (author)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/default/Rakefile.bns

@@ -13,5 +13,6 @@ Bones {
   authors  'FIXME (who is writing this software)'
   email    'FIXME (your e-mail)'
   url      'FIXME (project homepage)'
+  license  'MIT'
 }
 

data/lib/bones/app/plugins.rb

@@ -1,112 +1,106 @@
 
 module Bones::App
-class Plugins < Command
+  class Plugins < Command
 
-  def self.initialize_plugins
-    synopsis 'bones plugins [options]'
+    def self.initialize_plugins
+      synopsis 'bones plugins [options]'
 
-    summary 'list available Mr Bones plugins'
+      summary 'list available Mr Bones plugins'
 
-    description <<-__
+      description <<-__
 Parse the installed gems and then search for Mr Bones plugins related to
 those gems. Passing in the 'all' flag will show plugins even if the related
 gems are not installed.
-    __
+      __
 
-    option('-a', '--all', 'Show all plugins.', lambda { |_| config[:all] = true })
-    option(standard_options[:colorize])
-  end
-
-  def run
-    stdout.write 'Looking up avaialble Mr Bones plugins ... '
-    stdout.flush
-    plugins = find_bones_plugins
-    stdout.puts 'done!'
-    stdout.puts
-
-    if all?
-      plugins.each { |name, version| show_plugin(name, version) }
-    else
-      gemspecs = find_gemspecs
-      plugins.each { |name, version|
-        gemspecs.each { |gem_name, gem_version|
-          next unless name.downcase == gem_name.downcase
-          next if version && version != gem_version
-          show_plugin(name, version)
-        }
-      }
+      option('-a', '--all', 'Show all plugins.', lambda { |_| config[:all] = true })
+      option(standard_options[:colorize])
     end
 
-    stdout.puts
-  end
-
-  def all?
-    config[:all]
-  end
+    def run
+      stdout.write 'Looking up avaialble Mr Bones plugins ... '
+      stdout.flush
+      plugins = find_bones_plugins
+      stdout.puts 'done!'
+      stdout.puts
+
+      if all?
+        plugins.each {|name, version| show_plugin(name, version)}
+      else
+        gemspecs = find_gemspecs
+        plugins.each { |name, version|
+          gemspecs.each { |gem_name, gem_version|
+            next unless name.downcase == gem_name.downcase
+            next if version && version != gem_version
+            show_plugin(name, version)
+          }
+        }
+      end
 
-  def show_plugin( name, version )
-    name = "bones-#{name}"
-    name << "-#{version}" if version
+      stdout.puts
+    end
 
-    stdout.puts("  [%s]  %s" % [installed?(name) ? colorize('installed', :green) : colorize('available', :cyan), name])
-  end
+    def all?
+      config[:all]
+    end
 
-private
+    def show_plugin(name, version)
+      name = "bones-#{name}"
+      name << "-#{version}" if version
 
-  def find_gemspecs
-    if Gem::Specification.respond_to? :map
-      specs = Gem::Specification.map { |spec| spec }
-    else
-      specs = Gem.source_index.map { |_, spec| spec }
+      stdout.puts("  [%s]  %s" % [installed?(name) ? colorize('installed', :green) : colorize('available', :cyan), name])
     end
 
-    specs.map! { |s| [s.name, s.version.segments.first] }
-    specs.sort! { |a, b|
-      names = a.first <=> b.first
-      next names if names.nonzero?
-      b.last <=> a.last
-    }
+  private
 
-    specs.uniq!
-    return specs
-  end
+    def find_gemspecs
+      if Gem::Specification.respond_to? :map
+        specs = Gem::Specification.map { |spec| spec }
+      else
+        specs = Gem.source_index.map { |_, spec| spec }
+      end
+
+      specs.map! { |s| [s.name, s.version.segments.first] }
+      specs.sort! { |a, b|
+        names = a.first <=> b.first
+        next names if names.nonzero?
+        b.last <=> a.last
+      }
 
-  def find_bones_plugins
-    if Gem.const_defined? :Deprecate
-      # FIXME: this needs to change when rubygems removes the option to pass a regular expression to the Gem::Dependency initializer
-      dep = Gem::Deprecate.skip_during { Gem::Dependency.new(%r/^bones/i, Gem::Requirement.default) }
-    else
-      dep = Gem::Dependency.new(%r/^bones/i, Gem::Requirement.default)
+      specs.uniq!
+      return specs
     end
 
-    fetcher = Gem::SpecFetcher.fetcher
-    specs = fetcher.find_matching dep
+    def find_bones_plugins
+      fetcher = Gem::SpecFetcher.fetcher
+      specs = fetcher.detect(:latest) do |name_tuple|
+        %r/\Abones/.match?(name_tuple.name)
+      end
 
-    specs.map! { |(name, _, _), _|
-      next unless name =~ %r/^bones-(.*?)(?:-(\d+))?$/i
-      $2 ? [$1, $2.to_i] : $1
-    }
+      specs.map! do |tuple, _|
+        next unless tuple.name =~ %r/\Abones-(.*?)(?:-(\d+))?\Z/i
+        $2 ? [$1, $2.to_i] : $1
+      end
 
-    specs.compact!
-    specs.uniq!
-    return specs
-  end
+      specs.compact!
+      specs.uniq!
+      return specs
+    end
 
-  def installed?( name, version = Gem::Requirement.default )
-    # FIXME: check for rubygems version 1.8.X
-    if Gem::Specification.respond_to? :find_by_name
-      begin
-        Gem::Specification.find_by_name(name, version)
-        true
-      rescue Gem::LoadError
-        false
+    def installed?(name, version = Gem::Requirement.default)
+      # FIXME: check for rubygems version 1.8.X
+      if Gem::Specification.respond_to? :find_by_name
+        begin
+          Gem::Specification.find_by_name(name, version)
+          true
+        rescue Gem::LoadError
+          false
+        end
+      else
+        dep = Gem::Dependency.new name, version
+        !Gem.source_index.search(dep).empty?
       end
-    else
-      dep = Gem::Dependency.new name, version
-      !Gem.source_index.search(dep).empty?
     end
   end
-
-end  # class Plugins
-end  # module Bones::App
+end
 

data/lib/bones/gem_package_task.rb

@@ -2,9 +2,9 @@
 require 'find'
 require 'rake/packagetask'
 require 'rubygems/user_interaction'
-if RUBY_VERSION >= "2"
+begin
   require 'rubygems/package'
-else
+rescue LoadError
   require 'rubygems/builder'
 end
 
@@ -47,7 +47,7 @@ class Bones::GemPackageTask < Rake::PackageTask
     file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files do
       when_writing("Creating GEM") {
         chdir(package_dir_path) do
-          if RUBY_VERSION >= "2"
+          if defined? Gem::Package.build
             Gem::Package.build(gem_spec)
           else
             Gem::Builder.new(gem_spec).build
@@ -64,16 +64,12 @@ class Bones::GemPackageTask < Rake::PackageTask
     end
   end
 
-  #
-  #
   def gem_file
     if @gem_spec.platform == Gem::Platform::RUBY
-      "#{package_name}.gem"
+      "#{gem_spec.full_name}.gem"
     else
-      "#{package_name}-#{@gem_spec.platform}.gem"
+      "#{gem_spec.full_name}-#{gem_spec.platform}.gem"
     end
   end
+end
 
-end  # class Bones::GemPackageTask
-
-# EOF

data/lib/bones/plugins/bones_plugin.rb

@@ -38,6 +38,13 @@ module Bones::Plugins::BonesPlugin
         most current release are included.
       __
 
+      license  nil, :desc => <<-__
+        This should just be the name of your license. The full text of the
+        license should be in a LICENSE file at the top-level of your gem when
+        you build it. The simplest way is to specify the standard SPDX ID
+        https://spdx.org/licenses/ for the license.
+      __
+
       authors  nil, :desc => <<-__
         This can be a single author (as a string) or an array of authors
         if more than one person is working on the project.
@@ -173,8 +180,6 @@ module Bones::Plugins::BonesPlugin
   end
 
   def define_tasks
-    config = ::Bones.config
-
     namespace :bones do
       desc 'Show the current Mr Bones configuration'
       task :debug do |t|
@@ -202,9 +207,7 @@ module Bones::Plugins::BonesPlugin
 
         ::Bones.help.show(atr, :descriptions => false, :values => false)
       end
-
-    end  # namespace :bones
+    end
   end
-
-end  # module Bones::Plugins::BonesPlugin
+end
 

data/lib/bones/plugins/gem.rb

@@ -11,8 +11,7 @@ module Bones::Plugins::Gem
     # Adds the given gem _name_ to the current project's dependency list. An
     # optional gem _version_ can be given. If omitted, the newest gem version
     # will be used.
-    #
-    def depend_on( name, *args )
+    def depend_on(name, *args)
       opts = Hash === args.last ? args.pop : {}
       version = args.first || opts[:version]
       development = opts.key?(:development) ? opts[:development] : opts.key?(:dev) ? opts[:dev] : false
@@ -27,7 +26,7 @@ module Bones::Plugins::Gem
         spec = Gem.source_index.find_name(name).last
       end
 
-      version = ">= #{spec.version.to_s}" if version.nil? and !spec.nil?
+      version = "~> #{spec.version.to_s}" if version.nil? and !spec.nil?
 
       dep = case version
             when nil; [name]
@@ -40,9 +39,8 @@ module Bones::Plugins::Gem
       nil
     end
 
-    # Add the given _url_ to the list of gem sources.
-    #
-    def source( url )
+    # Add the given `url` to the list of gem sources.
+    def source(url)
       sources = ::Bones.config.gem.sources
       sources << url unless sources.include? url
       nil
@@ -133,7 +131,7 @@ module Bones::Plugins::Gem
     unless $bones_external_spec
       config.gem.files ||= manifest
       config.gem.executables ||= config.gem.files.find_all {|fn| fn =~ %r/^bin/}
-      config.gem.development_dependencies << ['bones', ">= #{Bones.version}"]
+      config.gem.development_dependencies << ['bones', "~> #{Bones.version}"]
     end
   end
 
@@ -149,8 +147,8 @@ module Bones::Plugins::Gem
           s.authors = Array(config.authors)
           s.email = config.email
           s.homepage = Array(config.url).first
-
           s.description = config.description
+          s.license = config.license
 
           config.gem.dependencies.each do |dep|
             s.add_dependency(*dep)
@@ -241,10 +239,7 @@ module Bones::Plugins::Gem
 
       desc 'Install the gem'
       task :install => [:clobber, 'gem:package'] do
-        sh "#{SUDO} #{GEM} install pkg/#{config.gem._spec.full_name}"
-
-        # use this version of the command for rubygems > 1.0.0
-        # sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{config.gem._spec.full_name}"
+        sh "#{SUDO} #{GEM} install pkg/#{config.gem._spec.full_name}.gem"
       end
 
       desc 'Uninstall the gem'
@@ -338,7 +333,7 @@ module Bones::Plugins::Gem
 
   # Import configuration from the given gemspec file.
   #
-  def import_gemspec( filename )
+  def import_gemspec(filename)
     $bones_external_spec = false
     spec = load_gemspec(filename)
     return if spec.nil?
@@ -356,6 +351,7 @@ module Bones::Plugins::Gem
     config.description        = spec.description
     config.files              = spec.files
     config.libs               = spec.require_paths
+    config.license            = spec.license
 
     config.gem.executables    = spec.executables
     if have? :rdoc
@@ -384,7 +380,7 @@ module Bones::Plugins::Gem
   # This method is stolen from the Bundler gem. It loads the gemspec from a
   # file if available.
   #
-  def load_gemspec( filename )
+  def load_gemspec(filename)
     path = Pathname.new(filename)
     # Eval the gemspec from its parent directory
     Dir.chdir(path.dirname) do
@@ -409,6 +405,5 @@ module Bones::Plugins::Gem
       end
     end
   end
-
-end  # Bones::Plugins::Gem
+end
 

data/lib/bones.rb

@@ -17,10 +17,7 @@ module Bones
   LIBPATH = File.expand_path('..', __FILE__) + File::SEPARATOR
   VERSION = File.read(PATH + '/version.txt').strip
   HOME = File.expand_path(ENV['HOME'] || ENV['USERPROFILE'])
-
-  # Ruby Interpreter location - taken from Rake source code
-  RUBY = File.join(RbConfig::CONFIG['bindir'],
-                   RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+  RUBY = 'ruby'
 
   module Plugins; end
   # :startdoc:

data/version.txt

@@ -1 +1 @@
-3.8.5
+3.9.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bones
 version: !ruby/object:Gem::Version
-  version: 3.8.5
+  version: 3.9.0
 platform: ruby
 authors:
 - Tim Pease
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,13 +99,16 @@ extra_rdoc_files:
 - spec/data/rdoc.txt
 files:
 - ".autotest"
-- ".tool-versions"
+- ".gitignore"
 - History.txt
+- LICENSE
 - README.rdoc
 - Rakefile
 - bin/bones
+- bones.gemspec
 - default/.bnsignore
 - default/History.txt.bns
+- default/LICENSE.bns
 - default/README.md.bns
 - default/Rakefile.bns
 - default/bin/NAME.bns
@@ -154,7 +157,8 @@ files:
 - spec/spec_helper.rb
 - version.txt
 homepage: http://rubygems.org/gems/bones
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: |
   --------------------------

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.7.1