day_planner 0.1.0.pre13.2 → 0.1.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1a8388bee3db6d14b3f8e87ae7a015ea6fb9e9
-  data.tar.gz: 1a3add64f1cf3ea29bcaf0ce9e5821360e02d8f9
+  metadata.gz: 76c86b034100ccea52a8255db13af7ffdf288878
+  data.tar.gz: 2e6b31e856ff9cdccd6abc89d11692c026e7e08f
 SHA512:
-  metadata.gz: d444e21d7abbca089a2ce5082fd91d3dc6e91d1162cf93e629a88a8c3121b18bd366ceb6c5169654af7ef5d2ad8fcc8f7a8b81608db2d57bcbce040be196d6cf
-  data.tar.gz: 23e61d289e2b28534dc1f54afe4699c07ddc200442c8dc308b84ef49f33b426b341df838455a741d319fe8e99f9af5bb0787dd4bbac142f2536afc5b021e2c05
+  metadata.gz: 6f2c7d5e8314258dec3f4255c09c0f3acbfc82ec319ca2e9a29aded05a2ff40e8e3c8d46adfdc1024079cb7b46aac0b6fe403503f64a3e443674d33e3f22d200
+  data.tar.gz: e6943f50012e19967acbbfd9c25a56dc23c309f028ba6fcd6655e4a8aae99a90d22630c82d8549905f1a424880416b2296caecc4a388b245a45dded5e3fb6fc9

data/PLANS.md

@@ -12,6 +12,8 @@ This is basically a gimme as long as we're already recording stuff in a database
 HIGH PRIORITY: I want to be able to monitor the elaborate new scheduling algorithm appropriately. This needs to be optional, but it would be nice to have the ability to monitor at least how well the task adheres to the timeline.
 * Optional generator task to create a table of task history whatnot? Check for it on initialize and then start writing to it if it's there.
 * Read history, add method to calculate number of times task performed over timeframe.
+* ActiveRecord::Base.connection.table_exists?('day_planner_task_log') welp then check for it
+* new rails generator to create that migration
 
 ### Attempt some degree of control with multi-process instances ###
 Not sure exactly how to do this.

data/app/models/day_planner/log.rb

@@ -0,0 +1,5 @@
+module DayPlanner
+	class Log < ActiveRecord::Base
+		self.table_name = :day_planner_log
+	end
+end

data/app/models/day_planner/task.rb

@@ -16,10 +16,19 @@ module DayPlanner
 			fields = {}
 			fields[:name] = options.delete(:name) if options[:name]
 			fields[:interval] = options.delete(:every).to_i if options[:every]
+			fields[:last_execution] = Time.parse("1/1/1")
 
 			task = DayPlanner::Task.create(fields)
 		end
 
+		def log
+			if ActiveRecord::Base.connection.table_exists?('day_planner_log')
+				DayPlanner::Log.create(name: name, interval: interval, datetime: Time.now)
+			else
+				puts "I refuse to log!"
+			end
+		end
+
 		def check_name
 			if name.present?
 				tasks = Task.where(name: name)

data/lib/day_planner/base.rb

@@ -34,7 +34,7 @@ module DayPlanner
 
 		def clear_tasks
 			@@tasks = []
-			ActiveRecord::Base.connection.execute("DELETE FROM #{DayPlanner::Task.table_name} WHERE true;")
+			ActiveRecord::Base.connection.execute("DELETE FROM #{DayPlanner::Task.table_name} WHERE 1;")
 			DayPlanner::Task.reset_table_sequence
 		end
 
@@ -106,7 +106,7 @@ module DayPlanner
 					if task.nil?
 						@@tasks.select!{ |item| item.id != t.id }
 					else
-						if task.last_execution.nil? || (time > task.next_execution && time > task.last_execution + (task.interval / 2))
+						if task.last_execution.nil? || task.next_execution.nil? || (time > task.next_execution && time > task.last_execution + (task.interval / 2))
 							task.last_execution = time
 
 							if !task.next_execution.nil?
@@ -117,6 +117,7 @@ module DayPlanner
 
 							task.save!
 
+							t.log
 							t.block.call
 						end
 					end

data/lib/day_planner/generators/day_planner_generator.rb

@@ -3,6 +3,35 @@ require 'rails/generators'
 
 module DayPlanner
 	module Generators
+		class LogGenerator < ::Rails::Generators::Base
+			include ::Rails::Generators::Migration
+
+			source_root File.expand_path('../../templates', __FILE__)
+
+			def copy_migrations
+				copy_migration "create_day_planner_log"
+			end
+
+		protected
+
+			def copy_migration(filename)
+				if self.class.migration_exists?("db/migrate", filename)
+					say_status("skipped", "Migration #{filename} already exists")
+				else
+					migration_template("migrations/#{filename}.rb", "db/migrate/#{filename}.rb")
+				end
+			end
+
+			def self.next_migration_number(path)
+				unless @previous_migration_number
+					@previous_migration_number = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
+				else
+					@previous_migration_number += 1
+				end
+				@previous_migration_number.to_s
+			end
+		end
+
 		class InstallGenerator < ::Rails::Generators::Base
 			include ::Rails::Generators::Migration
 

data/lib/day_planner/templates/migrations/create_day_planner_log.rb

@@ -0,0 +1,13 @@
+class CreateDayPlannerLog < ActiveRecord::Migration
+	def up
+		create_table :day_planner_log do |t|
+			t.string   :name
+			t.integer  :interval
+			t.datetime :datetime
+		end
+	end
+
+	def down
+		drop_table :day_planner_log
+	end
+end

data/lib/day_planner/version.rb

@@ -2,8 +2,8 @@ module DayPlanner
 	MAJOR = 0
 	MINOR = 1
 	TINY  = 0
-	PRE   = "pre13"
-	BUILD = 2
+	PRE   = "pre15"
+	BUILD = nil
 
   VERSION = [MAJOR, MINOR, TINY, PRE, BUILD].compact.join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: day_planner
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre13.2
+  version: 0.1.0.pre15
 platform: ruby
 authors:
 - Damon Siefert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - PLANS.md
 - README.md
 - Rakefile
+- app/models/day_planner/log.rb
 - app/models/day_planner/task.rb
 - day_planner.gemspec
 - lib/active_record/reset_table_sequence.rb
@@ -87,6 +88,7 @@ files:
 - lib/day_planner/base.rb
 - lib/day_planner/engine.rb
 - lib/day_planner/generators/day_planner_generator.rb
+- lib/day_planner/templates/migrations/create_day_planner_log.rb
 - lib/day_planner/templates/migrations/create_day_planner_tasks.rb
 - lib/day_planner/version.rb
 homepage: ''