joekhoobyar-capistrano-extensions 0.0.5 → 0.0.7

data/Rakefile

@@ -16,6 +16,7 @@ begin
     s.email = "joe@ankhcraft.com"
 
     s.add_dependency 'capistrano'
+    s.add_dependency 'archive-tar-minitar'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/lib/capistrano_extensions/files.rb

@@ -1,7 +1,7 @@
 module CapistranoExtensions
   module Files
 
-    COMMANDS = [ %w(mkdir mkdir_p rmdir cp cp_r rm rm_r rm_rf
+    COMMANDS = [ %w(mkdir mkdir_p rmdir cp cp_r rm rm_f rm_r rm_rf
                     chmod chmod_R chown chown_R touch),
                 %w(ln ln_s ln_sf mv install) ]
 

data/lib/capistrano_extensions/files/remote.rb

@@ -4,10 +4,6 @@ module CapistranoExtensions
   module Files
     module Remote
 
-      COMMANDS = [ %w(mkdir mkdir_p rmdir cp cp_r rm rm_r rm_rf
-                      chmod chmod_R chown chown_R touch),
-                  %w(ln ln_s ln_sf mv install) ]
-
       COMMANDS.each_with_index do |l,n|
         l.each do |m|
           k, f = m.split('_')
@@ -21,6 +17,14 @@ module CapistranoExtensions
         end
       end
 
+      FILE_TESTS.each do |m,t|
+        class_eval <<-EODEF
+          def #{m}(a, options={})
+            _t "test #{t}", a
+          end
+        EODEF
+      end
+
       def tail_f(file, n=10)
         cmd = "tail -n #{n} -f #{_q file}"
         _via == :system ? local_run(cmd) : stream(cmd, :via => _via)
@@ -49,14 +53,6 @@ module CapistranoExtensions
         capture('pwd', :via => _via)
       end
 
-      FILE_TESTS.each do |m,t|
-        class_eval <<-EODEF
-          def #{m}(a, options={})
-            _t "test #{t}", a
-          end
-        EODEF
-      end
-
     private
 
       def _t(cmd, args=nil, min=nil)

data/lib/capistrano_extensions/service/windows.rb

@@ -4,11 +4,12 @@ module CapistranoExtensions
 
       DEFAULT_ACTIONS = [:start, :stop]
 
-      STATUS_REGEX = /STATE +: +([0-9])+ +([^ ]+)/
-
       # Check for the existance of a generic Windows NT service.
-      def windows?(id)
-        `sc query "#{id}"` !~ / FAILED /
+      def windows?(id, verbose=false)
+        logger.trace "executing locally: sc query \"#{id}\"" if logger and verbose
+        $1.to_i if `sc query "#{id}"` =~ /STATE +: +([0-9])+ +([^ ]+)/
+      ensure
+        logger.trace "   service status => #{$2} (#{$1})" if logger and verbose
       end
 
       # Defines a recipe to control a generic Windows NT service.
@@ -30,13 +31,8 @@ module CapistranoExtensions
           [:default, :status].each do |k|
             desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:status]}" if svc_desc
             task k, options do
-              output = `sc query "#{id}"`
-              if output =~ STATUS_REGEX
-                logger.trace "Service status: #{svc_name}: #{$2} (#{$1})" if logger
-              else
-                logger.error output if logger
+              service.windows? id, true or
                 abort "Failed to get service status for #{svc_name}"
-              end
             end
           end
 
@@ -44,14 +40,16 @@ module CapistranoExtensions
             svc_action = svc_action.intern if String === svc_action
             desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[svc_action]}" if svc_desc
             task svc_action, options do
-              system "net #{svc_action} \"#{id}\""
+              local_run "net #{svc_action} \"#{id}\""
             end
           end
 
           desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:restart]}" if svc_desc
           task :restart, options do
-            `sc query "#{id}"` =~ STATUS_REGEX
-            $1 == '4' or stop
+            case service.windows?(id)
+            when 4, 2; stop
+            when NilClass; abort "Failed to get service status for #{svc_name}"
+            end
             start
           end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  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: []