Remove inconsistent #order and #randomize? config methods.

* Examples and groups can be ordered differently.
* Individual groups can be ordered differently.

As such, a global `order` reader method doesn't
make a lot of sense (although, assigning the global
default via `#order=` still does, I think).

Also:

* This exposed that the ordering force logic
  (e.g. to ensure CLI `--order rand` takes
  precedence over `RSpec.configure`) didn't
  work properly since it simply ensured `order`
  returned the forced option but did not ensure
  the global ordering was set properly.  I've
  fixed this.
* Don't clear the seed when setting the order to
  default. An individual example group may still
  be run in random order and will need the seed.
  There's really no reason to clear it.
* Always print the seed at the end of the run,
  even if default order is used. Consider that
  only one group may be randomized, in which case
  the seed would be important. Ideally, I'd like
  to refine this further so that it is conditionally
  printed based on if the random orderer ever got
  used, but that can be a later commit.

features/command_line/require_option.feature

@@ -20,8 +20,8 @@ Feature: --require option
             super
           end
 
-          def puts(message)
-            [@file, __getobj__].each { |out| out.puts message }
+          def puts(*args)
+            [@file, __getobj__].each { |out| out.puts(*args) }
           end
 
           def close

lib/rspec/core/command_line.rb

@@ -22,7 +22,7 @@ def run(err, out)
         @configuration.load_spec_files
         @world.announce_filters
 
-        @configuration.reporter.report(@world.example_count, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
+        @configuration.reporter.report(@world.example_count, @configuration.seed) do |reporter|
           begin
             @configuration.run_hook(:before, :suite)
             @world.ordered_example_groups.map {|g| g.run(reporter) }.all? ? 0 : @configuration.failure_exit_code

lib/rspec/core/configuration.rb

@@ -108,10 +108,6 @@ def self.add_setting(name, opts={})
       # The exit code to return if there are any failures (default: 1).
       add_setting :failure_exit_code
 
-      # Determines the order in which examples are run (default: OS standard
-      # load order for files, declaration order for groups and examples).
-      define_reader :order
-
       # Indicates files configured to be required
       define_reader :requires
 
@@ -194,7 +190,6 @@ def initialize
         @mock_framework = nil
         @files_to_run = []
         @formatters = []
-        @order = "default"
         @color = false
         @pattern = '**/*_spec.rb'
         @failure_exit_code = 1
@@ -878,23 +873,18 @@ def format_docstrings_block
 
       # @api
       #
-      # Sets the seed value and sets `order='rand'`
+      # Sets the seed value and sets the default global ordering to random.
       def seed=(seed)
         order_and_seed_from_seed(seed)
       end
 
       # @api
       #
-      # Sets the order and, if order is `'rand:<seed>'`, also sets the seed.
+      # Sets the default global order and, if order is `'rand:<seed>'`, also sets the seed.
       def order=(type)
         order_and_seed_from_order(type)
       end
 
-      def randomize?
-        order.to_s.match(/rand/)
-      end
-
-
       # Sets a strategy by which to order examples.
       #
       # @example
@@ -909,8 +899,9 @@ def randomize?
       # @see #order=
       # @see #seed=
       def order_examples(ordering=nil, &block)
-        strategy = @example_ordering_registry.set_global_order(ordering, &block)
-        @order = "custom" unless strategy.built_in?
+        unless @preferred_options.has_key?(:order)
+          @example_ordering_registry.set_global_order(ordering, &block)
+        end
       end
 
       # Sets a strategy by which to order groups.
@@ -927,8 +918,9 @@ def order_examples(ordering=nil, &block)
       # @see #order=
       # @see #seed=
       def order_groups(ordering=nil, &block)
-        strategy = @group_ordering_registry.set_global_order(ordering, &block)
-        @order = "custom" unless strategy.built_in?
+        unless @preferred_options.has_key?(:order)
+          @group_ordering_registry.set_global_order(ordering, &block)
+        end
       end
 
       # Sets a strategy by which to order groups and examples.
@@ -1077,11 +1069,10 @@ def file_at(path)
       end
 
       def order_and_seed_from_seed(value)
-        @example_ordering_registry.set_global_order(:random)
-        @group_ordering_registry.set_global_order(:random)
+        order_groups_and_examples(:random)
 
-        @order, @seed = 'rand', value.to_i
-        [@order, @seed]
+        order, @seed = 'rand', value.to_i
+        [order, @seed]
       end
 
       def set_order_and_seed(hash)
@@ -1091,19 +1082,16 @@ def set_order_and_seed(hash)
 
       def order_and_seed_from_order(type)
         order, seed = type.to_s.split(':')
-        @order = order
-        @seed  = seed = seed.to_i if seed
+        @seed = seed = seed.to_i if seed
 
-        if randomize?
-          @example_ordering_registry.set_global_order(:random)
-          @group_ordering_registry.set_global_order(:random)
+        ordering_name = if order.include?('rand')
+          :random
         elsif order == 'default'
-          @order, @seed = nil, nil
-
-          @example_ordering_registry.set_global_order(:default)
-          @group_ordering_registry.set_global_order(:default)
+          :default
         end
 
+        order_groups_and_examples(ordering_name) if ordering_name
+
         return order, seed
       end
     end

lib/rspec/core/ordering.rb

@@ -5,10 +5,6 @@ class Identity
         def order(items)
           items
         end
-
-        def built_in?
-          true
-        end
       end
 
       class Random
@@ -22,10 +18,6 @@ def order(items)
           Kernel.srand # reset random generation
           ordering
         end
-
-        def built_in?
-          true
-        end
       end
 
       class Custom
@@ -36,10 +28,6 @@ def initialize(callable)
         def order(list)
           @callable.call(list)
         end
-
-        def built_in?
-          false
-        end
       end
 
       class Registry

spec/rspec/core/configuration_spec.rb

@@ -1312,24 +1312,46 @@ def metadata_hash(*args)
     end
 
     describe "#force" do
-      it "forces order" do
-        config.force :order => "default"
-        config.order = "rand"
-        expect(config.order).to eq("default")
-      end
+      context "for ordering options" do
+        let(:list) { [1, 2, 3, 4] }
+        let(:example_ordering_strategy) { config.example_ordering_registry.global_ordering }
+        let(:group_ordering_strategy) { config.group_ordering_registry.global_ordering }
 
-      it "forces order and seed with :order => 'rand:37'" do
-        config.force :order => "rand:37"
-        config.order = "default"
-        expect(config.order).to eq("rand")
-        expect(config.seed).to eq(37)
-      end
+        let(:shuffled) do
+          Kernel.srand(37)
+          list.shuffle
+        end
+
+        specify "CLI `--order default` takes precedence over `config.order = rand`" do
+          config.force :order => "default"
+          config.order = "rand"
+
+          expect(example_ordering_strategy.order(list)).to eq([1, 2, 3, 4])
+        end
+
+        specify "CLI `--order rand:37` takes precedence over `config.order = default`" do
+          config.force :order => "rand:37"
+          config.order = "default"
+
+          expect(example_ordering_strategy.order(list)).to eq(shuffled)
+        end
 
-      it "forces order and seed with :seed => '37'" do
-        config.force :seed => "37"
-        config.order = "default"
-        expect(config.seed).to eq(37)
-        expect(config.order).to eq("rand")
+        specify "CLI `--seed 37` forces order and seed" do
+          config.force :seed => 37
+          config.order = "default"
+          config.seed  = 145
+
+          expect(example_ordering_strategy.order(list)).to eq(shuffled)
+          expect(config.seed).to eq(37)
+        end
+
+        specify "CLI `--order default` takes precedence over `config.order_groups_and_examples`" do
+          config.force :order => "default"
+          config.order_groups_and_examples(&:reverse)
+
+          expect(example_ordering_strategy.order(list)).to eq([1, 2, 3, 4])
+          expect(group_ordering_strategy.order(list)).to eq([1, 2, 3, 4])
+        end
       end
 
       it "forces 'false' value" do
@@ -1350,35 +1372,13 @@ def metadata_hash(*args)
       end
     end
 
-    describe '#randomize?' do
-      context 'with order set to :random' do
-        before { config.order = :random }
-
-        it 'returns true' do
-          expect(config.randomize?).to be_truthy
-        end
-      end
-
-      context 'with order set to nil' do
-        before { config.order = nil }
-
-        it 'returns false' do
-          expect(config.randomize?).to be_falsey
-        end
-      end
-    end
-
     describe '#order=' do
       context 'given "random"' do
         before do
           config.seed = 7654
           config.order = 'random'
         end
 
-        it 'sets order to "random"' do
-          expect(config.order).to eq('random')
-        end
-
         it 'does not change the seed' do
           expect(config.seed).to eq(7654)
         end
@@ -1393,10 +1393,6 @@ def metadata_hash(*args)
       context 'given "random:123"' do
         before { config.order = 'random:123' }
 
-        it 'sets order to "random"' do
-          expect(config.order).to eq('random')
-        end
-
         it 'sets seed to 123' do
           expect(config.seed).to eq(123)
         end
@@ -1414,12 +1410,8 @@ def metadata_hash(*args)
           config.order = 'default'
         end
 
-        it "sets the order to nil" do
-          expect(config.order).to be_nil
-        end
-
-        it "sets the seed to nil" do
-          expect(config.seed).to be_nil
+        it "does not change the seed" do
+          expect(config.seed).to eq(123)
         end
 
         it 'clears the random ordering' do
@@ -1441,11 +1433,6 @@ def metadata_hash(*args)
         ordering_strategy = config.example_ordering_registry.global_ordering
         expect(ordering_strategy.order(examples)).to eq([4, 3, 2, 1])
       end
-
-      it 'sets #order to "custom"' do
-        config.order_examples { |examples| examples.reverse }
-        expect(config.order).to eq("custom")
-      end
     end
 
     describe "#order_groups" do
@@ -1457,11 +1444,6 @@ def metadata_hash(*args)
         ordering_strategy = config.group_ordering_registry.global_ordering
         expect(ordering_strategy.order(groups)).to eq([4, 3, 2, 1])
       end
-
-      it 'sets #order to "custom"' do
-        config.order_groups { |groups| groups.reverse }
-        expect(config.order).to eq("custom")
-      end
     end
 
     describe "#order_groups_and_examples" do

spec/rspec/core/ordering_spec.rb

@@ -5,10 +5,6 @@ module RSpec::Core::Ordering
     it "does not affect the ordering of the items" do
       expect(Identity.new.order([1, 2, 3])).to eq([1, 2, 3])
     end
-
-    it 'is considered a built in ordering' do
-      expect(Identity.new).to be_built_in
-    end
   end
 
   describe Random do
@@ -45,10 +41,6 @@ def order_of(input, seed)
       strategy = Random.new(configuration)
       strategy.order([])
     end
-
-    it 'is considered a built in ordering' do
-      expect(Random.new(configuration)).to be_built_in
-    end
   end
 
   describe Custom do
@@ -57,10 +49,6 @@ def order_of(input, seed)
 
       expect(strategy.order([1, 2, 3, 4])).to eq([4, 3, 2, 1])
     end
-
-    it 'is not considered a built in ordering' do
-      expect(Custom.new(proc { })).not_to be_built_in
-    end
   end
 
   describe Registry do