gist 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a304fb9f742996cc0bca4b5a3d62c8ca52abba
-  data.tar.gz: 24bcae03f00c4e4241f4dea50aae4bf64850a140
+  metadata.gz: a00795d0cd699dec7993e7b371e70dc3387c7a91
+  data.tar.gz: f8dd93ec358f2193f5764f4bb567b3189d76cfdd
 SHA512:
-  metadata.gz: bb0f2608a1bb78e0cc359d9d4f2793ebfbf33e846fca649f91ffa48125c44ce59114b8adb84d886f6d8cf94b87a2622f8a234695b6ca04b3be4fd42d96737bbc
-  data.tar.gz: 5bbbe8d45b08eb54ec5f659d9e23b83313ff3abf9b2475f408d44c117e62d7eb9604d0c8d26bbfe11fe313d71671e12ba696c09fc8d1d92a692909fca5fa7de6
+  metadata.gz: 814b45808c5aea3d9d5d35117c706f38d956f96f20c394bcb28b68fd331fed0d8ba709bafc5c47aad90362e198abb14d96f7ebf36fa2ad0a12496ba838f0bf93
+  data.tar.gz: 14b0f241463232cfc679fac45a6e932031b21d4fdc94c56dc72228eb56d4c4a280fd2558e2b09f90ec28d8666d0361581840a26edf3cbe899928466943f43768

data/README.md

@@ -50,7 +50,8 @@ upload content to https://gist.github.com/.
 
 ‌You can update existing gists with `-u`:
 
-    gist lib/gist.rb bin/gist -u 42f2c239d2eb57299408
+    gist -u GIST_ID FILE_NAME
+    gist -u 42f2c239d2eb57299408 test.txt
 
 ‌If you'd like to copy the resulting URL to your clipboard, use `-c`.
 
@@ -84,7 +85,7 @@ an OAuth2 token (with the "gist" permission).
     2-factor auth code:
     Success! https://github.com/settings/applications
 
-You can read the 2-factor auth code from an sms or the authentification app,
+You can read the 2-factor auth code from an sms or the authentication app,
 depending on how you [set your account up](https://github.com/settings/admin).
 
 Note: 2-factor authentication

data/bin/gist

@@ -106,7 +106,7 @@ Usage: #{executable_name} [-o|-c|-e] [-p] [-s] [-R] [-d DESC] [-a] [-u URL] [-P]
     options[:paste] = true
   end
 
-  opts.on("-R", "--raw", "Raw url of the new gist") do
+  opts.on("-R", "--raw", "Display raw URL of the new gist") do
     options[:raw] = true
   end
 
@@ -145,9 +145,9 @@ begin
 
   if options.key? :list
     if options[:list]
-      Gist.list_gists(options[:list])
+      Gist.list_all_gists(options[:list])
     else
-      Gist.list_gists
+      Gist.list_all_gists
     end
     exit
   end

data/gist.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
 
   s.executables << 'gist'
 
-  %w(rake rspec webmock ronn).each do |gem|
-    s.add_development_dependency gem
-  end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'ronn'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'rspec', '>3'
 end

data/lib/gist.rb

@@ -12,12 +12,12 @@ end
 module Gist
   extend self
 
-  VERSION = '4.3.0'
+  VERSION = '4.4.0'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
     'xclip'   => 'xclip -o',
-    'xsel -i'    => 'xsel -o',
+    'xsel -i' => 'xsel -o',
     'pbcopy'  => 'pbpaste',
     'putclip' => 'getclip'
   }
@@ -40,11 +40,32 @@ module Gist
   end
   class ClipboardError < RuntimeError; include Error end
 
+  # helper module for authentication token actions
+  module AuthTokenFile
+    def self.filename
+      if ENV.key?(URL_ENV_NAME)
+        File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
+      else
+        File.expand_path "~/.gist"
+      end
+    end
+
+    def self.read
+      File.read(filename).chomp
+    end
+
+    def self.write(token)
+      File.open(filename, 'w', 0600) do |f|
+        f.write token
+      end
+    end
+  end
+
   # auth token for authentication
   #
   # @return [String] string value of access token or `nil`, if not found
   def auth_token
-    @token ||= File.read(auth_token_file) rescue nil
+    @token ||= AuthTokenFile.read rescue nil
   end
 
   # Upload a gist to https://gist.github.com
@@ -160,6 +181,40 @@ module Gist
     end
   end
 
+  def list_all_gists(user = "")
+    url = "#{base_path}"
+
+    if user == ""
+      access_token = auth_token()
+      if access_token.to_s != ''
+        url << "/gists?access_token=" << CGI.escape(access_token)
+        get_gist_pages(url)
+      else
+        raise Error, "Not authenticated. Use 'gist --login' to login or 'gist -l username' to view public gists."
+      end
+
+    else
+      url << "/users/#{user}/gists"
+      get_gist_pages(url)
+    end
+
+  end
+
+  def get_gist_pages(url)
+
+    request = Net::HTTP::Get.new(url)
+    response = http(api_url, request)
+    pretty_gist(response)
+
+    link_header = response.header['link']
+
+    if link_header
+      links = Hash[ link_header.gsub(/(<|>|")/, "").split(',').map { |link| link.split('; rel=') } ].invert
+      get_gist_pages(links['next']) if links['next']
+    end
+
+  end
+
   # return prettified string result of response body for all gists
   #
   # @params [Net::HTTPResponse] response
@@ -258,9 +313,7 @@ module Gist
       end
 
       if Net::HTTPCreated === response
-        File.open(auth_token_file, 'w', 0600) do |f|
-          f.write JSON.parse(response.body)['token']
-        end
+        AuthTokenFile.write JSON.parse(response.body)['token']
         puts "Success! #{ENV[URL_ENV_NAME] || "https://github.com/"}settings/applications"
         return
       elsif Net::HTTPUnauthorized === response
@@ -441,14 +494,6 @@ Could not find copy command, tried:
     ENV.key?(URL_ENV_NAME) ? URI(ENV[URL_ENV_NAME]) : GITHUB_API_URL
   end
 
-  def auth_token_file
-    if ENV.key?(URL_ENV_NAME)
-      File.expand_path "~/.gist.#{ENV[URL_ENV_NAME].gsub(/[^a-z.]/, '')}"
-    else
-      File.expand_path "~/.gist"
-    end
-  end
-
   def legacy_private_gister?
     return unless which('git')
     `git config --global gist.private` =~ /\Ayes|1|true|on\z/i

data/spec/auth_token_file_spec.rb

@@ -0,0 +1,61 @@
+describe Gist::AuthTokenFile do
+  subject { Gist::AuthTokenFile }
+
+  before(:each) do
+    stub_const("Gist::URL_ENV_NAME", "STUBBED_GITHUB_URL")
+  end
+
+  describe "::filename" do
+    let(:filename) { double() }
+
+    context "with default GITHUB_URL" do
+      it "is ~/.gist" do
+        File.should_receive(:expand_path).with("~/.gist").and_return(filename)
+        subject.filename.should be filename
+      end
+    end
+
+    context "with custom GITHUB_URL" do
+      before do
+        ENV[Gist::URL_ENV_NAME] = github_url
+      end
+      let(:github_url) { "gh.custom.org" }
+
+      it "is ~/.gist.{custom_github_url}" do
+        File.should_receive(:expand_path).with("~/.gist.#{github_url}").and_return(filename)
+        subject.filename.should be filename
+      end
+    end
+
+  end
+
+  describe "::read" do
+    let(:token) { "auth_token" }
+
+    it "reads file contents" do
+      File.should_receive(:read).and_return(token)
+      subject.read.should eq token
+    end
+
+    it "chomps file contents" do
+      File.should_receive(:read).and_return(token + "\n")
+      subject.read.should eq token
+    end
+  end
+
+  describe "::write" do
+    let(:token) { double() }
+    let(:filename) { double() }
+    let(:token_file) { double() }
+
+    before do
+      subject.stub(:filename) { filename }
+    end
+
+    it "writes token to file" do
+      File.should_receive(:open).with(filename, 'w', 0600).and_yield(token_file)
+      token_file.should_receive(:write).with(token)
+      subject.write(token)
+    end
+  end
+end

data/spec/ghe_spec.rb

@@ -63,7 +63,7 @@ describe '...' do
 
       it "uses them" do
         $stdin = StringIO.new "#{MOCK_USER}_wrong\n#{MOCK_PASSWORD}_wrong\n"
-        Gist.login! username: MOCK_USER, password: MOCK_PASSWORD
+        Gist.login! :username => MOCK_USER, :password => MOCK_PASSWORD
 
         assert_requested(:post, /#{MOCK_AUTHZ_GITHUB_URL}authorizations/)
       end

data/spec/gist_spec.rb

@@ -2,21 +2,21 @@ describe Gist do
 
   describe "should_be_public?" do
     it "should return false if -p is specified" do
-      Gist.should_be_public?(private: true).should be_false
+      Gist.should_be_public?(:private => true).should be_falsy
     end
 
     it "should return false if legacy_private_gister?" do
       Gist.should_receive(:legacy_private_gister?).and_return(true)
-      Gist.should_be_public?.should be_false
+      Gist.should_be_public?.should be_falsy
     end
 
     it "should return true if --no-private is specified" do
       Gist.stub(:legacy_private_gister?).and_return(true)
-      Gist.should_be_public?(private: false).should be_true
+      Gist.should_be_public?(:private => false).should be_truthy
     end
 
     it "should return true by default" do
-      Gist.should_be_public?.should be_true
+      Gist.should_be_public?.should be_truthy
     end
   end
 

data/spec/spec_helper.rb

@@ -5,11 +5,15 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :should
+  end
 end
 
 require 'webmock/rspec'
-require_relative '../lib/gist'
-
+require 'gist'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gist
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Conrad Irwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Provides a single function (Gist.gist) that uploads a gist.
 email:
 - conrad.irwin@gmail.com
@@ -87,6 +87,7 @@ files:
 - build/gist.1
 - gist.gemspec
 - lib/gist.rb
+- spec/auth_token_file_spec.rb
 - spec/clipboard_spec.rb
 - spec/ghe_spec.rb
 - spec/gist_spec.rb
@@ -115,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Just allows you to upload gists
 test_files: []
-has_rdoc: