pixelforce_cms 2.4 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6019c557dc8aea9ae5f218b8bccaa5c47f105de2
-  data.tar.gz: 656dadb5de484e74b8b81859569d3d16ab3dc4b8
+  metadata.gz: b440c3142c8fdce919ea86b5e6db6428c724c796
+  data.tar.gz: 6a67960b932e357efb51c15f9846ba484b5df06a
 SHA512:
-  metadata.gz: 94abaa0301430c74454d32360592f871dbce4422861d7c5830b206b78541ef50c9e3fc9368f22659c6b3e866a8c67052306f031c7a2d789aa19e87d14b90a8c3
-  data.tar.gz: a7b227b154c8b71fbeb48209ba6986035f0d953ad168d65610e0a201cebc2fa283edd7bcdced0be3bce53a1c4a53d40713ee1224cd62e748fd8be3f8eb49f87c
+  metadata.gz: ced46876b39bee7732b48b44fe97b71c2f97a946e876f1248df1c11c7f18ab15c19edeb863e5e0654a2744275c7447c578c1dc61fc9eaac839fd6213e7028dc6
+  data.tar.gz: f1c0479a4ca4e164d8d00f6c8700dc8eaef29fbd315bede282c0188f95b6c48fd7ed441de76392f51b8c4ebe606838890a3e6a0809aaf27cfa2517ee1d51da45

data/lib/generators/pixelforce_cms/install_generator.rb

@@ -50,8 +50,10 @@ module PixelforceCms
           remove_file 'app/views/layouts/application.html.erb'
           create_file 'app/views/pages/index.html.haml'
           @application_name = application_name
-          template    'deploy.rb', 'config/deploy.rb'
-          template    'unicorn.rb', 'config/unicorn.rb'
+          template    'deploy.rb',     'config/deploy.rb'
+          template    'staging.rb',    'config/deploy/staging.rb'
+          template    'production.rb', 'config/deploy/production.rb'
+          template    'unicorn.rb',    'config/unicorn.rb'
         end
       end
 

data/lib/generators/pixelforce_cms/templates/Gemfile

@@ -77,12 +77,13 @@ group :development do
   gem 'spring'
   gem 'capistrano', '2.15.5'
   gem 'rvm-capistrano'
+  gem 'capistrano-ext'
   gem "capistrano-db-tasks", require: false, github: 'gkopylov/capistrano-db-tasks', ref: 'f3949cd'
   gem 'quiet_assets'
   gem "better_errors"
   gem "binding_of_caller"
-  gem 'pixelforce_cms', '~> 1.0'
+  gem 'pixelforce_cms', '~> 2.4'
 end
 
 # Use debugger
-# gem 'debugger', group: [:development, :test]
+# gem 'debugger', group: [:development, :test]

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

@@ -13,26 +13,12 @@ set :scm, :git
 
 set :deploy_to,   '/home/deploy/<%= @application_name %>'
 set :user,        'deploy'
-set :branch,      'master'
-set :rails_env,   'production'
-set :migrate_env, 'production'
+
 set :use_sudo, false
 set :deploy_via, :remote_cache
 set :db_local_clean, true
 set :locals_rails_env, "development"
-set :server_address, "<%= @application_name %>.pixelforcesystems.com.au"
-
-# server "<%= @application_name %>.com.au", :app, :web, :db, :primary => true
 
 # if you want to clean up old releases on each deploy uncomment this:
 after "deploy:restart", "deploy:cleanup"
-after 'deploy:restart', 'unicorn:restart'
-
-# If you are using Passenger mod_rails uncomment this:
-namespace :deploy do
-  task :start do ; end  
-  task :stop do ; end  
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    run "cd '/home/deploy/<%= @application_name %>/current' ; bundle exec rake db:migrate db:seed RAILS_ENV=production"
-  end
-end
+after 'deploy:restart', 'unicorn:restart'

data/lib/generators/pixelforce_cms/templates/production.rb

@@ -0,0 +1,16 @@
+set :branch,      'master'
+set :rails_env,   'production'
+set :migrate_env, 'production'
+
+set :server_address, "www.<%= @application_name %>.com.au"
+
+server "www.<%= @application_name %>.com.au", :app, :web, :db, :primary => true
+
+# If you are using Passenger mod_rails uncomment this:
+namespace :deploy do
+  task :start do ; end  
+  task :stop do ; end  
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    run "cd '/home/deploy/<%= @application_name %>/current' ; bundle exec rake db:migrate RAILS_ENV=production"
+  end
+end

data/lib/generators/pixelforce_cms/templates/staging.rb

@@ -0,0 +1,16 @@
+set :branch,      'develop'
+set :rails_env,   'staging'
+set :migrate_env, 'staging'
+
+set :server_address, "<%= @application_name %>.pixelforcesystems.com.au"
+
+server "<%= @application_name %>.pixelforcesystems.com.au", :app, :web, :db, :primary => true
+
+# If you are using Passenger mod_rails uncomment this:
+namespace :deploy do
+  task :start do ; end  
+  task :stop do ; end  
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    run "cd '/home/deploy/<%= @application_name %>/current' ; bundle exec rake db:migrate RAILS_ENV=staging"
+  end
+end

data/lib/generators/pixelforce_cms/templates/unicorn.rb

@@ -3,7 +3,6 @@ worker_processes 2
 working_directory '/home/deploy/<%= @application_name %>/current'
 
 listen '/tmp/<%= @application_name %>.sock', :backlog => 2048
-listen 5001, :tcp_nopush => true
 
 timeout 60
 pid "/home/deploy/<%= @application_name %>/shared/pids/<%= @application_name %>.pid"

data/lib/pixelforce_cms/version.rb

@@ -1,3 +1,3 @@
 module PixelforceCms
-  VERSION = "2.4"
+  VERSION = "2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_cms
 version: !ruby/object:Gem::Version
-  version: '2.4'
+  version: '2.5'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/generators/pixelforce_cms/templates/notification.rb
 - lib/generators/pixelforce_cms/templates/pages_controller.rb
 - lib/generators/pixelforce_cms/templates/pretty_url.rb
+- lib/generators/pixelforce_cms/templates/production.rb
 - lib/generators/pixelforce_cms/templates/recipes/base.rb
 - lib/generators/pixelforce_cms/templates/recipes/delayed_job.rb
 - lib/generators/pixelforce_cms/templates/recipes/sphinx.rb
@@ -94,6 +95,7 @@ files:
 - lib/generators/pixelforce_cms/templates/recipes/templates/sphinx_init.erb
 - lib/generators/pixelforce_cms/templates/recipes/templates/unicorn_init.erb
 - lib/generators/pixelforce_cms/templates/recipes/unicorn.rb
+- lib/generators/pixelforce_cms/templates/staging.rb
 - lib/generators/pixelforce_cms/templates/unicorn.rb
 - lib/pixelforce_cms.rb
 - lib/pixelforce_cms/version.rb
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: ''