opsask 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2a167cc4d6b88c15b8a6f564cd1fb7efe217b3
-  data.tar.gz: 05219406e6467a1ae5392053fd76433e00399860
+  metadata.gz: 059273659a5289a1e0780e64270cdc848d11e952
+  data.tar.gz: 35af36122a71a36d9701c9dcde00c42ea626cfe3
 SHA512:
-  metadata.gz: 9f9a919aa7ab24df80ec98f0cfba0f1c93ff3ef36ce995193bd3971ad5d96a5647f5ec2d0d21d5740d08f842c632e56fb0ceed4050e5e747ce1050d9cdbe599a
-  data.tar.gz: ace1363e142fd393f4e927c8440970d69673daeff6a3c2ae817946219d0f28b4641a5e496473abe8205447ee501f40823015573285f5f8ebf2870b83f44c4da9
+  metadata.gz: 2358424286dc896a03d256401cc0bbbeaa0ed2a30bb28f38e3595da0259b13fa410a13fa4e5111788c8e47a0aeae4cbb51b3aca3e48630a695221a3a1e4dca1b
+  data.tar.gz: 2ebedfaa512641bd2615d95a01d9f8803c3251895b8df271136081f13f3fbbf35f31383cb278047058cd3b81fd315ecea1f93f6441fcb314d71a6371dbcf6fe8

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.3.0

data/lib/opsask/app.rb

@@ -62,6 +62,16 @@ module OpsAsk
       }
     end
 
+    get '/room' do
+      content_type :json
+      room = {}
+      (0..365).each do |n|
+        date = today n * one_day
+        room[date] = room_for_new_jiras_for? date
+      end
+      JSON.pretty_generate(room)
+    end
+
     get '/untracked' do
       erb :untracked, locals: {
         untracked_jiras: untracked_issues,
@@ -136,11 +146,24 @@ module OpsAsk
       "opsask #{settings.config[:app_version]}"
     end
 
+    get '/v' do
+      content_type :txt
+      settings.config[:app_version]
+    end
+
+
     # Try to create a JIRA
     post '/' do
-      duedate = validate_room_for_new_jiras
-      component, summary, description, assign_to_me, epic, ops_only = validate_jira_params
+      component, summary, description, assign_to_me, epic, ops_only, datepicker = validate_jira_params
+
+      if datepicker.nil? || datepicker.empty?
+        duedate = validate_room_for_new_jiras
+      else
+        duedate = datepicker
+      end
+
       jira = create_jira duedate, component, summary, description, assign_to_me, epic, ops_only
+
       if jira.nil? or !jira.has_key?('key')
         flash[:error] = [ %Q| Failure!
           JIRA had an issue processing your request. Try again?
@@ -151,9 +174,11 @@ module OpsAsk
           has been created on your behalf.
         | ]
       end
+
       redirect '/'
     end
 
+
     # Public assets
     %w[ css img js fonts ].each do |asset|
       get "/#{asset}/:file" do

data/lib/opsask/helpers.rb

@@ -324,14 +324,13 @@ module OpsAsk
       if now.hour < settings.config[:cutoff_hour] || its_the_weekend?
         return today if room_for_new_jiras_for? today, really
       end
-      return tomorrow if room_for_new_jiras_for? tomorrow, really
 
-      # # Remove the two-day limit [OPS-1862]
-      # n = 1 # day, i.e. tomorrow
-      # loop do
-      #   next_day = today n * one_day
-      #   return next_day if room_for_new_jiras_for? next_day, really
-      # end
+      # Remove the two-day limit [OPS-1862]
+      n = 1 # day, i.e. tomorrow
+      loop do
+        next_day = today n * one_day
+        return next_day if room_for_new_jiras_for? next_day, really
+      end
     end
 
     def room_for_new_jiras? really=false
@@ -358,7 +357,8 @@ module OpsAsk
         params['jira-description'],
         !!params['jira-assign_to_me'],
         params['jira-epic'],
-        !!params['jira-ops_only']
+        !!params['jira-ops_only'],
+        params['jira-datepicker']
       ]
     end
 

data/public/css/style.css

@@ -108,7 +108,7 @@ select, select:hover {
   background-color: #222;
 }
 
-textarea { height: 100px; }
+textarea { height: 200px; }
 
 .count.label {
   float: right;

data/public/js/opsask.js

@@ -15,5 +15,18 @@
       }, 2500);
     });
 
+    $.get('/room', function(dates){
+      $('#jira-datepicker').show().datepicker({
+        minDate: new Date(),
+        dateFormat: 'yy-mm-dd',
+        constrainInput: true,
+        beforeShowDay: function(date) {
+          date = date.toString('yyyy-MM-dd')
+          var room = dates[date];
+          if (room === undefined) room = false;
+          return [ room ];
+        }
+      });
+    });
   });
 })();

data/views/_form.erb

@@ -19,6 +19,9 @@
         <div class="small-12 columns">
           <textarea id="jira-description" name="jira-description" placeholder="Description (optional)"></textarea>
         </div>
+        <div class="small-12 columns">
+          <input type="text" id="jira-datepicker" name="jira-datepicker" placeholder="Due Date (optional)" style="display:none" />
+        </div>
       </div>
       <div class="row actions">
         <div class="small-8 columns">

data/views/layout.erb

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet" />
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/flick/jquery-ui.css" rel="stylesheet" />
     <link rel="stylesheet" href="/css/foundation.css" />
     <link rel="stylesheet" href="/css/style.css" />
     <link rel="shortcut icon" href="favicon.ico" />
@@ -35,7 +36,9 @@
       </div>
       <% end %>
     </div>
-    <script src="/js/vendor/jquery.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
     <script src="/js/opsask.js"></script>
   </body>
 </html>

metadata

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