Postponing the Bundler merge.

  I faced a big issue about Bundler with ruby core.
  I have no time to resolve it issue before 2.5 final release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 143 deletions

diff --git a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
deleted file mode 100644
index 284d92c19a..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-class Bundler::Thor
-  module Actions
-    # Creates an empty directory.
-    #
-    # ==== Parameters
-    # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #
-    # ==== Examples
-    #
-    #   empty_directory "doc"
-    #
-    def empty_directory(destination, config = {})
-      action EmptyDirectory.new(self, destination, config)
-    end
-
-    # Class which holds create directory logic. This is the base class for
-    # other actions like create_file and directory.
-    #
-    # This implementation is based in Templater actions, created by Jonas Nicklas
-    # and Michael S. Klishin under MIT LICENSE.
-    #
-    class EmptyDirectory #:nodoc:
-      attr_reader :base, :destination, :given_destination, :relative_destination, :config
-
-      # Initializes given the source and destination.
-      #
-      # ==== Parameters
-      # base<Bundler::Thor::Base>:: A Bundler::Thor::Base instance
-      # source<String>:: Relative path to the source of this file
-      # destination<String>:: Relative path to the destination of this file
-      # config<Hash>:: give :verbose => false to not log the status.
-      #
-      def initialize(base, destination, config = {})
-        @base = base
-        @config = {:verbose => true}.merge(config)
-        self.destination = destination
-      end
-
-      # Checks if the destination file already exists.
-      #
-      # ==== Returns
-      # Boolean:: true if the file exists, false otherwise.
-      #
-      def exists?
-        ::File.exist?(destination)
-      end
-
-      def invoke!
-        invoke_with_conflict_check do
-          require "fileutils"
-          ::FileUtils.mkdir_p(destination)
-        end
-      end
-
-      def revoke!
-        say_status :remove, :red
-        require "fileutils"
-        ::FileUtils.rm_rf(destination) if !pretend? && exists?
-        given_destination
-      end
-
-    protected
-
-      # Shortcut for pretend.
-      #
-      def pretend?
-        base.options[:pretend]
-      end
-
-      # Sets the absolute destination value from a relative destination value.
-      # It also stores the given and relative destination. Let's suppose our
-      # script is being executed on "dest", it sets the destination root to
-      # "dest". The destination, given_destination and relative_destination
-      # are related in the following way:
-      #
-      #   inside "bar" do
-      #     empty_directory "baz"
-      #   end
-      #
-      #   destination          #=> dest/bar/baz
-      #   relative_destination #=> bar/baz
-      #   given_destination    #=> baz
-      #
-      def destination=(destination)
-        return unless destination
-        @given_destination = convert_encoded_instructions(destination.to_s)
-        @destination = ::File.expand_path(@given_destination, base.destination_root)
-        @relative_destination = base.relative_to_original_destination_root(@destination)
-      end
-
-      # Filenames in the encoded form are converted. If you have a file:
-      #
-      #   %file_name%.rb
-      #
-      # It calls #file_name from the base and replaces %-string with the
-      # return value (should be String) of #file_name:
-      #
-      #   user.rb
-      #
-      # The method referenced can be either public or private.
-      #
-      def convert_encoded_instructions(filename)
-        filename.gsub(/%(.*?)%/) do |initial_string|
-          method = $1.strip
-          base.respond_to?(method, true) ? base.send(method) : initial_string
-        end
-      end
-
-      # Receives a hash of options and just execute the block if some
-      # conditions are met.
-      #
-      def invoke_with_conflict_check(&block)
-        if exists?
-          on_conflict_behavior(&block)
-        else
-          yield unless pretend?
-          say_status :create, :green
-        end
-
-        destination
-      rescue Errno::EISDIR, Errno::EEXIST
-        on_file_clash_behavior
-      end
-
-      def on_file_clash_behavior
-        say_status :file_clash, :red
-      end
-
-      # What to do when the destination file already exists.
-      #
-      def on_conflict_behavior
-        say_status :exist, :blue
-      end
-
-      # Shortcut to say_status shell method.
-      #
-      def say_status(status, color)
-        base.shell.say_status status, relative_destination, color if config[:verbose]
-      end
-    end
-  end
-end