ThiagoLelis-backgroundjob 1.0.4 → 1.0.5

data/lib/bj/attributes.rb

@@ -1,120 +1,120 @@
-module Attributes
-  Attributes::VERSION = '5.0.0' unless defined? Attributes::VERSION
-  def self.version() Attributes::VERSION end
-
-  class List < ::Array
-    def << element
-      super
-      self
-    ensure
-      uniq!
-      index!
-    end
-    def index!
-      @index ||= Hash.new
-      each{|element| @index[element] = true}
-    end
-    def include? element
-      @index ||= Hash.new
-      @index[element] ? true : false
-    end
-    def initializers
-      @initializers ||= Hash.new
-    end
-  end
-
-  def attributes *a, &b
-    unless a.empty?
-      returned = Hash.new
-
-      hashes, names = a.partition{|x| Hash === x}
-      names_and_defaults = {}
-      hashes.each{|h| names_and_defaults.update h}
-      names.flatten.compact.each{|name| names_and_defaults.update name => nil}
-
-      initializers = __attributes__.initializers
-
-      names_and_defaults.each do |name, default|
-        raise NameError, "bad instance variable name '@#{ name }'" if "@#{ name }" =~ %r/[!?=]$/o
-        name = name.to_s
-
-        initialize = b || lambda { default }
-        initializer = lambda do |this|
-          Object.instance_method('instance_eval').bind(this).call &initialize
-        end
-        initializer_id = initializer.object_id
-        __attributes__.initializers[name] = initializer
-
-        module_eval <<-code
-          def #{ name }=(*value, &block)
-            value.unshift block if block
-            @#{ name } = value.first
-          end
-        code
-
-        module_eval <<-code
-          def #{ name }(*value, &block)
-            value.unshift block if block
-            return self.send('#{ name }=', value.first) unless value.empty?
-            #{ name }! unless defined? @#{ name }
-            @#{ name }
-          end
-        code
-
-        module_eval <<-code
-          def #{ name }!
-            initializer = ObjectSpace._id2ref #{ initializer_id }
-            self.#{ name } = initializer.call(self)
-            @#{ name }
-          end
-        code
-
-        module_eval <<-code
-          def #{ name }?
-            #{ name }
-          end
-        code
-
-        attributes << name
-        returned[name] = initializer 
-      end
-
-      returned
-    else
-      begin
-        __attribute_list__
-      rescue NameError
-        singleton_class =
-          class << self
-            self
-          end
-        klass = self
-        singleton_class.module_eval do
-          attribute_list = List.new 
-          define_method('attribute_list'){ klass == self ? attribute_list : raise(NameError) }
-          alias_method '__attribute_list__', 'attribute_list'
-        end
-        __attribute_list__
-      end
-    end
-  end
-
-  %w( __attributes__ __attribute__ attribute ).each{|dst| alias_method dst, 'attributes'}
-end
-
-=begin
-class Object
-  def attributes *a, &b
-    sc = 
-      class << self
-        self
-      end
-    sc.attributes *a, &b
-  end
-  %w( __attributes__ __attribute__ attribute ).each{|dst| alias_method dst, 'attributes'}
-end
-=end
-
-class Module
-  include Attributes
-end
+module Attributes
+  Attributes::VERSION = '5.0.0' unless defined? Attributes::VERSION
+  def self.version() Attributes::VERSION end
+
+  class List < ::Array
+    def << element
+      super
+      self
+    ensure
+      uniq!
+      index!
+    end
+    def index!
+      @index ||= Hash.new
+      each{|element| @index[element] = true}
+    end
+    def include? element
+      @index ||= Hash.new
+      @index[element] ? true : false
+    end
+    def initializers
+      @initializers ||= Hash.new
+    end
+  end
+
+  def attributes *a, &b
+    unless a.empty?
+      returned = Hash.new
+
+      hashes, names = a.partition{|x| Hash === x}
+      names_and_defaults = {}
+      hashes.each{|h| names_and_defaults.update h}
+      names.flatten.compact.each{|name| names_and_defaults.update name => nil}
+
+      initializers = __attributes__.initializers
+
+      names_and_defaults.each do |name, default|
+        raise NameError, "bad instance variable name '@#{ name }'" if "@#{ name }" =~ %r/[!?=]$/o
+        name = name.to_s
+
+        initialize = b || lambda { default }
+        initializer = lambda do |this|
+          Object.instance_method('instance_eval').bind(this).call &initialize
+        end
+        initializer_id = initializer.object_id
+        __attributes__.initializers[name] = initializer
+
+        module_eval <<-code
+          def #{ name }=(*value, &block)
+            value.unshift block if block
+            @#{ name } = value.first
+          end
+        code
+
+        module_eval <<-code
+          def #{ name }(*value, &block)
+            value.unshift block if block
+            return self.send('#{ name }=', value.first) unless value.empty?
+            #{ name }! unless defined? @#{ name }
+            @#{ name }
+          end
+        code
+
+        module_eval <<-code
+          def #{ name }!
+            initializer = ObjectSpace._id2ref #{ initializer_id }
+            self.#{ name } = initializer.call(self)
+            @#{ name }
+          end
+        code
+
+        module_eval <<-code
+          def #{ name }?
+            #{ name }
+          end
+        code
+
+        attributes << name
+        returned[name] = initializer 
+      end
+
+      returned
+    else
+      begin
+        __attribute_list__
+      rescue NameError
+        singleton_class =
+          class << self
+            self
+          end
+        klass = self
+        singleton_class.module_eval do
+          attribute_list = List.new 
+          define_method('attribute_list'){ klass == self ? attribute_list : raise(NameError) }
+          alias_method '__attribute_list__', 'attribute_list'
+        end
+        __attribute_list__
+      end
+    end
+  end
+
+  %w( __attributes__ __attribute__ attribute ).each{|dst| alias_method dst, 'attributes'}
+end
+
+=begin
+class Object
+  def attributes *a, &b
+    sc = 
+      class << self
+        self
+      end
+    sc.attributes *a, &b
+  end
+  %w( __attributes__ __attribute__ attribute ).each{|dst| alias_method dst, 'attributes'}
+end
+=end
+
+class Module
+  include Attributes
+end

data/lib/bj/bj.rb

@@ -1,72 +1,72 @@
-class Bj
-  module ClassMethods
-    attribute("rails_root"){ Util.const_or_env("RAILS_ROOT"){ "." } }
-    attribute("rails_env"){ Util.const_or_env("RAILS_ENV"){ "development" } }
-    attribute("database_yml"){ File.join rails_root, "config", "database.yml" }
-    attribute("configurations"){ YAML::load(ERB.new(IO.read(database_yml)).result) }
-    attribute("tables"){ Table.list }
-    attribute("hostname"){ Socket.gethostname }
-    attribute("logger"){ Bj::Logger.off STDERR }
-    attribute("ruby"){ Util.which_ruby }
-    attribute("rake"){ Util.which_rake }
-    attribute("script"){ Util.find_script "bj" }
-    attribute("ttl"){ Integer(Bj::Table::Config["ttl"] || (twenty_four_hours = 24 * 60 * 60)) }
-    attribute("table"){ Table }
-    attribute("config"){ table.config }
-    attribute("util"){ Util }
-    attribute("runner"){ Runner }
-    attribute("joblist"){ Joblist }
-    attribute("default_path"){ %w'/bin /usr/bin /usr/local/bin /opt/local/bin'.join(File::PATH_SEPARATOR) }
-
-    def transaction options = {}, &block
-      options.to_options!
-
-      cur_rails_env = Bj.rails_env.to_s
-      new_rails_env = options[:rails_env].to_s
-
-      cur_spec = configurations[cur_rails_env]
-      table.establish_connection(cur_spec) unless table.connected?
-
-      if(new_rails_env.empty? or cur_rails_env == new_rails_env) 
-        table.transaction{ block.call(table.connection) }
-      else
-        new_spec = configurations[new_rails_env]
-        table.establish_connection(new_spec)
-        Bj.rails_env = new_rails_env
-        begin
-          table.transaction{ block.call(table.connection) }
-        ensure
-          table.establish_connection(cur_spec)
-          Bj.rails_env = cur_rails_env
-        end
-      end
-    end
-
-    def chroot options = {}, &block
-      if defined? @chrooted and @chrooted
-        return(block ? block.call(@chrooted) : @chrooted)
-      end
-      if block
-        begin
-          chrooted = @chrooted
-          Dir.chdir(@chrooted = rails_root) do
-            raise RailsRoot, "<#{ Dir.pwd }> is not a rails root" unless Util.valid_rails_root?(Dir.pwd)
-            block.call(@chrooted)
-          end
-        ensure
-          @chrooted = chrooted 
-        end
-      else
-        Dir.chdir(@chrooted = rails_root)
-        raise RailsRoot, "<#{ Dir.pwd }> is not a rails root" unless Util.valid_rails_root?(Dir.pwd)
-        @chrooted
-      end
-    end
-
-    def boot
-      load File.join(rails_root, "config", "boot.rb")
-      load File.join(rails_root, "config", "environment.rb")
-    end
-  end
-  send :extend, ClassMethods
-end
+class Bj
+  module ClassMethods
+    attribute("rails_root"){ Util.const_or_env("RAILS_ROOT"){ "." } }
+    attribute("rails_env"){ Util.const_or_env("RAILS_ENV"){ "development" } }
+    attribute("database_yml"){ File.join rails_root, "config", "database.yml" }
+    attribute("configurations"){ YAML::load(ERB.new(IO.read(database_yml)).result) }
+    attribute("tables"){ Table.list }
+    attribute("hostname"){ Socket.gethostname }
+    attribute("logger"){ Bj::Logger.off STDERR }
+    attribute("ruby"){ Util.which_ruby }
+    attribute("rake"){ Util.which_rake }
+    attribute("script"){ Util.find_script "bj" }
+    attribute("ttl"){ Integer(Bj::Table::Config["ttl"] || (twenty_four_hours = 24 * 60 * 60)) }
+    attribute("table"){ Table }
+    attribute("config"){ table.config }
+    attribute("util"){ Util }
+    attribute("runner"){ Runner }
+    attribute("joblist"){ Joblist }
+    attribute("default_path"){ %w'/bin /usr/bin /usr/local/bin /opt/local/bin'.join(File::PATH_SEPARATOR) }
+
+    def transaction options = {}, &block
+      options.to_options!
+
+      cur_rails_env = Bj.rails_env.to_s
+      new_rails_env = options[:rails_env].to_s
+
+      cur_spec = configurations[cur_rails_env]
+      table.establish_connection(cur_spec) unless table.connected?
+
+      if(new_rails_env.empty? or cur_rails_env == new_rails_env) 
+        table.transaction{ block.call(table.connection) }
+      else
+        new_spec = configurations[new_rails_env]
+        table.establish_connection(new_spec)
+        Bj.rails_env = new_rails_env
+        begin
+          table.transaction{ block.call(table.connection) }
+        ensure
+          table.establish_connection(cur_spec)
+          Bj.rails_env = cur_rails_env
+        end
+      end
+    end
+
+    def chroot options = {}, &block
+      if defined? @chrooted and @chrooted
+        return(block ? block.call(@chrooted) : @chrooted)
+      end
+      if block
+        begin
+          chrooted = @chrooted
+          Dir.chdir(@chrooted = rails_root) do
+            raise RailsRoot, "<#{ Dir.pwd }> is not a rails root" unless Util.valid_rails_root?(Dir.pwd)
+            block.call(@chrooted)
+          end
+        ensure
+          @chrooted = chrooted 
+        end
+      else
+        Dir.chdir(@chrooted = rails_root)
+        raise RailsRoot, "<#{ Dir.pwd }> is not a rails root" unless Util.valid_rails_root?(Dir.pwd)
+        @chrooted
+      end
+    end
+
+    def boot
+      load File.join(rails_root, "config", "boot.rb")
+      load File.join(rails_root, "config", "environment.rb")
+    end
+  end
+  send :extend, ClassMethods
+end

data/lib/bj/errors.rb

@@ -1,4 +1,4 @@
-class Bj
-  class Error < ::StandardError; end
-  class RailsRoot < Error; end
-end
+class Bj
+  class Error < ::StandardError; end
+  class RailsRoot < Error; end
+end

data/lib/bj/joblist.rb

@@ -1,112 +1,112 @@
-class Bj
-  class JobList < ::Array
-    module ClassMethods
-      def for jobs, options = {}
-        if Joblist === jobs
-          jobs.update options
-          return jobs
-        end
-        options.to_options!
-        jobs = [jobs].flatten.compact
-        list = []
-        jobs.each do |arg|
-          list.push(
-            case arg
-              when String
-                case arg
-                  when %r/^\d+$/
-                    job_from_id arg
-                  else
-                    job_from_string arg
-                end
-              when Hash
-                job_from_hash arg
-              when Io
-                jobs_from_io arg
-              when Fixnum, Bignum
-                job_from_number arg
-              else
-                job_from_string arg
-            end
-          )
-        end
-        list.flatten!
-        list.compact!
-        list.map!{|job| job.reverse_merge! options}
-        list
-      end
-
-      def job_from_hash arg
-        arg.to_hash.to_options!
-      end
-
-      def job_from_string arg
-        unless arg.strip.empty?
-          { :command => arg.to_s }
-        else
-          nil
-        end
-      end
-
-      def job_from_number arg
-        id = arg.to_i
-        Table::Job.find(id).to_hash
-      end
-
-      def jobs_from_io arg 
-        if arg == "-"
-          load_from_io STDIN
-        else
-          if arg.respond_to? :read
-            load_from_io arg 
-          else
-            open(arg, "r"){|fd| load_from_io fd}
-          end
-        end
-      end
-
-      def load_from_io io
-        list = []
-        io.each do |line|
-          line.strip!
-          next if line.empty?
-          list << job_from_string(line)
-        end
-        list
-      end
-
-      def jobs_from_yaml arg 
-        object =
-          if arg == "-"
-            YAML.load STDIN
-          else
-            if arg.respond_to? :read
-              YAML.load arg
-            else
-              open(arg, "r"){|fd| YAML.load fd}
-            end
-          end
-        Joblist.for object
-      end
-    end
-    send :extend, ClassMethods
-
-    module InstanceMethods
-      def update options = {}
-        options.to_options!
-        each{|job| job.update options}
-      end
-
-      def push other
-        Joblist.for(other).each do |job|
-          super job
-        end
-        self
-      end
-      alias_method "<<", "push"
-    end
-    send :include, InstanceMethods
-  end
-
-  Joblist = JobList
-end
+class Bj
+  class JobList < ::Array
+    module ClassMethods
+      def for jobs, options = {}
+        if Joblist === jobs
+          jobs.update options
+          return jobs
+        end
+        options.to_options!
+        jobs = [jobs].flatten.compact
+        list = []
+        jobs.each do |arg|
+          list.push(
+            case arg
+              when String
+                case arg
+                  when %r/^\d+$/
+                    job_from_id arg
+                  else
+                    job_from_string arg
+                end
+              when Hash
+                job_from_hash arg
+              when Io
+                jobs_from_io arg
+              when Fixnum, Bignum
+                job_from_number arg
+              else
+                job_from_string arg
+            end
+          )
+        end
+        list.flatten!
+        list.compact!
+        list.map!{|job| job.reverse_merge! options}
+        list
+      end
+
+      def job_from_hash arg
+        arg.to_hash.to_options!
+      end
+
+      def job_from_string arg
+        unless arg.strip.empty?
+          { :command => arg.to_s }
+        else
+          nil
+        end
+      end
+
+      def job_from_number arg
+        id = arg.to_i
+        Table::Job.find(id).to_hash
+      end
+
+      def jobs_from_io arg 
+        if arg == "-"
+          load_from_io STDIN
+        else
+          if arg.respond_to? :read
+            load_from_io arg 
+          else
+            open(arg, "r"){|fd| load_from_io fd}
+          end
+        end
+      end
+
+      def load_from_io io
+        list = []
+        io.each do |line|
+          line.strip!
+          next if line.empty?
+          list << job_from_string(line)
+        end
+        list
+      end
+
+      def jobs_from_yaml arg 
+        object =
+          if arg == "-"
+            YAML.load STDIN
+          else
+            if arg.respond_to? :read
+              YAML.load arg
+            else
+              open(arg, "r"){|fd| YAML.load fd}
+            end
+          end
+        Joblist.for object
+      end
+    end
+    send :extend, ClassMethods
+
+    module InstanceMethods
+      def update options = {}
+        options.to_options!
+        each{|job| job.update options}
+      end
+
+      def push other
+        Joblist.for(other).each do |job|
+          super job
+        end
+        self
+      end
+      alias_method "<<", "push"
+    end
+    send :include, InstanceMethods
+  end
+
+  Joblist = JobList
+end