fdlcap 0.3.29 → 0.3.30

data/VERSION

@@ -1 +1 @@
-0.3.29
+0.3.30

data/fdlcap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.29"
+  s.version = "0.3.30"
 
   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-09}
+  s.date = %q{2009-10-13}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]

data/lib/fdlcap/extensions/configuration.rb

@@ -45,9 +45,15 @@ class Capistrano::Configuration
     puts cmd
     puts options
     success = false
-    invoke_command("if [#{cmd}]; then echo exists; else echo not_found; fi", options) do |ch, stream, out|
+    if options[:check_exit_code]
+      command = "#{cmd}; if [ $? = 0 ]; then echo pass; else echo fail; fi"
+
+    else
+      command = "if [#{cmd}]; then echo pass; else echo fail; fi"
+    end
+    invoke_command(command, options) do |ch, stream, out|
       warn "#{ch[:server]}: #{out}" if stream == :err
-      success = out.strip == 'exists' ? true : false
+      success = out.strip == 'pass' ? true : false
       break if stream == :err
     end
     success

data/lib/fdlcap/recipes/geminstaller.rb

@@ -1,7 +1,8 @@
 Capistrano::Configuration.instance(:must_exist).load 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?
+    DEFAULT_GEM_SOURCES = ['http://gems.github.com', 'http://gemcutter.org']
+    
+    set :gem_sources, (sources + DEFAULT_GEM_SOURCES).flatten unless exists?(:gem_sources)
 
     #
     # Tasks
@@ -45,10 +46,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :source_gem_servers, :only => { :geminstaller => true } do
         as = fetch(:runner, "app")
         via = fetch(:run_method, :sudo)
+
+        puts "Checking gem sources => #{gem_sources.inspect}"
         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
+          unless check("gem source | grep -q '#{source}'", :via => via, :as => as, :check_exit_code => true)
+            sudo "gem source -a #{source}"
           end
         end
       end
@@ -56,7 +59,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       #
       # Callbacks
       #
-      before "deploy:check",          "geminstaller:add_remote_gem_dependencies"
+      before "deploy:check",         "geminstaller:add_remote_gem_dependencies"
       after "deploy:setup",          "geminstaller:install"
       after "geminstaller:install",  "geminstaller:run"
       after "deploy:update",         "geminstaller:run"

metadata

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