jekyll-auth 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc223340a6520df88b06451d72ae058a1e7fccc
-  data.tar.gz: 9e01134f5657d3907c6ec2c9fdc9669f2a1ec84d
+  metadata.gz: 17a79c0081692c9acc1e92e547bd29ee15b1199a
+  data.tar.gz: aabba861f295620d6d3b96d31d0864cffea6fd23
 SHA512:
-  metadata.gz: bfc937312e604c1404f5b0b60227189445d2d0a55c1e956ff0fdb082db9187d38322fa401d63d7b4accb1063209c3eb904aec2f389250df756f17c558b9fcec6
-  data.tar.gz: f8341736586ab79184449c3dc599b302763e7459610a42d300293226f35eaa3308d9b49a5c3d4c1354c0fc9a1142ee4dae27ca431627608a674f6642de199e57
+  metadata.gz: 3def7009c0b79da89abb0ce63685fd57fdd912cfbca4b4979a76b23caa92c96269fd88c333ce9e9a1e1edb320aa7027fc2e50dcf2736f9d6181c8885681fc2f6
+  data.tar.gz: 1c95a6f846f1c1012a1170a528b510199378d203d88868843c9bb55742ba3c27cc6a115cd424b6ee74535bd0397df688dcbbef0e8f1e637b520f71960a38c61f

data/bin/jekyll-auth

@@ -6,6 +6,7 @@ require 'commander/import'
 require 'rake'
 require 'jekyll-auth'
 require 'git'
+require 'mkmf'
 
 def changed?
   git = Git.init
@@ -47,6 +48,12 @@ command :setup do |c|
   c.syntax = "jekyll-auth setup"
   c.description = "Configure Heroku for use with your Jekyll Auth site"
   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..."
+      `wget -qO- https://toolbelt.heroku.com/install.sh | sh`
+    end
+    
     git = Git.init
     git.add "config.ru"
     git.add "Rakefile"

data/lib/jekyll-auth/auth-site.rb

@@ -22,7 +22,13 @@ class JekyllAuth
 
     before do
       pass if JekyllAuth.whitelist && JekyllAuth.whitelist.match(request.path_info)
-      if ENV['GITHUB_TEAM_ID']
+      if ENV['GITHUB_TEAM_IDS']
+        authenticate!
+        ENV['GITHUB_TEAM_IDS'].split(",").each do |team|
+          return pass if github_team_access?(team.strip)
+        end
+        halt 401
+      elsif ENV['GITHUB_TEAM_ID']
         github_team_authenticate!(ENV['GITHUB_TEAM_ID'])
       elsif ENV['GITHUB_ORG_ID']
         github_organization_authenticate!(ENV['GITHUB_ORG_ID'])

data/lib/jekyll-auth/version.rb

@@ -1,3 +1,3 @@
 class JekyllAuth
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auth
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: heroku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement