Skip to content

Commit

Permalink
foo generator
Browse files Browse the repository at this point in the history
  • Loading branch information
aslakhellesoy committed Feb 23, 2010
1 parent 39b37e9 commit d01f8c8
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 deletions.
1 change: 1 addition & 0 deletions cucumber-rails.gemspec
Expand Up @@ -41,6 +41,7 @@ Gem::Specification.new do |s|
"lib/cucumber/rails/test_unit.rb",
"lib/cucumber/rails/world.rb",
"lib/cucumber/web/tableish.rb",
"lib/generators/cucumber/cucumber_generator.rb",
"lib/generators/cucumber/feature/USAGE",
"lib/generators/cucumber/feature/feature_base.rb",
"lib/generators/cucumber/feature/feature_generator.rb",
Expand Down
2 changes: 1 addition & 1 deletion features/step_definitions/cucumber_rails_steps.rb
@@ -1,7 +1,7 @@
require 'cucumber/rails/rvm'

Given /^I'm using Ruby (.*) and Rails (.*)$/ do |ruby_name, rails_version|
@rvm = Cucumber::Rails::Rvm.new(ruby_name, rails_version, nil)
@rvm = Cucumber::Rails::Rvm.new(ruby_name, rails_version, nil, self)
end

Given /^a Rails app "(.*)"$/ do |app_name|
Expand Down
17 changes: 9 additions & 8 deletions lib/cucumber/rails/rvm.rb
Expand Up @@ -9,14 +9,14 @@ def each(&proc)
RVMS['rubies'].each do |ruby_name, ruby_version|
gems = RVMS['gems']
RVMS['rails_gems'].each do |rails_version, rails_gems|
proc.call(new(ruby_name, rails_version, gems))
proc.call(new(ruby_name, rails_version, gems + rails_gems, nil))
end
end
end
end

def initialize(ruby_name, rails_version, gems_with_version)
@ruby_version, @rails_version, @gems_with_version = RVMS['rubies'][ruby_name], rails_version, gems_with_version
def initialize(ruby_name, rails_version, gems_with_version, world)
@ruby_version, @rails_version, @gems_with_version, @world = RVMS['rubies'][ruby_name], rails_version, gems_with_version, world
raise "NO RUBY VERSION FOUND FOR #{ruby_name}. Check your rvms.yml" if @ruby_version.nil?
end

Expand All @@ -31,11 +31,12 @@ def run(cmd)
end

def rvm(cmd)
rvm_cmd = "rvm #{@ruby_version}%cucumber-rails-#{@rails_version} #{cmd}"
# puts "====="
# puts rvm_cmd
# puts "-----"
# puts @last_stdout
rvm_cmd = "rvm #{@ruby_version} #{cmd}"
if @world
@world.announce(rvm_cmd)
else
puts(rvm_cmd)
end
run(rvm_cmd)
raise "STDERR:\n#{@last_stderr}" if @last_exit_status && @last_exit_status != 0
end
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/cucumber/feature/feature_generator.rb
Expand Up @@ -2,7 +2,7 @@
require File.join(File.dirname(__FILE__), 'feature_base')

module Cucumber
module Generators
# module Generators
class FeatureGenerator < Rails::Generators::NamedBase

include Cucumber::Generators::FeatureBase
Expand Down Expand Up @@ -35,5 +35,5 @@ def self.source_root
end

end
end
# end
end
7 changes: 4 additions & 3 deletions lib/generators/cucumber/skeleton/skeleton_generator.rb
@@ -1,10 +1,11 @@
puts "HALOOOOOOOOOOOOOOOOO"
require File.join(File.dirname(__FILE__), 'skeleton_base')

module Cucumber
module Generators
# module Generators
class SkeletonGenerator < Rails::Generators::Base

include SkeletonBase
include Cucumber::Generators::SkeletonBase

DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])

Expand Down Expand Up @@ -58,5 +59,5 @@ def driver_from_options
end

end
end
# end
end
3 changes: 3 additions & 0 deletions lib/generators/foo/foo_generator.rb
@@ -0,0 +1,3 @@
require 'rails/generators'

puts "CUCUMBER GENERATOR"
2 changes: 1 addition & 1 deletion rvm.yml
@@ -1,6 +1,6 @@
rubies:
1.8.7: ruby-1.8.7-tv1_8_7_174
1.9.1: ruby-1.9.1-p378
# 1.9.1: ruby-1.9.1-p378
gems:
- aruba jeweler sqlite3-ruby capybara webrat spork database_cleaner cucumber rspec rspec-rails
rails_gems:
Expand Down

0 comments on commit d01f8c8

Please sign in to comment.