truenorth 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f3438794269dffcf86a880d84a026215705c4f209224788e6ea23455b14ea1
-  data.tar.gz: 01de8411d76be106e62a870885011c27cd10ec2df715af9300be9c1c6c545b75
+  metadata.gz: 63c9a467b51f61d550f8c48a37109dbc647d5b599044beffc55333f0bade9e48
+  data.tar.gz: 12211afbaf407921821f41c2cddcc9c9581ad9e6f8e1ffef20ef83a8ec6df91e
 SHA512:
-  metadata.gz: 5a9f8bb510b0d8e697dba433e05ff634dbb433a449afffbfef66eebb1cd0c371bc8533d3e858f397642ee5e722987d71693395a2b2133ef21f4281f93e5c3820
-  data.tar.gz: d383619f1d8df6b96f1628a7e6b642a6739b1f3ba7c74c4d0d8fa8b944a8b2f92f75e73d9be482a84654f8b15ec8de22d05153b7f7c29d3adbbc4949b415bd7f
+  metadata.gz: 2c0538cf12be2ff1a20f5950206b381537683bf3e5cfe87ee9895e7fe677154bebbd636df6837ed3ad0a136018060f982f697d875d456e1402cc4ef4d57e161a
+  data.tar.gz: 7874967a9ce9b6a7342e82ca8a5346dbd1fc0ccfe87a099dbeda0ac0201e9765ea9a8fbe3a36f8e9eff1eece1fb4ac12719f8ff5eb9777da2bef98560dfd7be4

data/lib/truenorth/cli.rb

@@ -59,23 +59,28 @@ module Truenorth
       exit 1
     end
 
-    desc 'book TIME', 'Book a slot at the specified time'
+    desc 'book TIME_OR_DESCRIPTION', 'Book a slot (e.g., "10am", "feb 15 10am", "squash feb 15 10am")'
     option :date, aliases: '-d', desc: 'Date (YYYY-MM-DD, or +N for days from today)'
     option :court, aliases: '-c', desc: 'Preferred court (e.g., "Court 1", "Squash Court 2")'
     option :activity, aliases: '-a', default: 'squash', desc: 'Activity type'
     option :dry_run, type: :boolean, aliases: '-n', desc: 'Test without actually booking'
-    def book(time)
-      date = parse_date(options[:date])
+    def book(time_or_description)
+      # Parse natural language input
+      parsed = parse_booking_request(time_or_description, options[:date], options[:activity])
+
+      date = parsed[:date]
+      time = parsed[:time]
+      activity = parsed[:activity]
       client = Client.new
 
       mode = options[:dry_run] ? ' (DRY RUN)' : ''
-      say "Booking #{options[:activity]} at #{time} on #{date}#{mode}...", :cyan
+      say "Booking #{activity} at #{time} on #{date}#{mode}...", :cyan
 
       result = client.book(
         time,
         date: date,
         court: options[:court],
-        activity: options[:activity],
+        activity: activity,
         dry_run: options[:dry_run]
       )
 
@@ -139,15 +144,27 @@ module Truenorth
 
     desc 'cancel INDEX', 'Cancel a reservation by index (from reservations list)'
     option :dry_run, type: :boolean, aliases: '-n', desc: 'Test without actually canceling'
+    option :all, type: :boolean, aliases: '-a', desc: 'Cancel from full list (use with --all view)'
     def cancel(index)
       client = Client.new
 
       say 'Fetching reservations...', :cyan
       results = client.reservations
 
+      # Apply same filter as reservations command
+      unless options[:all]
+        results = results.select { |r| r[:member].nil? }
+        if results.empty?
+          say 'You have no reservations to cancel.', :yellow
+          say "Use 'truenorth cancel INDEX --all' to cancel family members' reservations", :cyan
+          exit 1
+        end
+      end
+
       idx = index.to_i - 1
       if idx < 0 || idx >= results.length
-        say "Invalid index. Must be between 1 and #{results.length}", :red
+        filter_note = options[:all] ? '' : ' (your reservations only)'
+        say "Invalid index. Must be between 1 and #{results.length}#{filter_note}", :red
         exit 1
       end
 
@@ -305,6 +322,65 @@ module Truenorth
       "#{text[0...max_length - 1]}…"
     end
 
+    def parse_booking_request(input, date_option, activity_option)
+      # Extract activity if mentioned (squash, golf, music, room)
+      activity = activity_option
+      if input =~ /\b(squash|golf|music|room)\b/i
+        activity = ::Regexp.last_match(1).downcase
+        input = input.gsub(/\b(squash|golf|music|room)\b/i, '').strip
+      end
+
+      # Extract date if present
+      date = nil
+      input_lower = input.downcase
+
+      # Try patterns like "feb 15", "february 15th", "2/15"
+      if input_lower =~ /\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[a-z]*\s+(\d{1,2})(st|nd|rd|th)?\b/i
+        month_str = ::Regexp.last_match(1)
+        day = ::Regexp.last_match(2).to_i
+
+        month_map = {
+          'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4,
+          'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8,
+          'sep' => 9, 'oct' => 10, 'nov' => 11, 'dec' => 12
+        }
+
+        month = month_map[month_str[0..2].downcase]
+        year = Date.today.year
+        year += 1 if month && month < Date.today.month # Next year if month has passed
+
+        date = Date.new(year, month, day) if month
+        input = input.gsub(/\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[a-z]*\s+(\d{1,2})(st|nd|rd|th)?\b/i, '').strip
+      elsif input =~ %r{\b(\d{1,2})/(\d{1,2})\b}
+        month = ::Regexp.last_match(1).to_i
+        day = ::Regexp.last_match(2).to_i
+        year = Date.today.year
+        date = Date.new(year, month, day)
+        input = input.gsub(%r{\b\d{1,2}/\d{1,2}\b}, '').strip
+      end
+
+      # Remove day names (monday, tuesday, etc.)
+      input = input.gsub(/\b(monday|tuesday|wednesday|thursday|friday|saturday|sunday)\b/i, '').strip
+
+      # Extract time - look for patterns like "10am", "10:00am", "10:00 AM", "10"
+      time = nil
+      if input =~ /\b(\d{1,2})(:(\d{2}))?\s*(am|pm)?\b/i
+        hour = ::Regexp.last_match(1).to_i
+        minute = ::Regexp.last_match(3) || '00'
+        period = ::Regexp.last_match(4) || (hour < 8 ? 'PM' : 'AM')
+
+        time = "#{hour}:#{minute} #{period.upcase}"
+      end
+
+      # Use provided date option if date wasn't extracted
+      date ||= parse_date(date_option)
+
+      # If no time found, use the remaining input as-is
+      time ||= input.strip
+
+      { date: date, time: time, activity: activity }
+    end
+
     def parse_date(date_str)
       return Date.today if date_str.nil? || date_str.empty?
 

data/lib/truenorth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truenorth
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

data/truenorth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.2.3'
+  spec.version       = '0.2.5'
   spec.authors       = ['usiegj00']
   spec.email         = ['112138+usiegj00@users.noreply.github.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truenorth
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - usiegj00