chili 0.0.7 → 0.0.8

data/Gemfile

@@ -3,4 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in chili.gemspec
 gemspec
 gem 'rake'
-gem 'deface', github: 'railsdog/deface'

data/README.md

@@ -9,9 +9,9 @@ while leaving the main code untouched.
 
 ## Installation
 
-Install Chili on your system (not in your app!):
+Install Chili on your system (not in your app):
 
-    gem install chili
+    $ gem install chili
 
 ## Usage
 
@@ -21,13 +21,13 @@ Just like engines chili extensions are like mini apps that are created separatel
 
 Assuming you want to add a new extension that adds exposes a new social feature such as a "like" button feature to a subset of users, first run:
 
-    chili social # social is the name of the extension
+    $ chili social # social is the name of the extension
 
 This is basically a shortcut for running the `rails plugin new` engine generator with a custom template and will:
 
 1. Create a directory named chili_social containing the basic structure for the extension
 2. Clone the app you are adding the extension to as a submodule into chili_social/main_app
-3. Add a reference to the extensions gemspec to the main app gemfile for testing
+3. Add a reference to the extension to the main app gemfile for development/testing
 
 ### Define who can see the extension
 
@@ -66,7 +66,7 @@ Create a model with the same name as the one you want to modify: `rails g model
 and inherit from the original:
 
 ```ruby
-# app/model/chili_social/user.rb
+# app/models/chili_social/user.rb
 module ChiliSocial
   class User < ::User
     has_many :likes
@@ -99,13 +99,17 @@ Add files as usual in `app/assets/chili_social/javascripts|stylesheets` and inje
 
 ## Roadmap
 
+### Missing features
+
+- Running any rails command (rails server, bundle etc) should run the command in the main app directory
+- Docs for releasing to production
+- Docs for running tests
+
 ### Current Issues
 
-- Can only have one override per engine per partial due to the way I'm grabbing the class from the override
 - Haven't found a good way to modify existing controller actions
-- Need to use DSL branch from deface
 
 ### Minor niggles
 
-- Have to add gemspec to main app
 - Request specs don't have access to path helpers
+- Generated specs don't namespace properly

data/chili.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Chili::VERSION
 
   gem.add_dependency "rails", "~> 3.2"
+  gem.add_dependency "deface", "~> 0.9"
+
   gem.add_development_dependency 'rspec', '~> 2.9.0'
   gem.add_development_dependency 'rspec-rails', '~> 2.9.0'
   gem.add_development_dependency 'jquery-rails'

data/lib/chili.rb

@@ -1,3 +1,4 @@
+require "deface"
 require "chili/version"
 require "chili/engine"
 require "chili/overrides"

data/lib/chili/template.rb

@@ -6,14 +6,8 @@ if main_app_git_repo.present?
   run "cd #{destination_root} && git submodule add #{main_app_git_repo}  main_app"
 end
 
-# Add gemspec and deface branch to  main app Gemfile
-append_to_file "main_app/Gemfile" do <<-RUBY
-
-# Chili dev dependencies
-gemspec path: '../'
-gem 'deface', github: 'railsdog/deface'
-RUBY
-end
+# Add gem to main app Gemfile
+append_to_file "main_app/Gemfile", "gem '#{app_path}', path: '../' # git: '...'"
 
 # Uses Chili::ApplicationController and the layout from the main app
 remove_dir "app/controllers/#{app_path}"
@@ -32,6 +26,10 @@ require 'chili/tasks'
 RUBY
 end
 
+# Remove jquery stuff from application.js
+gsub_file "app/assets/javascripts/#{app_path}/application.js", "//= require jquery_ujs\n", ''
+gsub_file "app/assets/javascripts/#{app_path}/application.js", "//= require jquery\n", ''
+
 # Setup custom generator
 inject_into_file "lib/#{app_path}/engine.rb", :after => "isolate_namespace #{app_path.camelcase}\n" do <<-RUBY
     config.generators do |g|
@@ -70,16 +68,21 @@ inject_into_file "lib/#{app_path}/engine.rb", :after => " g.scaffold_controller
 RUBY
 end
 
+# Edit .gitignore
+gsub_file ".gitignore", /test\/dummy.*\n/, ''
+
 # Automount engine
 prepend_to_file 'config/routes.rb', "#{app_path.camelcase}::Engine.automount!\n"
 
 # Include chili libs
+require File.expand_path('../version', __FILE__)
+
 prepend_to_file "lib/#{app_path}.rb" do <<-RUBY
 require "chili"
 RUBY
 end
 
-gsub_file "#{app_path}.gemspec", '# s.add_dependency "jquery-rails"', 's.add_dependency "chili"'
+gsub_file "#{app_path}.gemspec", '# s.add_dependency "jquery-rails"', "s.add_dependency 'chili', '~> #{Chili::VERSION}'"
 
 # Include active_if
 inject_into_file "lib/#{app_path}.rb", :after => "module #{app_path.camelcase}\n" do <<-RUBY
@@ -89,7 +92,7 @@ RUBY
 end
 
 # Add dummy override
-example_file_path = "app/overrides/layouts/application/#{app_path}.html.erb.deface"
+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;'>

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70323199401800 !ruby/object:Gem::Requirement
+  requirement: &70101475238260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70323199401800
+  version_requirements: *70101475238260
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: &70101475237760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70101475237760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323199401280 !ruby/object:Gem::Requirement
+  requirement: &70101475237300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70323199401280
+  version_requirements: *70101475237300
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70323199400820 !ruby/object:Gem::Requirement
+  requirement: &70101475236840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70323199400820
+  version_requirements: *70101475236840
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70323199400420 !ruby/object:Gem::Requirement
+  requirement: &70101475252800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323199400420
+  version_requirements: *70101475252800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70323199399860 !ruby/object:Gem::Requirement
+  requirement: &70101475252300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323199399860
+  version_requirements: *70101475252300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70323199399440 !ruby/object:Gem::Requirement
+  requirement: &70101475251760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323199399440
+  version_requirements: *70101475251760
 description: The spicy extension framework (work in progress)
 email:
 - jens@balvig.com
@@ -192,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4584259311276612351
+      hash: 4520049109413080519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4584259311276612351
+      hash: 4520049109413080519
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11