bin/jekyll-auth in jekyll-auth-1.0.3 vs bin/jekyll-auth in jekyll-auth-2.0.0

- old
+ new

@@ -50,11 +50,11 @@ puts "Once you've got the token, prefix the jekyll-auth command with GITHUB_TOKEN=[YOUR TOKEN]".red puts "You can also add it to a `.env` file in this directory".red exit 1 end - org = options["org"] || ENV["GITHUB_ORG_ID"] + org = options["org"] || ENV["GITHUB_ORG_NAME"] team = options["team"] if org.nil? || team.nil? puts "An org name and team ID are required.".red puts "Usage: jekyll-auth team_id --org <ORG> --team <TEAM>" @@ -77,11 +77,11 @@ c.action do |args, options| # Ensure environmental variables are set unless ["GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET"].all? { |v| JekyllAuth::Commands.env_var_set?(v) } puts "Whoops. Looks like you forgot to tell Jekyll Auth about your app".red - puts "Be sure to run export GITHUB_CLIENT_ID=[client id], export GITHUB_CLIENT_SECRET=[client secret], and export GITHUB_ORG_ID=[org id] (or GITHUB_TEAM_ID)".red + puts "Be sure to run export GITHUB_CLIENT_ID=[client id], export GITHUB_CLIENT_SECRET=[client secret], and export GITHUB_ORG_NAME=[org name] (or GITHUB_TEAM_ID)".red puts "See the readme for more information on where to find these".red exit 1 end # build site @@ -98,10 +98,10 @@ c.syntax "setup" c.description "Configure Heroku for use with your Jekyll Auth site" c.option "client_id", "--client_id", "Your oauth app client id" c.option "client_secret", "--client_secret", "Your oauth app client secret" c.option "team_id", "--team_id", "The team to authenticate against" - c.option "org_id", "--org_id", "An organization to authenticate against" + c.option "org_name", "--org_name", "An organization to authenticate against" c.action do |args, options| if find_executable("heroku").nil? say "Looks like we're missing the Heroku client. Let's see if we can't install it..." JekyllAuth::Commands.execute_command "wget", "-qO-", "https://toolbelt.heroku.com/install.sh", "|", "sh"