cucumber-nagios 0.7.2 → 0.7.3

data/bin/cucumber-nagios-gen

@@ -18,38 +18,72 @@ module CucumberNagiosGenerators
       File.join(@destination_root, name)
     end
 
+    @root = Pathname.new(File.dirname(__FILE__)).parent.join('lib/cucumber/nagios')
+
     desc "Generate a new self-contained cucumber-nagios project."
     first_argument :name, :required => true, :desc => "Project name"
 
     file '.gitignore', '.gitignore'
     file '.bzrignore', '.bzrignore'
 
-    directory :steps, ::File.join(File.dirname(__FILE__), '..', 'lib', 'cucumber', 'nagios', 'steps'), 'features/steps'
-    directory :features, ::File.join(File.dirname(__FILE__), '..', 'lib', 'cucumber', 'nagios', 'support'), 'features/support'
+    directory :steps, @root.join('steps'), 'features/steps'
+    directory :features, @root.join('support'), 'features/support', :after => :readme
 
     glob!
 
+    def readme(action)
+      puts <<-README
+
+Your new cucumber-nagios project has been generated.
+
+To get going, you'll need to bundle gems into the project:
+
+  $ gem bundle
+
+It's *highly* recommended you version control your project:
+
+  - with Git: git init ; git add .
+  - with Bazaar: bzr init ; bzr add
+
+      README
+    end
+
   end
 
   desc "Generate a cucumber-nagios project."
   add :project, ProjectGenerator
 
-end
 
+  # feature generator
+  class FeatureGenerator < Templater::Generator
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'project', 'lib', 'generators', 'feature')
+    end
 
-CucumberNagiosGenerators.run_cli Dir.pwd, 'cucumber-nagios-gen', Cucumber::Nagios::VERSION, ARGV
+    desc <<-DESC
+      Generate a cucumber feature. Takes a two arguments:
+        bin/cucumber-nagios-gen feature <site-name> <feature-name>
+    DESC
 
-puts <<-README
-Your new cucumber-nagios project is set up.
+    first_argument :site, :required => true, :desc => "Site name"
+    second_argument :feature, :required => true, :desc => "Feature name"
 
-To get going, you'll need to bundle gems into the project:
-  
-  $ gem bundle
+    template :feature do |template|
+      template.source = "%feature_name%.feature"
+      template.destination = "features/#{site}/#{feature}.feature"
+    end
+
+    template :step do |template|
+      template.source = "%feature_name%_steps.rb"
+      template.destination = "features/#{site}/steps/#{feature}_steps.rb"
+    end
+
+  end
 
-It's highly recommended you version control your projects:
-  
-  - with Git: git init ; git add . 
-  - with Bazaar: bzr init ; bzr add 
+  desc "Generators for a cucumber-nagios project"
+  add :feature, FeatureGenerator
 
-README
+end
+
+CucumberNagiosGenerators.run_cli Dir.pwd, 'cucumber-nagios-gen', Cucumber::Nagios::VERSION, ARGV
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +10:00
+date: 2010-06-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,7 +156,6 @@ files:
 - lib/cucumber/nagios.rb
 - lib/cucumber-nagios.rb
 - lib/generators/project/bin/cucumber-nagios
-- lib/generators/project/bin/cucumber-nagios-gen
 - lib/generators/project/Gemfile
 - lib/generators/project/lib/generators/feature/%feature_name%.feature
 - lib/generators/project/lib/generators/feature/%feature_name%_steps.rb

data/lib/generators/project/bin/cucumber-nagios-gen

@@ -1,52 +0,0 @@
-#!/usr/bin/env ruby
-
-# attempt to load up the bundled gems, and give an explanatory message if we can't
-begin
-  require File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
-rescue LoadError
-  puts "You need to bundle gems into your project before you can run this."
-  puts
-  puts "To do this, make sure the 'bundler' gem is installed, and run:"
-  puts
-  puts "  $ gem bundle"
-  puts
-  exit 1
-end
-require 'templater'
-
-module CucumberNagiosGenerators
-
-  extend Templater::Manifold
-
-  # feature generator
-  class FeatureGenerator < Templater::Generator
-    def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'feature')
-    end
-
-    desc <<-DESC
-      Generate a cucumber feature. Takes a two arguments:
-        bin/cucumber-nagios-gen feature <site-name> <feature-name>
-    DESC
-
-    first_argument :site, :required => true, :desc => "Site name"
-    second_argument :feature, :required => true, :desc => "Feature name"
-
-    template :feature do |template|
-      template.source = "%feature_name%.feature"
-      template.destination = "features/#{site}/#{feature}.feature"
-    end
-
-    template :step do |template|
-      template.source = "%feature_name%_steps.rb"
-      template.destination = "features/#{site}/steps/#{feature}_steps.rb"
-    end
-
-  end
-
-  desc "Generators for a cucumber-nagios project"
-  add :feature, FeatureGenerator
-
-end
-
-CucumberNagiosGenerators.run_cli Dir.pwd, 'cucumber-nagios-gen', '0.6.3', ARGV