lhc-core-interceptors 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee16284796c7f53b053b526ed636722b2ed5ea8
-  data.tar.gz: 7a190e5024b2dfdd546ff12982cd97d11cdad36b
+  metadata.gz: 4f9b008ab67152dd009a75908ba53b46e859c3e9
+  data.tar.gz: 894734ee22df57d95f6a5e4b579d8eba39847625
 SHA512:
-  metadata.gz: fa70a751b5be926bcf04bce083ca290e35ece2b29f861790d442bb4901b48004ae2bfd6f5dece684b3c05eee01e09e6eadb1d1e0492563dfe0d68bc8a086748d
-  data.tar.gz: f7c1aba4e0dfe23cf207132050f247ffc91eda1fd93dcb3acf5534451daa318882efcf144746b59a6e9409645d7687244af7f9d453c561602ee02484f801c8b2
+  metadata.gz: 20f42d9456146fed2455827f7aca139a096a1cad24c8489b3e9c2617c042439fc1fa4b98fafe6be92b34af8ac4cb87186c90871354faac297426baf7e2b291f4
+  data.tar.gz: c39c15d1541a41727342ac0f50c6f17d5c486364db5fa021459ada3026c733a37419cb94d57a677ee1b27233173e4326b8fd69f16259c5b0264b5b9b62db4618

data/.gitignore

@@ -13,7 +13,6 @@ spec/dummy/log/*
 spec/dummy/tmp/cache/*
 Gemfile.lock
 .ruby-gemset
-.ruby-version
 
 ## Specific to RubyMotion:
 .dat*

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.2

data/README.md

@@ -130,6 +130,26 @@ Adds the following header to the request:
 
 Which is the base64 encoded credentials "username:password".
 
+## Rollbar Interceptor
+
+Forward errors to rollbar when exceptions occur during http requests.
+
+```ruby
+  LHC.config.interceptors = [LHC::Rollbar]
+```
+
+```ruby
+  LHC.get('http://local.ch')
+```
+
+If it raises, it forwards the request and response object to rollbar, which contain all necessary data.
+
+### Forward additional parameters
+
+```ruby
+  LHC.get('http://local.ch', rollbar: { tracking_key: 'this particular request' })
+```
+
 ## License
 
 [GNU Affero General Public License Version 3.](https://www.gnu.org/licenses/agpl-3.0.en.html)

data/cider-ci.yml

@@ -1,4 +1,3 @@
 jobs:
-  _cider-ci_include:
-    - cider-ci/jobs/rubocop.yml
+  include:
     - cider-ci/jobs/rspec.yml

data/cider-ci/bin/bundle

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -eux
+
+export PATH=~/.rubies/$RUBY/bin:$PATH
+rm -f .bundle/config
+
+if [ ! -f ~/.rubies/$RUBY/bin/bundle ]; then
+  gem install bundler
+fi
+
+sed "s/^source 'https:\/\/rubygems\.intra\.local\.ch'*/source 'http\:\/\/52.29.7.59:9292'/g" Gemfile > Gemfile.tmp
+mv Gemfile.tmp Gemfile
+
+DIGEST=$(git ls-tree HEAD --\
+  cider-ci.yml cider-ci Gemfile.lock \
+  | openssl dgst -sha1 | cut -d ' ' -f 2)
+
+DIGEST=$(echo "$DIGEST $PATH" \
+ | openssl dgst -sha1 | cut -d ' ' -f 2)
+
+CACHE_SIGNATURE_FILE="/tmp/bundle_cache_signature_${DIGEST}"
+
+if [ ! -f  $CACHE_SIGNATURE_FILE ] ; then
+  bundle install
+  touch $CACHE_SIGNATURE_FILE
+fi
+

data/cider-ci/bin/ruby_install

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -eux
+
+export PATH=~/.rubies/$RUBY/bin:$PATH
+
+if [ ! -d ~/.rubies/$RUBY ]; then
+  ruby-install --no-install-deps $RUBY
+fi

data/cider-ci/bin/ruby_version

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -eux
+
+if [ -f ./.ruby-version ]; then
+ echo ".ruby-version file found"
+fi
+
+if [ ! -f ./.ruby-version ]; then
+  echo ".ruby-version file not found" 
+  exit 1
+fi 
+
+IFS='-' read -ra EXPLODED_RUBY <<< "$RUBY"
+
+if [ "${#EXPLODED_RUBY[@]}" == "1" ]; then
+  echo 'No engine/version separator "-" found in .ruby-version file.'
+  exit 1
+fi
+
+if [ "${#EXPLODED_RUBY[@]}" != "1" ] && [ "${#EXPLODED_RUBY[@]}" != "2" ]; then
+  echo "Unknown format of .ruby-version file"
+  exit 1
+fi
+
+echo $RUBY

data/cider-ci/jobs/rspec.yml

@@ -1,48 +1,24 @@
 rspec:
-  name: 'RSPec tests'
+  name: 'rspec'
 
-  run-on:
-    - type: branch
-      include-match: ^.*$
+  run_when:
+    'some HEAD has been updated':
+      type: branch
+      include_match: ^.*$
 
   context:
-    task-defaults:
-      ports:
-        CAPYBARA_PORT:
-          inet_address: "localhost"
-          min: 8000
-          max: 8999
-        PHANTOMJS_PORT:
-          inet_address: "localhost"
-          min: 44600
-          max: 44999
 
-      scripts:
-        rspec:
-          start-when:
-            - script: bundle
-            - script: ruby-version
-            - script: tmp-cache
+    script_defaults:
+      template_environment_variables: true
 
+    task_defaults:
+      max_trials: 2
+      dispatch_storm_delay_duration: 1 Seconds
+      include:
+        - cider-ci/task_components/ruby.yml
+        - cider-ci/task_components/bundle.yml
+        - cider-ci/task_components/rspec.yml
 
-        _cider-ci_include:
-          - cider-ci/scripts/bundle.yml
-          - cider-ci/scripts/tmp-cache.yml
-          - cider-ci/scripts/ruby-version.yml
-          - cider-ci/scripts/rspec.yml
-
-
-      trial-attachments:
-        logs:
-          include-match: log\/.*\.log$
-          content-type: text/plain
-        image-screenshots:
-          include-match: tmp\/capybara\/.*\.png$
-          content-type: image/png
-        html-screenshots:
-          include-match: tmp\/capybara\/.*\.html$
-          content-type: text/html
-
-    _cider-ci_generate-tasks:
-      include-match: spec/.*_spec.rb
-      exclude-match: spec/support/shared/*
+    tasks:
+      all-rspec:
+        name: All rspec tests

data/cider-ci/task_components/bundle.yml

@@ -0,0 +1,18 @@
+traits:
+  ruby-install: true
+  Bash: true
+
+trial_attachments:
+  gemfile:
+    include_match: Gemfile
+    content_type: text/plain
+
+scripts:
+
+  bundle:
+    exclusive_executor_resource: ruby-install_{{$RUBY}}
+    timeout: 20 Minutes
+    body: cider-ci/bin/bundle
+    start_when:
+      'ruby installed':
+        script_key: ruby-install

data/cider-ci/task_components/rspec.yml

@@ -0,0 +1,36 @@
+ports:
+  CAPYBARA_PORT:
+    min: 8000
+    max: 8999
+  PHANTOMJS_PORT:
+    min: 44600
+    max: 44999
+
+environment_variables:
+  RUBY:
+    read_and_replace_with: .ruby-version
+
+scripts:
+  rspec:
+    body: |
+      #!/usr/bin/env bash
+      set -eux
+      mkdir -p tmp/cache
+      export PATH=~/.rubies/$RUBY/bin:$PATH
+      bundle exec rspec
+    
+    start_when:
+      'bundled':
+        script_key: bundle
+
+
+trial_attachments:
+  logs:
+    include_match: log\/.*\.log$
+    content_type: text/plain
+  image-screenshots:
+    include_match: tmp\/capybara\/.*\.png$
+    content_type: image/png
+  html-screenshots:
+    include_match: tmp\/capybara\/.*\.html$
+    content_type: text/html

data/cider-ci/task_components/ruby.yml

@@ -0,0 +1,15 @@
+environment_variables:
+  RUBY:
+    read_and_replace_with: .ruby-version
+
+scripts:
+  ruby-version:
+    body: cider-ci/bin/ruby_version
+  ruby-install:
+    exclusive_executor_resource: ruby-install_{{$RUBY}}
+    timeout: 20 Minutes
+    body: cider-ci/bin/ruby_install
+    start_when:
+      'ruby version checked':
+        script_key: ruby-version
+

data/lib/lhc-core-interceptors/rollbar.rb

@@ -0,0 +1,18 @@
+class LHC::Rollbar < LHC::Interceptor
+  include ActiveSupport::Configurable
+
+  def after_response(response)
+    return unless Object.const_defined?('Rollbar')
+    request = response.request
+    additional_params = request.options.fetch(:rollbar, {})
+    error = LHC::Error.find(response)
+    data = {
+      response: response,
+      request: request
+    }.merge additional_params
+    Rollbar.error(
+      error,
+      data
+    )
+  end
+end

data/lib/lhc-core-interceptors/version.rb

@@ -1,3 +1,3 @@
 module LHCCoreInterceptors
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/rollbar/main_spec.rb

@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe LHC::Rollbar do
+  before(:each) do
+    LHC.config.interceptors = [LHC::Rollbar]
+  end
+
+  it 'does not report if Rollbar is not defined' do
+    stub_request(:get, 'http://local.ch').to_return(status: 400)
+    expect(-> { LHC.get('http://local.ch') })
+      .to raise_error LHC::BadRequest
+  end
+
+  context 'Rollbar is defined' do
+    before(:each) do
+      class Rollbar; end
+      allow(::Rollbar).to receive(:error)
+    end
+
+    it 'does report errors to rollbar' do
+      stub_request(:get, 'http://local.ch').to_return(status: 400)
+      expect(-> { LHC.get('http://local.ch') })
+        .to raise_error LHC::BadRequest
+      expect(::Rollbar).to have_received(:error)
+        .with(LHC::BadRequest, hash_including(response: anything, request: anything))
+    end
+
+    context 'additional params' do
+      it 'does report errors to rollbar with additional data' do
+        stub_request(:get, 'http://local.ch')
+          .to_return(status: 400)
+        expect(-> { LHC.get('http://local.ch', rollbar: { additional: 'data' }) })
+          .to raise_error LHC::BadRequest
+        expect(::Rollbar).to have_received(:error)
+          .with(
+            LHC::BadRequest,
+            hash_including(
+              response: anything,
+              request: anything,
+              additional: 'data'
+            )
+          )
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc-core-interceptors
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -119,23 +119,24 @@ files:
 - ".gitignore"
 - ".rubocop.localch.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
 - cider-ci.yml
+- cider-ci/bin/bundle
+- cider-ci/bin/ruby_install
+- cider-ci/bin/ruby_version
 - cider-ci/jobs/rspec.yml
-- cider-ci/jobs/rubocop.yml
-- cider-ci/scripts/bundle.yml
-- cider-ci/scripts/github_comment.yml
-- cider-ci/scripts/rspec.yml
-- cider-ci/scripts/rubocop.yml
-- cider-ci/scripts/ruby-version.yml
-- cider-ci/scripts/tmp-cache.yml
+- cider-ci/task_components/bundle.yml
+- cider-ci/task_components/rspec.yml
+- cider-ci/task_components/ruby.yml
 - lhc-core-interceptors.gemspec
 - lib/lhc-core-interceptors.rb
 - lib/lhc-core-interceptors/auth.rb
 - lib/lhc-core-interceptors/caching.rb
 - lib/lhc-core-interceptors/monitoring.rb
+- lib/lhc-core-interceptors/rollbar.rb
 - lib/lhc-core-interceptors/version.rb
 - spec/auth/basic_auth_spec.rb
 - spec/auth/bearer_spec.rb
@@ -185,6 +186,7 @@ files:
 - spec/dummy/tmp/cache/.gitkeep
 - spec/monitoring/main_spec.rb
 - spec/rails_helper.rb
+- spec/rollbar/main_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleanup_configuration.rb
 homepage: https://github.com/local-ch/lhc-core-interceptors
@@ -261,5 +263,6 @@ test_files:
 - spec/dummy/tmp/cache/.gitkeep
 - spec/monitoring/main_spec.rb
 - spec/rails_helper.rb
+- spec/rollbar/main_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleanup_configuration.rb

data/cider-ci/jobs/rubocop.yml

@@ -1,55 +0,0 @@
-rubocop:
-  name: 'Rubocop analysis'
-
-  run-on:
-    - type: branch
-      include-match: ^.*$
-
-  context:
-    task-defaults:
-      environment-variables:
-        GIT_REPOSITORY: local-ch/location-app
-        RESULT_PATH: 'tmp/checkstyle.json'
-
-      scripts:
-        rubocop:
-          start-when:
-            - script: bundle
-            - script: ruby-version
-            - script: tmp-cache
-
-        
-        github_comment:
-          start-when:
-            - script: rubocop
-              states: [failed]
-        
-
-        _cider-ci_include:
-          - cider-ci/scripts/bundle.yml
-          - cider-ci/scripts/tmp-cache.yml
-          - cider-ci/scripts/ruby-version.yml
-          - cider-ci/scripts/rubocop.yml
-          
-          - cider-ci/scripts/github_comment.yml
-          
-
-      max-auto-trials: 1
-
-      trial-attachments:
-        logs:
-          include-match: tmp\/checkstyle.json$
-          content-type: application/json
-
-      tree-attachments:
-        logs:
-          include-match: tmp\/checkstyle.json$
-          content-type: application/json
-
-    tasks:
-      rubocop:
-        scripts:
-          rubocop: {}
-          
-          github_comment: {}
-          

data/cider-ci/scripts/bundle.yml

@@ -1,3 +0,0 @@
-bundle:
-  exclusive-executor-resource: bundler
-  body: sed 's/^source.*/source "http\:\/\/52.29.7.59:9292"/g' Gemfile > Gemfile.tmp ; mv Gemfile.tmp Gemfile && bundle install

data/cider-ci/scripts/github_comment.yml

@@ -1,6 +0,0 @@
-github_comment:
-  ignore-state: true
-  body: |
-    #!/usr/bin/env bash
-
-    bundle exec rake checkstyle

data/cider-ci/scripts/rspec.yml

@@ -1,4 +0,0 @@
-rspec:
-  body: |
-    #!/usr/bin/env bash
-    bundle exec rspec $CIDER_CI_TASK_FILE

data/cider-ci/scripts/rubocop.yml

@@ -1,5 +0,0 @@
-rubocop:
-  body: |
-    #!/usr/bin/env bash
-
-    bundle exec rubocop  --config .rubocop.yml --format json --out $RESULT_PATH --format progress

data/cider-ci/scripts/ruby-version.yml

@@ -1,2 +0,0 @@
-ruby-version:
-  body: ruby --version

data/cider-ci/scripts/tmp-cache.yml

@@ -1,2 +0,0 @@
-tmp-cache:
-  body: mkdir -p tmp/cache