Update Meetups when they change on Meetup.com (#727)

Author: marcoroth

.github/workflows/meetups.yml

@@ -29,20 +29,20 @@ jobs:
       - name: Set up the formatted date, branch name and PR title
         run: |
           echo "FORMATTED_DATE=$(date +'%B %d, %Y')" >> $GITHUB_ENV
-          echo "BRANCH_TO_MERGE=new-meetups-$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+          echo "BRANCH_TO_MERGE=meetups-update-$(date +'%Y-%m-%d')" >> $GITHUB_ENV
           echo "PULL_REQUEST_TITLE=$(cat ./pull_request_title.txt)" >> $GITHUB_ENV
 
       - name: Check if there are any new meetups
         run: |
           if [[ -n $(git diff --name-only _data/meetups.yml) ]]; then
-            echo "NEW_MEETUPS=true" >> $GITHUB_ENV
+            echo "MEETUPS_CHANGED=true" >> $GITHUB_ENV
           else
-            echo "NEW_MEETUPS=false" >> $GITHUB_ENV
+            echo "MEETUPS_CHANGED=false" >> $GITHUB_ENV
           fi
 
       - name: Commit New Meetups
         uses: stefanzweifel/git-auto-commit-action@v5
-        if: ${{ env.NEW_MEETUPS == 'true' }}
+        if: ${{ env.MEETUPS_CHANGED == 'true' }}
         with:
           # Optional. Commit message for the created commit.
           # Defaults to "Apply automatic changes"
@@ -106,7 +106,7 @@ jobs:
           create_branch: true
 
       - name: Create Pull Request
-        if: ${{ env.NEW_MEETUPS == 'true' }}
-        run: gh pr create -B main -H ${{ env.BRANCH_TO_MERGE }} --title "${{ env.PULL_REQUEST_TITLE }}" --body-file "./new_meetups.md"
+        if: ${{ env.MEETUPS_CHANGED == 'true' }}
+        run: gh pr create -B ${{ github.head_ref || github.ref_name }} -H ${{ env.BRANCH_TO_MERGE }} --title "${{ env.PULL_REQUEST_TITLE }}" --body-file "./pull_request_body.md"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,5 @@
 _site
 .jekyll-metadata
 bin/
-new_meetups.md
 pull_request_title.txt
+pull_request_body.md

Rakefile

@@ -7,6 +7,7 @@ require "ostruct"
 require "./src/data_file_validator"
 require "./src/static"
 require "./src/meetup_client"
+require "./src/meetups_file"
 
 desc "Build Jekyll site"
 task :build do
@@ -73,54 +74,16 @@ task :verify_meetups do
 end
 
 task :fetch_meetups do
-  File.write("./new_meetups.md", <<~MD)
-    ### New Meetups on #{Date.today.strftime("%B %d, %Y")}
-
-    | Title | Date | Meetup Group |
-    | ----- | ---- | ------------ |
-  MD
-
-  new_events = []
-
-  MeetupGroup.meetupdotcom.each do |group|
-    puts "Fetching Meetup.com Group: #{group.id}"
-
-    new_group_events = group.write_new_meetups!
-
-    new_events << new_group_events.zip(
-      new_group_events.map { |event| group.openstruct_to_md(event) }
-    )
-  end
-
-  new_events = new_events.flatten(1).to_h
-
-  new_events.sort_by { |event, _md| event.dateTime }.each do |_event, md|
-    File.write("./new_meetups.md", md, mode: "a+")
+  MeetupsFile.read.tap do |file|
+    file.fetch!
+    file.write!
   end
-
-  new_meetups_from_groups = new_events.group_by { |event, md| event.group["name"] }.transform_values { |value| value.map(&:first) }
-
-  if new_meetups_from_groups.keys.count == 1
-    pull_request_title =  "Add #{new_meetups_from_groups.keys.first} #{Date.parse(new_meetups_from_groups.first.last.sort_by(&:dateTime).first.dateTime).strftime("%B %Y")} Meetup"
-  elsif new_meetups_from_groups.keys.count > 1
-    *groups, last = new_meetups_from_groups.keys
-    pull_request_title = "Add #{groups.join(", ")} and #{last} Meetups"
-  else
-    pull_request_title = "New Meetups on #{Date.today.strftime("%B %d, %Y")}"
-  end
-
-  puts "pull_request_title: #{pull_request_title}"
-  File.write("./pull_request_title.txt", pull_request_title)
-
-  Rake::Task["sort_meetups"].invoke
 end
 
 task :sort_meetups do
-  events = YAML.load_file("./_data/meetups.yml", permitted_classes: [Date])
-
-  events.sort_by! { |event| [event["date"], event["name"]] }
-
-  File.write("./_data/meetups.yml", events.to_yaml.gsub("- name:", "\n- name:"))
+  MeetupsFile.read.tap do |file|
+    file.write!
+  end
 end
 
 task default: [:build, :verify_data, :verify_html]

_data/meetup_groups.yml

@@ -11,6 +11,7 @@
 - id: african_ruby_community
   name: African Ruby Community
   service: meetupdotcom
+  remove: ARC
 
 - id: aloharb
   name: aloha.rb
@@ -35,6 +36,7 @@
 - id: atlantaruby
   name: Atlanta Ruby
   service: meetupdotcom
+  remove: "[VIRTUAL] "
 
 - id: aucklandruby
   name: Auckland Ruby
@@ -397,6 +399,7 @@
   name: Orange County Ruby Users Group
   service: meetupdotcom
   exclude: Rails Camp
+  remove: "(OCRuby)"
 
 - id: odense-rb
   name: odense.rb
@@ -424,8 +427,9 @@
   service: meetupdotcom
 
 - id: paris_rb
-  name: ParisRB.new
+  name: Paris.rb
   service: meetupdotcom
+  remove: "ParisRb.new(:monthly, on: :first_tuesday)"
 
 - id: parisrb
   name: ParisRB.old
@@ -434,6 +438,7 @@
 - id: phillyrb
   name: Philly.rb
   service: meetupdotcom
+  remove: " - Global/Virtual"
 
 - id: polishrubyusergroup
   name: Polish Ruby User Group
@@ -720,7 +725,7 @@
 #   service: meetupdotcom
 
 - id: rubyonrails-ch
-  name: Ruby on Rails Schweiz
+  name: Ruby on Rails Switzerland
   service: meetupdotcom
 
 - id: rubyonrio
@@ -765,7 +770,7 @@
 #   service: meetupdotcom
 
 - id: san-francisco-ruby-meetup-group
-  name: SF Bay Area Ruby Meetup Group
+  name: SF Bay Area Ruby
   service: meetupdotcom
 
 - id: santa-barbara-on-rails
@@ -902,6 +907,7 @@
 - id: utah-ruby-users-group
   name: Utah Ruby Users Group
   service: meetupdotcom
+  remove: "URUG Meetup:"
 
 - id: utrecht-rb
   name: Utrecht.rb