tiny-rails 0.0.1 → 0.0.2

data/README.md

@@ -12,23 +12,62 @@ Install it using:
 ## Usage
 
 ```terminal
-$ tiny-rails tiny-app
-      create  tiny-app/application.coffee
-      create  tiny-app/application.scss
-      create  tiny-app/boot.rb
-      create  tiny-app/config.ru
-      create  tiny-app/Gemfile
-      create  tiny-app/index.html.haml
-      create  tiny-app/migrate
-      create  tiny-app/models.rb
-      create  tiny-app/server
-      create  tiny-app/tiny_rails_controller.rb
-      create  tiny-app/.gitignore
-       chmod  tiny-app/migrate
-       chmod  tiny-app/server
+$ tiny-rails new tiny-app
+      create
+      create  .gitignore
+      create  Gemfile
+      create  boot.rb
+      create  tiny_rails_controller.rb
+      create  index.html.erb
+      create  server
+      create  config.ru
+       chmod  server
 ```
 
-More info coming out soon...
+This will give you a pretty basic application that you can run with `rackup`
+or you prefferend server. It even supports code reloading for the generated
+controller!
+
+
+## Addons
+
+You can provide the `-a` parameter when creating new apllications to enable a
+list of "addons" on the generated app. For example:
+
+```terminal
+$ tiny-rails new tiny-app -a activerecord
+         ...
+       apply  /path/to/tiny-rails/gem/addons/activerecord.rb
+     gemfile    activerecord (~> 3.2)
+     gemfile    sqlite3
+      create    models.rb
+      insert    tiny_rails_controller.rb
+      insert    boot.rb
+      create    migrate
+       chmod    migrate
+      append    .gitignore
+```
+
+Or you can run `tiny-rails add [list of addons]` from a generated application
+folder.
+
+Here's a list of the addons bundled with the gem:
+
+* [activerecord](https://github.com/fgrehm/tiny-rails/blob/master/addons/activerecord.rb)
+
+
+### Building your own addon
+
+The API for writing addon scripts are based on Rails'
+[application templates](http://edgeguides.rubyonrails.org/rails_application_templates.html)
+(with a smaller API), please have a look at the [bundled addons](https://github.com/fgrehm/tiny-rails/blob/master/addons/),
+[`TinyRails::Actions`](https://github.com/fgrehm/tiny-rails/blob/master/lib/tiny-rails/actions.rb)
+and [`Thor::Actions`](http://rdoc.info/github/wycats/thor/master/Thor/Actions.html)
+modules to find out whats supported.
+
+As with Rails' application templates, you can use remote addon scripts, just pass
+in the URL as an argument to `tiny-rails new` or `tiny-rails add`.
+
 
 ## Contributing
 

data/addons/activerecord.rb

@@ -0,0 +1,29 @@
+gem 'activerecord', '~> 3.2'
+gem 'sqlite3'
+
+template 'activerecord/models.rb', 'models.rb'
+require_models_code = <<-CODE
+  # Enable code reloading for models
+  require_dependency 'models'
+CODE
+inject_into_file 'tiny_rails_controller.rb', "\n#{require_models_code}", :after => /class TinyRailsController < ActionController::Base/
+
+config_db_code = <<-CODE
+  def config.database_configuration
+    {
+      'development' =>
+        {
+          'adapter'  => 'sqlite3',
+          'database' => 'db.sqlite3',
+          'pool'     => 5,
+          'timeout'  => 5000
+        }
+    }
+  end
+CODE
+application "\n#{config_db_code}"
+
+template 'activerecord/migrate', 'migrate'
+chmod 'migrate', 0755
+
+append_to_file '.gitignore', 'db.sqlite3'

data/addons/client_side_validations.rb

@@ -0,0 +1,19 @@
+addon 'activerecord'
+addon 'coffeescript'
+addon 'jquery'
+
+gem 'client_side_validations'
+
+sentinel = {:after => "#= require jquery\n"}
+inject_into_file 'application.coffee', "#= require rails.validations\n", sentinel
+
+initializer_code = <<-CODE
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  unless html_tag =~ /^<label/
+    %{<div class="field_with_errors">\#{html_tag}<label for="\#{instance.send(:tag_id)}" class="message">\#{instance.error_message.first}</label></div>}.html_safe
+  else
+    %{<div class="field_with_errors">\#{html_tag}</div>}.html_safe
+  end
+end
+CODE
+initializer initializer_code

data/addons/coffeescript.rb

@@ -0,0 +1,8 @@
+enable_asset_pipeline!
+
+gem 'coffee-rails'
+gem 'therubyracer'
+
+create_file 'application.coffee', '#= require_self'
+# TODO: Add support for slim and haml
+inject_into_file 'index.html.erb', "\n    <%= javascript_include_tag 'application' %>\n  ", :before => '</head>'

data/addons/jquery.rb

@@ -0,0 +1,6 @@
+addon 'coffeescript'
+
+gem 'jquery-rails'
+
+sentinel = {:before => '#= require_self'}
+inject_into_file 'application.coffee', "#= require jquery\n", sentinel

data/lib/tiny-rails/actions.rb

@@ -0,0 +1,97 @@
+module TinyRails
+  # Kinda based on Rails' https://github.com/rails/rails/blob/master/railties/lib/rails/generators/actions.rb
+  module Actions
+    # Adds an entry into Gemfile for the supplied gem.
+    #
+    #   gem "rspec", group: :test
+    #   gem "technoweenie-restful-authentication", lib: "restful-authentication", source: "http://gems.github.com/"
+    #   gem "rails", "3.0", git: "git://github.com/rails/rails"
+    def gem(*args)
+      options = extract_options!(args)
+      name, version = args
+
+      # Set the message to be shown in logs. Uses the git repo if one is given,
+      # otherwise use name (version).
+      parts, message = [ name.inspect ], name
+      if version ||= options.delete(:version)
+        parts   << version.inspect
+        message << " (#{version})"
+      end
+      message = options[:git] if options[:git]
+
+      say_status :gemfile, message
+
+      options.each do |option, value|
+        parts << "#{option}: #{value.inspect}"
+      end
+
+      in_root do
+        str = "gem #{parts.join(", ")}"
+        str = "\n" + str
+        append_file "Gemfile", str, :verbose => false
+      end
+    end
+
+    # Adds a line inside the Application class on boot.rb.
+    #
+    #   application do
+    #     "config.assets.enabled = true"
+    #   end
+    def application(data=nil, &block)
+      sentinel = /class TinyRailsApp < Rails::Application/i
+      data = block.call if !data && block_given?
+
+      inject_into_file 'boot.rb', "\n  #{data}", :after => sentinel
+    end
+
+    def initializer(data)
+      if File.exists? 'initializers.rb'
+        append_file 'initializers.rb', "\n#{data}"
+      else
+        create_file 'initializers.rb', data
+      end
+    end
+
+    # Self explanatory :P
+    def enable_asset_pipeline!
+      return if File.read('boot.rb') =~ /^  config\.assets\.enabled = true$/
+
+      code = <<-CONFIG
+  config.assets.enabled = true
+  config.assets.debug   = true
+  config.assets.paths << File.dirname(__FILE__)
+CONFIG
+      application "\n#{code}"
+    end
+
+    def addon(path)
+      path = if URI(path).is_a?(URI::HTTP)
+        path
+      elsif File.exist? "#{self.class.bundled_addons_path}/#{path}.rb"
+        "#{self.class.bundled_addons_path}/#{path}.rb"
+      else
+        File.expand_path(path)
+      end
+
+      unless applied_addons.include?(path)
+        applied_addons << path
+        apply(path)
+      end
+    end
+
+    private
+
+    def applied_addons
+      @applied_addons ||= []
+    end
+
+    # From ActiveSupport's Array#extract_options!
+    def extract_options!(array)
+      if array.last.is_a?(Hash) && array.last.instance_of?(Hash)
+        array.pop
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/tiny-rails/cli.rb

@@ -1,50 +1,25 @@
 require 'thor'
 require 'thor/group'
 
+require 'tiny-rails/actions'
+require 'tiny-rails/commands/new'
+require 'tiny-rails/commands/add'
+
 module TinyRails
-  class CLI < Thor::Group
+  class CLI < Thor
     include Thor::Actions
 
-    argument :app_path, :required => true
-
-    def self.source_root
-      "#{File.expand_path('../../../templates', __FILE__)}/"
-    end
-
-    def self.banner
-      "tiny-rails #{self.arguments.map(&:usage).join(' ')} [options]"
-    end
-
-    def self.templates
-      @templates ||= %w(
-        application.coffee
-        application.scss
-        boot.rb
-        config.ru
-        Gemfile
-        index.html.haml
-        migrate
-        models.rb
-        server
-        tiny_rails_controller.rb
-        .gitignore
-      )
-    end
-
-    def self.executables
-      @executables ||= %w(
-        migrate
-        server
-      )
+    desc 'new APP_PATH', 'Creates a new tiny Rails application'
+    method_option :addons, :type => :array, :aliases => '-a', :default => []
+    def new(app_path)
+      Commands::New.start([app_path])
+      add(options[:addons]) unless options[:addons].empty?
     end
 
-    def scaffold
-      self.class.templates.each do |template|
-        template(template, "#{app_path}/#{template}")
-      end
-      self.class.executables.each do |script|
-        chmod "#{app_path}/#{script}", 0755
-      end
+    desc 'add [addons]', 'Configures addons on a generated tiny Rails application'
+    def add(addons = [])
+      addons = Array(addons)
+      Commands::Add.start(addons)
     end
   end
 end

data/lib/tiny-rails/commands/add.rb

@@ -0,0 +1,34 @@
+module TinyRails
+  module Commands
+    class Add < Thor::Group
+      include Thor::Actions
+      include Actions
+
+      argument :addons, :required => true, :type => :array
+
+      def self.banner
+        "tiny-rails add #{self.arguments.map(&:usage).join(' ')}"
+      end
+
+      # TODO: Move to a base command
+      def self.source_root
+        "#{File.expand_path('../../../../templates', __FILE__)}/"
+      end
+
+      def self.bundled_addons_path
+        @bundled_addons_path ||= "#{File.expand_path('../../../../addons', __FILE__)}"
+      end
+
+      def guard_inside_tiny_rails_app
+        unless File.exists?('boot.rb')
+          puts "Can't add addons to a non-TinyRails application, please change to a TinyRails application directory first.\n"
+          exit(1)
+        end
+      end
+
+      def apply_addon_scripts
+        addons.each{ |script| addon(script) }
+      end
+    end
+  end
+end

data/lib/tiny-rails/commands/new.rb

@@ -0,0 +1,46 @@
+require 'fileutils'
+
+module TinyRails
+  module Commands
+    class New < Thor::Group
+      include Thor::Actions
+      include Actions
+
+      argument :app_path, :required => true
+
+      # TODO: Move to a base command
+      def self.source_root
+        "#{File.expand_path('../../../../templates', __FILE__)}/"
+      end
+
+      def self.banner
+        "tiny-rails new #{self.arguments.map(&:usage).join(' ')} [options]"
+      end
+
+      def self.templates
+        @templates ||= %w(
+          .gitignore
+          Gemfile
+          boot.rb
+          tiny_rails_controller.rb
+          index.html.erb
+          server
+          config.ru
+        )
+      end
+
+      def create_root
+        self.destination_root = File.expand_path(app_path)
+        empty_directory '.'
+        FileUtils.cd destination_root
+      end
+
+      def scaffold
+        self.class.templates.each do |template|
+          template(template)
+        end
+        chmod 'server', 0755
+      end
+    end
+  end
+end

data/lib/tiny-rails/version.rb

@@ -1,3 +1,3 @@
 module TinyRails
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 end

data/spec/actions_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe TinyRails::Actions do
+  let(:generator) do
+    Class.new(Thor::Group) do
+      include Thor::Actions
+      include TinyRails::Actions
+    end.new
+  end
+
+  def action(*args, &block)
+    capture(:stdout) { generator.send(*args, &block) }
+  end
+
+  before do
+    FileUtils.rm_rf '.tmp' if Dir.exist?('.tmp')
+    @original_wd = Dir.pwd
+    Dir.mkdir '.tmp'
+    Dir.chdir '.tmp'
+  end
+
+  after { Dir.chdir @original_wd }
+
+  describe '#gem' do
+    let(:gemfile) { File.read 'Gemfile' }
+
+    before  { action :create_file, 'Gemfile' }
+
+    it 'adds gem dependency in Gemfile' do
+      action :gem, 'will-paginate'
+      gemfile.should =~ /gem "will\-paginate"/
+    end
+
+    it 'adds gem with version in Gemfile' do
+      action :gem, 'rspec', '>=2.0.0.a5'
+      gemfile.should =~ /gem "rspec", ">=2.0.0.a5"/
+    end
+
+    it 'inserts gems on separate lines' do
+      File.open('Gemfile', 'a') {|f| f.write('# Some content...') }
+
+      action :gem, 'rspec'
+      action :gem, 'rspec-rails'
+
+      gemfile.should =~ /^gem "rspec"$/
+      gemfile.should =~ /^gem "rspec-rails"$/
+    end
+
+    it 'includes gem options' do
+      action :gem, 'rspec', github: 'dchelimsky/rspec', tag: '1.2.9.rc1'
+      gemfile.should =~ /gem "rspec", github: "dchelimsky\/rspec", tag: "1\.2\.9\.rc1"/
+    end
+  end
+
+  describe '#application' do
+    let(:boot_rb) { File.read 'boot.rb' }
+
+    before { action :create_file, 'boot.rb', "class TinyRailsApp < Rails::Application\nend" }
+
+    it 'includes data in TinyRailsApp definition' do
+      assets_enable = 'config.assets.enabled = true'
+      action :application, assets_enable
+      boot_rb.should =~ /class TinyRailsApp < Rails::Application\n  #{Regexp.escape(assets_enable)}/
+    end
+
+    it 'includes provided block contents in TinyRailsApp definition' do
+      action :application do
+        '# This wont be added'
+        '# This will be added'
+      end
+
+      boot_rb.should =~ /# This will be added/
+      boot_rb.should_not =~ /# This wont be added/
+    end
+  end
+
+  describe '#enable_asset_pipeline!' do
+    let(:boot_rb) { File.read 'boot.rb' }
+
+    before do
+      action :create_file, 'boot.rb', "class TinyRailsApp < Rails::Application\nend"
+      action :enable_asset_pipeline!
+    end
+
+    it 'enables asset pipeline on boot.rb' do
+      boot_rb.should =~ /^  config\.assets\.enabled = true$/
+    end
+
+    it 'sets debugging to true' do
+      boot_rb.should =~ /^  config\.assets\.debug   = true$/
+    end
+
+    it 'appends application root folder to assets path' do
+      boot_rb.should =~ /^  config\.assets\.paths << File\.dirname\(__FILE__\)$/
+    end
+
+    it 'does not duplicate configs' do
+      10.times { action :enable_asset_pipeline! }
+      boot_rb.should have_a_single_occurence_of('config.assets.enabled = true')
+    end
+  end
+
+  describe '#initializer' do
+    let(:initializers_rb) { File.read 'initializers.rb' }
+
+    before do
+      action :initializer, '# Ruby code...'
+    end
+
+    it 'creates an initializers.rb file if it doesnt exist' do
+      initializers_rb.should == "# Ruby code..."
+    end
+
+    it 'appends to initializers.rb file if file exist' do
+      action :initializer, '# More code...'
+      initializers_rb.should =~ /\n# More code.../
+    end
+  end
+end

data/spec/commands/add_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+# TODO: Move these specs to spec/actions_spec.rb
+describe TinyRails::Commands::Add do
+  before do
+    Dir.exist?('.tmp') ? FileUtils.rm_rf('.tmp/*') : Dir.mkdir('.tmp')
+    @original_wd = Dir.pwd
+    FileUtils.cd '.tmp'
+    %w(.gitignore tiny_rails_controller.rb boot.rb Gemfile).each do |file|
+      `touch #{file}`
+    end
+  end
+
+  after { FileUtils.cd @original_wd }
+
+  let(:output) do
+    fixtures_path = "#{@original_wd}/spec/fixtures"
+    fixtures = %W( #{fixtures_path}/sample_addon_1.rb ../spec/fixtures/sample_addon_2.rb )
+    bundled_addon = 'activerecord'
+    output = capture(:stdout) { described_class.start([fixtures, bundled_addon, bundled_addon].flatten) }
+    output.gsub(/\e\[(\d+)m/, '')
+  end
+
+  it 'works with full path to file' do
+    output.should =~ /gemfile\s+from-sample-addon-1/
+  end
+
+  it 'works with relative path to file' do
+    output.should =~ /gemfile\s+from-sample-addon-2/
+  end
+
+  it 'works with bundled addons' do
+    output.should =~ /gemfile\s+activerecord/
+  end
+
+  it 'applies addon scripts only once' do
+    output.scan(/gemfile\s+activerecord/).should have(1).item
+  end
+end

data/spec/commands/new_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe TinyRails::Commands::New do
+  before do
+    FileUtils.rm_rf '.tmp' if Dir.exist?('.tmp')
+    @original_wd = Dir.pwd
+  end
+
+  after { FileUtils.cd @original_wd }
+
+  context 'scaffold' do
+    subject do
+      output = capture(:stdout) { described_class.start(['.tmp']) }
+      output.gsub(/\e\[(\d+)m/, '')
+    end
+
+    %w(
+      .gitignore
+      Gemfile
+      boot.rb
+      tiny_rails_controller.rb
+      index.html.erb
+      server
+      config.ru
+    ).each do |file|
+      it { should =~ /create\s+#{Regexp.escape file}/ }
+    end
+
+    it { should =~ /chmod\s+server/ }
+  end
+end

data/spec/fixtures/sample_addon_1.rb

@@ -0,0 +1 @@
+gem 'from-sample-addon-1'

data/spec/fixtures/sample_addon_2.rb

@@ -0,0 +1 @@
+gem 'from-sample-addon-2'

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'tiny-rails'
 require 'tiny-rails/cli'
 
-require 'fileutils'
+Dir['./spec/support/**/*.rb'].each { |file| require file }
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/matchers/have_single_occurrence_matcher.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_a_single_occurence_of do |expected|
+  match do |actual|
+    actual.scan(expected).size == 1
+  end
+
+  description do
+    "have a single occurence of #{expected.inspect}"
+  end
+end

data/templates/.gitignore

@@ -1,4 +1,3 @@
 tmp/
 log/
-db.sqlite3
 Gemfile.lock

data/templates/Gemfile

@@ -4,13 +4,4 @@ source :rubygems
 gem "tzinfo"
 
 gem "actionpack",   "~> 3.2"
-gem "activemodel",  "~> 3.2"
-gem "activerecord", "~> 3.2"
 gem "railties",     "~> 3.2"
-
-gem 'sqlite3'
-
-gem 'jquery-rails'
-gem 'haml-rails'
-gem 'sass-rails'
-gem 'coffee-rails'

data/templates/activerecord/migrate

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require './boot'
+
+def confirm_drop_db?
+  print 'We are going to drop and recreate the database, are you sure you want to proceed? [Y/n] '
+  answer = gets.chomp.downcase
+  answer.blank? || answer =~ /^y/
+end
+
+exit 0 unless confirm_drop_db?
+
+config = TinyRailsApp.config.database_configuration[Rails.env]
+
+# DROP DATABASE
+require 'pathname'
+path = Pathname.new(config['database'])
+file = path.absolute? ? path.to_s : File.join(Rails.root, path)
+FileUtils.rm(file)
+
+# CREATE DATABASE
+ActiveRecord::Base.establish_connection(config)
+ActiveRecord::Base.connection
+
+
+ActiveRecord::Schema.define do
+  create_table "posts" do |t|
+    t.string "title"
+    t.text   "body"
+    t.timestamps
+  end
+end

data/templates/activerecord/models.rb

@@ -0,0 +1,5 @@
+class Post < ActiveRecord::Base
+  validates :title, :body, :presence => true
+
+  attr_accessible :title, :body
+end

data/templates/boot.rb

@@ -14,29 +14,12 @@ class TinyRailsApp < Rails::Application
     match "/favicon.ico", :to => proc {|env| [200, {}, [""]] }
   end
 
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
 
   config.active_support.deprecation = :log
 
   config.autoload_paths << config.root
 
-  config.assets.enabled = true
-  config.assets.debug = true
-  config.assets.paths << File.dirname(__FILE__)
-
-
-  def config.database_configuration
-    {
-      'development' =>
-        {
-          'adapter'  => 'sqlite3',
-          'database' => 'db.sqlite3',
-          'pool'     => 5,
-          'timeout'  => 5000
-        }
-    }
-  end
-
   config.middleware.delete "Rack::Lock"
   config.middleware.delete "ActionDispatch::Flash"
   config.middleware.delete "ActionDispatch::BestStandardsSupport"
@@ -47,3 +30,5 @@ class TinyRailsApp < Rails::Application
 end
 
 TinyRailsApp.initialize!
+
+require 'initializers' if File.exists?('initializers.rb')

data/templates/index.html.erb

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Ruby on Rails: Welcome aboard</title>
+    <style media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+
+
+      #page {
+        background-color: #f0f0f0;
+        width: 500px;
+        margin: 15px auto 0 auto;
+      }
+
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        padding: 25px;
+        width: 500px;
+      }
+
+      #footer {
+        clear: both;
+      }
+
+      #about {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+
+      #header {
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+
+      #header img {
+        float: left;
+        margin-right: 25px;
+      }
+
+
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+        overflow-x: auto;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+    </style>
+    <script>
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","rails/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="content">
+        <div id="header">
+          <img src="http://rubyonrails.org/images/rails.png" height="64" width="50" />
+          <h1>
+            Welcome aboard
+          </h1>
+          <h2>You&rsquo;re riding a Tiny Ruby on Rails app!</h2>
+        </div>
+
+        <div id="about">
+          <h3><a href="rails/info/properties" onclick="about(); return false">About your tiny environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

data/templates/tiny_rails_controller.rb

@@ -1,11 +1,7 @@
 class TinyRailsController < ActionController::Base
-  # Code reloading goodness
-  require_dependency 'models'
-
   append_view_path File.dirname(__FILE__)
 
   def index
-    @model = SampleModel.new
     render :template => 'index'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,21 +112,31 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- addons/activerecord.rb
+- addons/client_side_validations.rb
+- addons/coffeescript.rb
+- addons/jquery.rb
 - bin/tiny-rails
 - lib/tiny-rails.rb
+- lib/tiny-rails/actions.rb
 - lib/tiny-rails/cli.rb
+- lib/tiny-rails/commands/add.rb
+- lib/tiny-rails/commands/new.rb
 - lib/tiny-rails/version.rb
-- spec/cli_spec.rb
+- spec/actions_spec.rb
+- spec/commands/add_spec.rb
+- spec/commands/new_spec.rb
+- spec/fixtures/sample_addon_1.rb
+- spec/fixtures/sample_addon_2.rb
 - spec/spec_helper.rb
+- spec/support/matchers/have_single_occurrence_matcher.rb
 - templates/.gitignore
 - templates/Gemfile
-- templates/application.coffee
-- templates/application.scss
+- templates/activerecord/migrate
+- templates/activerecord/models.rb
 - templates/boot.rb
 - templates/config.ru
-- templates/index.html.haml
-- templates/migrate
-- templates/models.rb
+- templates/index.html.erb
 - templates/server
 - templates/tiny_rails_controller.rb
 - tiny-rails.gemspec
@@ -144,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3409797732492821246
+      hash: -1156523687678209514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3409797732492821246
+      hash: -1156523687678209514
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -161,5 +171,10 @@ signing_key:
 specification_version: 3
 summary: A generator for tiny Rails apps
 test_files:
-- spec/cli_spec.rb
+- spec/actions_spec.rb
+- spec/commands/add_spec.rb
+- spec/commands/new_spec.rb
+- spec/fixtures/sample_addon_1.rb
+- spec/fixtures/sample_addon_2.rb
 - spec/spec_helper.rb
+- spec/support/matchers/have_single_occurrence_matcher.rb

data/spec/cli_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe TinyRails::CLI do
-  before { FileUtils.rm_rf '.tmp' if Dir.exist?('.tmp') }
-
-  context 'scaffold' do
-    subject do
-      output = capture(:stdout) { described_class.start(['.tmp']) }
-      output.gsub(/\e\[(\d+)m/, '')
-    end
-
-    described_class.templates.each do |file|
-      it { should =~ /create\s+\.tmp\/#{Regexp.escape file}/ }
-    end
-
-    described_class.executables.each do |script|
-      it { should =~ /chmod\s+\.tmp\/#{Regexp.escape script}/ }
-    end
-  end
-end

data/templates/application.coffee

@@ -1,6 +0,0 @@
-#= require jquery
-
-jQuery ($) ->
-  setTimeout ->
-    $('body').html('<h1 id="loaded">Page loaded!</h1>')
-  , 1500

data/templates/application.scss

@@ -1,2 +0,0 @@
-body    { font-size: 40px; color: blue; }
-#loaded { color: green; }

data/templates/index.html.haml

@@ -1,10 +0,0 @@
-!!! 5
-%head
-  %title TinyRailsApp
-  %meta{ charset: "utf-8" }
-
-  = stylesheet_link_tag    'application'
-  = javascript_include_tag 'application'
-
-%body
-  Loading...

data/templates/migrate

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-
-require './boot'
-
-# TODO: Alert that DB will be dropped
-
-def drop_database(config)
-  case config['adapter']
-  when /mysql/
-    ActiveRecord::Base.establish_connection(config)
-    ActiveRecord::Base.connection.drop_database config['database']
-  when /sqlite/
-    require 'pathname'
-    path = Pathname.new(config['database'])
-    file = path.absolute? ? path.to_s : File.join(Rails.root, path)
-
-    FileUtils.rm(file)
-  when /postgresql/
-    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-    ActiveRecord::Base.connection.drop_database config['database']
-  end
-end
-
-ActiveRecord::Base.configurations.each_value do |config|
-  # Skip entries that don't have a database key
-  next unless config['database']
-  begin
-    drop_database(config)
-  rescue Exception => e
-    $stderr.puts "Couldn't drop #{config['database']} : #{e.inspect}"
-  end
-end
-
-ActiveRecord::Schema.define do
-  create_table "accounts" do |t|
-    t.string "name"
-  end
-end

data/templates/models.rb

@@ -1,14 +0,0 @@
-class SampleModel
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  extend  ActiveModel::Naming
-
-  attr_accessor :password
-
-  validates :password, :confirmation => true
-
-  # Required to use this model in a form builder
-  def persisted?
-    false
-  end
-end