day_planner 0.0.8 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904c805d79424950a8099abbf95b0c6e2ae73647
-  data.tar.gz: e764170c2aea3098683557d6fbc205d8b9ae1625
+  metadata.gz: 945c2843fc7f28b960f82bd71392ab2ef725ce0d
+  data.tar.gz: b716a7c571a211836e45bc0391612beee4ef6b2b
 SHA512:
-  metadata.gz: 299536d558059bfc3c2be205cd5ffa02e3f4e615c69ce2650954f297bdf755f1655af306a9a003489c0b29a21b5d15759b5937700a66fa923f0be303be411b5d
-  data.tar.gz: ab15735a5e24df16f4035864228fb1472450bb23ba3962053f86739b05dd0fd9cefbe117f13feabf2197600fda5e6de28dbfd4cd9cdfee5815d3bf91b099d069
+  metadata.gz: 803d6968fc5ae408ac6dfa209fd5a62b8494d72ea7c114da515ce70d6634816c79c4bc320c7ad428766331e5cd37eb9f2f4d3b08c6f26f7b619fb442cd3768d7
+  data.tar.gz: 2d302295627b1d2a1dd90a90dac2c72a6152e6e89f1a47aa22ba04f1032b2d2e3e3f9c4b61fb4d94ccf60ae50cde3675cb3df84bb671df7dfa5b5a589d8d9a98

data/README.md

@@ -34,7 +34,7 @@ Obviously you only get those cute little time methods in Rails; otherwise, pass
 
 The tasks in the schedule will each be performed on startup and then thereafter according to their stated intervals.
 
-I'm not doing a whole damn ton to protect you from tasks that throw errors, but there is a begin/rescue/end up in there at some point. I definitely am not protecting you from a process that just won't end or anything like that. Given that each task is run in its own thread, you have some faint assurance that they are occuring at whatever interval you specify plus a very small amount of overhead.
+I'm not doing a whole damn ton to protect you from tasks that throw errors, but there is a begin/rescue/end up in there at some point. I definitely am not protecting you from a process that just won't end or anything like that. Remember that your interval is really the minimum possible time between instances of the task being performed, as it does not spawn a new thread for that purpose.
 
 By default, DayPlanner checks for tasks to be performed once per minute. You have the power to change this:
 
@@ -48,23 +48,36 @@ Note that if you try to schedule a task with an interval shorter than DayPlanner
 
 Specify your preferred interval (and whatever other goodies may be waiting in the pipeline) in config/day_planner_tasks.rb. Note that you probably won't manage to precede that first minute-long wait. I may default to a shorter value in the future. I dunno. Don't pressure me.
 
-### Non-Rails uses
+### Other options
 
-I sort of think it might work without Rails, keeping in mind the various aforementioned caveats? I'm not really sure. If it totally doesn't, I'd appreciate feedback.
+#### name
 
 You can name a task thusly:
+
     DayPlanner.schedule(every: 2.minutes, name: "my task") do
-    	MyClass.my_class_method
+        MyClass.my_class_method
     end
 
 If you do, you can find the task later:
     DayPlanner.find_task("my task")
 
+#### environment
+
+If you're using Rails, you can include environment in your options hash, setting the value to the Rails environment in which you'd like the task executed. For example:
+
+    DayPlanner.schedule(every: 1.hour, name: "occasional task", environment: "production") do
+        # I run every hour, but only if you're using Rails and in production.
+    end
+
 To cancel a task, you can either call the task's "destroy" method, or call a class method on DayPlanner:
     DayPlanner.cancel(task)
 
 You can either pass a name, if you named the task, or the task object.
 
+### Non-Rails uses
+
+I sort of think it might work without Rails, keeping in mind the various aforementioned caveats? I'm not really sure. If it totally doesn't, I'd appreciate feedback.
+
 ## Contributing
 
 1. Fork it

data/lib/day_planner/base.rb

@@ -22,7 +22,7 @@ module DayPlanner
 		def activate
 			@@master.kill if defined?(@@master)
 
-			if Rails && Rails.logger
+			if defined?(Rails) && Rails.logger
 				Rails.logger.info("DayPlanner activated.")
 			else
 				puts "DayPlanner activated."
@@ -65,7 +65,7 @@ module DayPlanner
 					begin
 						t.perform
 					rescue => e
-						if Rails && Rails.logger
+						if defined?(Rails) && Rails.logger
 							Rails.logger.error("DayPlanner: Scheduled task threw an error! Behave yourselves!\n#{e.inspect}")
 						else
 							puts "DayPlanner: Scheduled task threw an error! Behave yourselves!\n#{e.inspect}"
@@ -80,12 +80,26 @@ module DayPlanner
 		attr_reader :last_executed, :interval
 
 		def perform
-			@last_executed = Time.now
+			if @environment.nil? || (defined?(Rails) && defined?(Rails.environment) && Rails.environment == @environment)
+				@last_executed = Time.now
 
-			@thread.kill if defined?(@thread)
-
-			@thread = Thread.new do
 				@task.call
+			else
+				log_info = "DayPlanner: "
+
+				if @name
+					log_info += "Skipping task '#{@name}'"
+				else
+					log_info += "Skipping a task"
+				end
+
+				log_info += " because it's set for environment '#{@environment}'."
+
+				if defined?(Rails) && Rails.logger
+					Rails.logger.info(log_info)
+				else
+					puts log_info
+				end
 			end
 		end
 
@@ -112,6 +126,8 @@ module DayPlanner
 				end
 			end
 
+			@environment = options.delete(:environment) if options[:environment]
+
 			@task = block
 
 			DayPlanner.tasks.push(self)
@@ -119,7 +135,7 @@ module DayPlanner
 			log_info += ": '#{@name}'" unless @name.nil?
 			log_info += " with an execution interval of #{@interval.to_i} seconds."
 
-			if Rails && Rails.logger
+			if defined?(Rails) && Rails.logger
 				Rails.logger.info(log_info)
 			else
 				puts log_info
@@ -128,7 +144,7 @@ module DayPlanner
 			begin
 				perform
 			rescue => e
-				if Rails && Rails.logger
+				if defined?(Rails) && Rails.logger
 					Rails.logger.error("DayPlanner: Task caused error on first performance. There's no second chance for a good first impression!\n#{e.inspect}")
 				else
 					puts "DayPlanner: Task caused error on first performance. There's no second chance for a good first impression!\n#{e.inspect}"

data/lib/day_planner/version.rb

@@ -1,7 +1,7 @@
 module DayPlanner
 	MAJOR = 0
 	MINOR = 0
-	TINY  = 8
+	TINY  = 11
 	BUILD = nil
 
   VERSION = [MAJOR, MINOR, TINY, BUILD].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: day_planner
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.11
 platform: ruby
 authors:
 - Damon Siefert