fdlcap 0.3.28 → 0.3.29

data/VERSION

@@ -1 +1 @@
-0.3.28
+0.3.29

data/fdlcap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.28"
+  s.version = "0.3.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-09}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]

data/lib/fdlcap/extensions/configuration.rb

@@ -15,7 +15,7 @@ class Capistrano::Configuration
 
   def render_erb_template(filename)
     template = File.read(filename)
-    result   = ERB.new(template).result(binding)
+    result = ERB.new(template).result(binding)
   end
 
   ##
@@ -31,4 +31,26 @@ class Capistrano::Configuration
     return output.to_s
   end
 
+  def try(command, options)
+    success = true
+    invoke_command(command, options) do |ch, stream, out|
+      warn "#{ch[:server]}: #{out}" if stream == :err
+      yield ch, stream, out if block_given?
+    end
+  rescue Capistrano::CommandError => e
+    success = false
+  end
+
+  def check(cmd, options)
+    puts cmd
+    puts options
+    success = false
+    invoke_command("if [#{cmd}]; then echo exists; else echo not_found; fi", options) do |ch, stream, out|
+      warn "#{ch[:server]}: #{out}" if stream == :err
+      success = out.strip == 'exists' ? true : false
+      break if stream == :err
+    end
+    success
+  end
+
 end

data/lib/fdlcap/recipes/geminstaller.rb

@@ -1,5 +1,8 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  define_recipe :geminstaller do
+  define_recipe :geminstaller do |*sources|
+    gem_sources = sources || ['http://gems.github.com', 'http://gemcutter.org']
+    set :gem_sources, gem_sources.flatten unless exists?(:gem_sources) && !gem_sources.empty?
+
     #
     # Tasks
     #
@@ -11,8 +14,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         as = fetch(:runner, "app")
         via = fetch(:run_method, :sudo)
         invoke_command "gem install geminstaller", :via => via, :as => as
-        invoke_command "gem source -a http://gems.github.com", :via => via, :as => as
-        invoke_command "gem source -a http://gemcutter.org", :via => via, :as => as
       end
 
       desc <<-DESC
@@ -22,8 +23,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         as = fetch(:runner, "app")
         via = fetch(:run_method, :sudo)
         use_geminstaller_sudo = fetch(:geminstaller_sudo, false)
-        invoke_command  "if ! gem source | grep -q 'http://gemcutter.org' ; then gem source -a 'http://gemcutter.org'; fi", :via => via, :as => as
-        invoke_command  "if ! gem source | grep -q 'http://gems.github.com' ; then gem source -a 'http://gems.github.com'; fi", :via => via, :as => as
         invoke_command "/usr/bin/geminstaller #{use_geminstaller_sudo ? '-s' : ''} -c #{current_path}/config/geminstaller.yml  --geminstaller-output=all --rubygems-output=all", :via => via, :as => as
       end
 
@@ -39,15 +38,32 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
         end
       end
+
+      desc <<-DESC
+      add gem sources to server
+      DESC
+      task :source_gem_servers, :only => { :geminstaller => true } do
+        as = fetch(:runner, "app")
+        via = fetch(:run_method, :sudo)
+        gem_sources.each do |source|
+          puts source
+          unless check("gem source | grep '#{source}' = '#{source}'", :via => via, :as => as)
+            invoke_command "gem source -a #{source}", :via => via, :as => as
+          end
+        end
+      end
+
+      #
+      # Callbacks
+      #
+      before "deploy:check",          "geminstaller:add_remote_gem_dependencies"
+      after "deploy:setup",          "geminstaller:install"
+      after "geminstaller:install",  "geminstaller:run"
+      after "deploy:update",         "geminstaller:run"
+
+      before "geminstaller:install", "geminstaller:source_gem_servers"
+      before "geminstaller:run",     "geminstaller:source_gem_servers"
     end
 
-    #
-    # Callbacks
-    #
-    before "deploy:check",          "geminstaller:add_remote_gem_dependencies"
-    after  "deploy:setup",          "geminstaller:install"
-    after  "geminstaller:install",  "geminstaller:run"
-    after  "deploy:update",         "geminstaller:run"
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.3.28
+  version: 0.3.29
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -06:00
+date: 2009-10-09 00:00:00 -06:00
 default_executable: fdlcap
 dependencies: 
 - !ruby/object:Gem::Dependency