chili 0.0.9 → 0.1.0

data/.gitignore

@@ -16,5 +16,6 @@ spec/dummy/main_app/db/*.sqlite3
 spec/dummy/main_app/log/*.log
 spec/dummy/main_app/tmp/
 spec/dummy/main_app/.sass-cache
+spec/result
 tmp
 .DS_Store

data/README.md

@@ -9,7 +9,7 @@ while leaving the main code untouched.
 
 ## Installation
 
-Install Chili on your system (not in your app):
+Install Chili on your system (no need to add it to your app's gemfile):
 
     $ gem install chili
 
@@ -19,9 +19,10 @@ Just like engines chili extensions are like mini apps that are created separatel
 
 ### Creating a new chili extension
 
-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:
+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:
 
-    $ chili social # social is the name of the extension
+    $ chili social
 
 This is basically a shortcut for running the `rails plugin new` engine generator with a custom template and will:
 

data/chili.gemspec

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

data/lib/chili/overrides.rb

@@ -8,7 +8,7 @@ module Chili
     module InstanceMethods
       def activate_overrides
         Deface::Override.all.values.map(&:values).flatten.each do |override|
-          override.args[:disabled] = !override.railtie.class.parent.active?(self)
+          override.args[:disabled] = !override.railtie_class.constantize.parent.active?(self)
         end
       end
     end

data/lib/chili/template.rb

@@ -9,14 +9,15 @@ gsub_file gemspec, 'Dir["test/**/*"]', 's.files.grep(%r{^(test|spec|features)/})
 
 # Add main app as submodule
 # For some reason root when using git method is test/dummy so doing this manually
-main_app_git_repo = ask("Where is the main app you are extending located? (ie git://github.com/myname/myapp.git)")
+main_app_git_repo = ENV['MAIN_APP'] || ask("Where is the main app you are extending located? (ie git://github.com/myname/myapp.git)")
 if main_app_git_repo.present?
   run "cd #{destination_root} && git init"
   run "cd #{destination_root} && git submodule add #{main_app_git_repo}  main_app"
+
+  # Add gem to main app Gemfile
+  append_to_file "main_app/Gemfile", "gem '#{app_path}', path: '../' # git: '...'"
 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}"

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/bin/chili_spec.rb

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

data/spec/dummy/chili_template/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/spec/dummy/chili_template/README.rdoc

@@ -0,0 +1,3 @@
+= ChiliTemplate
+
+This project rocks and uses MIT-LICENSE.

data/spec/dummy/chili_template/Rakefile

@@ -0,0 +1,6 @@
+#!/usr/bin/env rake
+APP_RAKEFILE = File.expand_path("../main_app/Rakefile", __FILE__)
+require 'chili/tasks'
+
+# Default rake task to rspec
+task default: 'app:spec'

data/spec/dummy/chili_template/app/assets/javascripts/chili_template/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require_tree .

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

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+*/

data/spec/dummy/chili_template/app/overrides/layouts/application/example.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_bottom 'body' -->
+<div style='background: #FFF;text-align: center; padding: 4px 0;position: fixed;width: 100%;z-index: 9999;top: 0;'>
+  chili_template active - edit/remove this file:<br/>
+  <strong>app/overrides/layouts/application/example.html.erb.deface</strong><br/>
+  <%= link_to 'deface docs', 'https://github.com/railsdog/deface', target: '_blank' %>
+</div>

data/spec/dummy/chili_template/chili_template.gemspec

@@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "chili_template/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "chili_template"
+  s.version     = ChiliTemplate::VERSION
+  s.authors     = [""]
+  s.email       = ["jens@balvig.com"]
+  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.1.0'
+
+  s.add_development_dependency "sqlite3"
+end

data/spec/dummy/chili_template/config/routes.rb

@@ -0,0 +1,3 @@
+ChiliTemplate::Engine.automount!
+ChiliTemplate::Engine.routes.draw do
+end

data/spec/dummy/chili_template/lib/chili_template.rb

@@ -0,0 +1,7 @@
+require "chili"
+require "chili_template/engine"
+
+module ChiliTemplate
+  extend Chili::Activatable
+  active_if { logged_in? }
+end

data/spec/dummy/chili_template/lib/chili_template/engine.rb

@@ -0,0 +1,10 @@
+module ChiliTemplate
+  class Engine < ::Rails::Engine
+    isolate_namespace ChiliTemplate
+    config.generators do |g|
+      g.scaffold_controller :chili
+      g.test_framework :rspec, view_specs: false, routing_specs: false, controller_specs: false
+      g.integration_tool :rspec
+    end
+  end
+end

data/spec/dummy/chili_template/lib/chili_template/version.rb

@@ -0,0 +1,3 @@
+module ChiliTemplate
+  VERSION = "0.0.1"
+end

data/spec/dummy/chili_template/lib/tasks/chili_template_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :chili_template do
+#   # Task goes here
+# end

data/spec/dummy/chili_template/script/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/chili_template/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/spec/dummy/chili_template/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../main_app/config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories in both main app and the extension.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f }
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70174608984020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70174608984020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70174608983520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174608983520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174608983040 !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: *70174608983040
+  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: &70174608982540 !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: *70174608982540
+  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: &70174608982160 !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: *70174608982160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70174608981700 !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: *70174608981700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70174608981260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174608981260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The spicy extension framework
 email:
 - jens@balvig.com
@@ -114,6 +149,7 @@ files:
 - lib/chili/version.rb
 - lib/generators/rails/chili_generator.rb
 - lib/generators/rails/templates/controller.rb
+- spec/bin/chili_spec.rb
 - spec/dummy/chili_social/app/assets/images/chili_social/.gitkeep
 - spec/dummy/chili_social/app/assets/javascripts/chili_social/application.js
 - spec/dummy/chili_social/app/assets/stylesheets/chili_social/application.css.scss
@@ -130,6 +166,21 @@ files:
 - spec/dummy/chili_social/db/migrate/20120513031021_create_chili_likes_likes.rb
 - spec/dummy/chili_social/lib/chili_social.rb
 - spec/dummy/chili_social/lib/chili_social/engine.rb
+- spec/dummy/chili_template/MIT-LICENSE
+- spec/dummy/chili_template/README.rdoc
+- spec/dummy/chili_template/Rakefile
+- spec/dummy/chili_template/app/assets/images/chili_template/.gitkeep
+- spec/dummy/chili_template/app/assets/javascripts/chili_template/application.js
+- spec/dummy/chili_template/app/assets/stylesheets/chili_template/application.css
+- spec/dummy/chili_template/app/overrides/layouts/application/example.html.erb.deface
+- spec/dummy/chili_template/chili_template.gemspec
+- spec/dummy/chili_template/config/routes.rb
+- spec/dummy/chili_template/lib/chili_template.rb
+- spec/dummy/chili_template/lib/chili_template/engine.rb
+- spec/dummy/chili_template/lib/chili_template/version.rb
+- spec/dummy/chili_template/lib/tasks/chili_template_tasks.rake
+- spec/dummy/chili_template/script/rails
+- spec/dummy/chili_template/spec/spec_helper.rb
 - spec/dummy/main_app/README.rdoc
 - spec/dummy/main_app/Rakefile
 - spec/dummy/main_app/app/assets/javascripts/application.js
@@ -203,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4513349709949091825
+      hash: 2244926333438002551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,14 +263,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4513349709949091825
+      hash: 2244926333438002551
 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/chili_social/app/assets/images/chili_social/.gitkeep
 - spec/dummy/chili_social/app/assets/javascripts/chili_social/application.js
 - spec/dummy/chili_social/app/assets/stylesheets/chili_social/application.css.scss
@@ -236,6 +288,21 @@ test_files:
 - spec/dummy/chili_social/db/migrate/20120513031021_create_chili_likes_likes.rb
 - spec/dummy/chili_social/lib/chili_social.rb
 - spec/dummy/chili_social/lib/chili_social/engine.rb
+- spec/dummy/chili_template/MIT-LICENSE
+- spec/dummy/chili_template/README.rdoc
+- spec/dummy/chili_template/Rakefile
+- spec/dummy/chili_template/app/assets/images/chili_template/.gitkeep
+- spec/dummy/chili_template/app/assets/javascripts/chili_template/application.js
+- spec/dummy/chili_template/app/assets/stylesheets/chili_template/application.css
+- spec/dummy/chili_template/app/overrides/layouts/application/example.html.erb.deface
+- spec/dummy/chili_template/chili_template.gemspec
+- spec/dummy/chili_template/config/routes.rb
+- spec/dummy/chili_template/lib/chili_template.rb
+- spec/dummy/chili_template/lib/chili_template/engine.rb
+- spec/dummy/chili_template/lib/chili_template/version.rb
+- spec/dummy/chili_template/lib/tasks/chili_template_tasks.rake
+- spec/dummy/chili_template/script/rails
+- spec/dummy/chili_template/spec/spec_helper.rb
 - spec/dummy/main_app/README.rdoc
 - spec/dummy/main_app/Rakefile
 - spec/dummy/main_app/app/assets/javascripts/application.js