Put Rails helpers as functions in it's own file.

features/rails-helpers.el

@@ -0,0 +1,41 @@
+(defun rails-version()
+  "Determine rails version"
+  (save-excursion
+    (let ((buffer "*rails-version*"))
+      (flet ((kill-buffer-and-return-version (buffer version)
+                                             (progn
+                                               (kill-buffer buffer)
+                                               version)))
+        (progn
+          (shell-command "rails -v" buffer)
+          (switch-to-buffer buffer)
+          (goto-char (point-min))
+          (if (search-forward "Rails 2" (point-max) t)
+              (kill-buffer-and-return-version buffer 2)
+            (progn
+              (goto-char (point-min))
+              (if (search-forward "Rails 3" (point-max) t)
+                  (kill-buffer-and-return-version buffer 3)))))))))
+
+(defun generate-app (name)
+  "Generates a Rails application with NAME."
+  (let* ((tmp-dir (expand-file-name "tmp" rinari-root-path))
+         (app (expand-file-name name tmp-dir)))
+    (setq current-rails-application app)
+    (shell-command
+     (if (= (rails-version) 2)
+         (concat "rails " app " -q")
+       (concat "rails new " app " -q")))))
+
+(defun generate-scaffold (name)
+  "Generates a scaffold with name."
+  (let ((script-dir (expand-file-name "script" current-rails-application)))
+    (cond ((= (rails-version) 2)
+           (shell-command
+            (concat (expand-file-name "generate" script-dir) " scaffold " name)))
+          (t
+           (shell-command
+            (concat (expand-file-name "rails" script-dir) " generate scaffold " name " -q"))))))
+
+
+(provide 'rails-helpers)

features/step-definitions/rinari-steps.el

@@ -1,39 +1,24 @@
-(Given "Rails application \"\\(.+\\)\""
+(Given "^Rails application \"\\(.+\\)\"$"
        (lambda (name)
-	 (let* ((tmp-dir (expand-file-name "tmp" rinari-root-path))
-	       (app (expand-file-name name tmp-dir)))
-	   (setq current-rails-application app)
-	   (if (= (rails-version) 2)
-	       (progn 
-	       	 (if (not (file-exists-p tmp-dir))
-	       	     (make-directory tmp-dir))
-	       		 (shell-command (concat "rails " app)))
-	     (shell-command (concat "# rails3 assumed, hence -> rails new " app))))))
+         (generate-app name)))
 
-
-(Given "Rinari is \\(active\\|inactive\\)"
+(Given "^Rinari is \\(active\\|inactive\\)$"
        (lambda (status)
-	 (rinari-minor-mode (if (string= status "active") 1 -1))))
+         (rinari-minor-mode (if (string= status "active") 1 -1))))
 
-(When "I visit \"\\(.+\\)\""
+(When "^I visit \"\\(.+\\)\"$"
       (lambda (file)
         (find-file (expand-file-name file current-rails-application))))
 
-(Then "Rinari should be active"
+(Then "^Rinari should be active$"
       (lambda ()
         (should rinari-minor-mode)))
 
-
 (Given "^I generate scaffold for \"\\(.+\\)\"$"
-       (lambda (scaffold-name)
-	 (if (= (rails-version) 2)
-	     (shell-command (concat 
-			     (file-name-as-directory current-rails-application) 
-			     (file-name-as-directory "script")
-			     "generate scaffold " scaffold-name))
-	   (message "rails3 command should go here"))))
+       (lambda (name)
+         (generate-scaffold name)))
 
 (Then "^I should be in \"\\(.+\\)\"$"
-       (lambda (buffer)
-	 (string= (buffer-name) buffer)))
+      (lambda (buffer)
+        (string= (buffer-name) buffer)))
 

features/support.el

@@ -6,38 +6,21 @@
   (setq rinari-util-path (expand-file-name "util" rinari-root-path)))
 
 (add-to-list 'load-path rinari-root-path)
+(add-to-list 'load-path (expand-file-name "features" rinari-root-path))
 (add-to-list 'load-path (expand-file-name "espuds" (expand-file-name "test" rinari-util-path)))
 (add-to-list 'load-path (expand-file-name "ert" (expand-file-name "test" rinari-util-path)))
 
 (require 'rinari)
 (require 'espuds)
 (require 'ert)
-
+(require 'rails-helpers)
 (require 'cl)
 
-(defun rails-version()
-  "Determine rails version"
-  (save-excursion
-    (let ((buffer "*rails-version*"))
-      (flet ((kill-buffer-and-return-version (buffer version) 
-					     (progn 
-					       (kill-buffer buffer)
-					       version)))
-	(progn 
-	  (shell-command "rails -v" buffer)
-	  (switch-to-buffer buffer)
-	  (goto-char (point-min))
-	  (if (search-forward "Rails 2" (point-max) t)
-	      (kill-buffer-and-return-version buffer 2)
-	    (progn 
-	      (goto-char (point-min))
-	      (if (search-forward "Rails 3" (point-max) t)
-		  (kill-buffer-and-return-version buffer 3)))))))))
-
 (Setup
  (make-directory (expand-file-name "tmp" rinari-root-path)))
 
 (Teardown
-;(After
- (shell-command (concat "rm -Rf " (expand-file-name "tmp" rinari-root-path)))
+ (shell-command (concat "rm -Rf " (expand-file-name "tmp" rinari-root-path))))
+
+(After
  (setq rinari-minor-mode-hook '()))