only_one_rake 0.0.2 → 0.0.3

data/README.rdoc

@@ -4,12 +4,12 @@ Ensure only one rake is running at a time
 
 == Usage
 
-namespace :rails do
-  desc "online user count"
-  only_one_task :online_user_count => :environment do
-    loop { OnlineUser.count; sleep 1 }
+  namespace :rails do
+    desc "online user count"
+    only_one_task :online_user_count => :environment do
+      loop { OnlineUser.count; sleep 1 }
+    end
   end
-end
 
 == Contributing to only_one_rake
  

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/only_one_rake.rb

@@ -1,32 +1,55 @@
 module Rake
   WHOAMI = `whoami`.strip
 
-  class OOR < Struct.new(:uid, :pid, :ppid, :c, :stime, :tty, :time, :cmd)
+  class ProcessStatusLine < Struct.new(:uid, :pid, :ppid, :c, :stime, :tty, :time, :cmd)
     def nt_str; self.cmd.split.select {|i| i.match(/:/) }[0] end
-    def namespace; self.nt_str.split(':')[0] end
-    def task; self.nt_str.split(':')[1] end
-    def equal?(n, t); self.nt_str == [n, t].join(":") end
+    def namespace; self.nt_str.split(':')[1..-2].join(":") end
+    def task; self.nt_str.split(':')[-1] end
+    def equal? name; self.nt_str == name end
   end
 
   # TODO support not only one namespace
-  def self.ensure_only_one_task_is_running namespace, task = ""
-    oors = `ps -u #{WHOAMI} -ef | grep rake | grep -v '/bash ' | grep -v 'grep rake'`.split("\n").map {|line| OOR.new *line.split(" ", 8) }
-
-    Process.exit! 0 if oors.select {|oor| oor.equal? namespace, task }.size > 1
+  def self.ensure_only_one_task_is_running name
+    oors = `ps -u #{WHOAMI} -ef | grep rake | grep -v '/bash ' | grep -v 'grep rake'`.split("\n").map {|line| ProcessStatusLine.new *line.split(" ", 8) }
+    Process.exit! 0 if oors.select {|oor| oor.equal? name }.size > 1
   end
 
-  # From github.com/hongchen
-  # Add to rake.gem/lib/rake/dsl_definition.rb
   module DSL
     private
     def only_one_task(*args, &block)
-        name, params, deps = Rake.application.resolve_args(args.dup)
-        scope = Rake.application.instance_variable_get(:@scope).dup[0].to_sym
-        new_block = Proc.new do
-          Rake.ensure_only_one_task_is_running scope, name.to_sym
-          yield
+      task = Rake::Task.define_task(*args, &block)
+      task.is_only_one_task = true
+      task
+    end
+  end
+
+  class Task
+    attr_accessor :is_only_one_task
+
+    # Execute the actions associated with this task.
+    def execute(args=nil)
+      args ||= EMPTY_TASK_ARGS
+      if application.options.dryrun
+        application.trace "** Execute (dry run) #{name}"
+        return
+      end
+      if application.options.trace
+        application.trace "** Execute #{name}"
+      end
+      application.enhance_with_matching_rule(name) if @actions.empty?
+
+      # patch
+      Rake.ensure_only_one_task_is_running name if is_only_one_task
+
+      @actions.each do |act|
+        case act.arity
+        when 1
+          act.call(self)
+        else
+          act.call(self, args)
         end
-        Rake::Task.define_task(*args, &new_block)
+      end
     end
   end
+
 end

data/only_one_rake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "only_one_rake"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chen"]
-  s.date = "2013-01-15"
+  s.date = "2013-02-26"
   s.description = "ensure only one rake is running at a time"
   s.email = "mvjome@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: only_one_rake
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2164385160 !ruby/object:Gem::Requirement
+  requirement: &2153527320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164385160
+  version_requirements: *2153527320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152014800 !ruby/object:Gem::Requirement
+  requirement: &2153526720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2152014800
+  version_requirements: *2153526720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152074500 !ruby/object:Gem::Requirement
+  requirement: &2153525920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152074500
+  version_requirements: *2153525920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152084840 !ruby/object:Gem::Requirement
+  requirement: &2153524360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152084840
+  version_requirements: *2153524360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152081680 !ruby/object:Gem::Requirement
+  requirement: &2153537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152081680
+  version_requirements: *2153537320
 description: ensure only one rake is running at a time
 email: mvjome@gmail.com
 executables: []
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3484601440291875424
+      hash: -2838995736263901768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: