inline_forms 1.3.15 → 1.3.16

data/bin/inline_forms

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+mv#!/usr/bin/env ruby
 # copied from hobo and then modified. Some stuff is there because of that.
 
 require 'fileutils'
@@ -206,6 +206,10 @@ end
 
 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')

data/lib/generators/templates/deploy.rb

@@ -0,0 +1,70 @@
+# -*- encoding : utf-8 -*-
+
+require "bundler/capistrano"
+require "rvm/capistrano"
+
+set :application, "YOUR_APPLICATION_NAME"
+set :domain,      "YOUR_HOST_NAME"
+set :user,        "YOUR_USERNAME_ON_THE_HOST"
+
+#
+
+set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
+
+set :bundle_flags,       "--deployment"
+
+set :use_sudo,    false
+
+set :deploy_to,   "/var/www/ror/#{application}"
+
+set :repository,  "file:///home/#{user}/git-repos/#{application}.git"
+set :local_repository, "ssh://#{user}@#{domain}/home/#{user}/git-repos/#{application}.git"
+set :scm,         "git"
+
+
+role :app, domain
+role :web, domain
+role :db,  domain, :primary => true
+
+before :deploy do
+  system "bundle install"
+  system "git commit -a"
+  system "git push"
+end
+
+before 'deploy:setup', 'rvm:install_rvm'
+before 'deploy:setup', 'rvm:install_ruby'
+after  "deploy:update_code", "deploy:fix_stuff"
+after  "deploy:update_code", "deploy:precompile_assets"
+
+namespace :deploy do
+  task :start, :roles => :app do
+    run "touch #{current_release}/tmp/restart.txt"
+  end
+
+  task :stop, :roles => :app do
+    # Do nothing.
+  end
+
+  desc "Fix Stuff."
+  task :fix_stuff do
+    run "cd #{shared_path} && mkdir -p log"
+    run "cd #{shared_path} && mkdir -p sockets"
+    run "ln -s #{shared_path}/sockets #{release_path}/tmp/sockets"
+    raise "Rails environment not set" unless rails_env
+    run "cd #{release_path} && RAILS_ENV=#{rails_env} bundle exec rails g ckeditor:install "
+  end
+
+
+  desc "Compile all the assets named in config.assets.precompile."
+  task :precompile_assets do
+    raise "Rails environment not set" unless rails_env
+    task = "assets:precompile"
+    run "cd #{release_path} && bundle exec rake #{task} RAILS_ENV=#{rails_env}"
+  end
+
+  desc "Restart Application"
+  task :restart, :roles => :app do
+    run "touch #{current_release}/tmp/restart.txt"
+  end
+end

data/lib/generators/templates/unicorn.rb

@@ -0,0 +1,47 @@
+APP_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__)))
+
+if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
+  begin
+    #rvm_path = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
+    #rvm_lib_path = File.join(rvm_path, 'lib')
+    #$LOAD_PATH.unshift rvm_lib_path
+    require 'rvm'
+    RVM.use_from_path! APP_ROOT
+  rescue LoadError
+    raise "RVM ruby lib is currently unavailable."
+  end
+end
+
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
+require 'bundler/setup'
+
+worker_processes 4
+working_directory APP_ROOT
+
+preload_app true
+
+timeout 30
+
+listen APP_ROOT + "/tmp/sockets/unicorn.sock", :backlog => 64
+
+pid APP_ROOT + "/tmp/pids/unicorn.pid"
+
+stderr_path APP_ROOT + "/log/unicorn.stderr.log"
+stdout_path APP_ROOT + "/log/unicorn.stdout.log"
+
+before_fork do |server, worker|
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
+
+  old_pid = Rails.root + '/tmp/pids/unicorn.pid.oldbin'
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      puts "Old master alerady dead"
+    end
+  end
+end
+
+after_fork do |server, worker|
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
+end

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.16
   prerelease: 
 platform: ruby
 authors:
@@ -221,9 +221,10 @@ files:
 - lib/generators/inline_forms_generator.rb
 - lib/generators/templates/_inline_forms_tabs.html.erb
 - lib/generators/templates/controller.erb
-- lib/generators/templates/deploy.rb.rb
+- lib/generators/templates/deploy.rb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
+- lib/generators/templates/unicorn.rb
 - lib/inline_forms.rb
 - lib/inline_forms/version.rb
 - lib/locales/inline_forms.en.yml

data/lib/generators/templates/deploy.rb.rb

@@ -1,60 +0,0 @@
-# -*- encoding : utf-8 -*-
-require "bundler/capistrano"
-
-set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
-
-require "rvm/capistrano"
-
-set :bundle_flags,       "--deployment"
-
-set :use_sudo,    false
-
-set :application, "iDesignBack"
-set :domain,      "ror.suares.com"
-
-set :deploy_to,   "/var/www/ror/#{application}"
-
-set :repository,  "file:///home/capdeploy/git-repos/#{application}.git"
-set :local_repository, "ssh://capdeploy@#{domain}/home/capdeploy/git-repos/#{application}.git"
-set :scm,         "git"
-
-set :user,        "capdeploy"
-
-role :app, domain
-role :web, domain
-role :db,  domain, :primary => true
-
-before :deploy do
-  system "bundle install"
-#  system "bundle update inline_forms"
-  system "git commit -a"
-  system "git push"
-end
-
-after "deploy:update_code", "deploy:precompile_assets"
-before 'deploy:setup', 'rvm:install_rvm'
-before 'deploy:setup', 'rvm:install_ruby'
-
-namespace :deploy do
-  task :start, :roles => :app do
-    run "touch #{current_release}/tmp/restart.txt"
-  end
-
-  task :stop, :roles => :app do
-    # Do nothing.
-  end
-
-desc "Compile all the assets named in config.assets.precompile."
-task :precompile_assets do
-
-  run "cd #{release_path}/../../shared && mkdir -p log"
-  raise "Rails environment not set" unless rails_env
-  task = "assets:precompile"
-  run "cd #{release_path} && bundle exec rake #{task} RAILS_ENV=#{rails_env}"
-end
-
-  desc "Restart Application"
-  task :restart, :roles => :app do
-    run "touch #{current_release}/tmp/restart.txt"
-  end
-end