bullet_train 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e4626284c91f3dfd617425256200e3e385aadb8623730744d24a022071423e
-  data.tar.gz: 96bd5b5aebeec7f00a7e03660ef7829fd126dd6fac79cb46a3c982bb42900179
+  metadata.gz: fa2dfac5d71da28521ac903aef4acba2c5834f2da5c83ed89f4eb2dd1badf143
+  data.tar.gz: 7786d24e4271cf0547b495addefabbc46b0aaf58eb1672a3ab24ff5cb22a366e
 SHA512:
-  metadata.gz: ad23107ff2bb43a5690f13b4f60e11d6bdef8e67357dc2a3ebc48ee4edae1d10486234a6c513a16f1ee937dfd9c1573dfe5b55f5ad5c3af7fb790823738efcb4
-  data.tar.gz: 051a0a33c1b71667e7d54008d4de417fbced5d5d88a2dece93e5798ca7d200f2039c580285d6b1248a9c363e817a502b4cfde1dc498332264341e20b3a5a026d
+  metadata.gz: cf4cb1f74f1c85df573e544a7e6d03eac8d0db92a7fdb847de163d26527d153d7343cef139450e88d4d5332fe3728fbc9dc61f592ad84eeaf314bc40f378b40c
+  data.tar.gz: a347aa6b5e8234d6a90ce95a3c3e19e372597b45d4272e1e9a6feecc28bfbbfe5d9e24e6bc914ceb7e95eb8cdf9b187bc7a564ee30d8bd6c5f9d5e089ea62782

data/app/controllers/sessions_controller.rb

@@ -10,6 +10,18 @@ class SessionsController < Devise::SessionsController
   end
   helper_method :user_return_to_is_oauth
 
+  def new
+    # We allow people to pass in a URL to redirect to after sign in is complete. We have to do this because Safari
+    # doesn't allow them to set this in a session before a redirect if there isn't already a session. However, for
+    # security reasons we have to make sure we control the URL where we will redirect to, otherwise people could
+    # trick folks into redirecting to a fake destination in a phishing scheme.
+    if params[:return_url]&.start_with?(ENV["BASE_URL"])
+      store_location_for(resource_name, params[:return_url])
+    end
+
+    super
+  end
+
   def destroy
     if params.include?(:onboard_logout)
       signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))

data/app/models/concerns/memberships/base.rb

@@ -25,6 +25,8 @@ module Memberships::Base
       end
     end
 
+    scope :excluding_platform_agents, -> { where(platform_agent_of: nil) }
+    scope :platform_agents, -> { where.not(platform_agent_of: nil) }
     scope :current_and_invited, -> { includes(:invitation).where("user_id IS NOT NULL OR invitations.id IS NOT NULL").references(:invitation) }
     scope :current, -> { where("user_id IS NOT NULL") }
     scope :tombstones, -> { includes(:invitation).where("user_id IS NULL AND invitations.id IS NULL AND platform_agent IS FALSE").references(:invitation) }

data/app/models/concerns/teams/base.rb

@@ -38,6 +38,12 @@ module Teams::Base
     validates :time_zone, inclusion: {in: ActiveSupport::TimeZone.all.map(&:name)}, allow_nil: true
   end
 
+  def platform_agent_access_tokens
+    # TODO This could be written better.
+    platform_agent_user_ids = memberships.platform_agents.map(&:user_id).compact
+    Platform::AccessToken.joins(:application).where(resource_owner_id: platform_agent_user_ids, application: {team: nil})
+  end
+
   def admins
     memberships.current_and_invited.admins
   end

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.3"
+  VERSION = "1.2.5"
 end

data/lib/tasks/bullet_train_tasks.rake

@@ -91,13 +91,15 @@ namespace :bullet_train do
       puts ""
     end
 
+    framework_packages = I18n.t("framework_packages")
+
     # Process any flags that were passed.
     if arguments[:all_options].present?
       flags_with_values = []
 
       arguments[:all_options].split(/\s+/).each do |option|
         if option.match?(/^--/)
-          flags_with_values << {flag: option.gsub(/^--/, "").to_sym, values: []}
+          flags_with_values << {flag: option, values: []}
         else
           flags_with_values.last[:values] << option
         end
@@ -105,34 +107,27 @@ namespace :bullet_train do
 
       if flags_with_values.any?
         flags_with_values.each do |process|
-          if process[:flag] == :link || process[:flag] == :reset
-            packages = process[:values]
-
-            gemfile_lines = File.readlines("./Gemfile")
-            new_lines = gemfile_lines.map do |line|
-              packages.each do |package|
-                if line.match?(package)
-                  original_path = "gem \"bullet_train#{"-" + package if package}\""
-                  local_path = "gem \"bullet_train#{"-" + package if package}\", path: \"local/bullet_train#{"-" + package if package}\""
-
-                  case process[:flag]
-                  when :link
-                    line.gsub!(original_path, local_path)
-                    puts "Setting local '#{package}' package to the Gemfile...".blue
-                    break
-                  when :reset
-                    line.gsub!(local_path, original_path)
-                    puts "Resetting '#{package}' package in the Gemfile...".blue
-                    break
-                  end
-                end
-              end
-
-              line
-            end
-
-            File.write("./Gemfile", new_lines.join)
-            system "bundle install"
+          case process[:flag]
+          when "--help"
+            puts "bin/hack: Clone bullet_train-core and link up gems (will only link up gems if already cloned).".blue
+            puts "bin/hack --link: Link all of your Bullet Train gems to `local/bullet_train-core`".blue
+            puts "bin/hack --reset: Resets all of your gems to their original definition.".blue
+            puts "bin/hack --watch-js: Watches for any changes in JavaScript files gems that have an npm package.".blue
+            puts "bin/hack --clean-js: Resets all of your npm packages from `local/bullet_train-core` to their original definition".blue
+            exit
+          when "--link", "--reset"
+            set_core_gems(process[:flag], framework_packages)
+            stream "bundle install"
+          when "--watch-js"
+            set_npm_packages(process[:flag], framework_packages)
+
+            puts "Proceeding to reset your Bullet Train npm packages according to your root directory's `package.json`.".yellow
+            puts "If you press `Ctrl + C` before the process completely exits, just run `bin/hack --clean-js`".yellow
+            set_npm_packages("--clean-js", framework_packages)
+            break
+          when "--clean-js"
+            set_npm_packages(process[:flag], framework_packages)
+            break
           end
         end
 
@@ -140,123 +135,147 @@ namespace :bullet_train do
       end
     end
 
-    framework_packages = I18n.t("framework_packages")
+    puts "Welcome! Let's get hacking.".blue
 
-    puts "Which framework package do you want to work on?".blue
-    puts ""
-    framework_packages.each do |gem, details|
-      puts "  #{framework_packages.keys.find_index(gem) + 1}. #{gem}".blue
-    end
-    puts ""
-    puts "Enter a number below and hit <Enter>:".blue
-    number = $stdin.gets.chomp
+    # Adding these flags enables us to execute git commands in the gem from our starter repo.
+    work_tree_flag = "--work-tree=local/bullet_train-core"
+    git_dir_flag = "--git-dir=local/bullet_train-core/.git"
 
-    gem = framework_packages.keys[number.to_i - 1]
+    if File.exist?("local/bullet_train-core")
+      puts "We found the repository in `local/bullet_train-core`. We will try to use what's already there.".yellow
+      puts ""
 
-    if gem
-      details = framework_packages[gem]
-      package = details[:git].split("/").last
+      git_status = `git #{work_tree_flag} #{git_dir_flag} status`
+      unless git_status.match?("nothing to commit, working tree clean")
+        puts "This package currently has uncommitted changes.".red
+        puts "Please make sure the branch is clean and try again.".red
+        exit
+      end
 
-      puts "OK! Let's work on `#{gem}` together!".green
-      puts ""
+      current_branch = `git #{work_tree_flag} #{git_dir_flag} branch`.split("\n").select { |branch_name| branch_name.match?(/^\*\s/) }.pop.gsub(/^\*\s/, "")
+      unless current_branch == "main"
+        puts "Previously on #{current_branch}.".blue
+        puts "Switching local/bullet_train-core to main branch.".blue
+        stream("git #{work_tree_flag} #{git_dir_flag} checkout main")
+      end
 
-      if File.exist?("local/#{package}")
-        puts "We found the repository in `local/#{package}`. We will try to use what's already there.".yellow
-        puts ""
+      puts "Updating the main branch with the latest changes.".blue
+      stream("git #{work_tree_flag} #{git_dir_flag} pull origin main")
+    else
+      # Use https:// URLs when using this task in Gitpod.
+      stream "git clone #{(`whoami`.chomp == "gitpod") ? "https://github.com/" : "git@github.com:"}/bullet-train-co/bullet_train-core.git local/bullet_train-core"
+    end
 
-        # Adding these flags enables us to execute git commands in the gem from our starter repo.
-        work_tree_flag = "--work-tree=local/#{package}"
-        git_dir_flag = "--git-dir=local/#{package}/.git"
+    stream("git #{work_tree_flag} #{git_dir_flag} fetch")
+    stream("git #{work_tree_flag} #{git_dir_flag} branch -r")
+    puts "The above is a list of remote branches.".blue
+    puts "If there's one you'd like to work on, please enter the branch name and press <Enter>.".blue
+    puts "If not, just press <Enter> to continue.".blue
+    input = $stdin.gets.strip
+    unless input.empty?
+      puts "Switching to #{input.gsub("origin/", "")}".blue # TODO: Should we remove origin/ here if the developer types it?
+      stream("git #{work_tree_flag} #{git_dir_flag} checkout #{input}")
+    end
 
-        git_status = `git #{work_tree_flag} #{git_dir_flag} status`
-        unless git_status.match?("nothing to commit, working tree clean")
-          puts "This package currently has uncommitted changes.".red
-          puts "Please make sure the branch is clean and try again.".red
-          exit
-        end
+    # Link all of the local gems to the current Gemfile.
+    puts "Now we'll try to link up the Bullet Train core repositories in the `Gemfile`.".blue
+    set_core_gems("--link", framework_packages)
 
-        current_branch = `git #{work_tree_flag} #{git_dir_flag} branch`.split("\n").select { |branch_name| branch_name.match?(/^\*\s/) }.pop.gsub(/^\*\s/, "")
-        unless current_branch == "main"
-          puts "Previously on #{current_branch}.".blue
-          puts "Switching local/#{package} to main branch.".blue
-          stream("git #{work_tree_flag} #{git_dir_flag} checkout main")
-        end
+    puts ""
+    puts "Now we'll run `bundle install`.".blue
+    stream "bundle install"
 
-        puts "Updating the main branch with the latest changes.".blue
-        stream("git #{work_tree_flag} #{git_dir_flag} pull origin main")
-      else
-        # Use https:// URLs when using this task in Gitpod.
-        stream "git clone #{(`whoami`.chomp == "gitpod") ? "https://github.com/" : "git@github.com:"}#{details[:git]}.git local/#{package}"
-      end
+    puts ""
+    puts "We'll restart any running Rails server now.".blue
+    stream "rails restart"
 
-      stream("git #{work_tree_flag} #{git_dir_flag} fetch")
-      stream("git #{work_tree_flag} #{git_dir_flag} branch -r")
-      puts "The above is a list of remote branches.".blue
-      puts "If there's one you'd like to work on, please enter the branch name and press <Enter>.".blue
-      puts "If not, just press <Enter> to continue.".blue
-      input = $stdin.gets.strip
-      unless input.empty?
-        puts "Switching to #{input.gsub("origin/", "")}".blue # TODO: Should we remove origin/ here if the developer types it?
-        stream("git #{work_tree_flag} #{git_dir_flag} checkout #{input}")
-      end
+    puts ""
+    puts "OK, we're opening bullet_train-core in your IDE, `#{ENV["IDE"] || "code"}`. (You can configure this with `export IDE=whatever`.)".blue
+    `#{ENV["IDE"] || "code"} local/bullet_train-core`
+    puts ""
 
-      glob = if package == "bullet_train-core"
-        ", glob: \"#{gem}/#{gem}.gemspec\""
-      end
+    puts "Bullet Train has a few npm packages, so we will and install those now.".blue
+    puts "We will also watch for any changes in your JavaScript files and recompile as we go.".blue
+    puts "When you're done, you can hit <Control + C> and we'll clean all off this up.".blue
+    puts ""
+    set_npm_packages("--watch-js", framework_packages)
 
-      puts ""
-      puts "Now we'll try to link up that repository in the `Gemfile`.".blue
-      if `cat Gemfile | grep "gem \\\"#{gem}\\\", path: \\\"local/#{package}\\\""`.chomp.present?
-        puts "This gem is already linked to a checked out copy in `local` in the `Gemfile`.".green
-      elsif `cat Gemfile | grep "gem \\\"#{gem}\\\","`.chomp.present?
-        puts "This gem already has some sort of alternative source configured in the `Gemfile`.".yellow
-        puts "We can't do anything with this. Sorry! We'll proceed, but you have to link this package yourself.".red
-      elsif `cat Gemfile | grep "gem \\\"#{gem}\\\""`.chomp.present?
-        puts "This gem is directly present in the `Gemfile`, so we'll update that line.".green
-        text = File.read("Gemfile")
-        new_contents = text.gsub(/gem "#{gem}"/, "gem \"#{gem}\", path: \"local/#{package}\"#{glob}")
-        File.open("Gemfile", "w") { |file| file.puts new_contents }
-      else
-        puts "This gem isn't directly present in the `Gemfile`, so we'll add it temporarily.".green
-        File.open("Gemfile", "a+") { |file|
-          file.puts
-          file.puts "gem \"#{gem}\", path: \"local/#{package}\"#{glob} # Added by `bin/develop`."
-        }
+    # Clean up the npm packages after the developer enters `Ctrl + C`.
+    puts "Cleaning up npm packages...".blue
+    puts "If you cancel out of this process early, just run `bin/hack --clean-js` to revert to your original npm packages.".blue
+    set_npm_packages("--clean-js", framework_packages)
+
+    puts ""
+    puts "OK, here's a list of things this script still doesn't do you for you:".yellow
+    puts "1. It doesn't clean up the repository that was cloned into `local`.".yellow
+    puts "2. Unless you remove it, it won't update that repository the next time you link to it.".yellow
+  end
+
+  # Pass "--link" or "--reset" as a flag to set the gems.
+  def set_core_gems(flag, framework_packages)
+    packages = framework_packages.keys
+    gemfile_lines = File.readlines("./Gemfile")
+    new_lines = gemfile_lines.map do |line|
+      packages.each do |package|
+        if line.match?(/"#{package}"/)
+          original_path = "gem \"#{package}\""
+          local_path = "gem \"#{package}\", path: \"local/bullet_train-core/#{package}\""
+
+          case flag
+          when "--link"
+            if `cat Gemfile | grep "gem \\\"#{package}\\\", path: \\\"local/#{package}\\\""`.chomp.present?
+              puts "#{package} is already linked to a checked out copy in `local` in the `Gemfile`.".green
+            elsif `cat Gemfile | grep "gem \\\"#{package}\\\","`.chomp.present?
+              puts "#{package} already has some sort of alternative source configured in the `Gemfile`.".yellow
+              puts "We can't do anything with this. Sorry! We'll proceed, but you have to link this package yourself.".red
+            elsif `cat Gemfile | grep "gem \\\"#{package}\\\""`.chomp.present?
+              puts "#{package} is directly present in the `Gemfile`, so we'll update that line.".green
+              line.gsub!(original_path, local_path)
+            end
+            break
+          when "--reset"
+            line.gsub!(local_path, original_path)
+            puts "Resetting '#{package}' package in the Gemfile...".blue
+            break
+          end
+        end
       end
+      line
+    end
 
-      puts ""
-      puts "Now we'll run `bundle install`.".blue
-      stream "bundle install"
+    File.write("./Gemfile", new_lines.join)
+  end
 
-      puts ""
-      puts "We'll restart any running Rails server now.".blue
-      stream "rails restart"
+  def set_npm_packages(flag, framework_packages)
+    packages = framework_packages.select { |k, v| v[:npm].present? }.compact
 
-      puts ""
-      puts "OK, we're opening that package in your IDE, `#{ENV["IDE"] || "code"}`. (You can configure this with `export IDE=whatever`.)".blue
-      `#{ENV["IDE"] || "code"} local/#{package}`
+    if flag == "--watch-js"
+      puts "Make sure your server is running before proceeding. When you're ready, press <Enter>".blue
+      $stdin.gets.strip
 
+      puts "Linking npm packages...".blue
       puts ""
-      if details[:npm]
-        puts "This package also has an npm package, so we'll link that up as well.".blue
-        stream "cd local/#{gem} && yarn install && npm_config_yes=true npx yalc link && cd ../.. && npm_config_yes=true npx yalc link \"#{details[:npm]}\""
 
+      yarn_watch_command = []
+      packages.each do |package_name, details|
+        puts "Linking JavaScript for #{package_name}".blue
+        stream "cd local/bullet_train-core/#{package_name} && yarn install && npm_config_yes=true && npx yalc link && cd ../../.. && npm_config_yes=true npx yalc link \"#{details[:npm]}\""
+        puts "#{package_name} has been linked.".blue
         puts ""
-        puts "And now we're going to watch for any changes you make to the JavaScript and recompile as we go.".blue
-        puts "When you're done, you can hit <Control + C> and we'll clean all off this up.".blue
-        stream "cd local/#{gem} && yarn watch"
-      else
-        puts "This package has no npm package, so we'll just hang out here and do nothing. However, when you hit <Enter> here, we'll start the process of cleaning all of this up.".blue
-        $stdin.gets
+        yarn_watch_command << "yarn --cwd local/bullet_train-core/#{package_name} watch"
       end
 
+      # We use `&` to run the processes in parallel.
+      puts "Preparing to watch changes".blue
+      stream yarn_watch_command.join(" & ")
+    elsif flag == "--clean-js"
+      puts "Resetting packages to their original path".blue
       puts ""
-      puts "OK, here's a list of things this script still doesn't do you for you:".yellow
-      puts "1. It doesn't clean up the repository that was cloned into `local`.".yellow
-      puts "2. Unless you remove it, it won't update that repository the next time you link to it.".yellow
-    else
-      puts ""
-      puts "Invalid option, \"#{number}\". Try again.".red
+
+      packages.each do |package_name, details|
+        system "yarn yalc remove #{details[:npm]}"
+        system "yarn add #{details[:npm]}"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard