lhc 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496730ce418b771c2178219b3d68a6866e5e9f91
-  data.tar.gz: 50671f7af5a2634a70292307f05ff3250a05befd
+  metadata.gz: 3c8743276bc3e95f6692660682c68f0e1db0eb6d
+  data.tar.gz: d7e232ede3de6c48a8e03ae593ae7b95d895384b
 SHA512:
-  metadata.gz: a40eca0b07af2be7f5e61cd2afd63aad473578bf484723d957019b20486ad35456644d199f8c564a705b45fbb7ce14019b417756e04312da3bd349e8678066d6
-  data.tar.gz: 0a6414893434fc9e9f100d8f561d3215a4b14390d69b2477120fb4cf9f4c5214e69c4729dd9f70604d9019a0c3d37bc4320de28fafffa3dd81cba8cc0dc0a302
+  metadata.gz: 3a5c0ef4e4540459694ee0e1f6dbad6ab98c49429f4b4e047b650f5b275473a7bdb3c8e9c5b98260781af15fffb13199141306b564d7b2a632f6f03c94a270f0
+  data.tar.gz: 41275480184ac6fbcc56272e372b486e07953f2186d27611e0f3b2c49b85b5fa49cd701e7663a86646542a274ea1d9ba92d3d8caa56b269c7cb9054db3c63450

data/.gitignore

@@ -24,7 +24,6 @@ config/secrets.yml
 
 # these should all be checked in to normalise the environment:
 Gemfile.lock
-.ruby-version
 .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:

data/.rubocop.yml

@@ -15,5 +15,23 @@ RSpec/AnyInstance:
 RSpec/DescribedClass:
   Enabled: false
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/HookArgument:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
 Style/Lambda:
   Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.0

data/cider-ci.yml

@@ -1,4 +1,4 @@
 jobs:
-  _cider-ci_include:
+  include:
     - cider-ci/jobs/rubocop.yml
     - 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/jobs/rubocop.yml

@@ -1,55 +1,18 @@
 rubocop:
-  name: 'Rubocop analysis'
+  name: 'Rubocop'
 
-  run-on:
-    - type: branch
-      include-match: ^.*$
+  run_when:
+    'some HEAD has been updated':
+      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: {}
-          
+        
+        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

@@ -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,37 @@
+ports:
+  CAPYBARA_PORT:
+    min: 8000
+    max: 8999
+  PHANTOMJS_PORT:
+    min: 44600
+    max: 44999
+
+environment_variables:
+  RUBY:
+    read_and_replace_with: .ruby-version
+  RAILS_ENV: 'test'
+
+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/rubocop.yml

@@ -0,0 +1,29 @@
+trial_attachments:
+  logs:
+    include_match: tmp\/checkstyle.json$
+    content_type: application/json
+
+tree_attachments:
+  logs:
+    include_match: tmp\/checkstyle.json$
+    content_type: application/json
+
+environment_variables:
+  RUBY:
+    read_and_replace_with: .ruby-version
+  RESULT_PATH: 'tmp/checkstyle.json'
+
+max_trials: 1
+
+scripts:
+  rubocop:
+    start_when:
+      'bundled':
+        script_key: bundle
+    body: |
+      #!/usr/bin/env bash
+      set -eux
+      mkdir -p tmp/cache
+      export PATH=~/.rubies/$RUBY/bin:$PATH
+      bundle exec rubocop --config .rubocop.yml \
+        --format json --out $RESULT_PATH --format progress

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/lhc.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'geminabox'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'ciderizer'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-rspec'
   
   s.license = 'GPL-3'
 end

data/lib/lhc/config.rb

@@ -10,7 +10,7 @@ class LHC::Config
 
   def endpoint(name, url, options = {})
     name = name.to_sym
-    fail 'Endpoint already exists for that name' if @endpoints[name]
+    raise 'Endpoint already exists for that name' if @endpoints[name]
     @endpoints[name] = LHC::Endpoint.new(url, options)
   end
 
@@ -20,7 +20,7 @@ class LHC::Config
 
   def placeholder(name, value)
     name = name.to_sym
-    fail 'Placeholder already exists for that name' if @placeholders[name]
+    raise 'Placeholder already exists for that name' if @placeholders[name]
     @placeholders[name] = value
   end
 
@@ -33,7 +33,7 @@ class LHC::Config
   end
 
   def interceptors=(interceptors)
-    fail 'Default interceptors already set and can only be set once' if @interceptors
+    raise 'Default interceptors already set and can only be set once' if @interceptors
     @interceptors = interceptors
   end
 

data/lib/lhc/endpoint.rb

@@ -20,7 +20,7 @@ class LHC::Endpoint
         else
           find_value(match, params)
         end
-      replacement || fail("Compilation incomplete. Unable to find value for #{match.gsub(':', '')}.")
+      replacement || raise("Compilation incomplete. Unable to find value for #{match.gsub(':', '')}.")
     end
   end
 

data/lib/lhc/interceptor_processor.rb

@@ -15,7 +15,7 @@ class LHC::InterceptorProcessor
     interceptors.each do |interceptor|
       result = interceptor.send(name, target)
       if result.is_a? LHC::Response
-        fail 'Response already set from another interceptor' if @response
+        raise 'Response already set from another interceptor' if @response
         request = target.is_a?(LHC::Request) ? target : target.request
         @response = request.response = result
       end

data/lib/lhc/request.rb

@@ -108,6 +108,6 @@ class LHC::Request
 
   def throw_error(response)
     error = LHC::Error.find(response)
-    fail error.new(error, response)
+    raise error.new(error, response)
   end
 end

data/lib/lhc/response/data.rb

@@ -1,10 +1,11 @@
 # Response data is data provided through the response body
 # but made accssible in the ruby world
-class LHC::Response::Data
+class LHC::Response::Data < OpenStruct
 
   def initialize(response)
     @response = response
     set_dynamic_accessor_methods
+    super(as_json)
   end
 
   def as_json

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION = "3.7.0"
+  VERSION = "3.7.1"
 end

data/spec/request/error_handling_spec.rb

@@ -54,7 +54,7 @@ describe LHC::Request do
     end
 
     it 'requests json and parses response body' do
-      expect(->{
+      expect(-> {
         LHC.json.get('http://datastore/v2/feedbacks').data
       }).to raise_error(LHC::ParserError)
     end
@@ -63,7 +63,7 @@ describe LHC::Request do
   context 'custom error handler' do
     it 'handles errors with the provided handler and does not raise them' do
       stub_request(:get, "http://something").to_return(status: 400)
-      handler = spy('handler')
+      handler = double('handler', call: -> {})
       LHC::Request.new(url: "http://something", error_handler: handler)
       expect(handler).to have_received(:call)
     end

data/spec/response/data_spec.rb

@@ -25,5 +25,9 @@ describe LHC::Response do
     it 'can be converted to an open struct with the as_open_struct method' do
       expect(response.data.as_open_struct).to eq JSON.parse(response.body, object_class: OpenStruct)
     end
+
+    it 'returns nil when data is not available' do
+      expect(response.data.something).to be_nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ciderizer
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -133,18 +147,20 @@ 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/rubocop.yml
+- cider-ci/task_components/ruby.yml
 - docs/configuration.md
 - docs/exceptions.md
 - docs/interceptors.md

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
-    RAILS_ENV=test 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