ubcbooker 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc08809f822c73cd88eefdfb8d1b3e7dcdd67c1
-  data.tar.gz: d3b83b3f5966ba048b77c45b9423bf7f900db0af
+  metadata.gz: 053f9ad2f8d23269ce39d0c7e6cf53b51774d810
+  data.tar.gz: 79624f9a62de98c504efc5a53b96ee94da8ab41d
 SHA512:
-  metadata.gz: aa3dba7476926f4b89e1902203bccabb1f7dd50b93a4d7583b54db993b365b19334a07239176912b83749a8e29dba0719103a9ebd2381b4e48f9b1618a9c12af
-  data.tar.gz: 6e233736d5d31d8781d76685ead16a69d94ca4e846ca429e58a4558917596611aee97072ed2bc92ee3b7e950bfd8d971c6c7ceaf04ea657e671dbce30083c5e3
+  metadata.gz: 8464319a1fbebeb17ae4c7e66ff9335cf2a3125bd5cfe81b8aec9eacafd93b40d8b14813dbec3258bce30601eb3f0d0984b8fe77dfdc202dacb206edd4bdcca6
+  data.tar.gz: 5990bc3fdb45c82be09c794b712e199701a8a13d427281b480c6ba94c2ba889c8cccd6d609dfdd1dba5e8787fdcbea232dbb823bcdfab5c3a1e2f9747c053ec5

data/.gitignore

@@ -2,6 +2,7 @@
 *.gem
 *.rbc
 lib/ubcbooker/config.yml
+spec/config.yml
 /.config
 /coverage/
 /InstalledFiles

data/README.md

@@ -2,6 +2,8 @@
 
 CLI tool to book project rooms in UBC
 
+![Demo](https://i.imgur.com/UhT9zKJ.gif)
+
 ## Installation
 
 Install it as:
@@ -21,7 +23,17 @@ And then execute:
 ## Usage
 
 ```
-$ ubcbooker --helj
+# Book a room in CS with the name 'Study Group' from 11am to 1pm on March 5th
+
+$ ubcbooker -b cs -n 'Study Group' -d 03/05 -t 11:00-13:00
+```
+
+When you first run the command it will ask for your CWL account auth info. This is saved locally within the gem as `config.yml`. You can look at [sample.yml](https://github.com/jumbosushi/ubcbooker/blob/master/lib/ubcbooker/sample.yml) to understand what it will look like.
+
+Run `ubcbooker -u` to update the CWL auth info.
+
+```
+$ ubcbooker --help
 
 Usage: ubcbooker [options]
     -b, --building BUILDING          Specify which department to book rooms from
@@ -37,7 +49,8 @@ ex. Book a room in CS from 11am to 1pm on March 5th with the name 'Study Group'
     $> ubcbooker -b cs -n 'Study Group' -d 03/05 -t 11:00-13:00
 ```
 
-Currently this app supports project rooms in cs (Commputer Science).
+Currently this app supports project rooms in cs (Commputer Science). Run `ubcbooker -l` to check the latest supported departments.
+
 Feel free to send a PR that supports your department's rooms.
 
 ## Development

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+ENV['RACK_ENV'] == 'test'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/ubcbooker/cli.rb

@@ -7,16 +7,6 @@ module Ubcbooker
       @options = nil
     end
 
-    def ask_config
-      print "Your CWL username: "
-      username = gets.chomp
-      print "Your CWL password: "
-      # Hide the password input
-      password = STDIN.noecho(&:gets).chomp
-      @config.write(username, password)
-      puts
-    end
-
     def parse_options
 
       # This will hold the options we parse
@@ -47,9 +37,8 @@ module Ubcbooker
 
         parser.on("-h", "--help", "Show this help message") do
           puts parser
-          puts
-          puts "ex. Book a room in CS from 11am to 1pm on March 5th with the name 'Study Group'"
-          puts "    $>ubcbooker -b cs -n 'Study Group' -d 03/05 -t 11:00-13:00"
+          puts "\nex. Book a room in CS from 11am to 1pm on March 5th with the name 'Study Group'\n" <<
+               "    $ ubcbooker -b cs -n 'Study Group' -d 03/05 -t 11:00-13:00"
           exit(0)
         end
 
@@ -75,7 +64,7 @@ module Ubcbooker
         end
 
         parser.on("-u", "--update", "Update username and password") do |v|
-          ask_config
+          @config.ask
           exit(0)
         end
 
@@ -89,7 +78,7 @@ module Ubcbooker
       spinner.success("Done!") # Stop animation
 
       if CLI::Validator.is_required_missing(options)
-        raise OptionParser::MissingArgument
+        raise Ubcbooker::Error::MissingRequired
       end
 
       return options
@@ -101,15 +90,11 @@ module Ubcbooker
         Ubcbooker::Error::UnsupportedTime,
         Ubcbooker::Error::UnsupportedDate,
         Ubcbooker::Error::ProfaneName,
+        Ubcbooker::Error::MissingRequired,
       ]
 
       begin
         return parse_options
-      rescue OptionParser::MissingArgument
-        puts "Error: Missing Option\n".red <<
-          "One or more of required option are missing values\n" <<
-          "Please check if options -b, -d, -n, and -t all have values passed"
-        exit(1)
       rescue *option_errors => e
         puts e.message
         exit(1)
@@ -139,8 +124,13 @@ module Ubcbooker
     end
 
     def start
+      book_errors = [
+        Ubcbooker::Error::NoAvailableRoom,
+        Ubcbooker::Error::BookingFailed,
+      ]
+
       @options = get_options
-      ask_config if !@config.defined?
+      @config.ask if !@config.defined?
 
       @client = get_scraper(@options[:department],
                             @config.account["username"],
@@ -148,8 +138,9 @@ module Ubcbooker
       begin
         room_id = @client.book(@options)
         puts "Success! #{room_id} is booked".green
-      rescue Ubcbooker::Error::NoAvailableRoom => e
+      rescue *book_errors => e
         puts e.message
+        exit(1)
       end
     end
   end

data/lib/ubcbooker/config.rb

@@ -3,7 +3,7 @@ module Ubcbooker
     attr_accessor :account
 
     def initialize
-      @config_path = File.expand_path("../config.yml", __FILE__)
+      @config_path = get_config_path
       if !File.exist?(@config_path)
         create_config_file(@config_path)
       end
@@ -11,6 +11,16 @@ module Ubcbooker
       @account = YAML.load_file(@config_path)
     end
 
+    def ask
+      print "Your CWL username: "
+      username = gets.chomp
+      print "Your CWL password: "
+      # Hide the password input
+      password = STDIN.noecho(&:gets).chomp
+      write(username, password)
+      puts
+    end
+
     def create_config_file(config_path)
       File.open(config_path, "w") do |f|
         f.write("---\nusername: sample\npassword: sample")
@@ -32,8 +42,18 @@ module Ubcbooker
       end
     end
 
+    def get_config_path
+      if ENV['RACK_ENV'] == 'test'
+        File.expand_path("../config.yml", __FILE__)
+      else
+        File.expand_path("../../../spec/config.yml", __FILE__)
+      end
+    end
+
     def defined?
-      return @account["username"] != "sample" && @account["password"] != "sample"
+      return File.exist?(@config_path) &&
+             @account["username"] != "sample" &&
+             @account["password"] != "sample"
     end
   end
 end

data/lib/ubcbooker/error.rb

@@ -35,6 +35,17 @@ module Ubcbooker
       end
     end
 
+    class MissingRequired < StandardError
+      attr_reader :message, :time
+      def initialize()
+        @message = "Error: Missing Option\n".red <<
+          "One or more of required option are missing values\n" <<
+          "Please check if options -b, -d, -n, and -t all have values passed"
+        super
+      end
+    end
+
+
     class ProfaneName < StandardError
       attr_reader :message, :name
       def initialize(name = "unknown")
@@ -57,6 +68,15 @@ module Ubcbooker
       end
     end
 
+    class BookingFailed < StandardError
+      attr_reader :message
+      def initialize
+        @message = "\nBooking Failed :/\n".red <<
+          "Please raise an issue on GitHub"
+        super
+      end
+    end
+
     class LoginFailed < StandardError
       attr_reader :message
       def initialize

data/lib/ubcbooker/scrapers/cs.rb

@@ -46,8 +46,13 @@ module Ubcbooker
         booking_form["field_date[und][0][value][time]"] = time_to_ampm(book_slot.min)
         booking_form["field_date[und][0][value2][date]"] = book_date_str
         booking_form["field_date[und][0][value2][time]"] = time_to_ampm(book_slot.max)
-        booking_form.submit
-        spinner.success("Done!")
+        confirmation_page = booking_form.submit
+        if confirmation_page.search("div.alert-error").empty?
+          spinner.success("Done!")
+        else
+          spinner.fail("Booking rejected")
+          raise Ubcbooker::Error::BookingFailed.new
+        end
       end
 
       # Select the form otpion with right room id
@@ -115,7 +120,9 @@ module Ubcbooker
       def is_slot_booked(slot_booked, book_slot)
         booked = false
         slot_booked.each do |s|
-          if s.include?(book_slot.min) || s.include?(book_slot.max)
+          if (s.include?(book_slot.min) ||
+              s.include?(book_slot.max) ||
+              book_slot.include?(s))
             booked = true
           end
         end

data/lib/ubcbooker/version.rb

@@ -1,3 +1,3 @@
 module Ubcbooker
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ubcbooker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Atsushi Yamamoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -168,10 +168,8 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/setup
 - bin/ubcbooker
 - lib/ubcbooker.rb
-- lib/ubcbooker/account.rb
 - lib/ubcbooker/cli.rb
 - lib/ubcbooker/cli_validator.rb
 - lib/ubcbooker/color.rb

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/ubcbooker/account.rb

@@ -1,31 +0,0 @@
-module Ubcbooker
-  class Account
-    attr_accessor :username, :password
-
-    def initialize
-      @config_path = File.expand_path("../config.yml", __FILE__)
-      @account_info = YAML.load_file(@config_path)
-      @username = @account_info["username"]
-      @password = @account_info["password"]
-    end
-
-    def write(username, password)
-      @account["username"] = username
-      @account["password"] = password
-      new_yml = YAML.dump(@account)
-      open(@config_path, "w") { |f| f.write(new_yml) }
-      @account = YAML.load_file(@config_path)
-    end
-
-    def print_supported_departments
-      puts "Supported department options in #{Ubcbooker::VERSION}:"
-      BOOKING_URL.keys.each do |d|
-        puts "    -  #{d}"
-      end
-    end
-
-    def defined?
-      return @account["username"] != "hoge" && @account["password"] != "hoge"
-    end
-  end
-end