uberspec 0.1.1 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/{spec/spec.opts → .rspec} +0 -0
  2. data/Rakefile +9 -9
  3. data/VERSION +1 -1
  4. data/lib/uberspec/rspec.rb +3 -1
  5. data/lib/uberspec.rb +1 -0
  6. data/spec/parallel_spec.opts +1 -0
  7. data/spec/spec_helper.rb +3 -3
  8. data/spec/uberspec/rspec_spec.rb +18 -2
  9. data/uberspec.gemspec +51 -46
  10. data/uberspec.watchr +2 -2
  11. metadata +48 -22
  12. data/.gitignore +0 -21
data/{spec/spec.opts → .rspec} RENAMED
File without changes
data/Rakefile CHANGED
@@ -11,23 +11,23 @@ begin
11
11
  gem.homepage = "http://github.com/alanpeabody/uberspec"
12
12
  gem.authors = ["Alan Peabody"]
13
13
  gem.add_dependency "watchr"
14
- gem.add_dependency "rspec", "~> 1.3.0"
15
- gem.add_development_dependency "rspec", "~> 1.3.0"
16
- # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
14
+ gem.add_dependency "rspec", ">= 1.2"
15
+ gem.add_development_dependency "rspec", "~> 2.0"
16
+ gem.add_development_dependency "parallel_tests"
17
+ gem.add_development_dependency "watchr"
17
18
  end
18
19
  Jeweler::GemcutterTasks.new
19
20
  rescue LoadError
20
21
  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
21
22
  end
22
23
 
23
- require 'spec/rake/spectask'
24
- Spec::Rake::SpecTask.new(:spec) do |spec|
25
- spec.libs << 'lib' << 'spec'
26
- spec.spec_files = FileList['spec/**/*_spec.rb']
24
+ require 'rspec/core'
25
+ require 'rspec/core/rake_task'
26
+ RSpec::Core::RakeTask.new(:spec) do |spec|
27
+ spec.pattern = FileList['spec/**/*_spec.rb']
27
28
  end
28
29
 
29
- Spec::Rake::SpecTask.new(:rcov) do |spec|
30
- spec.libs << 'lib' << 'spec'
30
+ RSpec::Core::RakeTask.new(:rcov) do |spec|
31
31
  spec.pattern = 'spec/**/*_spec.rb'
32
32
  spec.rcov = true
33
33
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.2.0
data/lib/uberspec/rspec.rb CHANGED
@@ -1,8 +1,10 @@
1
+ require 'ruby-debug'
2
+
1
3
  module Uberspec
2
4
  class Rspec < Uberspec::Base
3
5
 
4
6
  def command
5
- 'spec'
7
+ @command ||= Gem.loaded_specs['rspec'].version >= Gem::Version.create('2.0') ? 'rspec' : 'spec'
6
8
  end
7
9
 
8
10
  def all_test_files
data/lib/uberspec.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'rubygems'
1
2
  require 'stringio'
2
3
  require 'uberspec/config'
3
4
  require 'uberspec/notify'
data/spec/parallel_spec.opts ADDED
@@ -0,0 +1 @@
1
+ --color
data/spec/spec_helper.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  $LOAD_PATH.unshift(File.dirname(__FILE__))
2
2
  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
3
3
  require 'uberspec'
4
- require 'spec'
5
- require 'spec/autorun'
4
+ require 'rspec'
5
+ require 'rspec/autorun'
6
6
 
7
- Spec::Runner.configure do |config|
7
+ RSpec.configure do |config|
8
8
 
9
9
  end
data/spec/uberspec/rspec_spec.rb CHANGED
@@ -6,10 +6,26 @@ describe Uberspec::Rspec do
6
6
  @rspec = Uberspec::Rspec.watch(@watchr_script)
7
7
  end
8
8
 
9
- it "should define the command" do
10
- @rspec.command.should == 'spec'
9
+ context "when using rspec 1" do
10
+ before(:each) do
11
+ Gem.stub_chain(:loaded_specs,:[],:version).and_return(Gem::Version.create('1.5'))
12
+ end
13
+
14
+ it "should define the command" do
15
+ @rspec.command.should == 'spec'
16
+ end
11
17
  end
12
18
 
19
+ context "when using rspec 2" do
20
+ before(:each) do
21
+ Gem.stub_chain(:loaded_specs,:[],:version).and_return(Gem::Version.create('2.0'))
22
+ end
23
+
24
+ it "should define the command" do
25
+ @rspec.command.should == 'rspec'
26
+ end
27
+ end
28
+
13
29
  it "should define all test files" do
14
30
  @rspec.all_test_files.should == Dir['spec/**/*_spec.rb']
15
31
  end
data/uberspec.gemspec CHANGED
@@ -1,66 +1,65 @@
1
1
  # Generated by jeweler
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{uberspec}
8
- s.version = "0.1.1"
8
+ s.version = "0.2.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Alan Peabody"]
12
- s.date = %q{2010-10-25}
12
+ s.date = %q{2011-02-15}
13
13
  s.description = %q{Continious Integration for Rspec using Watchr}
14
14
  s.email = %q{gapeabody@gmail.com}
15
15
  s.extra_rdoc_files = [
16
16
  "LICENSE",
17
- "README.rdoc"
17
+ "README.rdoc"
18
18
  ]
19
19
  s.files = [
20
20
  ".document",
21
- ".gitignore",
22
- ".rvmrc",
23
- "LICENSE",
24
- "README.rdoc",
25
- "Rakefile",
26
- "VERSION",
27
- "img/failed.png",
28
- "img/other.png",
29
- "img/passed.png",
30
- "img/pending.png",
31
- "lib/uberspec.rb",
32
- "lib/uberspec/config.rb",
33
- "lib/uberspec/notify.rb",
34
- "lib/uberspec/notify/growl.rb",
35
- "lib/uberspec/notify/lib_notify.rb",
36
- "lib/uberspec/parallel.rb",
37
- "lib/uberspec/rspec.rb",
38
- "spec/spec.opts",
39
- "spec/spec_helper.rb",
40
- "spec/uberspec/config_spec.rb",
41
- "spec/uberspec/notify/growl_spec.rb",
42
- "spec/uberspec/notify/lib_notify_spec.rb",
43
- "spec/uberspec/notify_spec.rb",
44
- "spec/uberspec/parallel_spec.rb",
45
- "spec/uberspec/rspec_spec.rb",
46
- "spec/uberspec_spec.rb",
47
- "uberspec.gemspec",
48
- "uberspec.watchr"
21
+ ".rspec",
22
+ ".rvmrc",
23
+ "LICENSE",
24
+ "README.rdoc",
25
+ "Rakefile",
26
+ "VERSION",
27
+ "img/failed.png",
28
+ "img/other.png",
29
+ "img/passed.png",
30
+ "img/pending.png",
31
+ "lib/uberspec.rb",
32
+ "lib/uberspec/config.rb",
33
+ "lib/uberspec/notify.rb",
34
+ "lib/uberspec/notify/growl.rb",
35
+ "lib/uberspec/notify/lib_notify.rb",
36
+ "lib/uberspec/parallel.rb",
37
+ "lib/uberspec/rspec.rb",
38
+ "spec/parallel_spec.opts",
39
+ "spec/spec_helper.rb",
40
+ "spec/uberspec/config_spec.rb",
41
+ "spec/uberspec/notify/growl_spec.rb",
42
+ "spec/uberspec/notify/lib_notify_spec.rb",
43
+ "spec/uberspec/notify_spec.rb",
44
+ "spec/uberspec/parallel_spec.rb",
45
+ "spec/uberspec/rspec_spec.rb",
46
+ "spec/uberspec_spec.rb",
47
+ "uberspec.gemspec",
48
+ "uberspec.watchr"
49
49
  ]
50
50
  s.homepage = %q{http://github.com/alanpeabody/uberspec}
51
- s.rdoc_options = ["--charset=UTF-8"]
52
51
  s.require_paths = ["lib"]
53
52
  s.rubygems_version = %q{1.3.7}
54
53
  s.summary = %q{Watchr + Rspec + Parallel Spec = Uberspec}
55
54
  s.test_files = [
56
55
  "spec/spec_helper.rb",
57
- "spec/uberspec/parallel_spec.rb",
58
- "spec/uberspec/notify_spec.rb",
59
- "spec/uberspec/rspec_spec.rb",
60
- "spec/uberspec/notify/growl_spec.rb",
61
- "spec/uberspec/notify/lib_notify_spec.rb",
62
- "spec/uberspec/config_spec.rb",
63
- "spec/uberspec_spec.rb"
56
+ "spec/uberspec/config_spec.rb",
57
+ "spec/uberspec/notify/growl_spec.rb",
58
+ "spec/uberspec/notify/lib_notify_spec.rb",
59
+ "spec/uberspec/notify_spec.rb",
60
+ "spec/uberspec/parallel_spec.rb",
61
+ "spec/uberspec/rspec_spec.rb",
62
+ "spec/uberspec_spec.rb"
64
63
  ]
65
64
 
66
65
  if s.respond_to? :specification_version then
@@ -69,17 +68,23 @@ Gem::Specification.new do |s|
69
68
 
70
69
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
71
70
  s.add_runtime_dependency(%q<watchr>, [">= 0"])
72
- s.add_runtime_dependency(%q<rspec>, ["~> 1.3.0"])
73
- s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
71
+ s.add_runtime_dependency(%q<rspec>, [">= 1.2"])
72
+ s.add_development_dependency(%q<rspec>, ["~> 2.0"])
73
+ s.add_development_dependency(%q<parallel_tests>, [">= 0"])
74
+ s.add_development_dependency(%q<watchr>, [">= 0"])
74
75
  else
75
76
  s.add_dependency(%q<watchr>, [">= 0"])
76
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
77
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
77
+ s.add_dependency(%q<rspec>, [">= 1.2"])
78
+ s.add_dependency(%q<rspec>, ["~> 2.0"])
79
+ s.add_dependency(%q<parallel_tests>, [">= 0"])
80
+ s.add_dependency(%q<watchr>, [">= 0"])
78
81
  end
79
82
  else
80
83
  s.add_dependency(%q<watchr>, [">= 0"])
81
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
82
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
84
+ s.add_dependency(%q<rspec>, [">= 1.2"])
85
+ s.add_dependency(%q<rspec>, ["~> 2.0"])
86
+ s.add_dependency(%q<parallel_tests>, [">= 0"])
87
+ s.add_dependency(%q<watchr>, [">= 0"])
83
88
  end
84
89
  end
85
90
 
data/uberspec.watchr CHANGED
@@ -1,9 +1,9 @@
1
1
  require 'uberspec'
2
2
 
3
- Uberspec::Rspec.watch(self) do |config|
3
+ Uberspec::Parallel.watch(self) do |config|
4
4
  config.code_paths += ['^lib/(.*)\.rb']
5
5
  config.spec_paths += ['^spec/(.*)\.']
6
- config.notify = 'LibNotify' #'Growl' #false
6
+ config.notify = false #'LibNotify' #'Growl' #false
7
7
  end
8
8
 
9
9
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uberspec
3
3
  version: !ruby/object:Gem::Version
4
- hash: 25
4
+ hash: 23
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
- - 1
9
- - 1
10
- version: 0.1.1
8
+ - 2
9
+ - 0
10
+ version: 0.2.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alan Peabody
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-10-25 00:00:00 -04:00
18
+ date: 2011-02-15 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -38,14 +38,13 @@ dependencies:
38
38
  requirement: &id002 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
- - - ~>
41
+ - - ">="
42
42
  - !ruby/object:Gem::Version
43
- hash: 27
43
+ hash: 11
44
44
  segments:
45
45
  - 1
46
- - 3
47
- - 0
48
- version: 1.3.0
46
+ - 2
47
+ version: "1.2"
49
48
  type: :runtime
50
49
  version_requirements: *id002
51
50
  - !ruby/object:Gem::Dependency
@@ -56,14 +55,41 @@ dependencies:
56
55
  requirements:
57
56
  - - ~>
58
57
  - !ruby/object:Gem::Version
59
- hash: 27
58
+ hash: 3
60
59
  segments:
61
- - 1
62
- - 3
60
+ - 2
63
61
  - 0
64
- version: 1.3.0
62
+ version: "2.0"
65
63
  type: :development
66
64
  version_requirements: *id003
65
+ - !ruby/object:Gem::Dependency
66
+ name: parallel_tests
67
+ prerelease: false
68
+ requirement: &id004 !ruby/object:Gem::Requirement
69
+ none: false
70
+ requirements:
71
+ - - ">="
72
+ - !ruby/object:Gem::Version
73
+ hash: 3
74
+ segments:
75
+ - 0
76
+ version: "0"
77
+ type: :development
78
+ version_requirements: *id004
79
+ - !ruby/object:Gem::Dependency
80
+ name: watchr
81
+ prerelease: false
82
+ requirement: &id005 !ruby/object:Gem::Requirement
83
+ none: false
84
+ requirements:
85
+ - - ">="
86
+ - !ruby/object:Gem::Version
87
+ hash: 3
88
+ segments:
89
+ - 0
90
+ version: "0"
91
+ type: :development
92
+ version_requirements: *id005
67
93
  description: Continious Integration for Rspec using Watchr
68
94
  email: gapeabody@gmail.com
69
95
  executables: []
@@ -75,7 +101,7 @@ extra_rdoc_files:
75
101
  - README.rdoc
76
102
  files:
77
103
  - .document
78
- - .gitignore
104
+ - .rspec
79
105
  - .rvmrc
80
106
  - LICENSE
81
107
  - README.rdoc
@@ -92,7 +118,7 @@ files:
92
118
  - lib/uberspec/notify/lib_notify.rb
93
119
  - lib/uberspec/parallel.rb
94
120
  - lib/uberspec/rspec.rb
95
- - spec/spec.opts
121
+ - spec/parallel_spec.opts
96
122
  - spec/spec_helper.rb
97
123
  - spec/uberspec/config_spec.rb
98
124
  - spec/uberspec/notify/growl_spec.rb
@@ -108,8 +134,8 @@ homepage: http://github.com/alanpeabody/uberspec
108
134
  licenses: []
109
135
 
110
136
  post_install_message:
111
- rdoc_options:
112
- - --charset=UTF-8
137
+ rdoc_options: []
138
+
113
139
  require_paths:
114
140
  - lib
115
141
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -139,10 +165,10 @@ specification_version: 3
139
165
  summary: Watchr + Rspec + Parallel Spec = Uberspec
140
166
  test_files:
141
167
  - spec/spec_helper.rb
142
- - spec/uberspec/parallel_spec.rb
143
- - spec/uberspec/notify_spec.rb
144
- - spec/uberspec/rspec_spec.rb
168
+ - spec/uberspec/config_spec.rb
145
169
  - spec/uberspec/notify/growl_spec.rb
146
170
  - spec/uberspec/notify/lib_notify_spec.rb
147
- - spec/uberspec/config_spec.rb
171
+ - spec/uberspec/notify_spec.rb
172
+ - spec/uberspec/parallel_spec.rb
173
+ - spec/uberspec/rspec_spec.rb
148
174
  - spec/uberspec_spec.rb
data/.gitignore DELETED
@@ -1,21 +0,0 @@
1
- ## MAC OS
2
- .DS_Store
3
-
4
- ## TEXTMATE
5
- *.tmproj
6
- tmtags
7
-
8
- ## EMACS
9
- *~
10
- \#*
11
- .\#*
12
-
13
- ## VIM
14
- *.swp
15
-
16
- ## PROJECT::GENERAL
17
- coverage
18
- rdoc
19
- pkg
20
-
21
- ## PROJECT::SPECIFIC