jekyll-auth 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c7d075ebcbc8bf817e6fac83be184151437115
-  data.tar.gz: decd0c07fa9790427b1af3492e605c91486ddc3d
+  metadata.gz: b2bc3f1b5a01a023ce6a06707d67be186171eb2c
+  data.tar.gz: 944440d4dc8586bb5ce652bfcae1d98135169411
 SHA512:
-  metadata.gz: df230eea9bc5a3512ac6557cba79a7c961df3b61bd3667173cd58104eacfb2ac26ad6cf7efab14129dbc5882c0d4504d5d95b3ac56113f662e34a8eeef53fcde
-  data.tar.gz: 3a05f6c5bacdd0214f409cccf7e38d80f9cc31be8a15078a766e3e436d7164393b0b39e31306c784e0e7e9e015fbe15ab78df4101a221086b76fc228ee01eb8d
+  metadata.gz: 035f53918722a1a28072452343193a39269dab8785e0592965cce0b24c099119fd2518c2f4fce6de27225d19254b20484c8aa337a181e4da85313ef7f33b6ba7
+  data.tar.gz: 975a8e9ffb1a8c64aa6d2ba2fd30bdfe29dc9dcdf73ade840f5e882ac9f519b0a135e561438245ccb8bad7b9ebb4558e92c429a34c223ff15421921373657269

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
 script: "./script/cibuild"
 
 before_script:
@@ -12,4 +16,4 @@ env:
   global:
     - GITHUB_CLIENT_ID=FOO
     - GITHUB_CLIENT_SECRET=BAR
-    - GITHUB_ORG_ID="balter-test-org"
+    - GITHUB_ORG_NAME="balter-test-org"

data/README.md

@@ -47,7 +47,7 @@ Remember the 'my-site' part for later on when using `heroku create`. Also, my-si
 
 #### Automatically
 
-Run `bundle exec jekyll-auth setup --client_id XXX --client_secret XXX --org_id XXX`
+Run `bundle exec jekyll-auth setup --client_id XXX --client_secret XXX --org_name XXX`
 
 (or `--team_id XXX`)
 
@@ -56,10 +56,18 @@ Run `bundle exec jekyll-auth setup --client_id XXX --client_secret XXX --org_id
 1. You may need to add and commit the files generated by `jekyll-auth new` to Git before continuing
 2. Make sure you have [the Heroku toolbelt](https://toolbelt.heroku.com/) installed
 3. Run `heroku create my-site` from your site's directory; make sure my-site matches what you specified in the Githup application registration above.
-4. `heroku config:set GITHUB_CLIENT_ID=XXX GITHUB_CLIENT_SECRET=XXX GITHUB_ORG_ID=XXX` (or `GITHUB_TEAM_ID`)
+4. `heroku config:set GITHUB_CLIENT_ID=XXX GITHUB_CLIENT_SECRET=XXX GITHUB_ORG_NAME=XXX` (or `GITHUB_TEAM_ID`)
 5. `git push heroku`, or if you are maintaining the site in an orphaned branch of your github repo (say 'heroku-pages'), do `git push heroku heroku-pages:master`
 6. `heroku open` to open the site in your browser
 
+#### Find the organization ID (needed to find team ID)
+
+If you need to find an organization's ID, you can use the following curl command:
+
+```
+curl https://api.github.com/orgs/{org_name}
+```
+
 #### Finding the team ID
 
 If you need help finding a team's numeric ID, you can use the `jekyll-auth team_id` command.
@@ -121,7 +129,7 @@ Just run `jekyll serve` as you would normally
 
 1. `export GITHUB_CLIENT_ID=[your github app client id]`
 2. `export GITHUB_CLIENT_SECRET=[your github app client secret]`
-3. `export GITHUB_ORG_ID=[org id]` or `export GITHUB_TEAM_ID=[team id]` or `export GITHUB_TEAM_IDS=1234,5678`
+3. `export GITHUB_ORG_NAME=[org name]` or `export GITHUB_TEAM_ID=[team id]` or `export GITHUB_TEAM_IDS=1234,5678`
 4. `jekyll-auth serve`
 
 *Pro-tip #1:* For sanity sake, and to avoid problems with your callback URL, you may want to have two apps, one with a local oauth callback, and one for production if you're going to be testing auth locally.

data/bin/jekyll-auth

@@ -52,7 +52,7 @@ Mercenary.program("jekyll-auth") do |p|
         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?
@@ -79,7 +79,7 @@ Mercenary.program("jekyll-auth") do |p|
       # 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
@@ -100,7 +100,7 @@ Mercenary.program("jekyll-auth") do |p|
     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?

data/jekyll-auth.gemspec

@@ -3,8 +3,8 @@ require './lib/jekyll_auth/version'
 Gem::Specification.new do |s|
   s.name                  = "jekyll-auth"
   s.version               = JekyllAuth::VERSION
-  s.summary               = "A simple way to use Github OAuth to serve a protected jekyll site to your GitHub organization"
-  s.description           = "A simple way to use Github Oauth to serve a protected jekyll site to your GitHub organization."
+  s.summary               = "A simple way to use GitHub OAuth to serve a protected jekyll site to your GitHub organization"
+  s.description           = "A simple way to use GitHub OAuth to serve a protected jekyll site to your GitHub organization."
   s.authors               = "Ben Balter"
   s.email                 = "ben@balter.com"
   s.homepage              = "https://github.com/benbalter/jekyll-auth"
@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_dependency "jekyll", "~> 2.0"
+  s.add_dependency "jekyll", ">= 2.0"
   s.add_dependency "sinatra-index", "~> 0.0"
   s.add_dependency "sinatra_auth_github", "~> 1.1"
   s.add_dependency "rack", "~> 1.6"
-  s.add_dependency "dotenv", "~> 1.0"
+  s.add_dependency "dotenv", "~> 2.0"
   s.add_dependency "rake", "~> 10.3"
   s.add_dependency "rack-ssl-enforcer", "~> 0.2"
   s.add_dependency "mercenary", "~> 0.3"

data/lib/jekyll_auth/auth_site.rb

@@ -33,7 +33,7 @@ class JekyllAuth
       when :teams
         github_teams_authenticate! ENV['GITHUB_TEAM_IDS'].split(",")
       when :org
-        github_organization_authenticate! ENV['GITHUB_ORG_ID']
+        github_organization_authenticate! ENV['GITHUB_ORG_NAME']
       else
         raise JekyllAuth::ConfigError
       end

data/lib/jekyll_auth/commands.rb

@@ -2,7 +2,7 @@ class JekyllAuth
   class Commands
 
     FILES = %w{Rakefile config.ru .gitignore .env}
-    VARS  = %w{client_id client_secret team_id org_id}
+    VARS  = %w{client_id client_secret team_id org_name}
 
     def self.source
       @source ||= File.expand_path( "../../templates", File.dirname(__FILE__) )

data/lib/jekyll_auth/helpers.rb

@@ -10,7 +10,7 @@ class JekyllAuth
         :team
       elsif !ENV['GITHUB_TEAM_IDS'].to_s.blank?
         :teams
-      elsif !ENV['GITHUB_ORG_ID'].to_s.blank?
+      elsif !ENV['GITHUB_ORG_NAME'].to_s.blank?
         :org
       end
     end

data/lib/jekyll_auth/version.rb

@@ -1,3 +1,3 @@
 class JekyllAuth
-  VERSION = '1.0.3'
+  VERSION = '2.0.0'
 end

data/spec/jekyll_auth_auth_site_spec.rb

@@ -12,9 +12,9 @@ describe "logged in user" do
     @user = make_user('login' => 'benbaltertest')
     login_as @user
 
-    ENV['GITHUB_ORG_ID'] = "balter-test-org"
+    ENV['GITHUB_ORG_NAME'] = "balter-test-org"
     
-    stub_request(:get, "https://api.github.com/orgs/#{ENV["GITHUB_ORG_ID"]}/members/benbaltertest").
+    stub_request(:get, "https://api.github.com/orgs/#{ENV["GITHUB_ORG_NAME"]}/members/benbaltertest").
     to_return(:status => 200)
   end
 
@@ -44,7 +44,7 @@ describe "logged out user" do
   end
 
   before do
-    ENV['GITHUB_ORG_ID'] = "balter-test-org"
+    ENV['GITHUB_ORG_NAME'] = "balter-test-org"
   end
 
   it "doesn't let you view indexes" do
@@ -68,7 +68,7 @@ describe "logged out user" do
   end
 
   it "refuses to serve the site without an authentication strategy" do
-    ENV["GITHUB_ORG_ID"] = nil
+    ENV["GITHUB_ORG_NAME"] = nil
     ENV["GITHUB_TEAM_ID"] = nil
     ENV["GITHUB_TEAMS_ID"] = nil
     expect{get "/"}.to raise_error(JekyllAuth::ConfigError)

data/spec/jekyll_auth_bin_spec.rb

@@ -19,7 +19,7 @@ describe "bin" do
       with_message(/prefix the jekyll-auth command with GITHUB_TOKEN/)
     end
 
-    it "errors if no team_id or org_id is given" do
+    it "errors if no team_id or org_name is given" do
       env = { "GITHUB_TOKEN" => "1234"}
       expect{execute_bin(env, "team_id")}.to raise_error(RuntimeError).
       with_message(/An org name and team ID are required/)

data/spec/jekyll_auth_helpers_spec.rb

@@ -17,7 +17,7 @@ describe "strategies" do
   before(:each) do
     JekyllAuth.instance_variable_set("@config", nil)
     @helper = TestHelper.new
-    ENV["GITHUB_ORG_ID"] = nil
+    ENV["GITHUB_ORG_NAME"] = nil
     ENV["GITHUB_TEAM_ID"] = nil
     ENV["GITHUB_TEAMS_ID"] = nil
   end
@@ -27,7 +27,7 @@ describe "strategies" do
   end
 
   it "should detect the org strategy" do
-    with_env("GITHUB_ORG_ID", "some_org") do
+    with_env("GITHUB_ORG_NAME", "some_org") do
       expect(@helper.authentication_strategy).to eql(:org)
     end
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: A simple way to use Github Oauth to serve a protected jekyll site to
+description: A simple way to use GitHub OAuth to serve a protected jekyll site to
   your GitHub organization.
 email: ben@balter.com
 executables:
@@ -268,10 +268,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
-summary: A simple way to use Github OAuth to serve a protected jekyll site to your
+summary: A simple way to use GitHub OAuth to serve a protected jekyll site to your
   GitHub organization
 test_files:
 - spec/jekyll_auth_auth_site_spec.rb
@@ -281,3 +281,4 @@ test_files:
 - spec/jekyll_auth_jekyll_site_spec.rb
 - spec/jekyll_auth_spec.rb
 - spec/spec_helper.rb
+has_rdoc: