cucumber-puppet 0.0.4 → 0.0.5

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:build: 
-:patch: 4
+---
+:build:
+:patch: 5
 :minor: 0
 :major: 0

data/bin/cucumber-puppet

@@ -1,20 +1,107 @@
 #!/usr/bin/env ruby
 
-unless ARGV[0]
-  puts "Usage: cucumber-puppet [options] <feature> [<feature> <feature> ...]"
-  exit 0
+require 'rubygems'
+require 'cucumber-puppet'
+require 'cucumber-puppet/helper'
+require 'optparse'
+
+include CucumberPuppet::Helper
+
+options = []
+opts = OptionParser.new do |o|
+  o.banner = "Usage: cucumber-puppet [options] <feature> [<feature> ...]"
+
+  o.on('-b', '--backtrace', 'Show full backtrace for all errors') do
+    options << "--backtrace "
+  end
+
+  o.on('-e', '--exclude PATTERN',
+       'Exclude files matching PATTERN') do |pattern|
+    options << "--exclude #{pattern}"
+  end
+
+  o.on('-f', '--format FORMAT',
+       'How to format features (default: pretty)',
+       '  see "cucumber --help" for details') do |format|
+    options << "--format #{format}"
+  end
+
+  o.on('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+
+  o.on('-n', '--name NAME',
+       'Only run matching feature elements',
+       '  see "cucumber --help" for details') do |n|
+    options << "--name #{n}"
+  end
+
+  o.on('-o', '--out FILE|DIR',
+       'Write output to file/directory',
+       '  see "cucumber --help" for details') do |f|
+    options << "--out #{f}"
+  end
+
+  o.on('-t', '--tags TAG_EXPRESSION',
+       'Only run features/scenarios matching expr',
+       '  see "cucumber --help" for details') do |t|
+    options << "--tags #{t}"
+  end
+
+  o.on('-v', '--verbose', 'Show files and features loaded') do
+    options << "--verbose"
+  end
+
+  o.on('--version', 'Show version number') do
+    puts CucumberPuppet::VERSION
+    exit
+  end
+
+  o.on('-x', '--expand', 'Expand Scenario Outline Tables in output') do
+    options << "--expand"
+  end
 end
 
-command = ""
-command << "cucumber "
-command << "--strict "
+begin
+  opts.parse!
+rescue OptionParser::InvalidOption
+  puts opts
+  exit 1
+end
 
-# XXX be more creative, finding this directory
-features_dir = "features"
-if File.directory?(features_dir)
-  command << "--require #{features_dir} "
+unless ARGV[0]
+  puts opts
+  exit 1
 end
 
-command << ARGV.join(' ')
+command = []
+command << "cucumber --strict"
+
+cwd = Dir.getwd
+root = find_root(cwd)
+command << "--require #{root}/features"
+command << options
+
+abs_root = File.expand_path(root)
+ARGV.each do |f|
+  if not File.exists?(f)
+    puts "No such file or directory: #{f}"
+    exit 1
+  end
+
+  abs_f = File.expand_path(f).split('/')
+  until abs_f.empty?
+    if abs_f.last == 'features'
+      command << "--require " + abs_f.join('/')
+      break
+    elsif abs_f.join('/') == abs_root
+      break
+    end
+    abs_f.pop
+  end
+
+  command << f
+end
 
-system(command) ? exit(0) : exit(1)
+system(command.join(' ')) ? exit(0) : exit(1)

data/bin/cucumber-puppet-gen

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'cucumber-puppet'
+require 'cucumber-puppet/helper'
 require 'templater'
 
 module CucumberPuppetGenerators
@@ -9,12 +10,14 @@ module CucumberPuppetGenerators
   extend Templater::Manifold
 
   class FeatureGenerator < Templater::Generator
+    include CucumberPuppet::Helper
+
     def source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'feature')
     end
 
     desc <<-DESC
-      Generate a cucumber feature.
+      Generate a cucumber feature
         cucumber-puppet-gen feature <module-name> <feature-name>
     DESC
 
@@ -22,24 +25,29 @@ module CucumberPuppetGenerators
     second_argument :feature, :required => true, :desc => "Feature name"
 
     template :feature do |template|
+      destdir = find_destdir(mod)
+
       template.source = "%feature_name%.feature"
-      template.destination = "features/modules/#{mod}/#{feature}.feature"
+      template.destination = "#{destdir}/#{feature}.feature"
     end
   end
 
   class TestcaseGenerator < Templater::Generator
+    extend CucumberPuppet::Helper
+
     def source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'testcase')
     end
 
     desc <<-DESC
-      Generate a test case for cucumber-puppet's test suite
+      Generate a test case for the test suite
         cucumber-puppet-gen testcase
     DESC
 
-    file('testcase.feature', 'testcase.feature', 'features/testcase.feature')
-    file('testcase.rb', 'testcase.rb', 'features/support/testcase.rb')
-    file('site.pp', 'site.pp')
+    destdir = find_destdir('testcase')
+    file('testcase.feature', 'testcase.feature', "#{destdir}/testcase.feature")
+    file('testcase.rb', 'testcase.rb', "#{destdir}/support/testcase.rb")
+    file('site.pp', 'site.pp', "#{destdir}/site.pp")
   end
 
   class WorldGenerator < Templater::Generator
@@ -47,12 +55,9 @@ module CucumberPuppetGenerators
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'world')
     end
 
-    def destination_root
-      File.join(@destination_root, 'features')
-    end
 
     desc <<-DESC
-      Generate cucumber step and support files.
+      Generate cucumber step and support files
         cucumber-puppet-gen world
     DESC
 
@@ -60,11 +65,11 @@ module CucumberPuppetGenerators
 
     template :version do |template|
       template.source = "support/world.rb"
-      template.destination = "support/world.rb"
+      template.destination = "features/support/world.rb"
     end
 
-    directory('steps', 'steps')
-    file('support/hooks.rb', 'support/hooks.rb')
+    directory('steps', 'steps', 'features/steps')
+    file('hooks.rb', 'support/hooks.rb', 'features/support/hooks.rb')
   end
 
   desc "Generators for cucumber-puppet"

data/lib/cucumber-puppet/helper.rb

@@ -0,0 +1,65 @@
+require 'cucumber-puppet'
+
+module CucumberPuppet::Helper
+  # Finds the root of the puppet directory tree according to puppet's
+  # directory naming convention. Relevant sub-trees are:
+  # - <puppetdir>/features/modules/$module
+  # - <puppetdir>/modules/$module/features
+  # In case no tree is identified, assumes cwd is <puppetdir>.
+  def find_root(cwd)
+    path = cwd.split('/')
+
+    if cwd.match('features$') and not cwd.match("modules/")
+      # <puppetdir>/features
+      path.pop
+    elsif cwd.match('features/modules$')
+      # <puppetdir>/features/modules
+      path.pop(2)
+    elsif cwd.match('features/modules/[^/]*$')
+      # <puppetdir>/features/modules/$module
+      path.pop(3)
+    elsif cwd.match('modules$')
+      # <puppetdir>/modules
+      path.pop
+    elsif cwd.match('/modules/[^/]*$')
+      # <puppetdir>/modules/$module
+      path.pop(2)
+    elsif cwd.match('/modules/[^/]*/features$')
+      # <puppetdir>/modules/$module/features
+      path.pop(3)
+    end
+
+    path.join('/')
+  end
+
+  # Finds the destination path for feature files to install according to
+  # puppet's directory naming convention.
+  def find_destdir(mod)
+    cwd = Dir.getwd
+
+    if cwd.match("features$") and not cwd.match("modules/")
+      # <puppetdir>/features
+      destdir = "modules/#{mod}"
+    elsif cwd.match("features/modules$")
+      # <puppetdir>/features/modules
+      destdir = mod
+    elsif cwd.match("features/modules/#{mod}$")
+      # <puppetdir>/features/modules/$mod
+      destdir = "."
+    elsif cwd.match("modules$")
+      # <puppetdir>/modules
+      destdir = "#{mod}/features"
+    elsif cwd.match("modules/#{mod}$")
+      # <puppetdir>/modules/$mod
+      destdir = "features"
+    elsif cwd.match("modules/#{mod}/features$")
+      # <puppetdir>/modules/$mod/features
+      destdir = "."
+    else
+      # <puppetdir>
+      destdir = "features/modules/#{mod}"
+    end
+
+    destdir
+  end
+end

data/lib/cucumber-puppet/puppet.rb

@@ -58,7 +58,6 @@ class CucumberPuppet
   end
 
   def resource(title)
-    resource = @catalog.resource(title)
-    return resource
+    @catalog.resource(title)
   end
 end

data/lib/cucumber-puppet/rake/task.rb

@@ -0,0 +1,48 @@
+# Defines a Rake task for running cucumber-puppet features.
+#
+# To create the basic task, call:
+#
+#   CucumberPuppetRakeTask.new
+#
+# This defines a task 'cucumber_puppet' that will run features in 'features'
+# and 'modules/**/features'.
+#
+# To further configure the task, you can pass a block:
+#
+#   CucumberPuppetRakeTask.new do |t|
+#     t.cucumber_opts = %w{--format progress}
+#   end
+
+class CucumberPuppetRakeTask
+  # extra options to pass to cucumber
+  attr_accessor :cucumber_opts
+
+  # an Array is preferred, so convert if String
+  def cucumber_opts=(opts)
+    @cucumber_opts = String === opts ? opts.split(' ') : opts
+  end
+
+
+  # define CucumberPuppet Rake task
+  def initialize(task_name = 'cucumber_puppet',
+                 desc = 'Run cucumber-puppet features')
+    @task_name = task_name
+    @desc = desc
+
+    yield self if block_given?
+
+    define_task
+  end
+
+  def define_task
+    desc @desc
+    task @task_name do
+      command = []
+      command << "cucumber-puppet"
+      command << cucumber_opts
+      command << "features"
+      command << Dir.glob("modules/*/features")
+      exit 1 unless system(command.join(' '))
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,18 +57,20 @@ files:
 - bin/cucumber-puppet
 - bin/cucumber-puppet-gen
 - lib/cucumber-puppet.rb
+- lib/cucumber-puppet/helper.rb
 - lib/cucumber-puppet/puppet.rb
+- lib/cucumber-puppet/rake/task.rb
 - lib/generators/feature/%feature_name%.feature
+- VERSION.yml
+- lib/generators/world/support/world.rb
+- lib/generators/world/support/hooks.rb
+- lib/generators/world/steps/user.rb
+- lib/generators/world/steps/puppet.rb
 - lib/generators/world/steps/cron.rb
+- lib/generators/world/steps/service.rb
+- lib/generators/world/steps/package.rb
 - lib/generators/world/steps/exec.rb
 - lib/generators/world/steps/file.rb
-- lib/generators/world/steps/package.rb
-- lib/generators/world/steps/puppet.rb
-- lib/generators/world/steps/service.rb
-- lib/generators/world/steps/user.rb
-- lib/generators/world/support/hooks.rb
-- lib/generators/world/support/world.rb
-- VERSION.yml
 has_rdoc: true
 homepage: http://github.com/nistude/cucumber-puppet/
 licenses: []