magic_recipes 0.0.27 → 0.0.28

data/bin/git_cap

@@ -13,22 +13,26 @@ spawn cap deploy
 match_max 100000
 
 # Look for user prompt
-expect "*?sername:*"
+# expect "*?sername:*"
+expect "*?sername for 'https://github.com':*"
 send -- "$g_user\r"
 send -- "\r"
 
 # Look for passwod prompt
-expect "*?assword:*"
+# expect "*?assword:*"
+expect "*?assword for *@github.com':*"
 send -- "$g_pwd\r"
 send -- "\r"
 
 # Look for user prompt
-expect "*?sername:*"
+# expect "*?sername:*"
+expect "*?sername for 'https://github.com':*"
 send -- "$g_user\r"
 send -- "\r"
 
 # Look for passwod prompt
-expect "*?assword:*"
+# expect "*?assword:*"
+expect "*?assword for *@github.com':*"
 send -- "$g_pwd\r"
 send -- "\r"
 

data/bin/git_cap_old

@@ -0,0 +1,35 @@
+#!/usr/bin/expect -f
+# Expect script to supply username/password to cap deploy to git private repository
+# This script needs username and password as arguments to connect to git server:
+# ------------------------------------------------------------------------
+# ./git_cap gitusr gitpwd
+# -------------------------------------------------------------------------
+# set Variables
+set g_user [lrange $argv 0 0] 
+set g_pwd [lrange $argv 1 1]   
+set timeout -1   
+
+spawn cap deploy
+match_max 100000
+
+# Look for user prompt
+expect "*?sername:*"
+send -- "$g_user\r"
+send -- "\r"
+
+# Look for passwod prompt
+expect "*?assword:*"
+send -- "$g_pwd\r"
+send -- "\r"
+
+# Look for user prompt
+expect "*?sername:*"
+send -- "$g_user\r"
+send -- "\r"
+
+# Look for passwod prompt
+expect "*?assword:*"
+send -- "$g_pwd\r"
+send -- "\r"
+
+expect eof

data/lib/magic_recipes/rvm.rb

@@ -19,13 +19,24 @@ module MagicRecipes
         
         ## change to rvm-capistrano gem, so commited out
         # $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
-        # require 'rvm/capistrano'
+        require 'rvm/capistrano'
+        
+        
+        Example:
+
+        # set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
+        # set :rvm_install_ruby_params, '--1.9'      # for jruby/rbx default to 1.9 mode
+
+        # before 'deploy:setup', 'rvm:install_rvm'   # install RVM
+        # before 'deploy:setup', 'rvm:install_ruby'  # install Ruby and create gemset, or:
+        # before 'deploy:setup', 'rvm:create_gemset' # only create gemset
         
         set_default :rails_env,     'production'
         set_default :rvm_ruby,      '1.9.3'
         set_default :rvm_patch,     'p0'
         set_default :rvm_gemset,    'global'
         set_default :rvm_path,      '/usr/local/rvm'
+        
         # set :rvm_type,              :system
         set :rvm_type,              :user
         set :rvm_ruby_string,       "ruby-#{rvm_ruby}-#{rvm_patch}@#{rvm_gemset}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -197,6 +197,7 @@ extra_rdoc_files: []
 files:
 - bin/g_cap
 - bin/git_cap
+- bin/git_cap_old
 - lib/generators/magic_recipes/capify_generator.rb
 - lib/generators/magic_recipes/git_cap_generator.rb
 - lib/generators/magic_recipes/templates/Capfile.tt