beet 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/beet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]

data/bin/beet

@@ -103,11 +103,11 @@ class BeetRunner < Thor
       Beet is used to quickly generate applications.
 
       Example:
-      beet generate example_app --recipes="rails/authlogic, rails/clean_files, rails/git"
+      beet generate example_app --recipes="rails3/auth/devise, rails3/clean_files, rails3/git"
 
       Same thing but shorter:
 
-      beet -g example_app -r=rails/authlogic,rails/clean_files,rails/git
+      beet -g example_app -r=rails3/auth/devise,rails3/clean_files,rails3/git
     } 
   end
 end

data/lib/beet/executor.rb

@@ -56,11 +56,16 @@ module Beet
               system("rails new #{project_name}")
             end
           else
-            puts "Generating rails project #{project_name}..."
-            if @template
-              system("rails #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
+            unless rails2_version = search_for_rails_2
+              puts "Please create a rails2 command which points to rails 2.x executable."
+              exit
             else
-              system("rails #{project_name}")
+              puts "Generating rails project #{project_name}..."
+              if @template
+                system("rails _#{rails2_version}_ #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
+              else
+                system("rails _#{rails2_version}_ #{project_name}")
+              end
             end
           end
         end
@@ -204,6 +209,13 @@ module Beet
       end
       nil
     end
+
+    def search_for_rails_2
+      rails_versions = `gem list rails`.chomp
+      clean_versions = rails_versions.match /\((.*)\)/
+      numbered_versions = clean_versions[1].split(', ')
+      numbered_versions.find {|v| v.split('.').first.to_i == 2}
+    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Jack Dempsey