ab_admin 0.5.0 → 0.6.0

data/lib/generators/ab_admin/install/install_generator.rb

@@ -21,10 +21,8 @@ module AbAdmin
 
         template('config/logrotate-config', 'config/logrotate-config')
         template('config/nginx.conf', 'config/nginx.conf')
-        template('script/unicorn.sh', 'script/unicorn.sh')
         template('config/settings.yml', 'config/settings/settings.yml')
         template('config/settings.yml', 'config/settings/settings.local.yml')
-        copy_file('config/unicorn/production.rb', 'config/unicorn/production.rb')
         copy_file('config/robots.txt', 'config/robots.txt')
         copy_file('gitignore', '.gitignore')
       end

data/lib/generators/ab_admin/install/templates/config/ab_admin.rb.erb

@@ -4,11 +4,9 @@ Settings.load_config
 
 I18n.available_locales = Globalize.available_locales = [:ru, :en]
 
-if Object.const_defined?('AbAdmin')
-  AbAdmin.setup do |config|
-    config.site_name = '<%= app_const_base.titleize %>'
-    #config.translate_models = %w(User Asset Structure StaticPage Header AdminComment)
-  end
+AbAdmin.setup do |config|
+  config.site_name = '<%= app_const_base.titleize %>'
+  #config.translate_models = %w(User Asset Structure StaticPage Header AdminComment)
 end
 
 

data/lib/generators/ab_admin/install/templates/config/nginx.conf

@@ -1,6 +1,7 @@
 upstream <%= app_name %>_upstream {
-  server unix:<%= app_path %>/tmp/sockets/unicorn.sock fail_timeout=0;
+  server unix:<%= app_path %>/tmp/sockets/app.sock fail_timeout=0;
 }
+
 server {
   server_name static.<%= app_name %>.com;
 

data/lib/generators/template.rb

@@ -4,19 +4,17 @@ gem 'slim'
 gem 'inherited_resources'
 gem 'has_scope'
 gem 'rack-pjax'
-#gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.1'
-#gem 'polyamorous', github: 'activerecord-hackery/polyamorous', branch: 'rails-4.1'
 
 gem 'devise'
 gem 'devise-encryptable'
-gem 'cancancan', '~> 1.7'
+gem 'cancancan'
 
 gem 'protected_attributes'
 gem 'galetahub-enum_field', require: 'enum_field'
 gem 'ransack'
 gem 'simple_slug'
 gem 'awesome_nested_set'
-gem 'globalize', '~> 4.0.0'
+gem 'globalize', '~> 5.0.0'
 
 gem 'carrierwave'
 gem 'mini_magick'
@@ -35,7 +33,6 @@ gem 'ruby-progressbar'
 gem 'ruby2xlsx'
 gem 'rest-client'
 gem 'nested_form', '~> 0.2.2'
-gem 'puma', require: false
 
 gem 'ab_admin', github: 'leschenko/ab_admin', branch: 'master'
 
@@ -52,7 +49,6 @@ if gem_adds
   gem 'dalli'
   gem 'exception_notification'
   gem 'redis-actionpack'
-  gem 'activevalidators', '~> 1.9.0'
 
   gem_group :development, :test do
     gem 'quiet_assets'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-pjax
   requirement: !ruby/object:Gem::Requirement
@@ -322,16 +322,16 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -437,25 +437,25 @@ files:
 - app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee
 - app/assets/javascripts/ab_admin/main.js
 - app/assets/javascripts/i18n/translations.js
-- app/assets/stylesheets/ab_admin/application.css.scss
-- app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss
-- app/assets/stylesheets/ab_admin/components/_admin_comments.css.scss
-- app/assets/stylesheets/ab_admin/components/_base.css.scss
-- app/assets/stylesheets/ab_admin/components/_colored_tabs.css.scss
-- app/assets/stylesheets/ab_admin/components/_columns_hider.css.scss
-- app/assets/stylesheets/ab_admin/components/_form.css.scss
-- app/assets/stylesheets/ab_admin/components/_geo_input.css.scss
-- app/assets/stylesheets/ab_admin/components/_grid_view.css.scss
-- app/assets/stylesheets/ab_admin/components/_locale_tabs.css.scss
-- app/assets/stylesheets/ab_admin/components/_navigation.css.scss
-- app/assets/stylesheets/ab_admin/components/_perms.css.scss
-- app/assets/stylesheets/ab_admin/components/_table_view.css.scss
-- app/assets/stylesheets/ab_admin/components/_translations.css.scss
-- app/assets/stylesheets/ab_admin/components/_tree_view.css.scss
-- app/assets/stylesheets/ab_admin/components/_view_layout.css.scss
-- app/assets/stylesheets/ab_admin/devise.css.scss
-- app/assets/stylesheets/ab_admin/fileupload.css.scss
-- app/assets/stylesheets/ab_admin/main.css.scss
+- app/assets/stylesheets/ab_admin/application.scss
+- app/assets/stylesheets/ab_admin/bootstrap_and_overrides.scss
+- app/assets/stylesheets/ab_admin/components/_admin_comments.scss
+- app/assets/stylesheets/ab_admin/components/_base.scss
+- app/assets/stylesheets/ab_admin/components/_colored_tabs.scss
+- app/assets/stylesheets/ab_admin/components/_columns_hider.scss
+- app/assets/stylesheets/ab_admin/components/_form.scss
+- app/assets/stylesheets/ab_admin/components/_geo_input.scss
+- app/assets/stylesheets/ab_admin/components/_grid_view.scss
+- app/assets/stylesheets/ab_admin/components/_locale_tabs.scss
+- app/assets/stylesheets/ab_admin/components/_navigation.scss
+- app/assets/stylesheets/ab_admin/components/_perms.scss
+- app/assets/stylesheets/ab_admin/components/_table_view.scss
+- app/assets/stylesheets/ab_admin/components/_translations.scss
+- app/assets/stylesheets/ab_admin/components/_tree_view.scss
+- app/assets/stylesheets/ab_admin/components/_view_layout.scss
+- app/assets/stylesheets/ab_admin/devise.scss
+- app/assets/stylesheets/ab_admin/fileupload.scss
+- app/assets/stylesheets/ab_admin/main.scss
 - app/controllers/admin/admin_comments_controller.rb
 - app/controllers/admin/assets_controller.rb
 - app/controllers/admin/base_controller.rb
@@ -637,7 +637,6 @@ files:
 - lib/generators/ab_admin/install/templates/config/robots.txt
 - lib/generators/ab_admin/install/templates/config/seeds.rb
 - lib/generators/ab_admin/install/templates/config/settings.yml
-- lib/generators/ab_admin/install/templates/config/unicorn/production.rb
 - lib/generators/ab_admin/install/templates/gitignore
 - lib/generators/ab_admin/install/templates/helpers/admin/structures_helper.rb
 - lib/generators/ab_admin/install/templates/models/ability.rb
@@ -660,7 +659,6 @@ files:
 - lib/generators/ab_admin/install/templates/models/user.rb
 - lib/generators/ab_admin/install/templates/models/user_role_type.rb
 - lib/generators/ab_admin/install/templates/rspec
-- lib/generators/ab_admin/install/templates/script/unicorn.sh
 - lib/generators/ab_admin/install/templates/spec/factories/sequences.rb
 - lib/generators/ab_admin/install/templates/spec/factories/structure_factory.rb
 - lib/generators/ab_admin/install/templates/spec/factories/user_factory.rb

data/lib/generators/ab_admin/install/templates/config/unicorn/production.rb

@@ -1,49 +0,0 @@
-APP_ROOT = File.expand_path('../../..', __FILE__)
-
-require 'redis'
-worker_processes 4
-
-#user "unprivileged_user", "unprivileged_group"
-
-working_directory APP_ROOT
-
-listen "#{APP_ROOT}/tmp/sockets/unicorn.sock", backlog: 64
-#listen 8080, tcp_nopush: true
-
-timeout 90
-
-pid "#{APP_ROOT}/tmp/pids/unicorn.pid"
-
-stderr_path "#{APP_ROOT}/log/unicorn.stderr.log"
-stdout_path "#{APP_ROOT}/log/unicorn.stdout.log"
-
-preload_app true
-GC.respond_to?(:copy_on_write_friendly=) and
-    GC.copy_on_write_friendly = true
-
-before_fork do |server, worker|
-  defined?(ActiveRecord::Base) and
-      ActiveRecord::Base.connection.disconnect!
-
-  old_pid = "#{server.config[:pid]}.oldbin"
-  if old_pid != server.pid
-    begin
-      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill(sig, File.read(old_pid).to_i)
-    rescue Errno::ENOENT, Errno::ESRCH
-    end
-  end
-
-  sleep 1
-end
-
-after_fork do |server, worker|
-  # per-process listener ports for debugging/admin/migrations
-  # addr = "127.0.0.1:#{9293 + worker.nr}"
-  # server.listen(addr, tries: -1, delay: 5, tcp_nopush: true)
-
-  ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
-  Resque.redis.client.reconnect if defined?(Resque)
-
-  $redis = Redis.connect
-end

data/lib/generators/ab_admin/install/templates/script/unicorn.sh

@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# unicorn_<%= app_name %> 
-#
-# chkconfig: - 85 15
-# processname: unicorn_<%= app_name %>
-# description: unicorn_<%= app_name %>
-#
-### BEGIN INIT INFO
-# Provides: unicorn_<%= app_name %>
-# Required-Start: $all
-# Required-Stop: $all
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop unicorn_<%= app_name %>
-### END INIT INFO
-
-set -u
-set -e
-
-APP_ROOT=<%= app_path %>
-PID=$APP_ROOT/tmp/pids/unicorn.pid
-RAILS_ENV=${RAILS_ENV:-"production"}
-
-RVM_RUBY=`cat $APP_ROOT/.ruby-version`
-RVM_GEMSET=`cat $APP_ROOT/.ruby-gemset`
-BUNDLE_PATH=/usr/local/rvm/wrappers/ruby-$RVM_RUBY@$RVM_GEMSET/bundle
-
-CMD="$BUNDLE_PATH exec unicorn -D -E $RAILS_ENV -c $APP_ROOT/config/unicorn/$RAILS_ENV.rb"
-
-old_pid="$PID.oldbin"
-
-cd $APP_ROOT || exit 1
-git show-ref >> tmp/refs
-
-sig () {
-	test -s "$PID" && kill -$1 `cat $PID`
-}
-
-oldsig () {
-	test -s $old_pid && kill -$1 `cat $old_pid`
-}
-
-case $1 in
-start)
-	sig 0 && echo >&2 "Already running" && exit 0
-	$CMD
-	;;
-stop)
-	sig QUIT && exit 0
-	echo >&2 "Not running"
-	;;
-force-stop)
-	sig TERM && exit 0
-	echo >&2 "Not running"
-	;;
-restart|reload)
-	sig HUP && echo reloaded OK && exit 0
-	echo >&2 "Couldn't reload, starting '$CMD' instead"
-	$CMD
-	;;
-upgrade)
-	sig USR2 && exit 0
-	echo >&2 "Couldn't upgrade, starting '$CMD' instead"
-	$CMD
-	;;
-rotate)
-        sig USR1 && echo rotated logs OK && exit 0
-        echo >&2 "Couldn't rotate logs" && exit 1
-        ;;
-*)
-	echo >&2 "Usage: $0 <start|stop|restart|upgrade|rotate|force-stop>"
-	exit 1
-	;;
-esac