gap 0.0.7 → 0.0.8

data/lib/gap/patch.rb

@@ -54,14 +54,14 @@ module Capistrano
                 value["task"].each do |app, commands|
                   task(app) do
                     commands.each { |name, command|
-                      task(name) { exec(command) }}
+                      task(name) { system(command) }}
                   end
                 end
               end
             else
               task(env) do
-                define_bulk_tasks value
                 define_config_tasks value
+                define_bulk_tasks value
               end
             end
 

data/lib/gap/tasks.rb

@@ -2,19 +2,20 @@ module Gap
   module Tasks
     def define_bulk_tasks value
       #gap dev start,restart,god
+      %w(role set task).each {|key| value.delete(key)}
       %w(start reload).each do |com|
         task(com) do
-          value["task"].each do |app, commands|
+          value.each do |app, commands|
             send(app)
-            send(com) if commands[com]
+            send(com) if commands["task"][com]
           end
         end
       end
 
       task(:stop) do
-        value["task"].reverse.each do |app, commands|
+        value.reverse.each do |app, commands|
           send(app)
-          send(commands["stop"])
+          send(commands["task"]["stop"])
         end
       end
 
@@ -24,7 +25,7 @@ module Gap
       end
 
       task(:god) do
-        value["task"].each do |app,commands|
+        value.each do |app,commands|
           send(app)
           send(:god)
         end
@@ -32,34 +33,71 @@ module Gap
     end
 
     def define_config_tasks value
-      value["role"].each { |attr, val| role attr.to_sym, val }
-      #value["set"].each { |attr, val| set attr, val }
-      value["task"].each do |app, commands|
+      value.each do |attr,val|
 
-        if value["god"]
-          task(app) do
-            task(:god) do
-              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 "god load #{god_config_path}"
-            end
+        case attr
+        when "role"
+          val.each { |attr, val| role attr.to_sym, val } if val
+        when "set"
+          val.each { |attr, val| set attr, val } if val
+        else
+
+
+          val.each do |a, v|
+
+            case a
+            when "role"
+              v.each { |attr, val| role attr.to_sym, val } if v
+            when "set"
+              v.each { |attr, val| set attr, val } if v
+            when "task"
+              if god
+                task(attr) do
+                  task(:god) do
+                    god_config_path = File.join( deploy_to, "config/god_#{application}_#{attr}.rb")
+                    tmpl_path = File.expand_path 'tmpl.erb', File.dirname(__FILE__) 
+                    god_config = Gap::GodErb.new(tmpl_path,application, attr, v)
+                    upload( god_config.render, god_config_path, :via => :scp)
+                    use_god_rvm do
+                      sudo "god load #{god_config_path}"
+                    end
+                  end
+
+                  v.each do |name, command|
+                    if ["start","stop","restart"].include?(name)
+                      task(name) do
+                        use_god_rvm do
+                          sudo "god #{name} #{attr}_#{application}"
+                        end
+                      end
+                    else
+                      task(name) do
+                        sudo_run command 
+                      end
+                    end
+                  end
+
+                end
+              else
 
-            commands.each do |name, command|
-              task(name) do
-                sudo "god #{name} #{app}_#{application}"
+                task(attr) do
+                  v.each do |name, command|
+                    task(name) { sudo_run command }
+                  end
+                end
               end
+            else
             end
           end
-        else
-
-          task(app) do
-            commands.each { |name, command|
-              task(name) { sudo_run command }}
-          end
-
         end
       end
     end
+
+    def use_god_rvm 
+      ruby_string_tmp = rvm_ruby_string
+      set :rvm_ruby_string, rvm_god_string
+      yield
+      set :rvm_ruby_string, ruby_string_tmp
+    end
   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.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -2,7 +2,7 @@
 name: gap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Takashi Yaguchi