cucumber-nagios 0.8.4 → 0.8.5

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'rake'
+require 'lib/cucumber/nagios/version'
 
 begin
   require 'jeweler'
@@ -13,6 +14,7 @@ begin
     gem.homepage = "http://cucumber-nagios.org/"
     gem.authors = ["Lindsay Holmwood"]
     gem.has_rdoc = false
+    gem.version = Cucumber::Nagios::VERSION
 
     gem.add_dependency('cucumber', '>= 0.10.0')
     gem.add_dependency('rspec', '>= 2.3.0')

data/bin/cucumber-nagios-gen

@@ -3,12 +3,24 @@
 require 'rubygems'
 require 'templater'
 require 'cucumber/nagios'
+require 'highline/import'
 
 module CucumberNagiosGenerators
 
   extend Templater::Manifold
 
   class ProjectGenerator < Templater::Generator
+    def initialize(destination_root, options = {}, *args)
+      super
+      @readme = []
+      @readme << "<%= color('Your new cucumber-nagios project has been generated!', :green) %>"
+      @readme << ""
+      @readme << "Next, install the necessary RubyGems with:"
+      @readme << ""
+      @readme << "    <%= color('bundle install', :yellow) %>"
+      @readme << ""
+    end
+
     def self.source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'project')
     end
@@ -20,36 +32,57 @@ module CucumberNagiosGenerators
 
     @root = Pathname.new(File.dirname(__FILE__)).parent.join('lib/cucumber/nagios')
 
-    desc "Generate a new self-contained cucumber-nagios project."
+    desc "Generate a cucumber-nagios project."
     first_argument :name, :required => true, :desc => "Project name"
 
     file '.gitignore', '.gitignore'
     file '.bzrignore', '.bzrignore'
 
     directory :steps, @root.join('steps'), 'features/steps'
-    directory :features, @root.join('support'), 'features/support', :after => :readme
+    directory :features, @root.join('support'), 'features/support'
 
     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:
-
-  $ bundle install
-
-It's *highly* recommended you version control your project
+    def after_run
+      git_init
+      readme
+    end
 
-  $ git init ; git add .
+    def git_init
+      if system("which git > /dev/null 2>&1")
+        Dir.chdir(destination_root) do
+          system("git init -q")
+          system("git add .")
+          system("git commit -qm 'Initial commit to #{name}.' .")
+        end
+
+        @readme << "Your project has been initialised as a git repository."
+        @readme << ""
+      else
+        @readme << "It's <%= color('strongly', :red) %> recommended you version control your project:"
+        @readme << ""
+        @readme << "    # Install git using your package manager."
+        @readme << "    <%= color('git init', :yellow) %>"
+        @readme << "    <%= color('git add .', :yellow) %>"
+        @readme << "    <%= color('git commit -m \"Initial commit to #{name}.\" .', :yellow) %>"
+        @readme << ""
+      end
+    end
 
-      README
+    def readme
+      puts
+      @readme.each do |line|
+        if line =~ /^\s*$/
+          puts line
+        else
+          say(line)
+        end
+      end
+      puts unless @readme.last =~ /^\s*$/
     end
 
   end
 
-  desc "Generate a cucumber-nagios project."
   add :project, ProjectGenerator
 
 
@@ -60,8 +93,10 @@ It's *highly* recommended you version control your project
     end
 
     desc <<-DESC
-      Generate a cucumber feature. Takes a two arguments:
-        cucumber-nagios-gen feature <site-name> <feature-name>
+      Generate a Cucumber feature.
+      \n
+      Usage: cucumber-nagios-gen feature <site> <feature>
+        e.g. cucumber-nagios-gen feature google.com.au search
     DESC
 
     first_argument :site, :required => true, :desc => "Site name"
@@ -79,9 +114,10 @@ It's *highly* recommended you version control your project
 
   end
 
-  desc "Generators for a cucumber-nagios project"
   add :feature, FeatureGenerator
 
+  desc "Generators for cucumber-nagios projects."
+
 end
 
 CucumberNagiosGenerators.run_cli Dir.pwd, 'cucumber-nagios-gen', Cucumber::Nagios::VERSION, ARGV

data/cucumber-nagios.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-nagios}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lindsay Holmwood"]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "TODO",
-     "VERSION",
      "bin/cucumber-nagios-gen",
      "cucumber-nagios.gemspec",
      "features/commands.feature",

data/lib/cucumber/nagios/version.rb

@@ -1,5 +1,5 @@
 module Cucumber
   module Nagios
-    VERSION = '0.7.0'
+    VERSION = '0.8.5'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-nagios
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -180,7 +180,6 @@ files:
 - README.md
 - Rakefile
 - TODO
-- VERSION
 - bin/cucumber-nagios-gen
 - cucumber-nagios.gemspec
 - features/commands.feature

data/VERSION

@@ -1 +0,0 @@
-0.8.4