gh 0.6.0 → 0.6.1

data/.travis.yml

@@ -12,6 +12,5 @@ rvm:
   - ree
 matrix:
   allow_failures:
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
     - rvm: jruby-head
+    - rvm: ruby-head

data/README.md

@@ -111,17 +111,3 @@ Scoping is thread-safe.
 ## Is this production ready?
 
 I hope so, we use it in production for [Travis CI](http://travis-ci.org/). The work on this library has been funded by the [Travis Love Campaign](https://love.travis-ci.org/).
-
-## History
-
-* 2012-04-15: 0.3.0 - added API for posting to github, fix merge commit, disable cache by default
-* 2012-04-13: 0.2.4 - added support for merge commits
-* 2012-04-12: 0.2.3 - better normalization
-* 2012-04-10: 0.2.2 - improved link following
-* 2012-04-10: 0.2.1 - bug fix release
-* 2012-04-10: 0.2.0 - added link following plus bug fixes (mainly encoding issues)
-* 2012-04-06: 0.1.2 - bug fix release (issues with cache reloading)
-* 2012-04-06: 0.1.1 - bug fix release (DSL fixes)
-* 2012-04-04: 0.1.0 - many bug fixes plus lazy loading
-* 2012-03-21: 0.0.1 - first public release
-* 2012-03-05: project started

data/lib/gh/faraday_adapter.rb

@@ -1,5 +1,6 @@
 require 'gh'
 require 'faraday'
+require 'thread'
 require 'net/https'
 require 'net/http/pipeline'
 require 'net/http/persistent'
@@ -9,20 +10,25 @@ module GH
   class FaradayAdapter < Faraday::Adapter::NetHttpPersistent
     class Manager
       def initialize(*)
+        @mutex    = Mutex.new
         @requests = {}
-        @connects = {}
       end
 
       def add_request(http, env, adapter)
         url = env[:url] + '/'
         env[:adapter] = adapter
-        @requests[url] ||= []
-        @requests[url] << env
+
+        @mutex.synchronize do
+          @requests[url] ||= []
+          @requests[url] << env
+        end
       end
 
       def run
+        requests = nil
+        @mutex.synchronize { requests, @requests = @requests, {} }
         http = Net::HTTP::Persistent.new 'GH'
-        @requests.each do |url, envs|
+        requests.each do |url, envs|
           requests  = envs.map { |env| env[:adapter].create_request(env) }
           responses = http.pipeline(url, requests)
           envs.zip(responses) do |e,r|

data/lib/gh/parallel.rb

@@ -27,10 +27,11 @@ module GH
       dummy
     end
 
-    def in_parallel(&block)
+    def in_parallel
       return yield if in_parallel?
       was, @in_parallel = @in_parallel, true
-      result = connection.in_parallel(&block)
+      result = nil
+      connection.in_parallel { result = yield }
       @mutex.synchronize do
         @queue.each { |dummy, key, response| dummy.__delegate__ = backend.generate_response(key, response) }
         @queue.clear

data/lib/gh/remote.rb

@@ -42,12 +42,16 @@ module GH
       faraday_options[:ssl] = options[:ssl] if options[:ssl]
       faraday_options.merge! options[:faraday_options] if options[:faraday_options]
 
+      adapter = options[:adapter]
+      adapter ||= Faraday::Adapter::NetHttp if defined? RUBY_ENGINE and RUBY_ENGINE == 'jruby'
+      adapter ||= GH::FaradayAdapter
+
       @connection = Faraday.new(faraday_options) do |builder|
         builder.request(:authorization, :token, token) if token
         builder.request(:basic_auth, username, password)  if username and password
         builder.request(:retry)
         builder.response(:raise_error)
-        builder.use(options[:adapter] || GH::FaradayAdapter)
+        builder.use(adapter)
       end
     end
 

data/lib/gh/version.rb

@@ -1,4 +1,4 @@
 module GH
   # Public: Library version.
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/parallel_spec.rb

@@ -43,4 +43,8 @@ describe GH::Parallel do
 
     GH.should_not be_in_parallel
   end
+
+  it 'returns the block value' do
+    GH.in_parallel { 42 }.should be == 42
+  end
 end

data/spec/response_spec.rb

@@ -10,6 +10,7 @@ describe GH::Response do
   end
 
   it 'handles broken encodings properly' do
+    pending if RUBY_ENGINE == 'jruby' # see https://github.com/flori/json/issues/138
     GH::Response.new({}, "{\"foo\":\"\xC3\"}")["foo"].should be == "\xC3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302474334740 !ruby/object:Gem::Requirement
+  requirement: &70100388987640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302474334740
+  version_requirements: *70100388987640
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70302474334320 !ruby/object:Gem::Requirement
+  requirement: &70100388987220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302474334320
+  version_requirements: *70100388987220
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70302474333820 !ruby/object:Gem::Requirement
+  requirement: &70100388986720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474333820
+  version_requirements: *70100388986720
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &70302474333320 !ruby/object:Gem::Requirement
+  requirement: &70100388986220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474333320
+  version_requirements: *70100388986220
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70302474332860 !ruby/object:Gem::Requirement
+  requirement: &70100386169740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474332860
+  version_requirements: *70100386169740
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70302474332480 !ruby/object:Gem::Requirement
+  requirement: &70100386169360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474332480
+  version_requirements: *70100386169360
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70302474332020 !ruby/object:Gem::Requirement
+  requirement: &70100386168900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474332020
+  version_requirements: *70100386168900
 - !ruby/object:Gem::Dependency
   name: net-http-pipeline
-  requirement: &70302474331600 !ruby/object:Gem::Requirement
+  requirement: &70100386168480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302474331600
+  version_requirements: *70100386168480
 description: multi-layer client for the github api v3
 email:
 - konstantin.mailinglists@googlemail.com