gap 0.0.3 → 0.0.4

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/gap/defalut_recipe.rb
 lib/gap/god_erb.rb
 lib/gap/patch.rb
 lib/gap/tasks.rb
+lib/gap/sudo_run.rb
 lib/gap/tmpl.erb
 lib/gap/recipes/hg.rb
 lib/gap/recipes/sys.rb

data/lib/gap/god_erb.rb

@@ -11,7 +11,7 @@ module Gap
 
     def render
       # ファイル出力
-      output = "./god_#{@app}_#{@part}.rb"
+      output = "./config/god_#{@app}_#{@part}.rb"
       txt = @erb.result(binding)
       fw = File.open(output, 'w')
       fw.puts(txt)

data/lib/gap/patch.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'gap/god_erb'
 require 'gap/tasks'
+require 'gap/sudo_run'
 
 
 module Capistrano
@@ -38,6 +39,7 @@ module Capistrano
         #コマンドラインオプションにする
         gap_config = YAML.load_file("config/gap.yml")
         config.send(:extend,Gap::Tasks)
+        config.send(:extend,Gap::SudoRun)
         config.load do
 
           gap_config.each do |env,value|

data/lib/gap/sudo_run.rb

@@ -0,0 +1,7 @@
+module Gap 
+  module SudoRun
+    def sudo_run command
+      run command.gsub(/sudo/,sudo)
+    end 
+  end 
+end

data/lib/gap/tasks.rb

@@ -41,12 +41,12 @@ module Gap
                 god_config_path = File.join( deploy_to, "config/god_#{application}_#{app}.rb")
                 god_config = Gap::GodErb.new("./gap/tmpl.erb",application, app, commands)
                 upload( god_config.render, god_config_path, :via => :scp)
-                sudo "rvm-shell '1.9.2@god' -c 'god load #{god_config_path}'"
+                sudo "god load #{god_config_path}"
               end
 
               commands.each do |name, command|
                 task(name) do
-                  sudo "rvm-shell '1.9.2@god' -c 'god #{name} #{app}_#{application}'"
+                  sudo "god #{name} #{app}_#{application}"
                 end
               end
             end
@@ -54,7 +54,7 @@ module Gap
 
             task(app) do
               commands.each { |name, command|
-                task(name) { run command }}
+                task(name) { sudo_run command }}
             end
 
           end

data/lib/gap.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gap
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -2,7 +2,7 @@
 name: gap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Takashi Yaguchi
@@ -74,6 +74,7 @@ files:
 - lib/gap/god_erb.rb
 - lib/gap/patch.rb
 - lib/gap/tasks.rb
+- lib/gap/sudo_run.rb
 - lib/gap/tmpl.erb
 - lib/gap/recipes/hg.rb
 - lib/gap/recipes/sys.rb