bundler 1.9.0 → 1.17.3

data/lib/bundler/templates/newgem/LICENSE.txt.tt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) <%=Time.now.year%> <%=config[:author]%>
+Copyright (c) <%= Time.now.year %> <%= config[: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

data/lib/bundler/templates/newgem/README.md.tt

@@ -1,6 +1,6 @@
-# <%=config[:constant_name]%>
+# <%= config[:constant_name] %>
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%=config[:namespaced_path]%>`. To experiment with that code, run `bin/console` for an interactive prompt.
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%= config[:namespaced_path] %>`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
 
@@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem '<%=config[:name]%>'
+gem '<%= config[:name] %>'
 ```
 
 And then execute:
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install <%=config[:name]%>
+    $ gem install <%= config[:name] %>
 
 ## Usage
 
@@ -26,14 +26,22 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the code located in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/<%=config[:name]%>/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Bug reports and pull requests are welcome on GitHub at https://github.com/<%= config[:github_username] %>/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.<% end %>
+<% if config[:mit] -%>
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+<% end -%>
+<% if config[:coc] -%>
+
+## Code of Conduct
+
+Everyone interacting in the <%= config[:constant_name] %> project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/master/CODE_OF_CONDUCT.md).
+<% end -%>

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -1,25 +1,29 @@
 require "bundler/gem_tasks"
-<% if config[:test] == 'minitest' -%>
+<% if config[:test] == "minitest" -%>
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
-<% elsif config[:test] == 'rspec' -%>
+<% elsif config[:test] == "rspec" -%>
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
 <% end -%>
 <% if config[:ext] -%>
 require "rake/extensiontask"
 
 task :build => :compile
 
-Rake::ExtensionTask.new("<%=config[:underscored_name]%>") do |ext|
-  ext.lib_dir = "lib/<%=config[:namespaced_path]%>"
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+  ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
+
+task :default => [:clobber, :compile, :<%= config[:test_task] %>]
+<% else -%>
+task :default => :<%= config[:test_task] %>
 <% end -%>

data/lib/bundler/templates/newgem/bin/console.tt

@@ -11,4 +11,4 @@ require "<%= config[:namespaced_path] %>"
 # Pry.start
 
 require "irb"
-IRB.start
+IRB.start(__FILE__)

data/lib/bundler/templates/newgem/bin/setup.tt

@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
+set -vx
 
 bundle install
 

data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt

@@ -1,9 +1,9 @@
-#include "<%=config[:underscored_name]%>.h"
+#include "<%= config[:underscored_name] %>.h"
 
-VALUE rb_m<%=config[:constant_array].join%>;
+VALUE rb_m<%= config[:constant_array].join %>;
 
 void
-Init_<%=config[:underscored_name]%>(void)
+Init_<%= config[:underscored_name] %>(void)
 {
-  rb_m<%=config[:constant_array].join%> = rb_define_module(<%=config[:constant_name].inspect%>);
+  rb_m<%= config[:constant_array].join %> = rb_define_module(<%= config[:constant_name].inspect %>);
 }

data/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt

@@ -1,6 +1,6 @@
-#ifndef <%=config[:underscored_name].upcase%>_H
-#define <%=config[:underscored_name].upcase%>_H 1
+#ifndef <%= config[:underscored_name].upcase %>_H
+#define <%= config[:underscored_name].upcase %>_H 1
 
 #include "ruby.h"
 
-#endif /* <%=config[:underscored_name].upcase%>_H */
+#endif /* <%= config[:underscored_name].upcase %>_H */

data/lib/bundler/templates/newgem/gitignore.tt

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -14,3 +13,8 @@
 *.a
 mkmf.log
 <%- end -%>
+<%- if config[:test] == "rspec" -%>
+
+# rspec failure tracking
+.rspec_status
+<%- end -%>

data/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -1,12 +1,13 @@
-require "<%=config[:namespaced_path]%>/version"
+require "<%= config[:namespaced_path] %>/version"
 <%- if config[:ext] -%>
-require "<%=config[:namespaced_path]%>/<%=config[:underscored_name]%>"
+require "<%= config[:namespaced_path] %>/<%= config[:underscored_name] %>"
 <%- end -%>
 
-<%- config[:constant_array].each_with_index do |c,i| -%>
-<%= '  '*i %>module <%= c %>
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
 <%- end -%>
-<%= '  '*config[:constant_array].size %># Your code goes here...
+<%= "  " * config[:constant_array].size %>class Error < StandardError; end
+<%= "  " * config[:constant_array].size %># Your code goes here...
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
-<%= '  '*i %>end
+<%= "  " * i %>end
 <%- end -%>

data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt

@@ -1,7 +1,7 @@
-<%- config[:constant_array].each_with_index do |c,i| -%>
-<%= '  '*i %>module <%= c %>
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
 <%- end -%>
-<%= '  '*config[:constant_array].size %>VERSION = "0.1.0"
+<%= "  " * config[:constant_array].size %>VERSION = "0.1.0"
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
-<%= '  '*i %>end
+<%= "  " * i %>end
 <%- end -%>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -1,39 +1,55 @@
+<%- if RUBY_VERSION < "2.0.0" -%>
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+<%- end -%>
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require '<%=config[:namespaced_path]%>/version'
+require "<%= config[:namespaced_path] %>/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = <%=config[:name].inspect%>
-  spec.version       = <%=config[:constant_name]%>::VERSION
-  spec.authors       = [<%=config[:author].inspect%>]
-  spec.email         = [<%=config[:email].inspect%>]
+  spec.name          = <%= config[:name].inspect %>
+  spec.version       = <%= config[:constant_name] %>::VERSION
+  spec.authors       = [<%= config[:author].inspect %>]
+  spec.email         = [<%= config[:email].inspect %>]
 
-  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
+  spec.summary       = %q{TODO: Write a short summary, because RubyGems requires one.}
   spec.description   = %q{TODO: Write a longer description or delete this line.}
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
 <%- if config[:mit] -%>
   spec.license       = "MIT"
 <%- end -%>
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+    spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 <%- if config[:ext] -%>
-  spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
+  spec.extensions    = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
 <%- end -%>
 
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
   spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>"
   spec.add_development_dependency "rake", "~> 10.0"
 <%- if config[:ext] -%>
   spec.add_development_dependency "rake-compiler"
 <%- end -%>
-<%- if config[:test] && config[:test] != "false" -%>
-  spec.add_development_dependency "<%=config[:test]%>"
+<%- if config[:test] -%>
+  spec.add_development_dependency "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
 <%- end -%>
 end

data/lib/bundler/templates/newgem/rspec.tt

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe <%= config[:constant_name] %> do
-  it 'has a version number' do
+RSpec.describe <%= config[:constant_name] %> do
+  it "has a version number" do
     expect(<%= config[:constant_name] %>::VERSION).not_to be nil
   end
 
-  it 'does something useful' do
+  it "does something useful" do
     expect(false).to eq(true)
   end
 end

data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt

@@ -1,2 +1,14 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require '<%= config[:namespaced_path] %>'
+require "bundler/setup"
+require "<%= config[:namespaced_path] %>"
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/lib/bundler/templates/newgem/test/{test_newgem.rb.tt → newgem_test.rb.tt}

@@ -1,6 +1,6 @@
-require 'minitest_helper'
+require "test_helper"
 
-class Test<%= config[:constant_name] %> < Minitest::Test
+class <%= config[:constant_name] %>Test < Minitest::Test
   def test_that_it_has_a_version_number
     refute_nil ::<%= config[:constant_name] %>::VERSION
   end

data/lib/bundler/templates/newgem/test/test_helper.rb.tt

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "<%= config[:namespaced_path] %>"
+
+require "minitest/autorun"

data/lib/bundler/templates/newgem/travis.yml.tt

@@ -0,0 +1,7 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - <%= RUBY_VERSION %>
+before_install: gem install bundler -v <%= Bundler::VERSION %>

data/lib/bundler/ui.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Bundler
   module UI
-    autoload :RGProxy, 'bundler/ui/rg_proxy'
-    autoload :Shell,   'bundler/ui/shell'
-    autoload :Silent,  'bundler/ui/silent'
+    autoload :RGProxy, "bundler/ui/rg_proxy"
+    autoload :Shell,   "bundler/ui/shell"
+    autoload :Silent,  "bundler/ui/silent"
   end
 end

data/lib/bundler/ui/rg_proxy.rb

@@ -1,5 +1,7 @@
-require 'bundler/ui'
-require 'rubygems/user_interaction'
+# frozen_string_literal: true
+
+require "bundler/ui"
+require "rubygems/user_interaction"
 
 module Bundler
   module UI
@@ -10,11 +12,7 @@ module Bundler
       end
 
       def say(message)
-        if message =~ /native extensions/
-          @ui.info "with native extensions "
-        else
-          @ui.debug(message)
-        end
+        @ui && @ui.debug(message)
       end
     end
   end

data/lib/bundler/ui/shell.rb

@@ -1,16 +1,25 @@
+# frozen_string_literal: true
+
+require "bundler/vendored_thor"
+
 module Bundler
   module UI
     class Shell
-      LEVELS = %w(silent error warn confirm info debug)
+      LEVELS = %w[silent error warn confirm info debug].freeze
 
       attr_writer :shell
 
       def initialize(options = {})
-        if options["no-color"] || !STDOUT.tty?
+        if options["no-color"] || !$stdout.tty?
           Thor::Base.shell = Thor::Shell::Basic
         end
         @shell = Thor::Base.shell.new
-        @level = ENV['DEBUG'] ? "debug" : "info"
+        @level = ENV["DEBUG"] ? "debug" : "info"
+        @warning_history = []
+      end
+
+      def add_color(string, *color)
+        @shell.set_color(string, *color)
       end
 
       def info(msg, newline = nil)
@@ -22,50 +31,69 @@ module Bundler
       end
 
       def warn(msg, newline = nil)
-        tell_me(msg, :yellow, newline) if level("warn")
+        return unless level("warn")
+        return if @warning_history.include? msg
+        @warning_history << msg
+
+        return tell_err(msg, :yellow, newline) if Bundler.feature_flag.error_on_stderr?
+        tell_me(msg, :yellow, newline)
       end
 
       def error(msg, newline = nil)
-        tell_me(msg, :red, newline) if level("error")
+        return unless level("error")
+        return tell_err(msg, :red, newline) if Bundler.feature_flag.error_on_stderr?
+        tell_me(msg, :red, newline)
       end
 
       def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if level("debug")
+        tell_me(msg, nil, newline) if debug?
       end
 
       def debug?
-        # needs to be false instead of nil to be newline param to other methods
         level("debug")
       end
 
       def quiet?
-        LEVELS.index(@level) <= LEVELS.index("warn")
+        level("quiet")
       end
 
       def ask(msg)
         @shell.ask(msg)
       end
 
+      def yes?(msg)
+        @shell.yes?(msg)
+      end
+
+      def no?
+        @shell.no?(msg)
+      end
+
       def level=(level)
         raise ArgumentError unless LEVELS.include?(level.to_s)
-        @level = level
+        @level = level.to_s
       end
 
       def level(name = nil)
-        name ? LEVELS.index(name) <= LEVELS.index(@level) : @level
+        return @level unless name
+        unless index = LEVELS.index(name)
+          raise "#{name.inspect} is not a valid level"
+        end
+        index <= LEVELS.index(@level)
       end
 
-      def trace(e, newline = nil)
-        return unless debug?
+      def trace(e, newline = nil, force = false)
+        return unless debug? || force
         msg = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}"
         tell_me(msg, nil, newline)
       end
 
-      def silence
-        old_level, @level = @level, "silent"
-        yield
-      ensure
-        @level = old_level
+      def silence(&blk)
+        with_level("silent", &blk)
+      end
+
+      def unprinted_warnings
+        []
       end
 
     private
@@ -80,9 +108,24 @@ module Bundler
         end
       end
 
+      def tell_err(message, color = nil, newline = nil)
+        return if @shell.send(:stderr).closed?
+
+        newline ||= message.to_s !~ /( |\t)\Z/
+        message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap]
+
+        color = nil if color && !$stderr.tty?
+
+        buffer = @shell.send(:prepare_message, message, *color)
+        buffer << "\n" if newline && !message.to_s.end_with?("\n")
+
+        @shell.send(:stderr).print(buffer)
+        @shell.send(:stderr).flush
+      end
+
       def strip_leading_spaces(text)
         spaces = text[/\A\s+/, 0]
-        spaces ? text.gsub(/#{spaces}/, '') : text
+        spaces ? text.gsub(/#{spaces}/, "") : text
       end
 
       def word_wrap(text, line_width = @shell.terminal_width)
@@ -90,6 +133,14 @@ module Bundler
           line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
       end
+
+      def with_level(level)
+        original = @level
+        @level = level
+        yield
+      ensure
+        @level = original
+      end
     end
   end
 end