Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Refactoring the gemspecs and Rakefile, updating to the Cucubmer 0.7.2

  • Loading branch information...
commit f10b57bec8222bd34ed069db34c04eb8c7af5d46 1 parent 163e854
@pk pk authored
Showing with 25 additions and 111 deletions.
  1. +1 −34 Rakefile
  2. +1 −1  lib/merb_cucumber/world/webrat.rb
  3. +23 −76 merb_cucumber.gemspec
View
35 Rakefile
@@ -1,37 +1,4 @@
-require "rubygems"
-require "rake"
-
-# Assume a typical dev checkout to fetch the current merb-core version
-require File.expand_path('../../merb/merb-core/lib/merb-core/version', __FILE__)
-
-# Load this library's version information
-require File.expand_path('../lib/merb_cucumber/version', __FILE__)
-
-begin
- require 'jeweler'
-
- Jeweler::Tasks.new do |gemspec|
- gemspec.version = Merb::Cucumber::VERSION
- gemspec.name = "merb_cucumber"
- gemspec.description = "Cucumber integration for Merb"
- gemspec.summary = "Cucumber integration for Merb"
- gemspec.authors = [ "Roman Gonzalez", "David Leal", "Jacques Crocker" ]
- gemspec.email = "merbjedi@gmail.com"
- gemspec.homepage = "http://github.com/merb/merb_cucumber"
- gemspec.files = %w(CHANGELOG LICENSE Rakefile README.textile TODO Generators) + Dir['{lib,spec}/**/*']
- # Runtime dependencies
- gemspec.add_dependency "merb-core", ">= 1.1.0.pre"
- gemspec.add_dependency "cucumber", ">= 0.4.0"
- gemspec.add_dependency "merb-gen", ">= 1.1.0.pre"
- # Development dependencies
- gemspec.add_development_dependency "rspec", ">= 1.2.9"
- end
-
- Jeweler::GemcutterTasks.new
-
-rescue LoadError
- puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'rake'
require 'spec/rake/spectask'
Spec::Rake::SpecTask.new(:spec) do |spec|
View
2  lib/merb_cucumber/world/webrat.rb
@@ -1,6 +1,6 @@
require File.join(File.dirname(__FILE__), 'base')
require 'webrat'
-require 'cucumber/webrat/element_locator'
+require 'cucumber/web/tableish'
module Merb
module Test
View
99 merb_cucumber.gemspec
@@ -1,82 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+#!/usr/bin/env gem build
# -*- encoding: utf-8 -*-
-Gem::Specification.new do |s|
- s.name = %q{merb_cucumber}
- s.version = "0.6"
+require 'date'
+require 'lib/merb_cucumber/version'
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Roman Gonzalez", "David Leal", "Jacques Crocker"]
- s.date = %q{2009-11-10}
- s.description = %q{Cucumber integration for Merb}
- s.email = %q{merbjedi@gmail.com}
- s.extra_rdoc_files = [
- "LICENSE",
- "README.textile"
- ]
- s.files = [
- "CHANGELOG",
- "Generators",
- "LICENSE",
- "README.textile",
- "Rakefile",
- "TODO",
- "lib/generators/cucumber.rb",
- "lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb",
- "lib/generators/cucumber/templates/config/cucumber.yml",
- "lib/generators/cucumber/templates/features/authentication/login.feature",
- "lib/generators/cucumber/templates/features/authentication/steps/login_steps.rb",
- "lib/generators/cucumber/templates/features/steps/result_steps.rb",
- "lib/generators/cucumber/templates/features/steps/webrat_steps.rb",
- "lib/generators/cucumber/templates/features/support/env.rb",
- "lib/generators/cucumber/templates/lib/tasks/cucumber.rake",
- "lib/generators/feature.rb",
- "lib/generators/feature/templates/feature.rbt",
- "lib/generators/feature/templates/feature_steps.rb",
- "lib/merb_cucumber.rb",
- "lib/merb_cucumber/helpers/activerecord.rb",
- "lib/merb_cucumber/helpers/datamapper.rb",
- "lib/merb_cucumber/version.rb",
- "lib/merb_cucumber/world/base.rb",
- "lib/merb_cucumber/world/simple.rb",
- "lib/merb_cucumber/world/webrat.rb",
- "spec/cucumber_setup_generator_spec.rb",
- "spec/feature_generator_spec.rb",
- "spec/spec_helper.rb"
- ]
- s.homepage = %q{http://github.com/merb/merb_cucumber}
- s.rdoc_options = ["--charset=UTF-8"]
- s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.5}
- s.summary = %q{Cucumber integration for Merb}
- s.test_files = [
- "spec/cucumber_setup_generator_spec.rb",
- "spec/feature_generator_spec.rb",
- "spec/spec_helper.rb"
- ]
+Gem::Specification.new do |gem|
+ gem.name = 'merb_cucumber'
+ gem.version = Merb::Cucumber::VERSION.dup
+ gem.authors = ["Roman Gonzalez", "David Leal", "Jacques Crocker"]
+ gem.date = Date.today.to_s
+ gem.email = 'merbjedi@gmail.com'
+ gem.homepage = 'http://github.com/merb/merb_cucumber'
+ gem.summary = 'Cucumber integration for Merb'
+ gem.description = gem.summary
- if s.respond_to? :specification_version then
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
- s.specification_version = 3
+ gem.has_rdoc = true
+ gem.require_paths = ['lib']
+ gem.extra_rdoc_files = ['README.textile', 'LICENSE', 'TODO']
+ gem.files = Dir['Rakefile', '{lib,spec}/**/*', 'README*', 'LICENSE*', 'TODO*', 'Generators'] & `git ls-files -z`.split("\0")
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<merb-core>, [">= 1.0.15"])
- s.add_runtime_dependency(%q<cucumber>, [">= 0.4.0"])
- s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
- s.add_development_dependency(%q<merb-gen>, [">= 1.0.15"])
- else
- s.add_dependency(%q<merb-core>, [">= 1.0.15"])
- s.add_dependency(%q<cucumber>, [">= 0.4.0"])
- s.add_dependency(%q<rspec>, [">= 1.2.9"])
- s.add_dependency(%q<merb-gen>, [">= 1.0.15"])
- end
- else
- s.add_dependency(%q<merb-core>, [">= 1.0.15"])
- s.add_dependency(%q<cucumber>, [">= 0.4.0"])
- s.add_dependency(%q<rspec>, [">= 1.2.9"])
- s.add_dependency(%q<merb-gen>, [">= 1.0.15"])
- end
+ gem.add_dependency 'merb-core', '>= 1.1.0'
+ gem.add_dependency 'merb-gen', '>= 1.1.0'
+ gem.add_dependency 'cucumber', '>= 0.7.2'
+ # Until we fix with the cucumber guys the cucumber-merb
+ # because element matchers were removed from cucumber.
+ gem.add_dependency 'cucumber-rails'
+ gem.add_development_dependency 'rspec', '>= 1.2.9'
end
-
Please sign in to comment.
Something went wrong with that request. Please try again.