opsask 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d05620360e3e9e71f076a5fd2c5540ebdd32d9
-  data.tar.gz: 5c74ef794d3bbee8af04a29f027ed836563a2f2e
+  metadata.gz: 8033a523637bfb87b0e5669277c47cb67c94c572
+  data.tar.gz: 914baba2787613c969697d868f083cc5de0791a6
 SHA512:
-  metadata.gz: 81b22a140fcb111016dac13fe9e669719d41d9d7b492a96e649b2faaadce4059346c71913c2ad1eaf312e2d6c1ecdd2af7b21c856c6fb5d02a1b08f880b49937
-  data.tar.gz: 30efd17d6b0c1b37325ad91045cb492bafb773939ff804bb4f28371df77e7cf14e872a85d1186bf7c06cf9182dd9b8a78478b67fcad83c836a7049bbdc4c7897
+  metadata.gz: 44aebe8bb2f69217a2c89623dd9051ebbf8701f02b8e2ec2b4f9c035f3997cb0637de15c683702eaa1db8a499525a2324837f4008da76786fa21f25e54653311
+  data.tar.gz: c23e34baba316b3d278f9b09f54a17f08eee2513608c6adaca9385e8f1ee534799f42db66430413bbd562f2a90eb0250056b7dedb249683c7abd2d1485a60a6a

data/VERSION

@@ -1 +1 @@
-2.3.3
+2.3.4

data/lib/opsask/app.rb

@@ -15,8 +15,8 @@ module OpsAsk
   class App < Sinatra::Base
     include OpsAsk::Helpers
 
-    @@room = nil
-    @@room_json = '{}'
+    @room = nil
+    @room_json = '{}'
 
     set :root, OpsAsk::ROOT
 
@@ -78,16 +78,16 @@ module OpsAsk
     get '/room' do
       debug 'get-/room'
       content_type :json
-      @@room ||= {}
-      if @@room.empty?
+      @room ||= {}
+      if @room.empty?
         debug 'RECALC ROOM!'
-        (0..365).each do |n|
+        (0..settings.config[:room_lookahead]).each do |n|
           date = today n * one_day
-          @@room[date] = room_for_new_jiras_for? date
+          @room[date] = room_for_new_jiras_for? date
         end
-        @@room_json = JSON.generate(@@room)
+        @room_json = JSON.generate(@room)
       end
-      @@room_json
+      @room_json
     end
 
     get '/untracked' do
@@ -200,7 +200,7 @@ module OpsAsk
         | ]
       end
 
-      @@room = nil # will recalculate
+      @room = nil # will recalculate
       redirect '/'
     end
 

data/lib/opsask/helpers.rb

@@ -320,15 +320,18 @@ module OpsAsk
       jira_count_for(date, really) < settings.config[:queue_size]
     end
 
-    def date_for_new_jiras really=false
+    def date_for_new_jiras really=false, depth=0
+      logger.debug 'date_for_new_jiras really=%s' % really.inspect
       if now.hour < settings.config[:cutoff_hour] || its_the_weekend?
         return today if room_for_new_jiras_for? today, really
       end
 
       # Remove the two-day limit [OPS-1862]
-      n = 1 # day, i.e. tomorrow
+      n = 0 # days from now
       loop do
+        n += 1 # first call n=1, tomorrow
         next_day = today n * one_day
+        logger.debug 'date_for_new_jiras next_day=%s' % next_day.inspect
         return next_day if room_for_new_jiras_for? next_day, really
       end
     end

data/lib/opsask/main.rb

@@ -60,7 +60,8 @@ module OpsAsk
         jira_private_key: 'opsask.pem',
         jira_consumer_key: 'opsask-test',
         app_version: OpsAsk::VERSION,
-        require_label: nil
+        require_label: nil,
+        room_lookahead: 90 # days
       }
 
       if options[:config]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsask
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor