chili 0.2.2 → 0.3.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+script: "rake app:db:setup && rake app:db:test:prepare && rake"
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,4 +1,4 @@
-# Chili
+# Chili [![Build Status](https://secure.travis-ci.org/balvig/chili.png?branch=master)](http://travis-ci.org/balvig/chili)
 
 Have you ever wanted to test out a new feature on only a subset of users?
 Did that implementation end up being lots of if/else statements embedded in the main code?
@@ -19,18 +19,18 @@ and run `bundle`.
 
 ## Usage
 
-Chili extensions are like mini apps that are created inside your main app's vendor directory using using the "chili" command.
+Chili extensions are like mini apps that are created inside your main app's vendor directory using using the "chili" generator.
 
 ### Creating a new chili extension
 
 As an example, assuming you want to add a new extension named "social" that exposes a new social feature in the form of a like-button
-to a subset of users, first run within your main app:
+to a subset of users, first within your main app run:
 
-    $ chili new social
+    $ rails g chili social
 
 This is basically a shortcut for running the `rails plugin new` engine generator with a custom template and will:
 
-1. Create a the directory vendor/chili_social containing the basic structure for the extension
+1. Create a the directory `vendor/chili_social` containing the basic structure for the extension
 2. Add a reference to the extension to the main app gemfile
 
 Since the extension is mounted as a gem you'll have to run `bundle`
@@ -98,7 +98,7 @@ Access in your overrides/extension views through the namespaced model:
 
 ### Stylesheets/javascripts
 
-Files added to `app/assets/chili_social/javascripts|stylesheets` are automatically injected into the layout using a pre-generated override:
+Files added to the extension's `app/assets/chili_social/javascripts|stylesheets` directory are automatically injected into the layout using a pre-generated override:
 
 ```erb
 <% # app/overrides/layouts/application/assets.html.erb.deface %>

data/Rakefile

@@ -6,8 +6,8 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-# APP_RAKEFILE = File.expand_path("../spec/dummy/main_app/Rakefile", __FILE__)
-# load 'rails/tasks/engine.rake'
+APP_RAKEFILE = File.expand_path("../spec/dummy/example/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
 require 'rspec/core/rake_task'
 

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/generators/chili/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generate a new chili extension
+
+Example:
+    rails generate chili social
+
+    This will create:
+        basic extension structure in vendor/chili_social

data/lib/generators/chili/chili_generator.rb

@@ -0,0 +1,104 @@
+class ChiliGenerator < Rails::Generators::NamedBase
+    NAME = "chili_#{ARGV[0]}"
+    PATH = "vendor/#{NAME}"
+
+  def run_plugin_generator
+    ARGV[0] = PATH
+    ARGV[1] = "--mountable"
+    ARGV[2] = '--skip-test-unit'
+    ARGV[3] = '--skip-bundle'
+
+    require 'rails/generators'
+    require 'rails/generators/rails/plugin_new/plugin_new_generator'
+    Rails::Generators::PluginNewGenerator.start
+  end
+
+  def reset_destination_root
+    self.destination_root = ''
+  end
+
+  def edit_gemspec
+    require File.expand_path('../../../chili/version', __FILE__)
+    gemspec = "#{NAME}.gemspec"
+    gsub_file gemspec, '# s.add_dependency "jquery-rails"', "s.add_dependency 'chili', '~> #{Chili::VERSION}'"
+    gsub_file gemspec, 'TODO: Your name', `git config user.NAME`.chomp
+    gsub_file gemspec, 'TODO: Your email', `git config user.email`.chomp
+    gsub_file gemspec, /TODO(:\s)?/, ''
+  end
+
+  def add_gem_to_main_gemfile
+    append_to_file "../../Gemfile", "gem '#{NAME}', path: '#{PATH}'"
+  end
+
+  def remove_unused_files
+    remove_dir "app/controllers/#{NAME}"
+    remove_dir "app/helpers/#{NAME}"
+    remove_dir 'app/views/layouts'
+    remove_file 'Gemfile'
+    remove_file 'Rakefile'
+  end
+
+  def remove_jquery_stuff
+    gsub_file "app/assets/javascripts/#{NAME}/application.js", "//= require jquery_ujs\n", ''
+    gsub_file "app/assets/javascripts/#{NAME}/application.js", "//= require jquery\n", ''
+  end
+
+  def set_up_custom_generator
+    inject_into_file "lib/#{NAME}/engine.rb", after: "isolate_namespace #{NAME.camelcase}\n" do <<-RUBY
+    config.generators do |g|
+      g.scaffold_controller :chili
+    end
+    RUBY
+    end
+  end
+
+  def set_up_rspec
+    inject_into_file "lib/#{NAME}/engine.rb", :after => " g.scaffold_controller :chili\n" do <<-RUBY
+      g.test_framework :rspec, view_specs: false, routing_specs: false, controller_specs: false
+      g.integration_tool :rspec
+    RUBY
+    end
+  end
+
+  def clean_up_gitignore
+    gsub_file ".gitignore", /test\/dummy.*\n/, ''
+  end
+
+  def automount_engine
+    prepend_to_file 'config/routes.rb', "#{NAME.camelcase}::Engine.automount!\n"
+  end
+
+  def include_chili_libs
+    prepend_to_file "lib/#{NAME}.rb", "require \"chili\"\n"
+  end
+
+  def include_active_if
+    inject_into_file "lib/#{NAME}.rb", :after => "module #{NAME.camelcase}\n" do <<-RUBY
+  extend Chili::Activatable
+  active_if { logged_in? }
+    RUBY
+    end
+  end
+
+  def add_dummy_override
+    example_file_path = "app/overrides/layouts/application/example.html.erb.deface"
+    create_file example_file_path do <<-RUBY
+<!-- insert_bottom 'body' -->
+<div style='background: #FFF;text-align: center; padding: 4px 0;position: fixed;width: 100%;z-index: 9999;top: 0;'>
+  #{NAME} active - edit/remove this file:<br/>
+  <strong>#{PATH}/#{example_file_path}</strong><br/>
+  <%= link_to 'deface docs', 'https://github.com/railsdog/deface', target: '_blank' %>
+</div>
+    RUBY
+    end
+  end
+
+  def add_assets_override
+    create_file 'app/overrides/layouts/application/assets.html.erb.deface' do <<-RUBY
+<!-- insert_bottom 'head' -->
+<%= stylesheet_link_tag '#{NAME}/application' %>
+<%= javascript_include_tag '#{NAME}/application' %>
+    RUBY
+    end
+  end
+end

data/spec/dummy/template/app/assets/stylesheets/chili_template/application.css

@@ -10,4 +10,4 @@
  *
  *= require_self
  *= require_tree .
-*/
+ */

data/spec/dummy/template/chili_template.gemspec

@@ -7,17 +7,16 @@ require "chili_template/version"
 Gem::Specification.new do |s|
   s.name        = "chili_template"
   s.version     = ChiliTemplate::VERSION
-  s.authors     = ["Jens Balvig"]
-  s.email       = ["jens@cookpad.com"]
+  s.authors     = ["GIT_AUTHOR"]
+  s.email       = ["GIT_EMAIL"]
   s.homepage    = ""
   s.summary     = "Summary of ChiliTemplate."
   s.description = "Description of ChiliTemplate."
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency "rails", "~> 3.2.3"
-  s.add_dependency 'chili', '~> 0.2.2'
+  s.add_dependency "rails", "~> 3.2.5"
+  s.add_dependency 'chili', '~> 0.3.0'
 
   s.add_development_dependency "sqlite3"
 end

data/spec/generators/chili/chili_generator_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'ChiliGenerator' do
+  describe 'rails g chili EXTENSION_NAME' do
+    let(:app_path) { File.expand_path("../../../dummy/example", __FILE__) }
+    let(:template_path) { File.expand_path("../../../dummy/template", __FILE__) }
+
+    before do
+      FileUtils.rm_rf File.join(app_path, 'vendor/chili_template')
+      FileUtils.rm_rf File.join(app_path, 'Gemfile')
+      FileUtils.touch File.join(app_path, 'Gemfile')
+    end
+
+    it 'creates a new extension with a correct file structure' do
+      puts `cd #{app_path} && rails g chili template`
+
+      Dir.glob(File.join(template_path, "**/*")).reject { |f| File.directory?(f) }.each do |template|
+        result = File.join(app_path, 'vendor/chili_template', template.sub(template_path, ''))
+        result_text = File.open(result, 'rb').read
+        template_text = File.open(template, 'rb').read
+        template_text.sub!('GIT_AUTHOR',`git config user.name`.chomp) # Git author is be different on each machine
+        template_text.sub!('GIT_EMAIL',`git config user.email`.chomp) # Git email is be different on each machine
+        result_text.should == template_text
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70189184713320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70189184713320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70189184712820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70189184712820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189184712340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70189184712340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70189184711880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70189184711880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70189184711460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189184711460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70189184710880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189184710880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70189184710380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,34 +117,37 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189184710380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The spicy extension framework
 email:
 - jens@balvig.com
-executables:
-- chili
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/controllers/chili/application_controller.rb
-- bin/chili
 - chili.gemspec
 - lib/chili.rb
 - lib/chili/activatable.rb
 - lib/chili/engine.rb
 - lib/chili/extensions/rails/engine.rb
 - lib/chili/overrides.rb
-- lib/chili/tasks.rb
-- lib/chili/template.rb
 - lib/chili/version.rb
+- lib/generators/chili/USAGE
+- lib/generators/chili/chili_generator.rb
 - lib/generators/rails/chili_generator.rb
 - lib/generators/rails/templates/controller.rb
-- spec/bin/chili_spec.rb
 - spec/dummy/example/README.rdoc
 - spec/dummy/example/Rakefile
 - spec/dummy/example/app/assets/javascripts/application.js
@@ -201,6 +234,7 @@ files:
 - spec/dummy/template/lib/chili_template/version.rb
 - spec/dummy/template/lib/tasks/chili_template_tasks.rake
 - spec/dummy/template/script/rails
+- spec/generators/chili/chili_generator_spec.rb
 - spec/lib/chili/activatable_spec.rb
 - spec/requests/chili_social_spec.rb
 - spec/spec_helper.rb
@@ -218,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 385854585272327348
+      hash: -3078710322112426020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,15 +261,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 385854585272327348
+      hash: -3078710322112426020
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The spicy extension framework
 test_files:
-- spec/bin/chili_spec.rb
 - spec/dummy/example/README.rdoc
 - spec/dummy/example/Rakefile
 - spec/dummy/example/app/assets/javascripts/application.js
@@ -322,6 +355,7 @@ test_files:
 - spec/dummy/template/lib/chili_template/version.rb
 - spec/dummy/template/lib/tasks/chili_template_tasks.rake
 - spec/dummy/template/script/rails
+- spec/generators/chili/chili_generator_spec.rb
 - spec/lib/chili/activatable_spec.rb
 - spec/requests/chili_social_spec.rb
 - spec/spec_helper.rb

data/bin/chili

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-template_file = File.join(File.dirname(__FILE__), '..', 'lib', 'chili', 'template.rb')
-system "rails plugin new vendor/chili_#{ARGV.last} --mountable -m #{template_file}"

data/lib/chili/tasks.rb

@@ -1,7 +0,0 @@
-module Chili
-  module Tasks
-    # App tasks
-    require 'rails'
-    load 'rails/tasks/engine.rake'
-  end
-end

data/lib/chili/template.rb

@@ -1,87 +0,0 @@
-# Edit gemspec
-require File.expand_path('../version', __FILE__)
-gemspec = "#{name}.gemspec"
-gsub_file gemspec, '# s.add_dependency "jquery-rails"', "s.add_dependency 'chili', '~> #{Chili::VERSION}'"
-gsub_file gemspec, 'TODO: Your name', `git config user.name`.chomp
-gsub_file gemspec, 'TODO: Your email', `git config user.email`.chomp
-gsub_file gemspec, /TODO(:\s)?/, ''
-gsub_file gemspec, 'Dir["test/**/*"]', 's.files.grep(%r{^(test|spec|features)/})'
-
-# Add gem to main app Gemfile
-append_to_file "../../Gemfile", "gem '#{name}', path: '#{app_path}'"
-
-# Uses Chili::ApplicationController and the layout from the main app
-remove_dir "app/controllers/#{name}"
-remove_dir "app/helpers/#{name}"
-remove_dir 'app/views/layouts'
-
-# Uses Gemfile from main app
-remove_file 'Gemfile'
-
-# Replace Rakefile
-remove_file 'Rakefile'
-
-# Remove jquery stuff from application.js
-gsub_file "app/assets/javascripts/#{name}/application.js", "//= require jquery_ujs\n", ''
-gsub_file "app/assets/javascripts/#{name}/application.js", "//= require jquery\n", ''
-
-# Setup custom generator
-inject_into_file "lib/#{name}/engine.rb", after: "isolate_namespace #{name.camelcase}\n" do <<-RUBY
-    config.generators do |g|
-      g.scaffold_controller :chili
-    end
-RUBY
-end
-
-# Remove dummy stuff
-remove_dir 'test'
-
-# Set up rspec
-inject_into_file "lib/#{name}/engine.rb", :after => " g.scaffold_controller :chili\n" do <<-RUBY
-      g.test_framework :rspec, view_specs: false, routing_specs: false, controller_specs: false
-      g.integration_tool :rspec
-RUBY
-end
-
-# Edit .gitignore
-gsub_file ".gitignore", /test\/dummy.*\n/, ''
-
-# Automount engine
-prepend_to_file 'config/routes.rb', "#{name.camelcase}::Engine.automount!\n"
-
-# Include chili libs
-prepend_to_file "lib/#{name}.rb" do <<-RUBY
-require "chili"
-RUBY
-end
-
-
-# Include active_if
-inject_into_file "lib/#{name}.rb", :after => "module #{name.camelcase}\n" do <<-RUBY
-  extend Chili::Activatable
-  active_if { logged_in? }
-RUBY
-end
-
-# Add dummy override
-example_file_path = "app/overrides/layouts/application/example.html.erb.deface"
-create_file example_file_path do <<-RUBY
-<!-- insert_bottom 'body' -->
-<div style='background: #FFF;text-align: center; padding: 4px 0;position: fixed;width: 100%;z-index: 9999;top: 0;'>
-  #{name} active - edit/remove this file:<br/>
-  <strong>#{app_path}/#{example_file_path}</strong><br/>
-  <%= link_to 'deface docs', 'https://github.com/railsdog/deface', target: '_blank' %>
-</div>
-RUBY
-end
-
-# Add assets override
-create_file 'app/overrides/layouts/application/assets.html.erb.deface' do <<-RUBY
-<!-- insert_bottom 'head' -->
-<%= stylesheet_link_tag '#{name}/application' %>
-<%= javascript_include_tag '#{name}/application' %>
-RUBY
-end
-
-# Disable bundler
-def run_bundle ; end

data/spec/bin/chili_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe 'Chili Binary' do
-  describe 'chili EXTENSION_NAME' do
-    let(:chili) { File.expand_path("../../../bin/chili", __FILE__) }
-    let(:app_path) { File.expand_path("../../dummy/example", __FILE__) }
-    let(:template_path) { File.expand_path("../../dummy/template", __FILE__) }
-
-    before do
-      FileUtils.rm_rf File.join(app_path, 'vendor/chili_template')
-      FileUtils.rm_rf File.join(app_path, 'Gemfile')
-      FileUtils.touch File.join(app_path, 'Gemfile')
-    end
-
-    it 'creates a new extension with a correct file structure' do
-      `cd #{app_path} && #{chili} new template`
-
-      Dir.glob(File.join(template_path, "**/*")).reject { |f| File.directory?(f) }.each do |source|
-        result = File.join(app_path, 'vendor/chili_template', source.sub(template_path, ''))
-        File.open(result, 'rb').read.should == File.open(source, 'rb').read
-      end
-    end
-  end
-end