bones-rspec 1.1.0 → 2.0.0

data/.gitignore

@@ -0,0 +1,18 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   Bones {
+#     ignore_file  '.gitignore'
+#   }
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/History.txt

@@ -1,3 +1,8 @@
+== 2.0.0 / 2011-02-05
+
+Major Enhancements
+  - Both versions of RSpec are handled by this plugin (versions 1.3 and 2.0)
+
 == 1.1.0 / 2010-10-26
 
 * 1 minor enhancement

data/{README.txt → README.md}

@@ -1,20 +1,35 @@
-bones-rspec
-    by Tim Pease
-    http://rubygems.org/gems/bones-rspec
+# bones-rspec
 
-== DESCRIPTION:
+A plugin for [Mr Bones](http://rugyems.org/gems/bones) that incorporates rake
+tasks for running RSpec style tests.
+
+## DESCRIPTION
 
 The rspec package for Mr Bones provides tasks to incorporate rspec tests into
 bones based projects. It also works in tandem with the bones-rcov plugin to
 run code coverage over your specs.
 
-== INSTALL:
+This plugin is compatible with both RSpec version 1 and RSpec version 2. If
+you have both RSpec versions installed this plugin will favor the newer
+version of RSpec. To force use of the older RSpec version, use the **gem**
+command in your Rakefile to load the appropriate version.
+
+    gem 'rspec', '~> 1.3.0'
+
+    Bones {
+      name   'my-awesome-gem'
+      ...
+    }
+
+The gem command must appear before the Bones configuration block.
+
+## INSTALL
 
-  gem install bones-rspec
+    gem install bones-rspec
 
-== LICENSE:
+#### LICENSE
 
-(The MIT License)
+*The MIT License*
 
 Copyright (c) 2010
 

data/Rakefile

@@ -10,10 +10,9 @@ Bones {
   authors      'Tim Pease'
   email        'tim.pease@gmail.com'
   url          'http://github.com/TwP/bones-rspec'
-  ignore_file  '.gitignore'
 
   depend_on    'bones'
-  depend_on    'rspec', '~> 1'
+  depend_on    'rspec'
 
   use_gmail
 }

data/lib/bones/plugins/rspec.rb

@@ -0,0 +1,41 @@
+
+module Bones::Plugins::Rspec
+  include ::Bones::Helpers
+  extend self
+
+  def initialize_rspec
+    gemspec = Gem.loaded_specs['rspec']
+
+    if gemspec
+      version = gemspec.version.segments.first
+      path = File.expand_path("../../rspec/rspec_version#{version}", __FILE__)
+      require path
+
+      @delegate = Bones::Rspec.const_get "RspecVersion#{version}"
+      have?(:rspec) { @delegate.initialize_rspec }
+    else
+      version = 2
+      while (version > 0)
+        path = File.expand_path("../../rspec/rspec_version#{version}", __FILE__)
+        require path
+
+        @delegate = Bones::Rspec.const_get "RspecVersion#{version}"
+        have?(:rspec) { @delegate.initialize_rspec }
+        break if have? :rspec
+        version -= 1
+      end
+    end
+  end
+
+  def post_load
+    return unless have? :rspec
+    @delegate.post_load
+  end
+
+  def define_tasks
+    return unless have? :rspec
+    @delegate.define_tasks
+  end
+
+end  # Bones::Plugins::Rspec
+

data/lib/bones/rspec/rspec_version1.rb

@@ -0,0 +1,87 @@
+
+module Bones::Rspec
+
+  module RspecVersion1
+    include ::Bones::Helpers
+    extend self
+
+    def initialize_rspec
+      require 'spec/rake/spectask'
+
+      ::Bones.config {
+        desc 'Configuration settings for the RSpec test framework.'
+        spec {
+          files  FileList['spec/**/*_spec.rb'], :desc => <<-__
+            The list of spec files to run. This defaults to all the ruby fines
+            in the 'spec' directory that end with '_spec.rb' as their filename.
+          __
+
+          opts [], :desc => <<-__
+            An array of command line options that will be passed to the rspec
+            command when running your tests. See the RSpec help documentation
+            either online or from the command line by running 'spec --help'.
+
+            Options can also be defined in the "spec/spec.opts" file. Please
+            leave this opts array empty if you prefer to use the spec.opts file
+            instead. However, both can be used in conjunction; watch out for
+            options colliions.
+          __
+        }
+      }
+      return true
+
+    rescue LoadError
+      return false
+    end
+
+    def post_load
+      config = ::Bones.config
+      have?(:rspec) { !config.spec.files.to_a.empty?  }
+    end
+
+    def define_tasks
+      config = ::Bones.config
+
+      namespace :spec do
+        desc 'Run all specs with basic output'
+        Spec::Rake::SpecTask.new(:run) do |t|
+          t.ruby_opts = config.ruby_opts
+          t.spec_opts = config.spec.opts unless config.spec.opts.empty?
+          t.spec_files = config.spec.files
+          t.libs += config.libs
+        end
+
+        if have? :rcov
+          require 'spec/rake/verify_rcov'
+
+          desc 'Run all specs with Rcov'
+          Spec::Rake::SpecTask.new(:rcov) do |t|
+            t.ruby_opts = config.ruby_opts
+            t.spec_opts = config.spec.opts unless config.spec.opts.empty?
+            t.spec_files = config.spec.files
+            t.libs += config.libs
+            t.rcov = true
+            t.rcov_dir = config.rcov.dir
+            t.rcov_opts.concat(config.rcov.opts)
+          end
+
+          RCov::VerifyTask.new(:verify) do |t|
+            t.threshold = config.rcov.threshold
+            t.index_html = File.join(config.rcov.dir, 'index.html')
+            t.require_exact_threshold = config.rcov.threshold_exact
+          end
+
+          task :verify => :rcov
+          remove_desc_for_task %w(spec:clobber_rcov)
+        end
+      end  # namespace :spec
+
+      desc 'Alias to spec:run'
+      task :spec => 'spec:run'
+
+      task :clobber => 'spec:clobber_rcov' if have? :rcov
+    end
+
+  end  # RspecVersion1
+end  # Bones::Rspec
+

data/lib/bones/rspec/rspec_version2.rb

@@ -0,0 +1,85 @@
+
+module Bones::Rspec
+
+  module RspecVersion2
+    include ::Bones::Helpers
+    extend self
+
+    def initialize_rspec
+      require 'rspec/core/rake_task'
+
+      ::Bones.config {
+        desc 'Configuration settings for the RSpec test framework.'
+        spec {
+          files  'spec/**/*_spec.rb', :desc => <<-__
+            Glob pattern used to match spec files to run. This defaults to all
+            the ruby fines in the 'spec' directory that end with '_spec.rb' as
+            their filename.
+          __
+
+          opts [], :desc => <<-__
+            An array of command line options that will be passed to the rspec
+            command when running your tests. See the RSpec help documentation
+            either online or from the command line by running 'spec --help'.
+
+            Options can also be defined in the "spec/spec.opts" file. Please
+            leave this opts array empty if you prefer to use the spec.opts file
+            instead. However, both can be used in conjunction; watch out for
+            options colliions.
+          __
+        }
+      }
+      return true
+
+    rescue LoadError
+      return false
+    end
+
+    def post_load
+      config = ::Bones.config
+      have?(:rspec) { !FileList[config.spec.files].to_a.empty?  }
+    end
+
+    def define_tasks
+      config = ::Bones.config
+
+      namespace :spec do
+        desc 'Run all specs with basic output'
+        ::RSpec::Core::RakeTask.new(:run) do |t|
+          t.ruby_opts = config.ruby_opts
+          t.rspec_opts = config.spec.opts unless config.spec.opts.empty?
+          t.pattern = config.spec.files
+        end
+
+        if have? :rcov
+          desc 'Run all specs with Rcov'
+          ::RSpec::Core::RakeTask.new(:rcov) do |t|
+            t.ruby_opts = config.ruby_opts
+            t.rspec_opts = config.spec.opts unless config.spec.opts.empty?
+            t.pattern = config.spec.files
+
+            t.rcov = true
+            t.rcov_path = config.rcov.path
+
+            rcov_opts = []
+            rcov_opts.concat config.rcov.opts
+            rcov_opts << '--output' << config.rcov.dir if config.rcov.dir
+
+            t.rcov_opts = rcov_opts
+          end
+
+          task :clobber_rcov do
+            rm_r config.rcov.dir rescue nil
+          end
+        end
+      end  # namespace :spec
+
+      desc 'Alias to spec:run'
+      task :spec => 'spec:run'
+
+      task :clobber => 'spec:clobber_rcov' if have? :rcov
+    end
+
+  end  # RspecVersion2
+end  # Bones::Rspec
+

data/version.txt

@@ -1 +1 @@
-1.1.0
+2.0.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bones-rspec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -06:00
+date: 2011-02-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
         - 3
-        - 5
-        - 0
-        version: 3.5.0
+        - 6
+        - 3
+        version: 3.6.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 25
         segments: 
         - 1
-        version: "1"
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,18 +58,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
         - 3
-        - 5
-        - 0
-        version: 3.5.0
+        - 6
+        - 3
+        version: 3.6.3
   type: :development
   version_requirements: *id003
 description: |-
-  The rspec package for Mr Bones provides tasks to incorporate rspec tests into
-  bones based projects. It also works in tandem with the bones-rcov plugin to
-  run code coverage over your specs.
+  A plugin for [Mr Bones](http://rugyems.org/gems/bones) that incorporates rake
+  tasks for running RSpec style tests.
 email: tim.pease@gmail.com
 executables: []
 
@@ -75,13 +76,14 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- README.txt
-- version.txt
 files: 
+- .gitignore
 - History.txt
-- README.txt
+- README.md
 - Rakefile
-- lib/bones/plugins/spec.rb
+- lib/bones/plugins/rspec.rb
+- lib/bones/rspec/rspec_version1.rb
+- lib/bones/rspec/rspec_version2.rb
 - version.txt
 has_rdoc: true
 homepage: http://github.com/TwP/bones-rspec
@@ -90,7 +92,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,6 +119,6 @@ rubyforge_project: bones-rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: The rspec package for Mr Bones provides tasks to incorporate rspec tests into bones based projects
+summary: A plugin for [Mr Bones](http://rugyems.
 test_files: []
 

data/lib/bones/plugins/spec.rb

@@ -1,84 +0,0 @@
-
-module Bones::Plugins::Spec
-  include ::Bones::Helpers
-  extend self
-
-  def initialize_spec
-    require 'spec/rake/spectask'
-    have?(:spec) { true }
-
-    ::Bones.config {
-      desc 'Configuration settings for the RSpec test framework.'
-      spec {
-        files  FileList['spec/**/*_spec.rb'], :desc => <<-__
-          The list of spec files to run. This defaults to all the ruby fines
-          in the 'spec' directory that end with '_spec.rb' as their filename.
-        __
-
-        opts [], :desc => <<-__
-          An array of command line options that will be passed to the spec
-          command when running your tests. See the RSpec help documentation
-          either online or from the command line by running 'spec --help'.
-
-          Options can also be defined in the "spec/spec.opts" file. Please
-          leave this opts array empty if you prefer to use the spec.opts file
-          instead.
-        __
-      }
-    }
-  rescue LoadError
-    have?(:spec) { false }
-  end
-
-  def post_load
-    return unless have? :spec
-    config = ::Bones.config
-    have?(:spec) { !config.spec.files.to_a.empty?  }
-  end
-
-  def define_tasks
-    return unless have? :spec
-    config = ::Bones.config
-
-    namespace :spec do
-      desc 'Run all specs with basic output'
-      Spec::Rake::SpecTask.new(:run) do |t|
-        t.ruby_opts = config.ruby_opts
-        t.spec_opts = config.spec.opts unless config.spec.opts.empty?
-        t.spec_files = config.spec.files
-        t.libs += config.libs
-      end
-
-      if have? :rcov
-        require 'spec/rake/verify_rcov'
-
-        desc 'Run all specs with Rcov'
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.ruby_opts = config.ruby_opts
-          t.spec_opts = config.spec.opts unless config.spec.opts.empty?
-          t.spec_files = config.spec.files
-          t.libs += config.libs
-          t.rcov = true
-          t.rcov_dir = config.rcov.dir
-          t.rcov_opts.concat(config.rcov.opts)
-        end
-
-        RCov::VerifyTask.new(:verify) do |t|
-          t.threshold = config.rcov.threshold
-          t.index_html = File.join(config.rcov.dir, 'index.html')
-          t.require_exact_threshold = config.rcov.threshold_exact
-        end
-
-        task :verify => :rcov
-        remove_desc_for_task %w(spec:clobber_rcov)
-      end
-    end  # namespace :spec
-
-    desc 'Alias to spec:run'
-    task :spec => 'spec:run'
-
-    task :clobber => 'spec:clobber_rcov' if have? :rcov
-  end
-
-end  # module Bones::Plugins::Spec
-