lhc 10.5.1 → 10.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b0317c2927977e904543c2d6f64b70324e6b94634ffce6ff1752cbaddd2acf2a
-  data.tar.gz: 19883b07caef846a43108601e931102348933abc4191af2c506d60496b86ec2e
+SHA1:
+  metadata.gz: 1ceecd53d94051855df66cfa2733ac9afda9b6b4
+  data.tar.gz: fbb5373333e5a18c287c1846b3bf0ad5b913e269
 SHA512:
-  metadata.gz: 6668ebf6f02d6cd4b9e49ff9f5fd22985dff77f7ae451b2062c1a65b93f32c1f8e3efabc981c0ce98b183e4f8435a8330dd274452cb5807444ce9da432e05377
-  data.tar.gz: ba098ab293a43a2035e79af76630d5a0fb5c867e73f5f0da7886fac697feeda98eed0c838bb8a3c72a83e577324f0e7b668f7dfb18b4b16bb0da5bd0d34cb27c
+  metadata.gz: 829385685260241d20874839ca0a32d8ad05f5870a7a9e6a509882833bc86af8d02d6addd1b837acf0b31456e29a65e4267d9110ddbb2f1fc6e6c76536ddf146
+  data.tar.gz: 63bc036627030c330e0a1ea811ea8296ce1cdf64b0ea499d761e29e0c5cae7b853d7484d501116bed38b901d81d7e25b504a61b7d5254ff079e742e79bb062e8

data/Gemfile.activesupport4

@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+
+gemspec
+gem 'activesupport', '~> 4.2.11'

data/Gemfile.activesupport5

@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+
+gemspec
+gem 'activesupport', '~> 5.0.0'

data/Gemfile.activesupport6

@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+
+gemspec
+gem 'activesupport', '~> 6.0.0.rc2'

data/cider-ci.yml

@@ -1,4 +1,6 @@
 jobs:
   include:
+    - cider-ci/jobs/rspec-activesupport-4.yml
+    - cider-ci/jobs/rspec-activesupport-5.yml
+    - cider-ci/jobs/rspec-activesupport-6.yml
     - cider-ci/jobs/rubocop.yml
-    - cider-ci/jobs/rspec.yml

data/cider-ci/bin/bundle

@@ -8,6 +8,10 @@ if [ ! -f ~/.rubies/$RUBY/bin/bundle ]; then
   gem install bundler
 fi
 
+# install bundler v. 1.17.3 in order to be able to run the tests with
+# ACTIVESUPPORT=4 because rails (= 4.2.0) depends on bundler (< 2.0, >= 1.3.0)
+gem install bundler:1.17.3
+
 sed "s/^source 'https:\/\/rubygems\.intra\.local\.ch'*/source 'http\:\/\/52.29.7.59:9292'/g" Gemfile > Gemfile.tmp
 mv Gemfile.tmp Gemfile
 
@@ -15,13 +19,33 @@ DIGEST=$(git ls-tree HEAD --\
   cider-ci.yml cider-ci Gemfile.lock \
   | openssl dgst -sha1 | cut -d ' ' -f 2)
 
+if [ ! -z ${ACTIVESUPPORT:-} ]; then
+  DIGEST=$(echo "$DIGEST $ACTIVESUPPORT")
+fi
+
 DIGEST=$(echo "$DIGEST $PATH" \
  | openssl dgst -sha1 | cut -d ' ' -f 2)
 
+echo "DIGEST"
+echo "${DIGEST}"
+
 CACHE_SIGNATURE_FILE="/tmp/bundle_cache_signature_${DIGEST}"
 
 if [ ! -f  $CACHE_SIGNATURE_FILE ] ; then
-  bundle install
+  if [ ! -z ${ACTIVESUPPORT:-} ]; then
+    if [ ! -z ${BUNDLER:-} ]; then
+      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install"
+      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install
+    else
+      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install"
+      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install
+    fi
+  else
+    echo "bundle install"
+    bundle $BUNDLER install
+  fi
   touch $CACHE_SIGNATURE_FILE
 fi
 
+echo "bundle install"
+bundle $BUNDLER install

data/cider-ci/jobs/rspec-activesupport-4.yml

@@ -0,0 +1,28 @@
+rspec-active-support-v4:
+  name: 'rspec with ActiveSupport v4'
+
+  run_when:
+    'some HEAD has been updated':
+      type: branch
+      include_match: ^.*$
+
+  context:
+
+    script_defaults:
+      template_environment_variables: true
+
+    task_defaults:
+      environment_variables:
+        ACTIVESUPPORT: '4'
+        BUNDLER: '_1.17.3_'
+
+      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
+
+    tasks:
+      all-rspec:
+        name: All rspec tests, using ActiveSupport v4

data/cider-ci/jobs/{rspec.yml → rspec-activesupport-5.yml}

@@ -1,5 +1,5 @@
-rspec:
-  name: 'rspec'
+rspec-active-support-v5:
+  name: 'rspec with ActiveSupport v5'
 
   run_when:
     'some HEAD has been updated':
@@ -12,6 +12,9 @@ rspec:
       template_environment_variables: true
 
     task_defaults:
+      environment_variables:
+        ACTIVESUPPORT: '5'
+
       max_trials: 2
       dispatch_storm_delay_duration: 1 Seconds
       include:
@@ -21,4 +24,4 @@ rspec:
 
     tasks:
       all-rspec:
-        name: All rspec tests
+        name: All rspec tests, using ActiveSupport v5

data/cider-ci/jobs/rspec-activesupport-6.yml

@@ -0,0 +1,28 @@
+rspec-active-support-v6:
+  name: 'rspec with ActiveSupport v6'
+
+  run_when:
+    'some HEAD has been updated':
+      type: branch
+      include_match: ^.*$
+
+  context:
+
+    script_defaults:
+      template_environment_variables: true
+
+    task_defaults:
+      environment_variables:
+        ACTIVESUPPORT: '6'
+        RUBY: 'ruby-2.6.3'
+
+      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
+
+    tasks:
+      all-rspec:
+        name: All rspec tests, using ActiveSupport v6

data/cider-ci/jobs/rubocop.yml

@@ -11,8 +11,8 @@ rubocop:
     tasks:
 
       rubocop:
-        
-        include:        
+
+        include:
           - cider-ci/task_components/ruby.yml
           - cider-ci/task_components/bundle.yml
           - cider-ci/task_components/rubocop.yml

data/cider-ci/task_components/bundle.yml

@@ -7,6 +7,9 @@ trial_attachments:
     include_match: Gemfile
     content_type: text/plain
 
+environment_variables:
+  BUNDLER: '_1.17.3_'
+
 scripts:
 
   bundle:
@@ -16,3 +19,4 @@ scripts:
     start_when:
       'ruby installed':
         script_key: ruby-install
+

data/cider-ci/task_components/rspec.yml

@@ -18,13 +18,12 @@ scripts:
       set -eux
       mkdir -p tmp/cache
       export PATH=~/.rubies/$RUBY/bin:$PATH
-      bundle exec rspec
-    
+      if [ ! -z ${ACTIVESUPPORT:-} ]; then BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER exec rspec; else bundle exec rspec; fi
+
     start_when:
       'bundled':
         script_key: bundle
 
-
 trial_attachments:
   logs:
     include_match: log\/.*\.log$

data/lhc.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.requirements << 'Ruby >= 2.0.0'
-  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency 'activesupport', '>= 4.2'
   s.add_dependency 'addressable'

data/lib/lhc/concerns/lhc/request/user_agent_concern.rb

@@ -11,7 +11,12 @@ module LHC
       included do
         Typhoeus::Config.user_agent = begin
           version = LHC::VERSION
-          application = defined?(Rails) ? Rails.application.class.parent_name : nil
+          application = nil
+          if defined?(Rails)
+            app_class = Rails.application.class
+            application = (ActiveSupport.gem_version >= Gem::Version.new('6.0.0.rc2')) ? app_class.module_parent_name : app_class.parent_name
+          end
+
           "LHC (#{[version, application].compact.join('; ')}) [https://github.com/local-ch/lhc]"
         end
       end

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '10.5.1'
+  VERSION ||= '10.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 10.5.1
+  version: 10.5.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -193,6 +193,9 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
+- Gemfile.activesupport4
+- Gemfile.activesupport5
+- Gemfile.activesupport6
 - LICENSE
 - README.md
 - Rakefile
@@ -200,7 +203,9 @@ files:
 - cider-ci/bin/bundle
 - cider-ci/bin/ruby_install
 - cider-ci/bin/ruby_version
-- cider-ci/jobs/rspec.yml
+- cider-ci/jobs/rspec-activesupport-4.yml
+- cider-ci/jobs/rspec-activesupport-5.yml
+- cider-ci/jobs/rspec-activesupport-6.yml
 - cider-ci/jobs/rubocop.yml
 - cider-ci/task_components/bundle.yml
 - cider-ci/task_components/rspec.yml
@@ -382,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -391,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors