gist 4.1.3 → 4.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 730e7eb88155102e71741d068a955fabedb5b13e
+  data.tar.gz: c0ec9f5d77a19f0e7b3a441b071f1bf70c3f76be
+SHA512:
+  metadata.gz: 28e3e28669cd3a7d419dc87f8d28e10544fa01c9b9d013e04f68ffd35040ead7770f29738f21a8929c6543c0ff03adaf61cb32d2195c17f4e7ab566bedb598c6
+  data.tar.gz: 776b770dd8b1e4091fb4d0c342946764d3f38724f4386b0ca99eac4e8554a86871714f558d17d5bccd899df35103a322868d5c33f3d6645d82cc3d0cbdbdb3ba

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/bin/gist

@@ -1,13 +1,16 @@
 #!/usr/bin/env ruby
 
+# Silence Ctrl-C's
+trap('INT'){ exit 1 }
+
 require 'optparse'
-require File.expand_path('../../lib/gist', __FILE__)
+require 'gist'
 
 # For the holdings of options.
 options = {}
 filenames = []
 
-opts = OptionParser.new do |opts|
+OptionParser.new do |opts|
   executable_name = File.split($0)[1]
   opts.banner = <<-EOS
 Gist (v#{Gist::VERSION}) lets you upload to https://gist.github.com/
@@ -28,7 +31,8 @@ Anonymous gists are not associated with your GitHub account, they can be created
 with "-a" even after you have used "gist --login".
 
 If you would like to shorten the resulting gist URL, use the -s flag. This will
-use GitHub's URL shortener, git.io.
+use GitHub's URL shortener, git.io. You can also use -R to get the link to the
+raw gist.
 
 To copy the resulting URL to your clipboard you can use the -c option, or to
 just open it directly in your browser, use -o. Using the -e option will copy the
@@ -39,7 +43,7 @@ Instead of creating a new gist, you can update an existing one by passing its ID
 or URL with "-u". For this to work, you must be logged in, and have created the
 original gist with the same GitHub account.
 
-Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
+Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
        #{executable_name} --login
 
   EOS
@@ -102,6 +106,10 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f
     options[:paste] = true
   end
 
+  opts.on("-R", "--raw", "Raw url of the new gist") do
+    options[:raw] = true
+  end
+
   opts.on_tail("-h","--help", "Show this message.") do
     puts opts
     exit
@@ -112,16 +120,19 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f
     exit
   end
 
-end
-opts.parse!
+end.parse!
 
 begin
   options[:output] = if options[:embed] && options[:shorten]
                        raise Gist::Error, "--embed does not make sense with --shorten"
                      elsif options[:embed]
                        :javascript
+                     elsif options[:shorten] and options[:raw]
+                       :short_raw_url
                      elsif options[:shorten]
                        :short_url
+                     elsif options[:raw]
+                       :raw_url
                      else
                        :html_url
                      end
@@ -152,6 +163,4 @@ begin
 rescue Gist::Error => e
   puts "Error: #{e.message}"
   exit 1
-rescue Interrupt
-  # bye!
 end

data/build/gist

@@ -1318,7 +1318,7 @@ end
 module Gist
   extend self
 
-  VERSION = '4.1.2'
+  VERSION = '4.2.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -1442,6 +1442,25 @@ module Gist
     end
   end
 
+  # Convert github url into raw file url
+  #
+  # Unfortunately the url returns from github's api is legacy,
+  # we have to taking a HTTPRedirection before appending it
+  # with '/raw'. Let's looking forward for github's api fix :)
+  #
+  # @param [String] url
+  # @return [String] the raw file url
+  def rawify(url)
+    uri = URI(url)
+    request = Net::HTTP::Get.new(uri.path)
+    response = http(uri, request)
+    if Net::HTTPSuccess === response
+      url + '/raw'
+    elsif Net::HTTPRedirection === response
+      rawify(response.header['location'])
+    end
+  end
+
   # Log the user into gist.
   #
   # This method asks the user for a username and password, and tries to obtain
@@ -1454,44 +1473,50 @@ module Gist
   # @see http://developer.github.com/v3/oauth/
   def login!(credentials={})
     puts "Obtaining OAuth2 access_token from github."
-    print "GitHub username: "
-    username = credentials[:username] || $stdin.gets.strip
-    print "GitHub password: "
-    password = credentials[:password] || begin
-      `stty -echo` rescue nil
-      $stdin.gets.strip
-    ensure
-      `stty echo` rescue nil
-    end
-    puts ""
-
-    request = Net::HTTP::Post.new("#{base_path}/authorizations")
-    request.body = JSON.dump({
-      :scopes => [:gist],
-      :note => "The gist gem",
-      :note_url => "https://github.com/ConradIrwin/gist"
-    })
-    request.content_type = 'application/json'
-    request.basic_auth(username, password)
-
-    response = http(api_url, request)
-
-    if Net::HTTPUnauthorized === response && response['X-GitHub-OTP']
-      print "2-factor auth code: "
-      twofa_code = $stdin.gets.strip
+    loop do
+      print "GitHub username: "
+      username = credentials[:username] || $stdin.gets.strip
+      print "GitHub password: "
+      password = credentials[:password] || begin
+        `stty -echo` rescue nil
+        $stdin.gets.strip
+      ensure
+        `stty echo` rescue nil
+      end
       puts ""
 
-      request['X-GitHub-OTP'] = twofa_code
+      request = Net::HTTP::Post.new("#{base_path}/authorizations")
+      request.body = JSON.dump({
+        :scopes => [:gist],
+        :note => "The gist gem",
+        :note_url => "https://github.com/ConradIrwin/gist"
+      })
+      request.content_type = 'application/json'
+      request.basic_auth(username, password)
+
       response = http(api_url, request)
-    end
 
-    if Net::HTTPCreated === response
-      File.open(auth_token_file, 'w', 0600) do |f|
-        f.write JSON.parse(response.body)['token']
+      if Net::HTTPUnauthorized === response && response['X-GitHub-OTP']
+        print "2-factor auth code: "
+        twofa_code = $stdin.gets.strip
+        puts ""
+
+        request['X-GitHub-OTP'] = twofa_code
+        response = http(api_url, request)
+      end
+
+      if Net::HTTPCreated === response
+        File.open(auth_token_file, 'w', 0600) do |f|
+          f.write JSON.parse(response.body)['token']
+        end
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        return
+      elsif Net::HTTPUnauthorized === response
+        puts "Error: #{JSON.parse(response.body)['message']}"
+        next
+      else
+        raise "Got #{response.class} from gist: #{response.body}"
       end
-      puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
-    else
-      raise "Got #{response.class} from gist: #{response.body}"
     end
   rescue => e
     raise e.extend Error
@@ -1546,8 +1571,12 @@ module Gist
                %Q{<script src="#{json['html_url']}.js"></script>}
              when :html_url
                json['html_url']
+             when :raw_url
+               rawify(json['html_url'])
              when :short_url
                shorten(json['html_url'])
+             when :short_raw_url
+               shorten(rawify(json['html_url']))
              else
                json
              end
@@ -1635,6 +1664,7 @@ Could not find copy command, tried:
               elsif RUBY_PLATFORM =~ /linux/
                 %w(
                   sensible-browser
+                  xdg-open
                   firefox
                   firefox-bin
                 ).detect do |cmd|
@@ -1682,13 +1712,16 @@ Could not find copy command, tried:
 end
 #!/usr/bin/env ruby
 
+# Silence Ctrl-C's
+trap('INT'){ exit 1 }
+
 require 'optparse'
 
 # For the holdings of options.
 options = {}
 filenames = []
 
-opts = OptionParser.new do |opts|
+OptionParser.new do |opts|
   executable_name = File.split($0)[1]
   opts.banner = <<-EOS
 Gist (v#{Gist::VERSION}) lets you upload to https://gist.github.com/
@@ -1709,7 +1742,8 @@ Anonymous gists are not associated with your GitHub account, they can be created
 with "-a" even after you have used "gist --login".
 
 If you would like to shorten the resulting gist URL, use the -s flag. This will
-use GitHub's URL shortener, git.io.
+use GitHub's URL shortener, git.io. You can also use -R to get the link to the
+raw gist.
 
 To copy the resulting URL to your clipboard you can use the -c option, or to
 just open it directly in your browser, use -o. Using the -e option will copy the
@@ -1720,7 +1754,7 @@ Instead of creating a new gist, you can update an existing one by passing its ID
 or URL with "-u". For this to work, you must be logged in, and have created the
 original gist with the same GitHub account.
 
-Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
+Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P] [-f NAME|-t EXT]* FILE*
        #{executable_name} --login
 
   EOS
@@ -1783,6 +1817,10 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f
     options[:paste] = true
   end
 
+  opts.on("-R", "--raw", "Raw url of the new gist") do
+    options[:raw] = true
+  end
+
   opts.on_tail("-h","--help", "Show this message.") do
     puts opts
     exit
@@ -1793,16 +1831,19 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-d DESC] [-a] [-u URL] [-P] [-f
     exit
   end
 
-end
-opts.parse!
+end.parse!
 
 begin
   options[:output] = if options[:embed] && options[:shorten]
                        raise Gist::Error, "--embed does not make sense with --shorten"
                      elsif options[:embed]
                        :javascript
+                     elsif options[:shorten] and options[:raw]
+                       :short_raw_url
                      elsif options[:shorten]
                        :short_url
+                     elsif options[:raw]
+                       :raw_url
                      else
                        :html_url
                      end
@@ -1833,6 +1874,4 @@ begin
 rescue Gist::Error => e
   puts "Error: #{e.message}"
   exit 1
-rescue Interrupt
-  # bye!
 end

data/build/gist.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIST" "1" "September 2013" "" "Gist manual"
+.TH "GIST" "1" "December 2013" "" "Gist manual"
 .
 .SH "NAME"
 \fBgist\fR \- upload code to https://gist\.github\.com
@@ -101,6 +101,7 @@ gist \-\-login
 Obtaining OAuth2 access_token from github\.
 GitHub username: ConradIrwin
 GitHub password:
+2\-factor auth code:
 Success! https://github\.com/settings/applications
 .
 .fi
@@ -108,7 +109,23 @@ Success! https://github\.com/settings/applications
 .IP "" 0
 .
 .P
-This token is stored in \fB~/\.gist\fR and used for all future gisting\. If you need to you can revoke it from https://github\.com/settings/applications, or just delete the file\.
+You can read the 2\-factor auth code from an sms or the authentification app, depending on how you set your account up \fIhttps://github\.com/settings/admin\fR\.
+.
+.P
+Note: 2\-factor authentication just appeared recently \fIhttps://github\.com/blog/1614\-two\-factor\-authentication\fR, so if you run into errors, update the gist gem\.
+.
+.IP "" 4
+.
+.nf
+
+gem update gist
+.
+.fi
+.
+.IP "" 0
+.
+.P
+This token is stored in \fB~/\.gist\fR and used for all future gisting\. If you need to you can revoke it from https://github\.com/settings/applications, 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 \fB~/\.gist\.github\.example\.com\fR where "github\.example\.com" is the URL for your Github Enterprise instance\.
 .
 .IP "\(bu" 4
 After you\'ve done this, you can still upload gists anonymously with \fB\-a\fR\.

data/lib/gist.rb

@@ -12,7 +12,7 @@ end
 module Gist
   extend self
 
-  VERSION = '4.1.3'
+  VERSION = '4.2.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
@@ -136,6 +136,25 @@ module Gist
     end
   end
 
+  # Convert github url into raw file url
+  #
+  # Unfortunately the url returns from github's api is legacy,
+  # we have to taking a HTTPRedirection before appending it
+  # with '/raw'. Let's looking forward for github's api fix :)
+  #
+  # @param [String] url
+  # @return [String] the raw file url
+  def rawify(url)
+    uri = URI(url)
+    request = Net::HTTP::Get.new(uri.path)
+    response = http(uri, request)
+    if Net::HTTPSuccess === response
+      url + '/raw'
+    elsif Net::HTTPRedirection === response
+      rawify(response.header['location'])
+    end
+  end
+
   # Log the user into gist.
   #
   # This method asks the user for a username and password, and tries to obtain
@@ -148,44 +167,50 @@ module Gist
   # @see http://developer.github.com/v3/oauth/
   def login!(credentials={})
     puts "Obtaining OAuth2 access_token from github."
-    print "GitHub username: "
-    username = credentials[:username] || $stdin.gets.strip
-    print "GitHub password: "
-    password = credentials[:password] || begin
-      `stty -echo` rescue nil
-      $stdin.gets.strip
-    ensure
-      `stty echo` rescue nil
-    end
-    puts ""
-
-    request = Net::HTTP::Post.new("#{base_path}/authorizations")
-    request.body = JSON.dump({
-      :scopes => [:gist],
-      :note => "The gist gem",
-      :note_url => "https://github.com/ConradIrwin/gist"
-    })
-    request.content_type = 'application/json'
-    request.basic_auth(username, password)
-
-    response = http(api_url, request)
-
-    if Net::HTTPUnauthorized === response && response['X-GitHub-OTP']
-      print "2-factor auth code: "
-      twofa_code = $stdin.gets.strip
+    loop do
+      print "GitHub username: "
+      username = credentials[:username] || $stdin.gets.strip
+      print "GitHub password: "
+      password = credentials[:password] || begin
+        `stty -echo` rescue nil
+        $stdin.gets.strip
+      ensure
+        `stty echo` rescue nil
+      end
       puts ""
 
-      request['X-GitHub-OTP'] = twofa_code
+      request = Net::HTTP::Post.new("#{base_path}/authorizations")
+      request.body = JSON.dump({
+        :scopes => [:gist],
+        :note => "The gist gem",
+        :note_url => "https://github.com/ConradIrwin/gist"
+      })
+      request.content_type = 'application/json'
+      request.basic_auth(username, password)
+
       response = http(api_url, request)
-    end
 
-    if Net::HTTPCreated === response
-      File.open(auth_token_file, 'w', 0600) do |f|
-        f.write JSON.parse(response.body)['token']
+      if Net::HTTPUnauthorized === response && response['X-GitHub-OTP']
+        print "2-factor auth code: "
+        twofa_code = $stdin.gets.strip
+        puts ""
+
+        request['X-GitHub-OTP'] = twofa_code
+        response = http(api_url, request)
+      end
+
+      if Net::HTTPCreated === response
+        File.open(auth_token_file, 'w', 0600) do |f|
+          f.write JSON.parse(response.body)['token']
+        end
+        puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
+        return
+      elsif Net::HTTPUnauthorized === response
+        puts "Error: #{JSON.parse(response.body)['message']}"
+        next
+      else
+        raise "Got #{response.class} from gist: #{response.body}"
       end
-      puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
-    else
-      raise "Got #{response.class} from gist: #{response.body}"
     end
   rescue => e
     raise e.extend Error
@@ -240,8 +265,12 @@ module Gist
                %Q{<script src="#{json['html_url']}.js"></script>}
              when :html_url
                json['html_url']
+             when :raw_url
+               rawify(json['html_url'])
              when :short_url
                shorten(json['html_url'])
+             when :short_raw_url
+               shorten(rawify(json['html_url']))
              else
                json
              end
@@ -329,6 +358,7 @@ Could not find copy command, tried:
               elsif RUBY_PLATFORM =~ /linux/
                 %w(
                   sensible-browser
+                  xdg-open
                   firefox
                   firefox-bin
                 ).detect do |cmd|

data/spec/rawify_spec.rb

@@ -0,0 +1,12 @@
+describe '...' do
+  before do
+    stub_request(:post, /api\.github.com\/gists/).to_return(:body => '{"html_url": "https://gist.github.com/XXXXXX"}')
+    stub_request(:get, "https://gist.github.com/XXXXXX").to_return(:status => 304, :headers => { 'Location' => 'https://gist.github.com/anonymous/XXXXXX' })
+    stub_request(:get, "https://gist.github.com/anonymous/XXXXXX").to_return(:status => 200)
+  end
+
+  it "should return the raw file url" do
+    Gist.gist("Test gist", :output => :raw_url, :anonymous => true).should == "https://gist.github.com/anonymous/XXXXXX/raw"
+  end
+end
+

metadata

@@ -1,92 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gist
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
-  segments: 
-  - 4
-  - 1
-  - 3
-  version: 4.1.3
+version: !ruby/object:Gem::Version
+  version: 4.2.0
 platform: ruby
-authors: 
+authors:
 - Conrad Irwin
-- !binary |
-  4piIa2luZw==
-
+- ☈king
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-12-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ronn
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ronn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a single function (Gist.gist) that uploads a gist.
-email: 
+email:
 - conrad.irwin@gmail.com
 - rkingist@sharpsaw.org
-executables: 
+executables:
 - gist
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -102,41 +91,33 @@ files:
 - spec/ghe_spec.rb
 - spec/gist_spec.rb
 - spec/proxy_spec.rb
+- spec/rawify_spec.rb
 - spec/shorten_spec.rb
 - spec/spec_helper.rb
 - vendor/json.rb
 homepage: https://github.com/defunkt/gist
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Just allows you to upload gists
 test_files: []
-
+has_rdoc: