Permalink
Browse files

Move things around a little

  • Loading branch information...
aslakhellesoy committed Oct 2, 2010
1 parent 0e632b1 commit d8ce2f53ead206c64d8262d5526c41a37294201d
Showing with 22 additions and 24 deletions.
  1. +3 −0 .gitignore
  2. +2 −0 Gemfile
  3. +6 −1 Rakefile
  4. +1 −10 bin/cuke4duke
  5. +3 −3 cuke4duke.gemspec
  6. 0 {cuke4duke/src/main/resources → lib}/cucumber/class_support/backtrace_filter.rb
  7. 0 {cuke4duke/src/main/resources → lib}/cucumber/class_support/class_language.rb
  8. 0 {cuke4duke/src/main/resources → lib}/cucumber/clj_support/backtrace_filter.rb
  9. 0 {cuke4duke/src/main/resources → lib}/cucumber/clj_support/clj_language.rb
  10. 0 {cuke4duke/src/main/resources → lib}/cucumber/groovy_support/backtrace_filter.rb
  11. 0 {cuke4duke/src/main/resources → lib}/cucumber/groovy_support/groovy_language.rb
  12. 0 {cuke4duke/src/main/resources → lib}/cucumber/ik_support/backtrace_filter.rb
  13. 0 {cuke4duke/src/main/resources → lib}/cucumber/ik_support/ik_language.rb
  14. 0 {cuke4duke/src/main/resources → lib}/cucumber/java_support/java_analyzer.rb
  15. 0 {cuke4duke/src/main/resources → lib}/cucumber/java_support/java_snippet_generator.rb
  16. 0 {cuke4duke/src/main/resources → lib}/cucumber/java_support/java_snippet_generator_spec.rb
  17. 0 {cuke4duke/src/main/resources → lib}/cucumber/js_support/backtrace_filter.rb
  18. 0 {cuke4duke/src/main/resources → lib}/cucumber/js_support/js_language.rb
  19. 0 {cuke4duke/src/main/resources → lib}/cucumber/jvm_support/backtrace_filter.rb
  20. 0 {cuke4duke/src/main/resources → lib}/cucumber/scala_support/backtrace_filter.rb
  21. 0 {cuke4duke/src/main/resources → lib}/cucumber/scala_support/scala_analyzer.rb
  22. 0 {cuke4duke/src/main/resources → lib}/cucumber/scala_support/scala_snippet_generator.rb
  23. +7 −10 {cuke4duke/src/main/resources → lib}/cuke4duke.rb
  24. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/language_proxy.rb
  25. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/py_string_ext.rb
  26. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/scenario_ext.rb
  27. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/step_match_ext.rb
  28. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/step_mother_ext.rb
  29. 0 {cuke4duke/src/main/resources → lib}/cuke4duke/table_ext.rb
View
@@ -11,3 +11,6 @@ pkg
*.sw?
.idea
cuke4duke/test-output/
+.bundle
+.rvmrc
+Gemfile.lock
View
@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec
View
@@ -1,3 +1,8 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+Bundler::GemHelper.install_tasks
+
desc 'Make all files use UNIX (\n) line endings'
task :fix_cr_lf do
files = FileList['**/*']
@@ -10,7 +15,7 @@ task :fix_cr_lf do
end
desc 'Release'
-task :release do
+task :releaseXX do
version = IO.read('pom.xml').match(/<version>(.*)<\/version>/)[1]
Dir.chdir('cuke4duke') do
sh %{rake gemspec}
View
@@ -1,13 +1,4 @@
#!/usr/bin/env ruby
$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
-require 'cuke4duke.jar'
-require 'cuke4duke.rb'
-require 'cucumber'
-
-module Cuke4Duke
- VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION').strip
- Cucumber::VERSION << " (cuke4duke #{VERSION})"
-end
-
+require 'cuke4duke'
load Cucumber::BINARY
View
@@ -1,16 +1,16 @@
# -*- encoding: utf-8 -*-
-require 'nokogiri'
+require 'rexml/document'
Gem::Specification.new do |s|
s.name = 'cuke4duke'
- s.version = Nokogiri::XML(open('pom.xml')).xpath("//xmlns:project/xmlns:version/text()").first.content
+ s.version = REXML::XPath.first(REXML::Document.new(IO.read('pom.xml')), '//xmlns:project/xmlns:version/text()')
s.authors = ["Aslak Hellesøy"]
s.description = 'Write Cucumber Step Definitions in Java, Scala, Groovy, Rhino Javascript, Clojure or Ioke'
s.summary = "cuke4duke-#{s.version}"
s.email = 'cukes@googlegroups.com'
s.homepage = 'http://cukes.info'
- s.add_dependency 'cucumber', '~> 0.9.0'
+ s.add_dependency 'cucumber', '~> 0.9.1'
s.rubygems_version = "1.3.7"
s.files = `git ls-files -- lib`.split("\n")
@@ -1,15 +1,12 @@
-# This file is loaded before Cucumber is loaded.
require 'rubygems'
-begin
- require 'cucumber'
-rescue LoadError => e
- gem 'cucumber'
- puts 'LOADPATH'
- puts $:
- puts e.message
- puts e.backtrace
- require 'cucumber'
+require 'cucumber'
+
+module Cuke4Duke
+ VERSION = Gem::Specification.load(File.dirname(__FILE__) + '/../cuke4duke.gemspec').version
end
+require "cuke4duke-#{Cuke4Duke::VERSION}.jar"
+Cucumber::VERSION << " (cuke4duke #{Cuke4Duke::VERSION})"
+
require 'cucumber/formatter/unicode'
# Workaround to make the java code have access to the same Ruby

0 comments on commit d8ce2f5

Please sign in to comment.