mana 0.0.4 → 0.0.5

data/README.md

@@ -4,6 +4,8 @@ Configuration management with Chef & Capistrano
 
 ## Installation
 
+### Step 1
+
 Add this line to your application's Gemfile:
 
     gem 'mana'
@@ -16,10 +18,32 @@ Or install it yourself as:
 
     $ gem install mana
 
-## Usage
+### Step 2
+
+Init project with Chef, Capistrano and Vagrant configs:
 
     rake mana:install
 
+Edit `config/deploy.rb` to provide application name, SCM repository etc. and Chef cookbook params.
+
+Edit `Vagrantfile` to match your available Vagrant boxes and personal taste.
+
+Edit Chef cookbooks under `config/deploy/cookbooks` directory to add software.
+
+## Usage
+
+Setup all software on server:
+
+    cap <stage> mana:setup
+
+where `<stage>` is server name. Individual stages can be added in `config/deploy/` directory.
+See default `vagrant` stage for details.
+
+Use ordinary `cap deploy`-like stuff for later deploys and `cap mana:install` for configuration upgrades.
+
+Use `cap -T mana` to see useful stuff added after this.
+
+
 ## Contributing
 
 1. Fork it

data/lib/mana/capistrano.rb

@@ -1,40 +1,57 @@
 require 'roundsman/capistrano'
-require 'capistrano_colors'
 require 'capistrano/ext/multistage'
+require 'capistrano/recipes/deploy/strategy/remote_cache'
+require 'mana/remote_cache_subdir'
 
 Capistrano::Configuration.default_io_proc = ->(ch, stream, out){
-  next if out.strip.empty?
+  next if out.strip.empty? # skipping extensive blank lines
   level = stream == :err ? :important : :info
   ch[:options][:logger].send(level, out.strip, "#{stream} :: #{ch[:server]}")
 }
 
 Capistrano::Configuration.instance(:must_exist).load do
-  
+
   # Convinient defaults
-  
+
   set(:deploy_to) { "/opt/#{fetch(:application)}" }
   set :scm, 'git'
   set :deploy_via, :remote_cache
   set :use_sudo, false
-  
+
   default_run_options[:pty] = true
   ssh_options[:forward_agent] = true
-  
+
+  set :strategy, RemoteCacheSubdir.new(self)
+
   # Roundsman fine-tuning
 
-  set :chef_version, '10.12.0'
+  set :chef_version, '~> 10.18.2'
   set :cookbooks_directory, 'config/deploy/cookbooks'
-  set :stream_roundsman_output, false
-  set :ruby_install_script do %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
-    gem install bundler
-  } end
-  
+  set :stream_roundsman_output, false # todo check why is this needed
+  set :ruby_install_script do
+    if fetch(:ruby_version) == :brightbox
+      %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
+        gem install bundler
+      }
+    else
+      %Q{
+        set -e
+        cd #{roundsman_working_dir}
+        rm -rf ruby-build
+        git clone -q https://github.com/sstephenson/ruby-build.git
+        cd ruby-build
+        ./install.sh
+        CONFIGURE_OPTS='--disable-install-rdoc' ruby-build #{fetch(:ruby_version)} #{fetch(:ruby_install_dir)}
+      }
+    end
+  end
+
   # Mana
-  
+
   namespace :mana do
     desc 'Complete update of all software'
     task :default do
@@ -44,23 +61,23 @@ Capistrano::Configuration.instance(:must_exist).load do
       install
       deploy.migrations
     end
-  
+
     desc 'Bootstrap chef and ruby'
     task :bootstrap do
       roundsman.install.default
       roundsman.chef.install
     end
-    
+
     desc 'Install & update software'
     task :install do
       roundsman.chef.default
     end
-    
+
     desc 'Show install log'
     task :log do
       sudo "cat /tmp/roundsman/cache/chef-stacktrace.out"
     end
-    
+
     desc 'Complete setup'
     task :setup do
       upgrade
@@ -71,28 +88,40 @@ Capistrano::Configuration.instance(:must_exist).load do
       deploy.seed
       sudo 'monit reload'
     end
-    
+
     desc 'Upgrade software'
     task :upgrade do
       sudo "DEBIAN_FRONTEND=noninteractive #{fetch(:package_manager)} -yq update"
       sudo "DEBIAN_FRONTEND=noninteractive #{fetch(:package_manager)} -yq upgrade"
     end
-    
+
     desc "Open SSH connection to server"
     task :ssh do
       host = roles[:app].servers.first # silly approach
       exec "ssh -L 3737:localhost:3737 #{fetch(:user)}@#{host}" # forward monit status server port
     end
+
+    desc "Watch Rails log"
+    task :watchlog do
+      begin
+        run "tail -n 100 -f #{fetch(:shared_path)}/log/#{rails_env}.log", pty: true do |_, stream, data|
+          puts "[#{channel[:host]}][#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] #{data}"
+          break if stream == :err
+        end
+      rescue Interrupt
+        exit
+      end
+    end
   end
-  
+
   # More convinience
-  
+
   namespace :deploy do
     desc 'Update the database with seed data'
     task :seed, roles: :db, only: {primary: true} do
       run "cd #{current_path}; bundle exec rake db:seed RAILS_ENV=#{rails_env}"
     end
-    
+
     desc "Restart unicorn"
     task :restart_unicorn, roles: :app, except: {no_release: true} do
       sudo "service #{fetch(:application)}-web restart"

data/lib/mana/remote_cache_subdir.rb

@@ -0,0 +1,21 @@
+class RemoteCacheSubdir < Capistrano::Deploy::Strategy::RemoteCache
+  private
+
+  def repository_cache_subdir
+    if configuration[:deploy_subdir] then
+      File.join(repository_cache, configuration[:deploy_subdir])
+    else
+      repository_cache
+    end
+  end
+
+  def copy_repository_cache
+    logger.trace "copying the cached version to #{configuration[:release_path]}"
+    if copy_exclude.empty?
+      run "cp -RPp #{repository_cache_subdir} #{configuration[:release_path]} && #{mark}"
+    else
+      exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
+      run "rsync -lrpt #{exclusions} #{repository_cache_subdir}/* #{configuration[:release_path]} && #{mark}"
+    end
+  end
+end

data/lib/mana/version.rb

@@ -1,3 +1,3 @@
 module Mana
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

data/mana.gemspec

@@ -17,5 +17,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "capistrano"
   gem.add_dependency "roundsman"
-  gem.add_dependency "capistrano_colors"
 end

data/templates/config/deploy.rb

@@ -1,17 +1,35 @@
-set :application, 'application' #TODO: change this to application name
+#TODO: change this to application name
+set :application, 'application'
 
-set :repository, 'git@github.com:author/application.git' #TODO: change this to repository
+#TODO: change this to repository
+set :repository, 'git@github.com:author/application.git'
+
+# set :deploy_subdir, ''
 
 set :default_stage, :vagrant
 
+# Uses Brightbox Next Generation Ruby Packages
+# http://wiki.brightbox.co.uk/docs:ruby-ng
+# by default.
+# Change to specific version in ruby-build format
+# if exact version needed.
+set :ruby_version, :brightbox
 set :care_about_ruby_version, false
 
-set :postgresql, version: '9.1'
+set :postgresql,
+    version: '9.1',
+    listen_all: false #TODO: changes this to `true` for TCP connectivity
 
 set :monit,
     notify_email: 'admin@application.com', #TODO: change this to your email to receive monit alerts
     poll_period: 30
 
+set :railsapp,
+    server_names: '_' #TODO: change this to domain name(s) of the project
+
+# For other options look into cookbooks/*/attributes/default.rb
+# and other cookbook sources.
+
 set :run_list, %w(
   recipe[monit]
   recipe[monit::ssh]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mana
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano_colors
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Configuration management with Chef & Capistrano
 email:
 - ilia@flamefork.ru
@@ -103,6 +87,7 @@ files:
 - lib/mana.rb
 - lib/mana/capistrano.rb
 - lib/mana/railtie.rb
+- lib/mana/remote_cache_subdir.rb
 - lib/mana/version.rb
 - lib/tasks/mana.rake
 - mana.gemspec