beet 0.5.0 → 0.6.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "jack.dempsey@gmail.com"
     gem.homepage = "http://github.com/jackdempsey/beet"
     gem.authors = ["Jack Dempsey"]
-    gem.add_dependency "thor", "~> 0.11.6"
+    gem.add_dependency "thor", "~> 0.14.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/beet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-08-31}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
      "features/support/env.rb",
      "lib/beet.rb",
      "lib/beet/capistrano.rb",
-     "lib/beet/execution.rb",
+     "lib/beet/command_execution.rb",
      "lib/beet/executor.rb",
      "lib/beet/file_system.rb",
      "lib/beet/files/swfupload/images/cancelbutton.gif",
@@ -65,6 +65,14 @@ Gem::Specification.new do |s|
      "lib/beet/recipes/rails/swfupload.rb",
      "lib/beet/recipes/rails/testing/rspec.rb",
      "lib/beet/recipes/rails/testing/shoulda.rb",
+     "lib/beet/recipes/rails3/auth/devise.rb",
+     "lib/beet/recipes/rails3/clean_files.rb",
+     "lib/beet/recipes/rails3/css/reset.rb",
+     "lib/beet/recipes/rails3/db/mysql.rb",
+     "lib/beet/recipes/rails3/git.rb",
+     "lib/beet/recipes/rails3/js/jquery.rb",
+     "lib/beet/recipes/rails3/testing/cucumber.rb",
+     "lib/beet/recipes/rails3/testing/rspec.rb",
      "lib/beet/scm.rb",
      "lib/beet/scm/git.rb",
      "lib/beet/scm/svn.rb",
@@ -76,7 +84,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jackdempsey/beet}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A gem to help with easily generating projects}
   s.test_files = [
     "test/executor_test.rb",
@@ -88,13 +96,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, ["~> 0.11.6"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thor>, ["~> 0.14.0"])
     else
-      s.add_dependency(%q<thor>, ["~> 0.11.6"])
+      s.add_dependency(%q<thor>, ["~> 0.14.0"])
     end
   else
-    s.add_dependency(%q<thor>, ["~> 0.11.6"])
+    s.add_dependency(%q<thor>, ["~> 0.14.0"])
   end
 end
 

data/bin/beet

@@ -103,16 +103,6 @@ class BeetRunner < Thor
     } 
   end
 end
-def method_missing(*args)
-  unless @activesupport_required
-    require 'activesupport'
-    @activesupport_required = true
-    m = args.shift
-    send(m, *args)
-  else
-    super
-  end
-end
 
 BeetRunner.start
 

data/lib/beet/{execution.rb → command_execution.rb}

@@ -1,5 +1,5 @@
 module Beet
-  module Execution
+  module CommandExecution
     # Executes a command
     #
     # ==== Example

data/lib/beet/executor.rb

@@ -5,7 +5,7 @@ require 'yaml'
 module Beet
   class Executor
     BEET_DATA_FILE = "~/.beet.yml"
-    include Beet::Execution
+    include Beet::CommandExecution
     include Beet::FileSystem
     include Beet::Interaction
 
@@ -25,7 +25,7 @@ module Beet
       @options = options
       @todo_items = ''
       @recipes = []
-      @project_type = options[:project_type].to_sym || :rails
+      @project_type = (options[:project_type] && options[:project_type].to_sym) || :rails3
       @generate = true unless options[:generate] == false
       @display = options[:display]
       extract_commands_from_options
@@ -45,24 +45,16 @@ module Beet
       if @display && @template
         puts open(TEMPLATE_LOCATIONS[@template]).read
       else
-        case @project_type
-        when :rails3
-          # TODO win compatibility
-          unless `which rails3`.blank?
-            if @generate
-              puts "Generating rails 3 project #{project_name}..."
-              if @template
-                system("rails3 #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
-              else
-                system("rails3 #{project_name}")
-              end
+        if @generate
+          # TODO maybe let people specify path to rails 3 script rather than just assume its 'rails'
+          if @project_type == :rails3
+            puts "Generating rails 3 project #{project_name}..."
+            if @template
+              system("rails new #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
+            else
+              system("rails new #{project_name}")
             end
           else
-            puts "Beet relies on you defining a rails3 command to build rails 3 projects. Please make sure one is available in your PATH."
-            exit
-          end
-        when :rails
-          if @generate
             puts "Generating rails project #{project_name}..."
             if @template
               system("rails #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")

data/lib/beet/file_system.rb

@@ -87,9 +87,8 @@ module Beet
     #
     #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
     #
-    def gsub_file(relative_destination, regexp, *args, &block)
+    def gsub_file(path, regexp, *args, &block)
       #path = destination_path(relative_destination)
-      path = relative_destination
       content = File.read(path)
       check_for = args.first || yield('')
       regex = Regexp.new(regexp.source + Regexp.escape(check_for))
@@ -121,6 +120,21 @@ module Beet
       end
     end
 
+    # Add text after matching line, otherwise append to file wrapped in before/after text
+    #
+    # ==== Example
+    #
+    #    add_after_or_append 'Gemfile', 'group :test', "gem 'rspec-rails'", "group :test do", "end"
+    #
+    def add_after_or_append(filename, matching_text, text_to_add, before_text, after_text)
+      content = File.read(filename)
+      if content.include?(matching_text)
+        add_after(filename, matching_text, text_to_add)
+      else
+        append_file(filename, [before_text, text_to_add, after_text].join("\n"))
+      end
+    end
+
     # Add text before matching line
     #
     # ==== Example

data/lib/beet/rails.rb

@@ -53,22 +53,46 @@ module Beet
       end
     end
 
+    def gem_group(group)
+      @_gem_group = group
+      yield
+      @_gem_group = nil
+    end
+
     # Adds an entry into config/environment.rb for the supplied gem :
     def gem(name, options = {})
       log 'gem', name
-      env = options.delete(:env)
+      group = options.delete(:group) || @_gem_group
+      version = options.delete(:version)
 
-      gems_code = "config.gem '#{name}'"
+      gems_code = "gem '#{name}'"
+      gems_code << ", '#{version}'" if version
 
       if options.any?
         opts = options.inject([]) {|result, h| result << [":#{h[0]} => #{h[1].inspect.gsub('"',"'")}"] }.sort.join(", ")
         gems_code << ", #{opts}"
       end
 
-      environment gems_code, :env => env
+      gemfile(gems_code, :group => group)
+    end
+
+    # Adds a line inside the Gemfile. Used by #gem
+    # If options :group is specified, the line is added inside the corresponding group
+    def gemfile(data, options={})
+      if group = options[:group]
+        if group.is_a?(Array)
+          group.each do |g|
+            add_after_or_append "Gemfile", "group :#{g} do", "\s\s" + data, "group :#{g} do", "end\n"
+          end
+        else
+          add_after_or_append "Gemfile", "group :#{group} do", "\s\s" + data, "group :#{group} do", "end\n"
+        end
+      else
+        append_file "Gemfile", data
+      end
     end
 
-    # Adds a line inside the Initializer block for config/environment.rb. Used by #gem
+    # Adds a line inside the Initializer block for config/environment.rb.
     # If options :env is specified, the line is appended to the corresponding
     # file in config/environments/#{env}.rb
     def environment(data = nil, options = {}, &block)
@@ -140,7 +164,7 @@ module Beet
       log 'generating', what
       argument = args.map {|arg| arg.to_s }.flatten.join(" ")
 
-      in_root { run_ruby_script("script/generate #{what} #{argument}", false) }
+      in_root { run_ruby_script("script/rails generate #{what} #{argument}", false) }
     end
   end # Rails
 end # Beet

data/lib/beet/recipes/rails3/auth/devise.rb

@@ -0,0 +1,8 @@
+# this is designed for rails 3
+gem 'devise', :version => '1.1.rc2'
+
+generate "devise:install"
+generate "devise User"
+generate "devise:views"
+
+rake "db:migrate"

data/lib/beet/recipes/rails3/clean_files.rb

@@ -0,0 +1,3 @@
+run "rm README"
+run "rm public/index.html"
+run "rm public/favicon.ico"

data/lib/beet/recipes/rails3/css/reset.rb

@@ -0,0 +1,10 @@
+reset_file_location = "http://developer.yahoo.com/yui/build/reset/reset.css"
+unless File.exists?('public/stylesheets/reset.css')
+  begin
+    file "public/stylesheets/reset.css" do
+      open(reset_file_location).read
+    end
+  rescue
+    "Couldn't load #{reset_file_location}"
+  end
+end

data/lib/beet/recipes/rails3/db/mysql.rb

@@ -0,0 +1,31 @@
+file 'config/database.yml' do
+  %{  
+---
+development: &defaults
+  adapter: mysql
+  encoding: utf8
+  reconnect: false
+  database: #{project_name}_development
+  pool: 5
+  username: root
+  password:
+ 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<:       *defaults
+  database: #{project_name}_test
+ 
+production:
+  <<:       *defaults
+  database: #{project_name}_production
+}
+end
+
+FileUtils.copy "config/database.yml", "config/database.yml.example"
+
+if yes?("Create databases using rake db:create:all?")
+  rake "db:create:all"
+end
+

data/lib/beet/recipes/rails3/git.rb

@@ -0,0 +1,8 @@
+# .gitignore is now created for us by rails
+# only need to init git, add the current dir, and commit!
+
+git :init
+
+git :add => "."
+
+git :commit => "-m 'Initial commit from Beet. Enjoy.'"

data/lib/beet/recipes/rails3/js/jquery.rb

@@ -0,0 +1,9 @@
+%w(application controls dragdrop effects prototype rails).each do |filename|
+  FileUtils.rm("public/javascripts/#{filename}.js")
+end
+
+run "curl -L http://jqueryjs.googlecode.com/files/jquery-1.4.1.min.js > public/javascripts/jquery.js"
+run "curl -L http://jqueryjs.googlecode.com/svn/trunk/plugins/form/jquery.form.js > public/javascripts/jquery.form.js"
+run "curl -L http://github.com/rails/jquery-ujs/raw/master/src/rails.js > public/javascripts/rails.js"
+
+prepend_file 'public/javascripts/rails.js', %{jQuery.ajaxSetup({'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript");}})}

data/lib/beet/recipes/rails3/testing/cucumber.rb

@@ -0,0 +1,13 @@
+gem_group :cucumber do
+  gem 'capybara'
+  gem 'database_cleaner'
+  gem 'cucumber-rails'
+  gem 'cucumber', :version => '0.7.3'
+  gem 'rspec-rails', :version => '~> 2.0.0.beta.19'
+  gem 'spork'
+  gem 'launchy'
+end
+
+run 'bundle install'
+
+generate 'cucumber:skeleton --rspec --capybara'

data/lib/beet/recipes/rails3/testing/rspec.rb

@@ -0,0 +1,15 @@
+gem 'rspec-rails', :version => '~> 2.0.0.beta.19', :group => [:development,:test]
+
+run "bundle install"
+
+generate "rspec:install"
+
+in_root do
+  add_after 'config/application.rb', 'class Application < Rails::Application' do
+%{
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+}
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beet
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -05:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
         - 0
-        - 11
-        - 6
-        version: 0.11.6
+        - 14
+        - 0
+        version: 0.14.0
   type: :runtime
   version_requirements: *id001
 description: 
@@ -57,7 +60,7 @@ files:
 - features/support/env.rb
 - lib/beet.rb
 - lib/beet/capistrano.rb
-- lib/beet/execution.rb
+- lib/beet/command_execution.rb
 - lib/beet/executor.rb
 - lib/beet/file_system.rb
 - lib/beet/files/swfupload/images/cancelbutton.gif
@@ -88,6 +91,14 @@ files:
 - lib/beet/recipes/rails/swfupload.rb
 - lib/beet/recipes/rails/testing/rspec.rb
 - lib/beet/recipes/rails/testing/shoulda.rb
+- lib/beet/recipes/rails3/auth/devise.rb
+- lib/beet/recipes/rails3/clean_files.rb
+- lib/beet/recipes/rails3/css/reset.rb
+- lib/beet/recipes/rails3/db/mysql.rb
+- lib/beet/recipes/rails3/git.rb
+- lib/beet/recipes/rails3/js/jquery.rb
+- lib/beet/recipes/rails3/testing/cucumber.rb
+- lib/beet/recipes/rails3/testing/rspec.rb
 - lib/beet/scm.rb
 - lib/beet/scm/git.rb
 - lib/beet/scm/svn.rb
@@ -105,23 +116,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem to help with easily generating projects