rack-logstasher 0.0.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2d5dadb9e4dfe9709a500d0d95c547473c085fde
+  data.tar.gz: 3bfee07e71c02dc05878c8824a258d86193302b9
+SHA512:
+  metadata.gz: 0bdce96aa0baed8c87f6866d2587160830b6431809141d3f184560a3fd6ba8966fbe5309ae1606f9a3bf23a8b31118d9cfd6d33d3017b192839eebc664c3377f
+  data.tar.gz: 71dfb7ba5e1e77a33f2f379feef745d74c693736e292530ab1e5c477e4e5fb591b159cce7560e7d5c6ae75b4d6a42b80576ae971864cba22b5421db8b4d9a03f

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+2.3.1

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 1.0.0
+
+- Add support for Rack 2 (thanks @anicholson https://github.com/alphagov/rack-logstasher/issues/5)
+- Drop support for Rack < 2

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 Add this to the middleware stack.  e.g.
 
-    use Rask::Logstasher::Logger, Logger.new("/path/to/logfile.json.log")
+    use Rack::Logstasher::Logger, Logger.new("/path/to/logfile.json.log")
 
 ## Contributing
 

data/jenkins.sh

@@ -1,10 +1,58 @@
-#!/bin/bash -x
-set -e
+#!/bin/bash
 
-rm -f Gemfile.lock
+REPO_NAME=${REPO_NAME:-"alphagov/rack-logstasher"}
+CONTEXT_MESSAGE=${CONTEXT_MESSAGE:-"default"}
+GH_STATUS_GIT_COMMIT=${SCHEMA_GIT_COMMIT:-${GIT_COMMIT}}
+
+function github_status {
+  REPO_NAME="$1"
+  STATUS="$2"
+  MESSAGE="$3"
+  gh-status "$REPO_NAME" "$GH_STATUS_GIT_COMMIT" "$STATUS" -d "Build #${BUILD_NUMBER} ${MESSAGE}" -u "$BUILD_URL" -c "$CONTEXT_MESSAGE" >/dev/null
+}
+
+function error_handler {
+  trap - ERR # disable error trap to avoid recursion
+  local parent_lineno="$1"
+  local message="$2"
+  local code="${3:-1}"
+  if [[ -n "$message" ]] ; then
+    echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}"
+  else
+    echo "Error on or near line ${parent_lineno}; exiting with status ${code}"
+  fi
+  github_status "$REPO_NAME" error "errored on Jenkins"
+  exit "${code}"
+}
+
+trap 'error_handler ${LINENO}' ERR
+github_status "$REPO_NAME" pending "is running on Jenkins"
+
+# Cleanup anything left from previous test runs
 git clean -fdx
 
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
+# Try to merge master into the current branch, and abort if it doesn't exit
+# cleanly (ie there are conflicts). This will be a noop if the current branch
+# is master.
+git merge --no-commit origin/master || git merge --abort
+
+# Bundle and run tests against multiple ruby versions
+for version in 2.3 2.2; do
+  rm -f Gemfile.lock
+  export RBENV_VERSION=$version
+  echo "Running tests under ruby $version"
+  bundle install --path "${HOME}/bundles/${JOB_NAME}"
+
+  if ! bundle exec rake ${TEST_TASK:-"default"}; then
+    github_status "$REPO_NAME" failure "failed on Jenkins"
+    exit 1
+  fi
+done
+unset RBENV_VERSION
+
+if [[ -n "$PUBLISH_GEM" ]]; then
+  bundle install --path "${HOME}/bundles/${JOB_NAME}"
+  bundle exec rake publish_gem --trace
+fi
 
-bundle exec rake
-bundle exec rake publish_gem
+github_status "$REPO_NAME" success "succeeded on Jenkins"

data/lib/rack/logstasher/logger.rb

@@ -1,4 +1,4 @@
-require 'rack/commonlogger'
+require 'rack/common_logger'
 require 'logstash/event'
 
 module Rack

data/lib/rack/logstasher/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Logstasher
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
   end
 end

data/rack-logstasher.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack"
+  spec.add_dependency "rack", "~> 2.0"
   spec.add_dependency "logstash-event"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstasher
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Alex Tomlins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: logstash-event
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -131,9 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -149,33 +135,26 @@ files:
 homepage: https://github.com/alphagov/rack-logstasher
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1970584439746248370
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1970584439746248370
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack middleware to log requests in logstash json event format
 test_files:
 - spec/logger_spec.rb