cucumber-nagios 0.8.9 → 0.8.10

data/bin/cucumber-nagios-gen

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'templater'
 require 'cucumber/nagios'
 require 'highline/import'
+require 'pathname'
 
 module CucumberNagiosGenerators
 
@@ -22,28 +23,23 @@ module CucumberNagiosGenerators
     end
 
     def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'project')
+      Pathname.new(__FILE__).parent.parent.join('lib', 'generators', 'project').expand_path
     end
 
     def destination_root
-      if options[:directory]
-        options[:directory].to_s
-      else
-        # takes :name from first_argument
-        File.join(@destination_root, name)
-      end
+      options[:directory] ? options[:directory].to_s : Pathname.new(@destination_root).join(name)
     end
 
-    @root = Pathname.new(File.dirname(__FILE__)).parent.join('lib/cucumber/nagios')
+    @root = Pathname.new(__FILE__).parent.parent.join('lib', 'cucumber', 'nagios').expand_path
 
     desc "Generate a cucumber-nagios project."
-    first_argument :name, :required => true, :desc => "Project name"
-    option :directory, :desc => "specify the directory to generate the project into"
+    first_argument :name,      :required => true, :desc => "Project name"
+    option         :directory, :desc => "specify the directory to generate the project into"
 
     file '.gitignore', '.gitignore'
     file '.bzrignore', '.bzrignore'
 
-    directory :steps, @root.join('steps'), 'features/steps'
+    directory :steps,    @root.join('steps'),   'features/steps'
     directory :features, @root.join('support'), 'features/support'
 
     glob!
@@ -56,8 +52,8 @@ module CucumberNagiosGenerators
     def git_init
       if system("which git > /dev/null 2>&1")
         Dir.chdir(destination_root) do
-          git_directory = File.join(destination_root, '.git')
-          if not File.directory?(git_directory)
+          git_directory = Pathname.new(destination_root).join('.git')
+          if not git_directory.directory?
             system("git init -q")
             system("git add .")
             system("git commit -qm 'Initial commit to #{name}.' .")
@@ -97,7 +93,7 @@ module CucumberNagiosGenerators
   # feature generator
   class FeatureGenerator < Templater::Generator
     def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'project', 'lib', 'generators', 'feature')
+      Pathname.new(__FILE__).parent.parent.join('lib', 'generators', 'feature').expand_path
     end
 
     desc <<-DESC
@@ -107,16 +103,16 @@ module CucumberNagiosGenerators
         e.g. cucumber-nagios-gen feature google.com.au search
     DESC
 
-    first_argument :site, :required => true, :desc => "Site name"
+    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.source      = "%feature_name%.feature"
       template.destination = "features/#{site}/#{feature}.feature"
     end
 
     template :step do |template|
-      template.source = "%feature_name%_steps.rb"
+      template.source      = "%feature_name%_steps.rb"
       template.destination = "features/#{site}/steps/#{feature}_steps.rb"
     end
 

data/cucumber-nagios.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-nagios}
-  s.version = "0.8.9"
+  s.version = "0.8.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lindsay Holmwood"]
@@ -58,13 +58,13 @@ Gem::Specification.new do |s|
      "lib/cucumber/nagios/support/env.rb",
      "lib/cucumber/nagios/support/webrat_logging_patches.rb",
      "lib/cucumber/nagios/version.rb",
+     "lib/generators/feature/%feature_name%.feature",
+     "lib/generators/feature/%feature_name%_steps.rb",
      "lib/generators/project/.bzrignore",
      "lib/generators/project/.gitignore",
      "lib/generators/project/Gemfile",
      "lib/generators/project/README",
      "lib/generators/project/bin/cucumber-nagios",
-     "lib/generators/project/lib/generators/feature/%feature_name%.feature",
-     "lib/generators/project/lib/generators/feature/%feature_name%_steps.rb",
      "man/cucumber-nagios.1.ronn"
   ]
   s.has_rdoc = false

data/features/steps/creating_steps.rb

@@ -13,7 +13,7 @@ end
 
 When /^I freeze in dependencies$/ do
   @project_name.should_not be_nil
-  silent_system("cd /tmp/#{@project_name} ; bundle install").should be_true
+  silent_system("cd /tmp/#{@project_name} ; bundle install --local").should be_true
 end
 
 Then /^a Gemfile lock should be created$/ do

data/features/steps/installing_steps.rb

@@ -12,7 +12,7 @@ When /^I install the latest gem$/ do
   glob = File.join(pkg_dir, '*.gem')
   latest = Dir.glob(glob).sort {|a, b| File.ctime(a) <=> File.ctime(b) }.last
 
-  silent_system("gem install #{latest} 2>&1 > /dev/null").should be_true
+  silent_system("gem install --local #{latest}").should be_true
 end
 
 Then /^I should have cucumber\-nagios\-gen on my path$/ do

data/features/steps/using_steps.rb

@@ -35,8 +35,7 @@ Then /^"([^"]*)" in the "([^"]*)" project should not exist$/ do |file, project_n
 end
 
 Then /^the "([^"]*)" feature on "([^"]*)" should produce multiline output$/ do |feature, site|
-  @output = `cd /tmp/#{@project_name} ; bin/cucumber-nagios features/#{site}/#{feature}.feature`
-  $?.exitstatus.should == 0
-
+  command = "cd /tmp/#{@project_name} ; bin/cucumber-nagios features/#{site}/#{feature}.feature"
+  @output = `#{command}`
   @output.split("\n").size.should > 1
 end

data/features/support/silent_system.rb

@@ -1,4 +1,4 @@
 def silent_system(cmd)
-  silent_cmd = cmd + " 2>&1 > /dev/null"
+  silent_cmd = cmd + " > /dev/null 2>&1"
   system(silent_cmd)
 end

data/features/using.feature

@@ -35,7 +35,7 @@ Feature: Using features
   @using
   Scenario: Multiline output
     Given a project called "multiline-output" is created and frozen
-    When I generate a new feature called "homepage" for "github.com"
+    When I generate a new feature called "profile" for "github.com"
     And the "profile" feature on "github.com" checks for something preposterous
     Then the "profile" feature on "github.com" should not exit cleanly
-    And the "profile" feature on "github" should produce multiline output
+    And the "profile" feature on "github.com" should produce multiline output

data/lib/cucumber/nagios.rb

@@ -3,7 +3,7 @@ module Cucumber
   end
 end
 
-begin 
+begin
   require 'cucumber/nagios/version'
   require 'cucumber/nagios/command'
   require 'net/ssh'
@@ -11,7 +11,7 @@ begin
   require 'mq'
 rescue LoadError => e
   dep = e.message.split.last
-  puts "You don't appear to have #{dep} installed." 
-  puts "Perhaps run `gem bundle` or `gem install #{dep}`?"
+  puts "You don't appear to have #{dep} installed."
+  puts "Perhaps run `bundle install` or `gem install #{dep}`?"
   exit 2
 end

data/lib/cucumber/nagios/version.rb

@@ -1,5 +1,5 @@
 module Cucumber
   module Nagios
-    VERSION = '0.8.9'
+    VERSION = '0.8.10'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-nagios
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -211,13 +211,13 @@ files:
 - lib/cucumber/nagios/support/env.rb
 - lib/cucumber/nagios/support/webrat_logging_patches.rb
 - lib/cucumber/nagios/version.rb
+- lib/generators/feature/%feature_name%.feature
+- lib/generators/feature/%feature_name%_steps.rb
 - lib/generators/project/.bzrignore
 - lib/generators/project/.gitignore
 - lib/generators/project/Gemfile
 - lib/generators/project/README
 - lib/generators/project/bin/cucumber-nagios
-- lib/generators/project/lib/generators/feature/%feature_name%.feature
-- lib/generators/project/lib/generators/feature/%feature_name%_steps.rb
 - man/cucumber-nagios.1.ronn
 has_rdoc: false
 homepage: http://cucumber-nagios.org/