gap 0.0.5 → 0.0.7

data/gap.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.description = "gap is a wrapper of capistrano. gap = god + cap"
 
   #s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency("capistrano", ">= 2.9.0")
-  s.add_dependency("god", "~> 0.11.0")
+  s.add_runtime_dependency("capistrano", ">= 2.9.0")
+  s.add_runtime_dependency("god", "~> 0.11.0")
 
   s.files        = Dir.glob("lib/**/*") + %w(README.rdoc Rakefile)
   s.require_path = 'lib'

data/lib/gap/defalut_recipe.rb

@@ -1,7 +1,11 @@
-#load File.expand_path './recipes/hg.rb', File.dirname(__FILE__)
-#load File.expand_path './recipes/sys.rb', File.dirname(__FILE__)
-load 'gap/recipes/hg.rb'
-load 'gap/recipes/sys.rb'
+load File.expand_path './recipes/hg.rb', File.dirname(__FILE__)
+load File.expand_path './recipes/sys.rb', File.dirname(__FILE__)
+#load 'gap/recipes/hg.rb'
+#load 'gap/recipes/sys.rb'
+
+$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
+require "rvm/capistrano"
+set :rvm_bin_path, "/usr/local/rvm/bin/"
 
 set :stages, %w(dev alpha beta pro)
 set :default_stage, "dev"

data/lib/gap/patch.rb

@@ -44,8 +44,20 @@ module Capistrano
 
           gap_config.each do |env,value|
 
-            if env == "global"
+            case env
+            when "global"
               value["set"].each { |attr, val| set attr, val}
+            when "local"
+              task(env) do
+                define_bulk_tasks value
+                #value["set"].each { |attr, val| set attr, val }
+                value["task"].each do |app, commands|
+                  task(app) do
+                    commands.each { |name, command|
+                      task(name) { exec(command) }}
+                  end
+                end
+              end
             else
               task(env) do
                 define_bulk_tasks value

data/lib/gap/tasks.rb

@@ -29,35 +29,35 @@ module Gap
           send(:god)
         end
       end
+    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|
-
-          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
+    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|
 
-              commands.each do |name, command|
-                task(name) do
-                  sudo "god #{name} #{app}_#{application}"
-                end
-              end
+        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
-          else
 
-            task(app) do
-              commands.each { |name, command|
-                task(name) { sudo_run command }}
+            commands.each do |name, command|
+              task(name) do
+                sudo "god #{name} #{app}_#{application}"
+              end
             end
+          end
+        else
 
+          task(app) do
+            commands.each { |name, command|
+              task(name) { sudo_run command }}
           end
+
         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.5'
+  VERSION = '0.0.7'
 end

metadata

@@ -2,7 +2,7 @@
 name: gap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - Takashi Yaguchi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc