capistrano-alice 0.0.3 → 0.0.4

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-alice.gemspec
 gemspec
+
+gem 'rake'

data/lib/capistrano-alice/release_managment.rb

@@ -3,6 +3,8 @@ class Capistrano::Alice::Release
   attr_accessor :processes
   attr_accessor :path_rules
   attr_accessor :environment
+  attr_accessor :deploy_reference
+  attr_accessor :repository_reference
 
   attr_accessor :id
   attr_accessor :number
@@ -14,11 +16,13 @@ class Capistrano::Alice::Release
 
   def create!
     body = {
-      "application" => @config.application,
-      "machines"    => @servers,
-      "processes"   => @processes,
-      "path_rules"  => (@path_rules || {}).to_a,
-      "environment" => @environment
+      "application"          => @config.application,
+      "machines"             => @servers,
+      "processes"            => @processes,
+      "path_rules"           => (@path_rules || {}).to_a,
+      "environment"          => @environment,
+      "deploy_reference"     => @deploy_reference,
+      "repository_reference" => @repository_reference
     }
 
     Net::HTTP.start(@config.alice_host, @config.alice_port) do |http|
@@ -75,6 +79,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         find_and_execute_task("alice:release:_create:detect_ruby_version")
         find_and_execute_task("alice:release:_create:detect_node_version")
 
+        alice_release.deploy_reference     = fetch(:release_name,  nil)
+        alice_release.repository_reference = fetch(:real_revision, nil)
+
         on_rollback { find_and_execute_task("alice:release:destroy") }
 
         begin
@@ -85,9 +92,15 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         default_environment.merge! alice_release.environment
 
-        if alice_release.environment['RUBY_VERSION']
-          set :rvm_ruby_string, alice_release.environment['RUBY_VERSION']
+        if version = alice_release.environment['RUBY_VERSION']
+          set :rvm_ruby_string, version
           reset!(:default_shell)
+
+          if fetch(:alice_env, false)
+            path = default_environment['PATH'] || '$PATH'
+            path = [File.join(fetch(:alice_prefix, '/var/alice'), 'env', 'ruby', version, 'bin'), path].join(':')
+            default_environment['PATH'] = path
+          end
         end
 
         if alice_release.environment['RAILS_ENV']
@@ -199,6 +212,15 @@ Capistrano::Configuration.instance(:must_exist).load do
             end
           end
 
+          if rails_env = fetch(:rails_env, nil)
+            env['RAILS_ENV'] = rails_env
+            env['RACK_ENV']  = rails_env
+          end
+
+          if node_env = fetch(:node_env, nil)
+            env['NODE_ENV'] = node_env
+          end
+
           env.merge! fetch(:alice_environment, {})
 
           alice_release.environment.merge! env

data/lib/capistrano-alice/rvm.rb

@@ -0,0 +1,5 @@
+begin
+  require "rvm/capistrano"
+rescue LoadError
+  require "capistrano-alice/rvm_capistrano"
+end

data/lib/capistrano-alice/rvm_capistrano.rb

@@ -0,0 +1,62 @@
+
+# Recipes for using RVM on a server with capistrano.
+
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "rvm/capistrano requires Capistrano >= 2."
+end
+
+Capistrano::Configuration.instance(true).load do
+
+  # Taken from the capistrano code.
+  def _cset(name, *args, &block)
+    unless exists?(name)
+      set(name, *args, &block)
+    end
+  end
+
+  set :default_shell do
+    shell = File.join(rvm_bin_path, "rvm-shell")
+    ruby = rvm_ruby_string.to_s.strip
+    shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
+    shell
+  end
+
+  # Let users set the type of their rvm install.
+  _cset(:rvm_type, :system)
+
+  # Define rvm_path
+  # This is used in the default_shell command to pass the required variable to rvm-shell, allowing
+  # rvm to boostrap using the proper path.  This is being lost in Capistrano due to the lack of a
+  # full environment.
+  _cset(:rvm_path) do
+    case rvm_type
+    when :root, :system
+      "/usr/local/rvm"
+    when :local, :user, :default
+      "$HOME/.rvm/"
+    else
+      rvm_type.to_s.empty? ?  "$HOME/.rvm" : rvm_type.to_s
+    end
+  end
+
+  # Let users override the rvm_bin_path
+  _cset(:rvm_bin_path) do
+    case rvm_type
+    when :root, :system
+      "/usr/local/rvm/bin"
+    when :local, :user, :default
+      "$HOME/.rvm/bin"
+    else
+      rvm_type.to_s.empty? ?  "#{rvm_path}/bin" : rvm_type.to_s
+    end
+  end
+
+  # Use the default ruby on the server, by default :)
+  _cset(:rvm_ruby_string, "default")
+end
+
+# E.g, to use ree and rails 3:
+#
+#   require 'rvm/capistrano'
+#   set :rvm_ruby_string, "ree@rails3"
+#

data/lib/capistrano-alice/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Alice
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,46 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-alice
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70356617209300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70356617209300
 description: This makes deploying apps to alice/pluto much easier.
-email: 
+email:
 - simon.menke@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -48,39 +36,37 @@ files:
 - lib/capistrano-alice.rb
 - lib/capistrano-alice/maintenance_mode.rb
 - lib/capistrano-alice/release_managment.rb
+- lib/capistrano-alice/rvm.rb
+- lib/capistrano-alice/rvm_capistrano.rb
 - lib/capistrano-alice/version.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2999335112235911117
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2999335112235911117
 requirements: []
-
 rubyforge_project: capistrano-alice
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: "[ALICE] capistrano extention for alice"
+summary: ! '[ALICE] capistrano extention for alice'
 test_files: []
-