octokit 2.2.0 → 2.3.0

data/lib/octokit/backports/uri.rb

@@ -0,0 +1,56 @@
+# :stopdoc:
+
+# Stolen from ruby core's uri/common.rb, with modifications to support 1.8.x
+#
+# https://github.com/ruby/ruby/blob/trunk/lib/uri/common.rb
+#
+#
+
+module URI
+  TBLENCWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
+  end
+  TBLENCWWWCOMP_[' '] = '+'
+  TBLENCWWWCOMP_.freeze
+  TBLDECWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    h, l = i>>4, i&15
+    TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+    TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+    TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+    TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+  end
+  TBLDECWWWCOMP_['+'] = ' '
+  TBLDECWWWCOMP_.freeze
+
+  # Encode given +s+ to URL-encoded form data.
+  #
+  # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
+  # (ASCII space) to + and converts others to %XX.
+  #
+  # This is an implementation of
+  # http://www.w3.org/TR/html5/forms.html#url-encoded-form-data
+  #
+  # See URI.decode_www_form_component, URI.encode_www_form
+  def self.encode_www_form_component(s)
+    str = s.to_s
+    if RUBY_VERSION < "1.9" && $KCODE =~ /u/i
+      str.gsub(/([^ a-zA-Z0-9_.-]+)/) do
+        '%' + $1.unpack('H2' * Rack::Utils.bytesize($1)).join('%').upcase
+      end.tr(' ', '+')
+    else
+      str.gsub(/[^*\-.0-9A-Z_a-z]/) {|m| TBLENCWWWCOMP_[m]}
+    end
+  end
+
+  # Decode given +str+ of URL-encoded form data.
+  #
+  # This decodes + to SP.
+  #
+  # See URI.encode_www_form_component, URI.decode_www_form
+  def self.decode_www_form_component(str, enc=nil)
+    raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%[0-9a-fA-F]{2}|[^%])*\z/ =~ str
+    str.gsub(/\+|%[0-9a-fA-F]{2}/) {|m| TBLDECWWWCOMP_[m]}
+  end
+end

data/lib/octokit/client/pub_sub_hubbub.rb

@@ -1,3 +1,10 @@
+major, minor, patch = RUBY_VERSION.split('.').map(&:to_i)
+
+if (major == 1 && minor < 9) || (major == 1 && minor == 9 && patch < 2)
+  # pull in backports
+  require 'octokit/backports/uri'
+end
+
 module Octokit
   class Client
 
@@ -16,9 +23,9 @@ module Octokit
       #   client.subscribe("https://github.com/joshk/devise_imapable/events/push", "github://Email?address=josh.kalderimis@gmail.com")
       def subscribe(topic, callback)
         options = {
+          :"hub.callback" => callback,
           :"hub.mode" => "subscribe",
-          :"hub.topic" => topic,
-          :"hub.callback" => callback
+          :"hub.topic" => topic
         }
         response = pub_sub_hubbub_request(options)
 
@@ -35,9 +42,9 @@ module Octokit
       #   client.unsubscribe("https://github.com/joshk/devise_imapable/events/push", "github://Email?address=josh.kalderimis@gmail.com")
       def unsubscribe(topic, callback)
         options = {
+          :"hub.callback" => callback,
           :"hub.mode" => "unsubscribe",
-          :"hub.topic" => topic,
-          :"hub.callback" => callback
+          :"hub.topic" => topic
         }
         response = pub_sub_hubbub_request(options)
 

data/lib/octokit/client/releases.rb

@@ -93,18 +93,17 @@ module Octokit
       # @see http://developer.github.com/v3/repos/releases/#upload-a-release-asset
       def upload_asset(release_url, path_or_file, options = {})
         options[:accept] ||= PREVIEW_MEDIA_TYPE
-        file = File.new(path_or_file, "r+b") unless file.respond_to?(:read)
+        file = path_or_file.respond_to?(:read) ? path_or_file : File.new(path_or_file, "r+b")
         options[:content_type] ||= content_type_from_file(file)
         raise Octokit::MissingContentType.new if options[:content_type].nil?
         unless name = options[:name]
-          require 'pathname'
-          name = Pathname.new(file).basename.to_s
+          name = File.basename(file.path)
         end
         upload_url = release(release_url).rels[:upload].href_template.expand(:name => name)
 
         request :post, upload_url, file.read, parse_query_and_convenience_headers(options)
       ensure
-        file.close
+        file.close if file
       end
 
       # Get a single release asset

data/lib/octokit/client/repositories.rb

@@ -522,6 +522,7 @@ module Octokit
       # @example
       #   @client.edit_hook(
       #     'octokit/octokit.rb',
+      #     100000,
       #     'web',
       #     {
       #       :url => 'http://something.com/webhook',

data/lib/octokit/error.rb

@@ -144,18 +144,26 @@ module Octokit
   # and headers include "X-GitHub-OTP"
   class OneTimePasswordRequired < ClientError
     #@private
-    HEADER = /required; (?<delivery>\w+)/i
+    OTP_DELIVERY_PATTERN = /required; (\w+)/i
 
     #@private
     def self.required_header(headers)
-      HEADER.match headers['X-GitHub-OTP'].to_s
+      OTP_DELIVERY_PATTERN.match headers['X-GitHub-OTP'].to_s
     end
 
     # Delivery method for the user's OTP
     #
     # @return [String]
     def password_delivery
-      @password_delivery ||= self.class.required_header(@response[:response_headers])[:delivery]
+      @password_delivery ||= delivery_method_from_header
+    end
+
+    private
+
+    def delivery_method_from_header
+      if match = self.class.required_header(@response[:response_headers])
+        match[1]
+      end
     end
   end
 

data/lib/octokit/version.rb

@@ -2,6 +2,6 @@ module Octokit
 
   # Current version
   # @return [String]
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 
 end

data/octokit.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |spec|
   spec.email = ['wynn.netherland@gmail.com', 'sferik@gmail.com', 'clint@ctshryock.com']
   spec.files = %w(.document CONTRIBUTING.md LICENSE.md README.md Rakefile octokit.gemspec)
   spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("spec/**/*")
   spec.homepage = 'https://github.com/octokit/octokit.rb'
   spec.licenses = ['MIT']
   spec.name = 'octokit'

data/spec/octokit/client/authorizations_spec.rb

@@ -32,28 +32,25 @@ describe Octokit::Client::Authorizations do
     end
 
     context 'with :idempotent => true' do
-      subject do
-        lambda do |info = {}|
-          @client.create_authorization({
-            :idempotent    => true,
-            :client_id     => test_github_client_id,
-            :client_secret => test_github_client_secret
-          }.merge(info))
-        end
-      end
-
       it "creates a new authorization with options" do
-        info = {
-          :scopes => ["gist"],
-        }
-        authorization = subject.call info
+        authorization = @client.create_authorization \
+          :idempotent    => true,
+          :client_id     => test_github_client_id,
+          :client_secret => test_github_client_secret,
+          :scopes => %w(gist)
         expect(authorization.scopes).to be_kind_of Array
         assert_requested :put, basic_github_url("/authorizations/clients/#{test_github_client_id}")
       end
 
       it 'returns an existing API authorization if one already exists' do
-        first_authorization = subject.call
-        second_authorization = subject.call
+        first_authorization = @client.create_authorization \
+          :idempotent    => true,
+          :client_id     => test_github_client_id,
+          :client_secret => test_github_client_secret
+        second_authorization = @client.create_authorization \
+          :idempotent    => true,
+          :client_id     => test_github_client_id,
+          :client_secret => test_github_client_secret
         expect(first_authorization.id).to eql second_authorization.id
       end
     end

data/spec/octokit/client/pub_sub_hubbub_spec.rb

@@ -70,7 +70,11 @@ describe Octokit::Client::PubSubHubbub do
         with(irc_request_body).
         to_return(:status => 204)
       expect(@client.subscribe_service_hook("joshk/completeness-fu", "irc", { :server => "chat.freenode.org", :room => "#myproject"})).to eql(true)
-      assert_requested :post, "https://api.github.com/hub", :body => irc_request_body, :times => 1
+      # Since we can't depend upon hash ordering across the Rubies
+      assert_requested :post, "https://api.github.com/hub", :times => 1 do |req|
+        req.body[%r{hub.callback=github%3A%2F%2Firc%3Froom%3D%2523myproject}]
+        req.body[%r{server%3Dchat.freenode.org}]
+      end
     end
   end # .subscribe_service_hook
 

data/spec/octokit/client/releases_spec.rb

@@ -79,10 +79,11 @@ describe Octokit::Client::Releases do
       end
       it "uploads a release asset as file object" do
         file = File.new("spec/fixtures/upload.png", "r+b")
+        size = File.size(file)
         name = "upload_by_file.png"
         asset = @client.upload_asset(@release_url, file, :content_type => "image/png", :name => name)
         expect(asset.name).to eq(name)
-        expect(asset.size).to eq(file.size)
+        expect(asset.size).to eq(size)
       end
       it "uploads a release asset with a default name" do
         path = "spec/fixtures/upload.png"

metadata

@@ -1,54 +1,68 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: octokit
-version: !ruby/object:Gem::Version
-  version: 2.2.0
+version: !ruby/object:Gem::Version 
+  hash: 3
+  prerelease: 
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
-authors:
+authors: 
 - Wynn Netherland
 - Erik Michaels-Ober
 - Clint Shryock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-01 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sawyer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
+  type: :runtime
+  version_requirements: *id002
 description: Simple wrapper for the GitHub API
-email:
+email: 
 - wynn.netherland@gmail.com
 - sferik@gmail.com
 - clint@ctshryock.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - CONTRIBUTING.md
 - LICENSE.md
@@ -57,6 +71,7 @@ files:
 - octokit.gemspec
 - lib/octokit/arguments.rb
 - lib/octokit/authentication.rb
+- lib/octokit/backports/uri.rb
 - lib/octokit/client/authorizations.rb
 - lib/octokit/client/commit_comments.rb
 - lib/octokit/client/commits.rb
@@ -437,31 +452,43 @@ files:
 - spec/octokit/rate_limit_spec.rb
 - spec/octokit/repository_spec.rb
 - spec/octokit_spec.rb
+has_rdoc: true
 homepage: https://github.com/octokit/octokit.rb
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-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
+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: 17
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby toolkit for working with the GitHub API
-test_files:
+test_files: 
 - spec/cassettes/delete_authorization.json
 - spec/cassettes/Octokit_Client/_get/handles_query_params.json
 - spec/cassettes/Octokit_Client/_head/handles_query_params.json
@@ -801,4 +828,3 @@ test_files:
 - spec/octokit/rate_limit_spec.rb
 - spec/octokit/repository_spec.rb
 - spec/octokit_spec.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 49bd50a2f9430627f5a602916c03e3931299a222
-  data.tar.gz: 7133fd9d3339e1fc94dd480a456948551d88fcc3
-SHA512:
-  metadata.gz: 5ad7ef3547f6c91f21821e0bb69ceb919363b224abe3cc9e494c064c43fa9be3aace48139298aefb2deb938d2b98fcdc7b49626ce5c870eef88ea5ea628c7af8
-  data.tar.gz: 61d8515ae3534f2b5e74954b3ee3a3033dcb976dc526135c26216342eaa09f6f6ac2c5836f5b1a8f6f4abc7a1a59cc8c0909fd44729bff0066a71dee29d43749