joekhoobyar-capistrano-extensions 0.0.0 → 0.0.1

data/Rakefile

@@ -10,10 +10,12 @@ begin
     s.name = "capistrano-extensions"
     s.homepage = "http://github.com/joekhoobyar/capistrano-extensions"
     s.summary = "Joe Khoobyar's Capistrano Extensions"
-    s.description = %Q{Joe Khoobyar's Capistrano Extensions}
+    s.description = %Q{Various capistrano extensions}
 
     s.authors = ["Joe Khoobyar"]
     s.email = "joe@ankhcraft.com"
+
+    s.add_dependency 'capistrano'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -36,5 +38,5 @@ Rake::TestTask.new do |t|
   t.libs << "lib"
 end
 
-task :default => :package
+task :default => :build
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 0
-:patch: 0
+:patch: 1
 :major: 0
+:minor: 0

data/lib/capistrano_extensions/files.rb

@@ -7,11 +7,7 @@ module CapistranoExtensions::Files
   end.join("\n"))
 
   def _via
-    if ! @config.exists?(:files_via) or @config.files_via != :local then
-      :remote
-    else
-      :local
-    end
+    @config.fetch(:files_via, :remote).to_sym != :local ? :remote : :local
   end
 end
 

data/lib/capistrano_extensions/files/local.rb

@@ -5,11 +5,10 @@ module CapistranoExtensions
     module Local
 
       def tail_f(file, n=10)
-        unless defined? File::Tail::Logfile
-          gem 'file-tail'
-          require 'file/tail'
-        end
+        unless defined? File::Tail::Logfile then gem 'file-tail'; require 'file/tail' end
         File::Tail::Logfile.tail(file, :backward=>n) do |line| puts line end
+      rescue Interrupt
+        logger.trace "interrupted (Ctrl-C)" if logger
       end
 
       def upload(from, to)

data/lib/capistrano_extensions/files/remote.rb

@@ -6,15 +6,17 @@ module CapistranoExtensions
 
       def tail_f(file, n=10)
         cmd = "tail -n #{n} -f #{_q file}"
-        _via == :system ? system(cmd) : stream(cmd)
+        _via == :system ? system(cmd) : stream(cmd, :via => _via)
+      rescue Interrupt
+        logger.trace "interrupted (Ctrl-C)" if logger
       end
 
       def upload(*args)
-        _via == :system ? cp(*args) : upload(*args)
+        _via == :system ? cp(*args) : @config.upload(*args.push(:via => _via))
       end
 
       def download(*args)
-        _via == :system ? cp(*args) : download(*args)
+        _via == :system ? cp(*args) : @config.download(*args.push(:via => _via))
       end
 
       def cd(dir, options={})
@@ -160,8 +162,6 @@ module CapistranoExtensions
         when :system
           @quiet or $stderr.puts cmd
           system cmd
-        when :sudo
-          sudo cmd, :as => @config.fetch(:runner, 'app')
         else
           invoke_command cmd, :via => v
         end          
@@ -172,11 +172,11 @@ module CapistranoExtensions
       end
 
       def _via
-        case (v = files_via)
+        case (v = @config.fetch(:files_via, nil))
         when :local
           :system
         when :remote, NilClass
-          :runner
+          @config.fetch(:run_method, nil)
         else 
           v
         end

data/lib/capistrano_extensions/invocation.rb

@@ -0,0 +1,24 @@
+module CapistranoExtension
+  module Invocation
+    def sudo_as(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      options[:as] = fetch(:runner, nil)
+      sudo *args.push(options), &block
+    end
+    
+    def sudo_su(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      args[0] = "su #{fetch(:runner, nil)} -c '#{args[0]}'"
+      sudo *args.push(options), &block
+    end
+    
+    def sudo_su_to(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      options[:shell] = false
+      args[0] = "echo \"#{args[0].gsub('"', '\\"')}\" | #{sudo} su - #{fetch(:runner, nil)}"
+      run *args.push(options), &block
+    end
+  end
+  Capistrano::Configuration.send :include, Invocation
+end
+

data/lib/jk_capistrano_extensions.rb

@@ -3,6 +3,6 @@ unless Capistrano::Configuration.respond_to?(:instance)
 end
 require 'capistrano'
 
-require "#{File.dirname(__FILE__)}/capistrano_extensions/file_transfer.rb"
+require "#{File.dirname(__FILE__)}/capistrano_extensions/invocation.rb"
 require "#{File.dirname(__FILE__)}/capistrano_extensions/files.rb"
 require "#{File.dirname(__FILE__)}/capistrano_extensions/service.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,11 +9,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: Joe Khoobyar's Capistrano Extensions
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: capistrano
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Various capistrano extensions
 email: joe@ankhcraft.com
 executables: []
 
@@ -27,6 +36,7 @@ files:
 - lib/capistrano_extensions/files.rb
 - lib/capistrano_extensions/files/local.rb
 - lib/capistrano_extensions/files/remote.rb
+- lib/capistrano_extensions/invocation.rb
 - lib/capistrano_extensions/service.rb
 - lib/jk_capistrano_extensions.rb
 - README