jekyll-auth 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d94cc333de503a6fbdb201f1ed9b31cff858cb5
-  data.tar.gz: bfcedea76e84e2134f0bdf187bed35f30d8e99b0
+  metadata.gz: 89c7d075ebcbc8bf817e6fac83be184151437115
+  data.tar.gz: decd0c07fa9790427b1af3492e605c91486ddc3d
 SHA512:
-  metadata.gz: ab4b0d18dfd9ee56ab8e3781990ff90decf4bb580e20f67379cf889cb836168e9a86ce1e2f495c0bc77e4417e61d21bdfaa5a95cf4f6152f464f6e43402bc0e3
-  data.tar.gz: 3d444b873b5918a678d31acbbb18c7944cb825c9f765ad28038ce36d5b0dcc2983dd0f9261c78fba87a67c19f83eb221389ba1445d6c7d6fd1f20731c587b502
+  metadata.gz: df230eea9bc5a3512ac6557cba79a7c961df3b61bd3667173cd58104eacfb2ac26ad6cf7efab14129dbc5882c0d4504d5d95b3ac56113f662e34a8eeef53fcde
+  data.tar.gz: 3a05f6c5bacdd0214f409cccf7e38d80f9cc31be8a15078a766e3e436d7164393b0b39e31306c784e0e7e9e015fbe15ab78df4101a221086b76fc228ee01eb8d

data/README.md

@@ -23,12 +23,15 @@ But what if you only want to share that site with a select number of people? Bef
 
 1. Navigate to [the GitHub app registration page](https://github.com/settings/applications/new)
 2. Give your app a name
-3. Tell GitHub the URL you want the app to eventually live at
-4. Hit Save, but leave the page open, you'll need some of the information in a moment
+3. Tell GitHub the URL you want the app to eventually live at. If using a free Heroku account, this will be something like http://my-site.herokuapp.com
+4. Specify the callback URL; should be like this: https://my-site.herokuapp.com/auth/github/callback; note that this is **https**, not http.
+5. Hit Save, but leave the page open, you'll need some of the information in a moment
+
+Remember the 'my-site' part for later on when using `heroku create`. Also, my-site is often called 'app-name' in Heroku documenation.
 
 ### Add Jekyll Auth to your site
 
-1. Add `gem 'jekyll-auth'` to your `Gemfile` or if you don't already have a `Gemfile`, create a file called `Gemfile` in the root of your site's repository with the following content:
+1. Within your new site repository or orphaned github [branch](https://help.github.com/articles/creating-project-pages-manually/) (the branch could be named anything except 'gh-pages' since this would then be public on github!), add `gem 'jekyll-auth'` to your `Gemfile` or if you don't already have a `Gemfile`, create a file called `Gemfile` in the root of your site's repository with the following content:
 
   ```ruby
   source "https://rubygems.org"
@@ -36,7 +39,7 @@ But what if you only want to share that site with a select number of people? Bef
   gem 'jekyll-auth'
   ```
 
-2. `cd` into your project's directory and run `bundle install`.
+2. `cd` into your project's directory and run `bundle install`. If you get an error using `bundle install`, see Troubleshooting below. 
 
 3. Run `bundle exec jekyll-auth new` which will copy the necessary files to set up the server
 
@@ -44,7 +47,7 @@ But what if you only want to share that site with a select number of people? Bef
 
 #### Automatically
 
-Run `bundle exec jekyll-auth --client_id XXX --client_secret XXX --org_id XXX`
+Run `bundle exec jekyll-auth setup --client_id XXX --client_secret XXX --org_id XXX`
 
 (or `--team_id XXX`)
 
@@ -52,9 +55,9 @@ Run `bundle exec jekyll-auth --client_id XXX --client_secret XXX --org_id XXX`
 
 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 `herkou create` from your site's directory
+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`)
-5. `git push heroku`
+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
 
 #### Finding the team ID
@@ -147,3 +150,22 @@ If they're in the org, they get the page. Otherwise, all they ever get is [the b
 4. Remove any Jekyll Auth specific requirements from your `Gemfile`
 5. Follow [the instructions above](https://github.com/benbalter/jekyll-auth#add-jekyll-auth-to-your-site) to get started
 6. When prompted, select "n" if Heroku is already set up
+
+## Troubleshooting
+
+* **ERROR: YOUR SITE COULD NOT BE BUILT** during install, either locally or on Heroku. You likely need to add `exclude: [vendor]` to `_config.yml` in your branch's root directory (create the file if it does not exist already). If you still have problems on the *local* install, you may have better luck using `bundle install --deployment`, but be sure to add the resulting 'vendor' directory to .gitignore. For completeness, the full error may look something like this:
+
+```
+remote:        Configuration file: none
+remote:                     ERROR: YOUR SITE COULD NOT BE BUILT:
+remote:                            ------------------------------------
+remote:                            Invalid date '0000-00-00': Post '/vendor/bundle/ruby/2.0.0/gems/jekyll-2.5.3/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb' does not have a valid date in the filename.
+```
+
+* **Pushing to heroku**. If you are working from a new github-cloned repo (where you have not run `heroku create`), you may also want to push to heroku. You do not add the remote in the standard way using git, but instead do this: 
+
+```
+heroku git:remote -a my-site 
+```
+
+

data/bin/jekyll-auth

@@ -4,7 +4,6 @@
 require 'mercenary'
 require 'jekyll-auth'
 require 'open3'
-require 'jekyll-auth'
 
 Mercenary.program("jekyll-auth") do |p|
   p.version     JekyllAuth::VERSION
@@ -62,9 +61,9 @@ Mercenary.program("jekyll-auth") do |p|
         exit 1
       end
 
-      team_id = JekyllAuth::Comands.team_id(org, team)
+      team_id = JekyllAuth::Commands.team_id(org, team)
 
-      if found
+      if team_id
         puts "The team ID for `@#{org}/#{team}` is `#{team_id}`".green
       else
         puts "Couldn't find the `@#{org}/#{team}` team.".red

data/jekyll-auth.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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.5.2"
+  s.add_dependency "rack", "~> 1.6"
   s.add_dependency "dotenv", "~> 1.0"
   s.add_dependency "rake", "~> 10.3"
   s.add_dependency "rack-ssl-enforcer", "~> 0.2"

data/lib/jekyll_auth/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -56,16 +56,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A simple way to use Github OAuth to serve a protected jekyll site to your