Merge pull request #258 from gcbw/patch-1

fix token file name

Author: ConradIrwin

README.md

@@ -92,14 +92,38 @@ an OAuth2 token (with the "gist" permission).
 
 This token is stored in `~/.gist` and used for all future gisting. If you need to
 you can revoke it from https://github.com/settings/tokens, or just delete the
-file. If you need to store tokens for both github.com and a Github Enterprise instance 
-you can save your Github Enterprise token in `~/.gist.github.example.com` where 
-"github.example.com" is the URL for your Github Enterprise instance.
+file. 
 
 ‌After you've done this, you can still upload gists anonymously with `-a`.
 
  gist -a a.rb
 
+### GitHub Enterprise
+
+If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
+you need to export the `GITHUB_URL` environment variable (usually done in your `~/.bashrc`).
+
+ export GITHUB_URL=http://github.internal.example.com/
+
+Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
+automatically use github enterprise instead of the public github.com
+
+Your token for GitHub Enterprise will be stored in `.gist.<protocol>.<server.name>[.<port>]` (e.g.
+`~.gist.http.github.internal.example.com` for the GITHUB_URL example above) instead of `~/.gist`.
+
+If you have multiple servers or use Enterprise and public GitHub often, you can work around this by creating scripts
+that set the env var and then run `gist`. Keep in mind that to use the public GitHub you must unset the env var. Just
+setting it to the public URL will not work. Use `unset GITHUB_URL`
+
+### Token file format
+
+If you cannot use passwords, as most Enterprise installations do, you can generate the token via the web interface
+and then simply save the string in the correct file. Avoid line breaks or you might see:
+```
+$ gist -l
+Error: Bad credentials
+```
+
 # Library
 
 ‌You can also use Gist as a library from inside your ruby code:
@@ -131,16 +155,6 @@ NOTE: The access_token must have the "gist" scope.
 ‌This will take them through the process of obtaining an OAuth2 token, and storing it
 in `~/.gist`, where it can later be read by `Gist.gist`
 
-## GitHub enterprise
-
-‌If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
-you need to export the `GITHUB_URL` environment variable in your `~/.bashrc`.
-
- export GITHUB_URL=http://github.internal.example.com/
-
-‌Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
-automatically use github enterprise instead of the public github.com
-
 ## Configuration
 
 ‌If you'd like `-o` or `-c` to be the default when you use the gist executable, add an

lib/gist.rb

@@ -44,7 +44,7 @@ class ClipboardError < RuntimeError; include Error end
  module AuthTokenFile
  def self.filename
  if ENV.key?(URL_ENV_NAME)
- File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
+ File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/:/, '.').gsub(/[^a-z0-9.]/, '')}"
  else
  File.expand_path "~/.gist"
  end

spec/auth_token_file_spec.rb

@@ -19,10 +19,10 @@
  before do
  ENV[Gist::URL_ENV_NAME] = github_url
  end
- let(:github_url) { "gh.custom.org" }
+ let(:github_url) { "http://gh.custom.org:442/" }
 
  it "is ~/.gist.{custom_github_url}" do
- File.should_receive(:expand_path).with("~/.gist.#{github_url}").and_return(filename)
+ File.should_receive(:expand_path).with("~/.gist.http.gh.custom.org.442").and_return(filename)
  subject.filename.should be filename
  end
  end