clockwork_web 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d4554a13250d7249b7074982f164055299db2de
-  data.tar.gz: 079e42ce8ce88456cc44d5000a085a88e2c16ce7
+  metadata.gz: f7c3867ecea98c7c51988649055e143e26ba30e4
+  data.tar.gz: 14e364f74e9f89798dd7a399bf7d78fee1f40cc9
 SHA512:
-  metadata.gz: 6ba42432d2220db8080cfc978a4c0a39a9f6e0ababe50d6218b976a061b518e8ff75fe1d5858497123262b24ef09922acd3e81e1dd19c0d80d67347ab3799858
-  data.tar.gz: 5dc43184b56bc5b15cf5716d4209cf91c05491b2cac070e55eaee6ab90a0d2049e2a4d6eb2efddb5e033161662825a3b5550d47684a01c724126b4443917b40c
+  metadata.gz: db09daf6bff8cc75ce2829a9501a32c60ed4951ea7b6a54c2a0ca443b195fe738464b8a4ecfcaef0da75ea40390d4c2b5946644660e365b45dc947326d39970e
+  data.tar.gz: 7423110942b760aa63b881a455a1cec2884c9acbb7a097023f32233ba1914d536179b13636f7a236653e243acc9b36de29e1aa01950ff42b1f0d5110c3887cf3

data/README.md

@@ -47,6 +47,14 @@ authenticate :user, lambda {|user| user.admin? } do
 end
 ```
 
+## Customize
+
+Change clock path
+
+```ruby
+ClockworkWeb.clock_path = Rails.root.join("clock") # default
+```
+
 ## TODO
 
 - demo

data/app/controllers/clockwork_web/home_controller.rb

@@ -6,8 +6,27 @@ module ClockworkWeb
     http_basic_authenticate_with name: ENV["CLOCKWORK_USERNAME"], password: ENV["CLOCKWORK_PASSWORD"] if ENV["CLOCKWORK_PASSWORD"]
 
     def index
-      @events = Clockwork.manager.instance_variable_get(:@events).sort_by{|e| [e.instance_variable_get(:@period), e.job.to_s] }
-      # TODO fetch all disabled jobs and last runs in one call
+      @events =
+        Clockwork.manager.instance_variable_get(:@events).sort_by do |e|
+          at = e.instance_variable_get(:@at)
+          [
+            e.instance_variable_get(:@period),
+            (at && at.instance_variable_get(:@hour)) || -1,
+            (at && at.instance_variable_get(:@min)) || -1,
+            e.job.to_s
+          ]
+        end
+
+      @last_run = {}
+      @disabled = {}
+      if ClockworkWeb.redis
+        keys = @events.flat_map{|e| ["clockwork:last_run:#{e.job}", "clockwork:disabled:#{e.job}"] }
+        values = ClockworkWeb.redis.mget(keys)
+        @events.each_with_index do |event, i|
+          @last_run[event.job] = values[i * 2]
+          @disabled[event.job] = values[i * 2 + 1]
+        end
+      end
     end
 
     def job

data/app/helpers/clockwork_web/home_helper.rb

@@ -3,9 +3,9 @@ module ClockworkWeb
 
     def friendly_period(period)
       if period % 1.day == 0
-        "#{period / 1.day} day"
+        pluralize(period / 1.day, "day")
       elsif period % 1.hour == 0
-        "#{period / 1.hour} hour"
+        pluralize(period / 1.hour, "hour")
       elsif period % 1.minute == 0
         "#{period / 1.minute} min"
       else
@@ -13,13 +13,17 @@ module ClockworkWeb
       end
     end
 
-    def last_run(event)
-      if ClockworkWeb.redis
-        # TODO get all events at once
-        timestamp = ClockworkWeb.redis.get("clockwork:last_run:#{event.job}")
-        if timestamp
-          time_ago_in_words(Time.at(timestamp.to_i))
-        end
+    def last_run(timestamp)
+      if timestamp
+        time_ago_in_words(Time.at(timestamp.to_i))
+      end
+    end
+
+    def friendly_time_part(time_part)
+      if time_part
+        time_part.to_s.rjust(2, "0")
+      else
+        "**"
       end
     end
 

data/app/views/clockwork_web/home/index.html.erb

@@ -62,22 +62,20 @@
         </thead>
         <tbody>
           <% @events.each do |event| %>
-            <% enabled = ClockworkWeb.enabled?(event.job) %>
+            <% enabled = !@disabled[event.job] %>
             <tr class="<%= enabled ? "" : "disabled" %>">
               <td><%= event.job %></td>
               <td>
                 <%= friendly_period(event.instance_variable_get(:@period)) %>
                 <% at = event.instance_variable_get(:@at) %>
                 <% if at %>
-                  <div>
-                    <!-- TODO better format -->
-                    min: <%= at.instance_variable_get(:@min) %>
-                    hour: <%= at.instance_variable_get(:@hour) %>
-                    wday: <%= at.instance_variable_get(:@wday) %>
-                  </div>
+                  at <%= friendly_time_part(at.instance_variable_get(:@hour)) %>:<%= friendly_time_part(at.instance_variable_get(:@min)) %>
+                <% end %>
+                <% if event.instance_variable_get(:@if) %>
+                  if __
                 <% end %>
               </td>
-              <td><%= last_run(event) %></td>
+              <td><%= last_run(@last_run[event.job]) %></td>
               <td><%= button_to enabled ? "Disable" : "Enable", home_job_path(job: event.job, enable: !enabled) %></td>
             </tr>
           <% end %>

data/lib/clockwork_web.rb

@@ -9,21 +9,34 @@ require "clockwork_web/engine"
 
 module ClockworkWeb
   class << self
+    attr_accessor :clock_path
     attr_accessor :redis
   end
 
   def self.enable(job)
-    ClockworkWeb.redis.del("clockwork:disabled:#{job}")
-    true
+    if redis
+      redis.del("clockwork:disabled:#{job}")
+      true
+    else
+      false
+    end
   end
 
   def self.disable(job)
-    ClockworkWeb.redis.set("clockwork:disabled:#{job}", 1)
-    true
+    if redis
+      redis.set("clockwork:disabled:#{job}", 1)
+      true
+    else
+      false
+    end
   end
 
   def self.enabled?(job)
-    !ClockworkWeb.redis.exists("clockwork:disabled:#{job}")
+    if redis
+      !redis.exists("clockwork:disabled:#{job}")
+    else
+      true
+    end
   end
 end
 
@@ -31,11 +44,9 @@ module Clockwork
   on(:before_run) do |t|
     run = true
     safely do
-      if ClockworkWeb.redis
-        run = ClockworkWeb.enabled?(t.job)
-        if run
-          ClockworkWeb.redis.set("clockwork:last_run:#{t.job}", Time.now.to_i)
-        end
+      run = ClockworkWeb.enabled?(t.job)
+      if run && ClockworkWeb.redis
+        ClockworkWeb.redis.set("clockwork:last_run:#{t.job}", Time.now.to_i)
       end
     end
     run

data/lib/clockwork_web/engine.rb

@@ -3,7 +3,8 @@ module ClockworkWeb
     isolate_namespace ClockworkWeb
 
     initializer "clockwork_web" do |app|
-      require Rails.root.join("clock") # hacky
+      ClockworkWeb.clock_path ||= Rails.root.join("clock")
+      require ClockworkWeb.clock_path
     end
   end
 end

data/lib/clockwork_web/version.rb

@@ -1,3 +1,3 @@
 module ClockworkWeb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockwork_web
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kane