mana 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 1d1f4d839d3344bd4793d13559e8f66c38dd2aa6
-  data.tar.gz: eb5da8d8975006218ab0a4d79a235938870274c6
-!binary "U0hBNTEy":
-  metadata.gz: 04b7f09d37b5ebcce0fab58fa700553312878a8285b6ae6b2f6c131325b1538196832afdcdad5c5a6eabc788264004758ae070f3878d6446cacfc4346721cca6
-  data.tar.gz: be56da97fad3ae85b595ea023493770c66cc3c7cac49d3d5885210b0d2a99e0df92e48443fe871b944da62b99029cca41e0ff93b0e1f6f464724781c60ef6ba3
+SHA1:
+  metadata.gz: f9b3aacd3cfab074c2e2df7229864cc87fde2e97
+  data.tar.gz: f675ab4391127d3d6ae66bbb3863279ea9b74b65
+SHA512:
+  metadata.gz: 63eff43efe552c2474cc76619916f374bf336dfe72e406641f87a93666384fd3cebc2dc5b2cc8fc3fefce267574890a08ae2a8662502041bc3bc0be0dc7d6c42
+  data.tar.gz: 45fec0b69cfff97b22120a542741efc4cee5e8449228041583126997b8bb0b9969fe4b869b3da2ae76c0c68095adeb2f6aa1b7ee16c2fde395390095d66f4091

data/cookbooks/railsapp/templates/default/site.conf.erb

@@ -24,12 +24,13 @@ server {
     }
   }
 
-  location ~* \.(js|css|png|jpg|gif)$ {
-    if ($query_string ~ "^[0-9]+$") {
-      access_log off;
-      expires max;
-      add_header Cache-Control public;
-    }
+  location ~ ^/(assets)/  {
+    gzip_static on;
+    access_log off;
+    expires max;
+    add_header Cache-Control public;
+    add_header Last-Modified "";
+    add_header ETag "";
   }
 }
 
@@ -46,13 +47,13 @@ server {
   proxy_set_header  X-FORWARDED_PROTO https;
 
   root <%= node[:current_path] %>/public;
-  
+
   location / {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
     proxy_read_timeout <%= node[:railsapp][:request_timeout] %>s;
-    
+
     # If you don't find the filename in the static files
     # Then request it from the unicorn server
     if (!-f $request_filename) {

data/cookbooks/ubuntu/recipes/default.rb

@@ -0,0 +1 @@
+package 'ntp'

data/lib/mana/capistrano.rb

@@ -23,18 +23,23 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   set :strategy, RemoteCacheSubdir.new(self)
 
+  set :show_mascot, true
+  set :ask_confirmation, true
+
   # Roundsman fine-tuning
 
   set :chef_version, '~> 11.4.0'
   set :cookbooks_directory, 'config/deploy/cookbooks'
   set :stream_roundsman_output, false # todo check why is this needed
   set :ruby_install_script do
-    if fetch(:ruby_version) == :brightbox
+    if fetch(:ruby_source) == :brightbox
+      #pg for brightbox ruby2.0   requires headers
       %Q{
         apt-get install -y python-software-properties
         apt-add-repository -y ppa:brightbox/ruby-ng
         apt-get update
-        apt-get install -y ruby1.9.3
+        apt-get install -y ruby#{fetch(:ruby_version) == "2.0" ? "#{fetch(:ruby_version)} ruby2.0-dev": fetch(:ruby_version)}
+
         gem install bundler
       }
     else
@@ -58,7 +63,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         return true
       end
 
-      return false if fetch(:ruby_version) == :brightbox
+      return false if fetch(:ruby_source) == :brightbox
 
       required_version = fetch(:ruby_version).gsub("-", "")
       if installed_version.include?(required_version)
@@ -128,7 +133,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Open SSH connection to server"
     task :ssh do
-      host = roles[:app].servers.first # silly approach
+      host = find_servers.first
       exec "ssh #{ssh_login_options} #{fetch(:user)}@#{host}"
     end
     
@@ -138,14 +143,14 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc 'Run rails console'
     task :console do
-      host = roles[:app].servers.first # silly approach
+      host = find_servers.first
       cmd = "cd #{current_path} && #{sudo_runner} bundle exec rails console #{rails_env}"
       exec "ssh -t #{ssh_login_options} #{fetch(:user)}@#{host} #{cmd.shellescape}"
     end
 
     desc 'Run rake task. Example: cap mana:rake about'
     task :rake do
-      host = roles[:app].servers.first # silly approach
+      host = find_servers.first # todo we could also iterate here?
       args = ARGV.drop_while { |a| a != 'mana:rake' }[1..-1].join ' '
       cmd = "cd #{current_path} && #{sudo_runner} RAILS_ENV=#{rails_env} bundle exec rake #{args}"
       exec "ssh #{fetch(:user)}@#{host} #{cmd.shellescape}"
@@ -163,6 +168,45 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
+    namespace :addon do
+      task :mascot do
+        file = File.join("config", "deploy", "mascot.txt")
+
+        if File.exist?(file) && show_mascot
+          puts File.read(file)
+        end
+
+      end
+
+      task :confirmation do
+        if ask_confirmation
+          set(:confirmed) do
+            project = "#{application.upcase} (#{stage.upcase})"
+            project = Array.new(((72 - project.length) / 2).ceil, "").join(" ") + project
+
+            puts <<-WARN
+
+        ========================================================================
+        #{project}
+        ========================================================================
+
+          WARNING: You're about to perform actions on application server(s)
+          Please confirm that all your intentions are kind and friendly
+
+        ========================================================================
+
+            WARN
+            answer = Capistrano::CLI.ui.ask "  Are you sure you want to continue? (Y) "
+            if answer == 'Y' then true else false end
+          end
+
+          unless fetch(:confirmed)
+            puts "\nDeploy cancelled!"
+            exit
+          end
+        end
+      end
+    end
   end
 
   # More convinience
@@ -178,4 +222,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       sudo "service #{fetch(:application)}-web restart"
     end
   end
+
+  before 'deploy', 'mana:addon:mascot'
+  before 'deploy', 'mana:addon:confirmation'
 end

data/lib/mana/version.rb

@@ -1,3 +1,3 @@
 module Mana
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'
 end

data/templates/config/deploy.rb

@@ -13,7 +13,9 @@ set :default_stage, :vagrant
 # by default.
 # Change to specific version in ruby-build format
 # if exact version needed.
-set :ruby_version, :brightbox
+#valid brightbox "1.9.3" and "2.0"
+set :ruby_version, "2.0"
+set :ruby_source, :brightbox
 set :care_about_ruby_version, false
 
 set :postgresql,
@@ -31,6 +33,15 @@ set :aws,
     access_key_id: '',
     secret_access_key: '' #TODO: set this to let railsapp::backup put backups in s3
 
+
+# Show ASCII beautiful deer in console before deploy.
+# True by default
+#set :show_beautiful_deer, false
+
+# Ask confirmation [Y/N] before deploy. It should be true for production stages.
+# True by default
+#set :ask_confirmation, false
+
 # For other options look into cookbooks/*/attributes/default.rb
 # and other cookbook sources.
 
@@ -41,6 +52,7 @@ set :run_list, %w(
   recipe[nginx]
   recipe[railsapp]
   recipe[railsapp::backup]
+  recipe[ubuntu]
 )
   
 after 'deploy:restart', 'deploy:restart_unicorn'

data/templates/config/deploy/mascot.txt

@@ -0,0 +1,24 @@
+                     /|       |\
+                  `__\\       //__'
+                     ||      ||
+                   \__`\     |'__/
+                     `_\\   //_'
+                     _.,:---;,._
+                     \_:     :_/
+                       |@. .@|
+                       |     |
+                       ,\.-./ \
+                       ;;`-'   `---__________-----.-.
+                       ;;;                         \_\
+                       ';;;                         |
+                        ;    |                      ;
+                         \   \     \        |      /
+                          \_, \    /        \     |\
+                            |';|  |,,,,,,,,/ \    \ \_
+                            |  |  |           \   /   |
+                            \  \  |           |  / \  |
+                             | || |           | |   | |
+                             | || |           | |   | |
+                             | || |           | |   | |
+                             |_||_|           |_|   |_|
+                            /_//_/           /_/   /_/

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mana
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Ilia Ablamonov, Cloud Castle Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: roundsman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: right_aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Configuration management with Chef & Capistrano
@@ -94,6 +94,7 @@ files:
 - cookbooks/railsapp/templates/default/unicorn-init.sh.erb
 - cookbooks/railsapp/templates/default/unicorn.rb.erb
 - cookbooks/railsapp/templates/default/worker.monit.conf.erb
+- cookbooks/ubuntu/recipes/default.rb
 - lib/mana.rb
 - lib/mana/capistrano.rb
 - lib/mana/railtie.rb
@@ -105,6 +106,7 @@ files:
 - templates/Capfile
 - templates/Vagrantfile
 - templates/config/deploy.rb
+- templates/config/deploy/mascot.txt
 - templates/config/deploy/vagrant.rb
 homepage: https://github.com/cloudcastle/mana
 licenses: []
@@ -115,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Configuration management with Chef & Capistrano