generative 0.2.0.pre2 → 0.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49659c159ebfd282874884ad9286ca2f947493a7
-  data.tar.gz: a44984cd34f637445dfa16b49269e2ff0c6d18c2
+  metadata.gz: 5faa370af27a180158e8c85e3fd490e17705d648
+  data.tar.gz: cf64fb8e0597e19ab5008e85178307ba1f8a9be9
 SHA512:
-  metadata.gz: 277d2e6d7bbf4e52b2378b0bff70418cd4ecb90e071741a43d1754ea85098f398883ab080a9d433e9c9131d261a41cf9031430f663f052e2aae12ddbcca8fd49
-  data.tar.gz: 0bb3ccd617f93fedcb8e6bebbfc2b246ccd056e909f18fef9ace0a21e817e8f78f1543cd2afdbed1d29daa887ce8358c34bcf8477386543240c72a0c94d8d073
+  metadata.gz: 3fe5857f7cbf5ed68100cb824b3c4a2c77b8aee62b8c55e44b3cad2aa61180a2a089f95c846bf8eec88674c7b436cf233afbe9f86d00f9458be25a86bb1749d5
+  data.tar.gz: 9ddf3005b3c3be9064cd6f0c5bc8cf6b5bc8a6c8c50c09af960252b552e96829cc23dcd40fd6b8786c9d4b79eb80b3169c5b7d9a587b839142efc68411ebfaf7

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
-env:
-  - RSPEC_VERSION=2
-  - RSPEC_VERSION=3
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+
+* Drop support for RSpec 2
+
 ## 0.1.0
 
 * Add support for RSpec 2

data/README.md

@@ -38,20 +38,6 @@ RSpec::Core::RakeTask.new
 Generative::RakeTask.new
 ```
 
-### Remove any random/other ordering
-
-If using RSpec 2, you'll need to make sure you remove `config.order =
-'random'`, or any other ordering strategies, from your spec helper. You can
-also use `Generative.running?` to only disable random ordering during
-Generative runs:
-
-```rb
-config.order = :random unless Generative.running?
-```
-
-In RSpec 3, this is not necessary, because each example group (the `generative`
-block) can override ordering for that group.
-
 ## Usage
 
 ### Specs

data/Rakefile

@@ -10,16 +10,27 @@ Generative::RakeTask.new
 
 desc "Verify all spec commands behave properly"
 task :acceptance do
+  ENV.delete('GENERATIVE_COUNT')
+
   [
-    ['rspec', '6'],
-    ['rake spec', '6'],
+    ['rspec', '13'],
+    ['rake spec', '13'],
     ['rake generative', '30000'],
     ['bin/generative', '30000']
-  ].each do |command, example_count|
-    result = system %{#{command} | grep "#{example_count} examples, 0 failures"}
+  ].each do |command, expected_example_count|
+    puts "Checking output of `#{command}`"
+    output = %x{#{command}}
+    pattern = /(\d+) examples, (\d+) failures/
+    _, example_count, failure_count = output.match(pattern).to_a
+
+    unless failure_count == '0'
+      fail "`#{command}` had #{failure_count} failures"
+    end
 
-    unless result
-      fail "`#{command}` had an incorrect example count"
+    unless example_count == expected_example_count
+      fail "`#{command}` had an incorrect example count, " \
+        "expected #{expected_example_count}, " \
+        "but got #{example_count}"
     end
   end
 

data/generative.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'generative'
-  gem.version       = '0.2.0.pre2'
+  gem.version       = '0.2.0.pre3'
   gem.authors       = ["Justin Campbell",          "Dan McClory"]
   gem.email         = ["justin@justincampbell.me", "danmcclory@gmail.com"]
   gem.description   = "Generative testing for RSpec"
@@ -17,14 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  case ENV['RSPEC_VERSION']
-  when '2'
-    gem.add_dependency 'rspec', '~> 2.0'
-  when '3'
-    gem.add_dependency 'rspec', '3.0.0.beta1'
-  else
-    gem.add_dependency 'rspec'
-  end
+  gem.add_dependency 'rspec', '>= 3.0'
 
   gem.add_development_dependency 'rake'
 end

data/lib/generative/dsl.rb

@@ -1,10 +1,6 @@
 class RSpec::Core::ExampleGroup
-  def self.generative(name = nil, &block)
-    name = "(#{name})" if name
-    name = "\033[36mgenerative#{name}\033[0m"
 
-    describe(name, generative: true, order: :generative, &block)
-  end
+  define_example_group_method :generative, { generative: true, order: :generative}
 
   class << self
     alias_method :data, :let

data/lib/generative/formatters.rb

@@ -1,13 +1,16 @@
 require 'rspec/core/formatters/progress_formatter'
+require 'rspec/core/formatters/console_codes'
 
 class RSpec::Core::Formatters::ProgressFormatter
-  def example_passed(example)
-    super(example)
+  alias_method :super_example_passed, :example_passed
+
+  def example_passed(notification)
+    example = notification.example
 
     if example.metadata[:generative]
-      output.print detail_color('.')
+      output.print RSpec::Core::Formatters::ConsoleCodes.wrap('.', :cyan)
     else
-      output.print success_color('.')
+      super_example_passed(notification)
     end
   end
 end
@@ -16,11 +19,19 @@ require 'rspec/core/formatters/documentation_formatter'
 
 module Generative
   class Formatter < RSpec::Core::Formatters::DocumentationFormatter
+    RSpec::Core::Formatters.register self,
+      :example_failed,
+      :example_group_started,
+      :example_passed,
+      :example_pending
+
     def initialize(output)
-      super(output)
+      super
     end
 
-    def example_group_started(example_group)
+    def example_group_started(notification)
+      example_group = notification.group
+
       @example_group = example_group
 
       output.puts if @group_level == 0
@@ -41,28 +52,38 @@ module Generative
       @group_level += 1
     end
 
-    def example_passed(example)
+    def example_passed(notification)
+      example = notification.example
+
       return if generative?(example)
 
-      super(example)
+      super
     end
 
-    def example_pending(example)
+    def example_pending(notification)
+      example = notification.example
+
       return if generative?(example)
 
-      super(example)
+      super
     end
 
-    def example_failed(example)
+    def example_failed(notification)
+      example = notification.example
+
       if generative?(example)
         RSpec.wants_to_quit = true
       end
 
-      super(example)
+      super
     end
 
     private
 
+    def detail_color(text)
+      RSpec::Core::Formatters::ConsoleCodes.wrap(text, :cyan)
+    end
+
     def generative?(example)
       example.metadata[:generative]
     end

data/lib/generative/ordering.rb

@@ -1,15 +1,13 @@
 Generative::ORDERING = ->(examples) {
+  generative, regular = examples.partition { |example|
+    example.metadata[:generative]
+  }
+
   number_of_examples = ENV.fetch('GENERATIVE_COUNT', '1').to_i
-  examples * number_of_examples
+
+  regular + generative * number_of_examples
 }
 
 RSpec.configure do |rspec|
-  case RSpec::Core::Version::STRING
-  when /^2/
-    rspec.order_examples(&Generative::ORDERING) if ENV['GENERATIVE_COUNT']
-  when /^3/
-    rspec.register_ordering(:generative, &Generative::ORDERING)
-  else
-    puts "Generative was unable to determine the RSpec version."
-  end
+  rspec.register_ordering(:generative, &Generative::ORDERING)
 end

data/lib/generative/rake_task.rb

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 module Generative
   class RakeTask < RSpec::Core::RakeTask
     def initialize(*args, &task_block)
-      setup_ivars(args)
+      super
 
       self.name = :generative if name == :spec
 

data/spec/generative/ordering_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Generative::ORDERING do
+  let(:ordering) { Generative::ORDERING }
+
+  around do |example|
+    previous = ENV['GENERATIVE_COUNT']
+    ENV['GENERATIVE_COUNT'] = '10'
+
+    example.call
+
+    ENV['GENERATIVE_COUNT'] = previous
+  end
+
+  it "does not duplicate regular specs" do
+    spec = double(metadata: {})
+    expect(ordering.call([spec])).to eq([spec])
+  end
+
+  it "duplicates generative specs" do
+    spec = double(metadata: { generative: true })
+    expect(ordering.call([spec]).count).to eq(10)
+  end
+end

data/spec/generative/rake_task_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'generative/rake_task'
+
+describe Generative::RakeTask do
+  let(:task) { Generative::RakeTask.new(*args) }
+  let(:args) { [] }
+
+  describe "name" do
+    subject(:name) { task.name }
+
+    it "has a default" do
+      expect(name).to eq(:generative)
+    end
+
+    context "when passed a name" do
+      let(:args) { [:properties] }
+
+      it "uses that name" do
+        expect(name).to eq(:properties)
+      end
+    end
+  end
+
+  describe "rspec_opts" do
+    subject(:rspec_opts) { task.rspec_opts }
+
+    it "require generative" do
+      expect(rspec_opts).to include("--require generative")
+    end
+
+    it "format with Generative::Formatter" do
+      expect(rspec_opts).to include("--format Generative::Formatter")
+    end
+
+    it "only run specs tagged with generative" do
+      expect(rspec_opts).to include("--format Generative::Formatter")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generative
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Justin Campbell
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Generative testing for RSpec
@@ -48,9 +48,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -64,6 +64,8 @@ files:
 - lib/generative/ordering.rb
 - lib/generative/rake_task.rb
 - lib/generative/version.rb
+- spec/generative/ordering_spec.rb
+- spec/generative/rake_task_spec.rb
 - spec/generative_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/justincampbell/generative
@@ -76,20 +78,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Generative testing for RSpec
 test_files:
+- spec/generative/ordering_spec.rb
+- spec/generative/rake_task_spec.rb
 - spec/generative_spec.rb
 - spec/spec_helper.rb
+has_rdoc: