inline_forms 1.3.47 → 1.3.48

data/README.rdoc

@@ -5,11 +5,11 @@ Inline Forms is almost a complete admin application. You can try it out easily.
 = Usage
 
  gem install inline_forms
- inline_forms MyAppName
+ inline_forms create MyAppName
  cd MyAppName
- rails g inline_forms Picture name:string caption:string image:image_field description:text apartment:belongs_to _presentation:'#{name}' -f
+ rails g inline_forms Picture name:string caption:string image:image_field description:text apartment:belongs_to _presentation:'#{name}'
  rails generate uploader Image
- rails g inline_forms Apartment name:string title:string description:text pictures:has_many pictures:associated _enabled:yes _presentation:'#{name}' -f
+ rails g inline_forms Apartment name:string title:string description:text pictures:has_many pictures:associated _enabled:yes _presentation:'#{name}'
  bundle exec rake db:migrate
  rails s
 
@@ -18,16 +18,6 @@ point your browser to http://localhost:3000/apartments (make sure JavaScript is
 It's work in progress.
 
 
-== Contributing to inline_forms
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
 == Copyright
 
 Copyright (c) 2011 Ace Suares. See LICENSE.txt for

data/bin/inline_forms

@@ -1,248 +1,281 @@
 #!/usr/bin/env ruby
+module InlineForms
 
-require 'rvm'
+  require File.join(File.dirname(__FILE__), "../lib/inline_forms/version.rb")
 
-if not RVM.current
-  puts "ruby or rvm not found"
-  exit 2
-end
-
-# what is this?
-Signal.trap("INT") { puts; exit }
-
-# require the version file
-src = File.join(File.dirname(__FILE__), "..")
-require "#{src}/lib/inline_forms/version.rb"
-
-USAGE = "
-USAGE: inline_forms <options> <app-name>
-
-  'inline_forms MyApp' will create a rails app in directory MyApp.
-
-Options:
-  --help                      # show this message
-
-VERSION: #{InlineForms::VERSION}
-"
-
-
-while true
-  case arg_name = ARGV.shift
-  when "--help"
-    puts USAGE
-    exit
-  else
-    app_name = arg_name
-    break
+  require 'rvm'
+  if not RVM.current
+    puts "ruby or rvm not found"
+    exit 2
   end
-end
-
-if !ARGV.empty? || app_name.nil? || !/^[a-zA-Z][0-9a-zA-Z_-]+/.match(app_name) || File.exists?(app_name)
-  puts USAGE
-  exit 1
-end
-
-puts "\nGenerating Rails app '#{app_name}'...\n"
-RVM.run "rails new #{app_name}"
-
-puts "\nCreating and trusting .rvmrc...\n"
-ruby_version = %x[rvm current]
-system "echo rvm use #{ruby_version.chop}@#{app_name} --create > #{app_name}/.rvmrc"
-system "cd #{app_name} && rvm rvmrc trust .rvmrc"
-
-puts "\nChanging to '#{app_name}' with RVM...\n"
-RVM.chdir(app_name) do
-  puts "\nWorking directory is now #{`pwd`}"
-  RVM.use_from_path! '.'
-  rvm_gemset = %x[rvm current]
-  puts "\nRVM gemset is now #{rvm_gemset}"
-
-  puts "\nInstalling Gemfile...\n"
-  gemfile_sources = "
-source 'http://rubygems.org'
-
-  "
-  gemfile_gems = "
-
-gem 'test-unit'
-gem 'rails'
-gem 'rake'
-gem 'jquery-rails'
-gem 'capistrano'
-gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git'
-gem 'tabs_on_rails' # , :git => 'git://github.com/acesuares/tabs_on_rails.git', :branch => 'add_remote'
-gem 'ckeditor', :git => 'git://github.com/acesuares/ckeditor.git', :branch => 'master'
-gem 'carrierwave'
-gem 'remotipart', '~> 1.0'
-gem 'paper_trail'
-gem 'devise'
-gem 'cancan'
-gem 'inline_forms'
-gem 'mini_magick'
-gem 'jquery_datepicker'
-gem 'yaml_db'
-gem 'rails-i18n'
-gem 'unicorn'
-gem 'rvm'
-gem 'rvm-capistrano'
-
-  "
-  gemfile_development_group ="
-
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'sqlite3'
-  gem 'rspec-rails'
-  gem 'shoulda', '>= 0'
-  gem 'bundler'
-  gem 'jeweler'
-#  gem 'rcov', '>= 0'
-end
-
-  "
-  gemfile_production_group ="
-# these are just for production
-group :production do
-  gem 'mysql2'
-  gem 'therubyracer'
-  gem 'uglifier'
-end
-
-  "
 
-  File.open( 'Gemfile', 'w') {|f| f.write(gemfile_sources + gemfile_gems + gemfile_development_group + gemfile_production_group ) }
-
-
-  puts "\nRunning bundle...\n"
-  system "bundle install"
+  # what is this?
+  Signal.trap("INT") { puts; exit }
+
+  require 'thor'
+
+  class Creator < Thor
+    include Thor::Actions
+
+    String.class_eval do
+      def strip_heredoc_with_indent(indent=0)
+        new_indent = ( self.empty? ? 0 : ( scan(/^[ \t]*(?=\S)/).min.size - indent ) )
+        gsub(/^[ \t]{#{new_indent}}/, '')
+      end
+    end
+
+    def self.source_root
+      File.dirname(__FILE__)+"/.."
+    end
+
+    desc "create APP", "create an application with inline_forms v#{VERSION}"
+    DATABASE_OPTIONS = %w(sqlite mysql)
+    method_option :database, :aliases => "-d", :default => DATABASE_OPTIONS.first, :banner => DATABASE_OPTIONS.join('|'), :desc => 'specify development database'
+    method_option :dry, :type => :boolean, :desc => 'dry run. Do not do most things. Only useful for development of inline_forms'
+
+    def create(app_name)
+
+      def dry_run?
+        options[:dry]
+      end
+
+      options_database = DATABASE_OPTIONS.include?(options[:database]) ? options[:database] : DATABASE_OPTIONS.first
+
+      say "This is a dry run. I hope you know what you are doing...", :red if dry_run?
+      say "Creating #{app_name} with inline_forms v#{VERSION} and development database #{options_database}...", :green
+
+      regex = /\A[0-9a-zA-Z][0-9a-zA-Z_-]+[0-9a-zA-Z]\Z/
+      if ! regex.match(app_name)
+        say "Error: APP must match #{regex.source}", :red
+        exit 1
+      end
+
+      if File.exists?(app_name)
+        say "Error: APP exists", :red
+        exit 1
+      end
+
+      say "- Generating Rails app '#{app_name}'..."
+      dry_run? ? empty_directory(app_name) : RVM.run("rails new #{app_name}")
+      
+
+      say "- Creating and trusting .rvmrc..."
+      ruby_version = %x[rvm current]
+      create_file "#{app_name}/.rvmrc", "rvm use #{ruby_version.chop}@#{app_name} --create"
+      say ("- " + %x[cd #{app_name} && rvm rvmrc trust .rvmrc]).chop, :green
+
+      say "- Changing to '#{app_name}' with RVM..."
+      RVM.chdir(app_name) do
+
+        say "- Working directory is now #{`pwd`}"
+        RVM.use_from_path! '.'
+        rvm_gemset = %x[rvm current]
+        say "- RVM gemset is now #{rvm_gemset}"
+
+        say "- Recreating Gemfile..."
+      
+        remove_file "#{app_name}/Gemfile" # the one that 'rails new' created
+        create_file "#{app_name}/Gemfile", <<-END_GEMFILE.strip_heredoc_with_indent
+          # generated by inline_forms v#{VERSION}
+
+          source 'http://rubygems.org'
+
+          gem 'test-unit'
+          gem 'rails'
+          gem 'rake'
+          gem 'jquery-rails'
+          gem 'capistrano'
+          gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git'
+          gem 'tabs_on_rails' # , :git => 'git://github.com/acesuares/tabs_on_rails.git', :branch => 'add_remote'
+          gem 'ckeditor', :git => 'git://github.com/acesuares/ckeditor.git', :branch => 'master'
+          gem 'carrierwave'
+          gem 'remotipart', '~> 1.0'
+          gem 'paper_trail'
+          gem 'devise'
+          gem 'cancan'
+          gem 'inline_forms'
+          gem 'mini_magick'
+          gem 'jquery_datepicker'
+          gem 'yaml_db'
+          gem 'rails-i18n'
+          gem 'unicorn'
+          gem 'rvm'
+          gem 'rvm-capistrano'
+
+          # Include everything needed to run rake, tests, features, etc.
+          group :development do
+            gem 'sqlite3'
+            gem 'rspec-rails'
+            gem 'shoulda', '>= 0'
+            gem 'bundler'
+            gem 'jeweler'
+            # gem 'rcov', '>= 0'
+          end
+
+          # these are just for production
+          group :production do
+            gem 'mysql2'
+            gem 'therubyracer'
+            gem 'uglifier'
+          end
+        END_GEMFILE
+
+        say "- Running bundle..."
+        system "bundle install" unless dry_run?
   
-  puts "\nDatabase setup: creating config/database.yml\n"
-  development_stanza = "
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-  "
-  production_stanza = "
-production:
-  adapter: mysql2
-  database: #{app_name}_p
-  username: #{app_name}
-  password: #{app_name}444
-
-  "
-  File.open( 'config/database.yml', 'w') {|f| f.write(development_stanza + production_stanza) }
-
-  puts "\nDevise install..."
-  RVM.run "bundle exec rails g devise:install"
-  puts "\nDevise User model install with added name field..."
-  RVM.run "bundle exec rails g devise User name:string"
-  puts "\nInstall ckeditor..."
-  RVM.run "bundle exec rails g ckeditor:install"
-  puts "Create config file in app/assets/javascripts/ckeditor/config.js"
-  FileUtils.mkdir_p 'app/assets/javascripts/ckeditor'
-  system("cp #{src}/lib/app/assets/javascripts/ckeditor/config.js app/assets/javascripts/ckeditor")
-  puts "Add remotipart to app/assets/javascripts/application.js..."
-  system('echo >> app/assets/javascripts/application.js')
-  system('echo "//= require jquery.remotipart" >> app/assets/javascripts/application.js')
-  system('echo >> app/assets/javascripts/application.js')
-  puts "Paper_trail install..."
-  RVM.run "bundle exec rails g paper_trail:install"
-
-
-  puts "Migrating Devise and Versions"
-  system('bundle exec rake db:migrate')
-
-  puts "Creating header in app/views/inline_forms/_header.html.erb...\n"
-  header_src = "
-<div id='Header'>
-  <div id='title'>
-    #{app_name} v<%= inline_forms_version -%>
-  </div>
-  <% if cancan_enabled? -%>
-  <div id='logout'>
-    <%= link_to \"Afmelden: \#{current_user.name}\", destroy_user_session_path, :method => :delete %>
-  </div>
-  <% end -%>
-  <div style='clear: both;'></div>
-</div>
-  "
-  FileUtils.mkdir_p 'app/views/inline_forms'
-  File.open( 'app/views/inline_forms/_header.html.erb', 'w') {|f| f.write(header_src) }
-
-  puts "Set application_name and _title in ApplicationHelper...\n"
-  app_helper = "
-module ApplicationHelper
-  def application_name
-    #{app_name}
-  end
-  def application_title
-    #{app_name}
+        say "- Database setup: creating config/database.yml with development database #{options_database}"
+        remove_file "#{app_name}/config/database.yml" # the one that 'rails new' created
+        if options_database == 'mysql'
+          create_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
+          development:
+            adapter: mysql2
+            database: #{app_name}_dev
+            username: #{app_name}
+            password: #{app_name}
+
+          END_DATABASEYML
+        else
+          create_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
+          development:
+            adapter: sqlite3
+            database: db/development.sqlite3
+            pool: 5
+            timeout: 5000
+
+          END_DATABASEYML
+        end
+        append_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
+          production:
+            adapter: mysql2
+            database: #{app_name}_p
+            username: #{app_name}
+            password: #{app_name}444
+        END_DATABASEYML
+
+        say "- Devise install..."
+        RVM.run "bundle exec rails g devise:install" unless dry_run?
+
+        say "- Devise User model install with added name field..."
+        RVM.run "bundle exec rails g devise User name:string" unless dry_run?
+
+        say "- Install ckeditor..."
+        RVM.run "bundle exec rails g ckeditor:install" unless dry_run?
+
+        say "- Create ckeditor config.js"
+        copy_file "lib/app/assets/javascripts/ckeditor/config.js", "#{app_name}/app/assets/javascripts/ckeditor/config.js"
+
+        say "- Add remotipart to application.js..."
+        create_file "#{app_name}/app/assets/javascripts/application.js", "//= require_tree .\n" if dry_run?
+        insert_into_file "#{app_name}/app/assets/javascripts/application.js", "//= require jquery.remotipart\n", :before => "//= require_tree .\n"
+
+        say "- Paper_trail install..."
+        RVM.run "bundle exec rails g paper_trail:install" unless dry_run?
+
+        say "- Migrating Devise and Versions"
+        RVM.run "bundle exec rake db:migrate" unless dry_run?
+
+        say "- Creating header in app/views/inline_forms/_header.html.erb..."
+        create_file "#{app_name}/app/views/inline_forms/_header.html.erb", <<-END_HEADER.strip_heredoc_with_indent
+            <div id='Header'>
+              <div id='title'>
+                #{app_name} v<%= inline_forms_version -%>
+              </div>
+              <% if current_user -%>
+              <div id='logout'>
+                <%= link_to \"Afmelden: \#{current_user.name}\", destroy_user_session_path, :method => :delete %>
+              </div>
+              <% end -%>
+              <div style='clear: both;'></div>
+            </div>
+        END_HEADER
+
+        say "- Recreating ApplicationHelper to set application_name and application_title..."
+        remove_file "#{app_name}/app/helpers/application_helper.rb" # the one that 'rails new' created
+        create_file "#{app_name}/app/helpers/application_helper.rb", <<-END_APPHELPER.strip_heredoc_with_indent
+          module ApplicationHelper
+            def application_name
+              #{app_name}
+            end
+            def application_title
+              #{app_name}
+            end
+          end
+        END_APPHELPER
+
+        say "- Recreating ApplicationController to add devise and cancan stuff..."
+        remove_file "#{app_name}/app/controllers/application_controller.rb" # the one that 'rails new' created
+        create_file "#{app_name}/app/controllers/application_controller.rb", <<-END_APPCONTROLLER.strip_heredoc_with_indent
+          class ApplicationController < ActionController::Base
+            protect_from_forgery
+
+            # before_filter :authenticate_user!
+            # check_authorization :unless => :devise_controller?
+
+            # rescue_from CanCan::AccessDenied do |exception|
+            #  sign_out :user if user_signed_in?
+            #  redirect_to new_user_session_path, :alert => exception.message
+            # end
+          end
+        END_APPCONTROLLER
+
+        # create environments/production.rb if it's a dry run
+        create_file "#{app_name}/config/environments/production.rb", "  # config.assets.precompile += %w( search.js )\nend\n" if dry_run?
+
+        say "- Injecting precompile assets stuff in environments/production.rb..."
+        insert_into_file "#{app_name}/config/environments/production.rb",
+          "  config.assets.precompile += %w(inline_forms_application.js inline_forms_application.css devise.css)\n",
+          :after => "  # config.assets.precompile += %w( search.js )\n"
+    
+        say "- Injecting devise mailer stuff in environments/production.rb..."
+        insert_into_file "#{app_name}/config/environments/production.rb", <<-DEVISE_MAILER_STUFF.strip_heredoc_with_indent(2), :before => "end\n"
+
+          # for devise
+          config.action_mailer.default_url_options = { :protocol => 'https', :host => 'YOURHOSTNAME' }
+          config.action_mailer.delivery_method = :smtp
+          config.action_mailer.smtp_settings = {
+            :address => 'YOURMAILSERVER',
+            :enable_starttls_auto => true,
+            :password => 'YOURPASSWORD',
+            :user_name => 'YOURUSERNAME'
+          }
+          
+        DEVISE_MAILER_STUFF
+
+        say "- Setting config.assets.compile to true in environments/production.rb..."
+        insert_into_file "#{app_name}/config/environments/production.rb", "  config.assets.compile = false\n", :before => "end\n" if dry_run?
+        insert_into_file "#{app_name}/config/environments/production.rb", <<-COMPILE_ASSETS.strip_heredoc_with_indent(2), :after => "  config.assets.compile = false\n"
+          # Fallback to assets pipeline if a precompiled asset is missed, we need this for ckeditor
+          config.assets.compile = true
+        COMPILE_ASSETS
+          
+        comment_lines "#{app_name}/config/environments/production.rb", /config\.assets\.compile = false/
+
+        say "- Capify..."
+        RVM.run 'capify .'
+        remove_file "#{app_name}/config/deploy.rb" # remove the file capify created!
+        copy_file "lib/generators/templates/deploy.rb", "#{app_name}/config/deploy.rb"
+
+        say "- Unicorn Config..."
+        copy_file "lib/generators/templates/unicorn.rb", "#{app_name}/config/unicorn.rb"
+
+        say "- Initializing git..."
+        RVM.run 'git init'
+        create_file "#{app_name}/.gitignore", "/tmp\n" if dry_run?
+        insert_into_file "#{app_name}/.gitignore", <<-GITIGNORE.strip_heredoc_with_indent, :after => "/tmp\n"
+          # netbeans
+          nbproject
+          # remotipart uploads
+          public/uploads
+        GITIGNORE
+
+        RVM.run 'git add .'
+        RVM.run 'git commit -a -m " * Initial"'
+
+        say "\nDone! Now make your tables with 'rails g inline_forms ...", :green
+        #say "- Don't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n"
+
+      end
+    end
+    Creator.start
   end
 end
-  "
-  File.open( 'app/helpers/application_helper.rb', 'w') {|f| f.write(app_helper) }
-
-
-
-  puts "Overwriting application_controller...\n"
-  app_cont = "
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  # before_filter :authenticate_user!
-  # check_authorization :unless => :devise_controller?
-
-  # rescue_from CanCan::AccessDenied do |exception|
-  #  sign_out :user if user_signed_in?
-  #  redirect_to new_user_session_path, :alert => exception.message
-  # end
-end
-  "
-  File.open( 'app/controllers/application_controller.rb', 'w+') {|f| f.write(app_cont) }
-
-  puts "Injecting precompile assets stuff in production.rb...\n"
-  precomp = "
-  \n
-  \n
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  #{app_name}::Application.configure do
-    config.assets.precompile += %w( inline_forms_application.js inline_forms_application.css devise.css )
-    # Fallback to assets pipeline if a precompiled asset is missed, we need this for ckeditor
-    config.assets.compile = true
-    # for devise
-    config.action_mailer.default_url_options = { :protocol => 'https', :host => 'YOURHOSTNAME' }
-
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = {
-      :address => 'YOURMAILSERVER',
-      :enable_starttls_auto => true,
-      :password => 'YOURPASSWORD',
-      :user_name => 'YOURUSERNAME'
-    }
-  end
-  \n"
-  File.open( 'config/environments/production.rb', 'a') {|f| f.write(precomp) }
-
-  puts "Capify...\n"
-  system('capify .')
-  system("cp #{src}/lib/generators/templates/deploy.rb config/deploy.rb")
-
-  puts "Unicorn Config...\n"
-  system("cp #{src}/lib/generators/templates/unicorn.rb config/unicorn.rb")
-
-  puts "Initializing git...\n"
-  system('git init')
-  system('echo >> .gitignore')
-  system('echo "nbproject" >> .gitignore')
-  system('echo "public/uploads" >> .gitignore')
-  system('echo  >> .gitignore')
-  system('git add .')
-  system('git commit -a -m " * Initial"')
-
-  puts "\n\nDone! Now make your tables with 'rails g inline_forms ...\n"
-  puts "\nDon't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n\n"
-
-end
-

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.3.47"
+  VERSION = "1.3.48"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.47
+  version: 1.3.48
   prerelease: 
 platform: ruby
 authors: