Merge branch 'develop' of https://github.com/rightlag/timely

Author: vagrant

timely/timely.py

@@ -1,4 +1,5 @@
 import boto.ec2
+import collections
 import sys
 
 from datetime import datetime
@@ -38,6 +39,8 @@ def all(self, instance_ids=None):
                 IDs
         """
         data = {}
+        Time = collections.namedtuple('Time',
+                                      ['weekday', 'start_time', 'end_time'])
         instances = self.conn.get_only_instances(instance_ids=instance_ids)
         for instance in instances:
             times = instance.tags.get('times')
@@ -55,7 +58,9 @@ def all(self, instance_ids=None):
                     end_time = end_time.strftime('%H:%M')
                     weekday = (self.weekdays[i + 1]
                                if self.iso else self.weekdays[i])
-                    data[instance.id].append((weekday, start_time, end_time,))
+                    data[instance.id].append(
+                        Time(weekday, start_time, end_time)
+                    )
         return data
 
     def set(self, instance_ids=None, weekdays=None, start_time=None,
@@ -130,6 +135,28 @@ def set(self, instance_ids=None, weekdays=None, start_time=None,
             except self.conn.ResponseError, e:
                 raise e
 
+    def unset(self, instance_ids=None, weekdays=None):
+        """Unset instance times for specific weekdays or all weekdays."""
+        # integer representation of `weekdays`
+        if weekdays == ['*']:
+            # All 7 days
+            weekdays = range(len(self.weekdays))
+        else:
+            weekdays = [self.weekdays.index(weekday) for weekday in weekdays]
+        instances = self.conn.get_only_instances(instance_ids=instance_ids)
+        for instance in instances:
+            times = instance.tags.get('times')
+            if times:
+                times = times.split(';')
+                for weekday in weekdays:
+                    times[weekday] = None
+                times = ';'.join([str(time) for time in times])
+                try:
+                    # Overwrite existing `times` tag with new value
+                    instance.add_tag('times', times)
+                except self.conn.ResponseError, e:
+                    raise e
+
     def check(self, instance_ids=None):
         """Check the state of instances and either start or stop them
         based on the current time restrictions set for the current day.