house_floor_bills 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94d99cd5e475e372bd9e0245e5cdb667910c91cc
-  data.tar.gz: 39e999418718201edb8049fae13c1d089f2715b9
+SHA256:
+  metadata.gz: 26c8d3a9f2c394994df84179f9e4cfd941c0dac98b692a4164cf7d8e5df53779
+  data.tar.gz: eb14221c0c2eae74ef300a44e4ff85515ef6c7c46669c48b0a8c7ef63c5886fc
 SHA512:
-  metadata.gz: 22476ffc79b1e4660b35526739b53209905c52696d4d09b057859348415a2de251274715ef3fd83bf7227b1d339ef10ef5d90cd1a6f01717f94c93683ad8bb0b
-  data.tar.gz: 1c61b16207aff2654686b3fb3f32507c2dcced8cf94ac337060d0ca10f2920bb467b10bb561e93f279c0a74543375c25cb7e2e4ec6e5bf831d251170465dbaef
+  metadata.gz: 24b3352d05fee6e3196b138705dfb16fdcd228630a28a447f30a06c69aab2e3101ce2909f8c6755225bca79be23a5391241fb460a3d6fa04dd8f133ccefbd71d
+  data.tar.gz: 5bd4ea45ecb08a72eaff897678c5d3c5a06daf7499c035b3484e8e5bd4ee7e12ff422093f17663bd14c30eba3f499b575b3890b0c860cf1ebccdb732e86fd6c6

data/README.md

@@ -1,6 +1,11 @@
-# HouseFloorBills
+# House Floor Bills
 
-The house-floor-bills CLI gem provides a CLI interface to view the schedule of legislative bills to be debated on the House of Representatives floor this week. Further details about the scheduled bills can be viewed as well.
+The House Floor Bills application provides a command-line interface for viewing the current schedule of legislative bills that are up for consideration on the U.S. House of Representatives floor this week.
+
+## Requirements
+
+- [Ruby](https://www.ruby-lang.org/)
+- [Ruby Gems](https://rubygems.org/)
 
 ## Installation
 
@@ -8,19 +13,19 @@ The house-floor-bills CLI gem provides a CLI interface to view the schedule of l
 
 ## Usage
 
-Type the following command in your computer's terminal and follow the on-screen prompts.
+Once the House Floor Bills gem is installed, type the following command in your computer's terminal and follow the on-screen prompts:
 
     $ house-floor-bills
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` in your terminal to install dependencies. To run the tests, enter `rake spec`. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/house_floor_bills. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/dalmaboros/house_floor_bills. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/house_floor_bills.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "colorize"
 end

data/lib/house_floor_bills.rb

@@ -3,8 +3,8 @@
 require "open-uri"
 require "nokogiri"
 require "pry"
+require "colorize"
 
-require_relative "./house_floor_bills/version"
 require_relative "./house_floor_bills/cli"
 require_relative "./house_floor_bills/bill"
 require_relative "./house_floor_bills/scraper"

data/lib/house_floor_bills/cli.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 class HouseFloorBills::CLI
 
   def call
@@ -7,20 +9,20 @@ class HouseFloorBills::CLI
   end
 
   def welcome
-    puts "\n------ Welcome to House Floor Bills ------"
-    puts "\nBills to be considered on the U.S. House floor:"
+    puts "\n🏛 " + " House Floor Bills ".blue + "🏛"
+    puts "A simple CLI app to display the bills up for consideration on the U.S. House floor this week."
   end
 
   def list_bills
     s = HouseFloorBills::Scraper.new
     @schedule = s.scrape
 
-    puts "\n-------------------------------------------"
-    puts "#{@schedule.title}"
-    puts "-------------------------------------------\n "
+    puts "\n\n-------------------------------------------".green
+    puts "#{@schedule.title}".green
+    puts "-------------------------------------------\n ".green
 
     @schedule.bills.each.with_index(1) do |bill, i|
-      puts "#{i}. #{bill.number} - #{bill.name}"
+      puts "#{i}." + " #{bill.number}".blue + " - #{bill.name}"
     end
   end
 
@@ -36,26 +38,25 @@ class HouseFloorBills::CLI
   end
 
   def print_commands
-    puts "\nCOMMANDS"
-    puts "-------------------------------------------"
-    puts "Enter 1-#{@schedule.bills.length} for more info on corresponding bill."
-    puts "Enter 'open 1-#{@schedule.bills.length}' to open bill page in browser."
-    puts "Enter 'pdf 1-#{@schedule.bills.length}' to open bill PDF in browser."
-    puts "Enter 'list' to see the list of bills again."
-    puts "Enter 'exit' to exit program."
+    puts "\nEnter a number between '" + "1-#{@schedule.bills.length}".red + "' for more info on corresponding bill."
+    puts "Enter '" + "open 1-#{@schedule.bills.length}".red + "' to open bill page in browser."
+    puts "Enter '" + "pdf 1-#{@schedule.bills.length}".red + "' to open bill PDF in browser."
+    puts "Enter '" + "live".red + "' to watch the U.S. House of Representatives live"
+    puts "Enter '" + "list".red + "' to see the list of bills again."
+    puts "Enter '" + "exit".red + "' to exit program."
   end
 
   def menu
     input = nil
 
     while input != "exit"
-      puts "\nEnter command (type 'commands' for list of commands):"
-      print ">"
+      puts "\nEnter command (type '" + "usage".red + "' for help):"
+      print "> "
       input = gets.strip.downcase
 
       if input.to_i.between?(1, @schedule.bills.size)
         print_bill(@schedule.find_bill(input))
-      elsif input == "commands"
+      elsif input == "usage"
         print_commands
       elsif input =~ /open \d/
         system("open #{@schedule.find_bill(input.split.last).url}")
@@ -63,8 +64,10 @@ class HouseFloorBills::CLI
         system("open #{@schedule.find_bill(input.split.last).pdf}")
       elsif input == "list"
         list_bills
+      elsif input == "live"
+        system("open https://live.house.gov/")
       elsif input == "exit"
-        puts "Goodybye!"
+        puts "💨"
       else
         puts "Invalid input."
       end

data/lib/house_floor_bills/scraper.rb

@@ -18,8 +18,24 @@ class HouseFloorBills::Scraper
     @schedule.week = @doc_schedule.search("div#primaryContent h1 > text()").text.split("\n").last.strip
   end
 
+  def get_congress
+    current_DC_time = Time.now.getlocal('-04:00')
+    
+    start_of_congress_116 = Time.utc(2019,"jan",3,04,00,0)
+    start_of_congress_117 = Time.utc(2021,"jan",3,04,00,0)
+    start_of_congress_118 = Time.utc(2023,"jan",3,04,00,0)
+
+    if current_DC_time < start_of_congress_117
+      return "116th-congress"
+    elsif current_DC_time < start_of_congress_118
+      return "117th-congress"
+    elsif current_DC_time >= start_of_congress_118
+      return "118th-congress"
+    end
+  end
+
   def scrape_bills
-    print "Loading "
+    print "\nLoading bills "
     @doc_schedule.search("table.floorItems > tr.floorItem").collect do |floor_item|
       # Instantiate the bill
       b = HouseFloorBills::Bill.new
@@ -32,11 +48,11 @@ class HouseFloorBills::Scraper
 
       # Set URL conditionally, based on type of bill:
       if b.number.split.include? "H.R."
-        b.url = "https://www.congress.gov/bill/115th-congress/house-bill/#{b.number.split.last}"
+        b.url = "https://www.congress.gov/bill/#{get_congress}/house-bill/#{b.number.split.last}"
       elsif b.number.split.include? "H.Res."
-        b.url = "https://www.congress.gov/bill/115th-congress/house-resolution/#{b.number.split.last}"
+        b.url = "https://www.congress.gov/bill/#{get_congress}/house-resolution/#{b.number.split.last}"
       elsif b.number.split.include? "S."
-        b.url = "https://www.congress.gov/bill/115th-congress/senate-bill/#{b.number.split.last}"
+        b.url = "https://www.congress.gov/bill/#{get_congress}/senate-bill/#{b.number.split.last}"
       else
         b.url = ""
       end

data/lib/house_floor_bills/version.rb

@@ -1,3 +1,3 @@
 module HouseFloorBills
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_floor_bills
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Dalma Boros
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Legislative bills scheduled for debate this week on the United States
   House of Representatives floor.
 email:
@@ -132,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Bills to be considered on the house floor.