quiz_api_client 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2463d4ce86dbe40353740eebbd781d066b1adc8
-  data.tar.gz: 1927ad94d775b8d5187c81422040717490633a8d
+  metadata.gz: 495e1d1a307162fa8936f613e20380bb842291c1
+  data.tar.gz: cb5e833889a0f3291eee0046cecf5f03e3914cc8
 SHA512:
-  metadata.gz: 19c114e3a2814f6b04ac9e15675e391a47d80aa32e729f671e2bae69bed20a1bb08e3dc9487c066663d47b60c06db1527d645d67be73b89f7e831a6e24d4ade6
-  data.tar.gz: f9d09b8a7f0111d696d64b94864619e3b96af470dd7a8a7e5735c09acab6132f4ba40cf68795a866231da22c4a96b0bb4536b23ccdff6dec0b6d56f9bdad6bf8
+  metadata.gz: db378349c766050f4da8f8ba9930d745c1585231d944c93dfa09f10ad67fe024c7170c1d33bb6980e1bf539d32b511bd8c20cb58cc71db7cc9a6e24149421e09
+  data.tar.gz: cb4fec7cd16e380a062ef9bba994f9eb637d25df5788705fb9f37c8484d785c6f57b33782297a6febf7a557b43db80ac413a76757083d8823749f1f652376c3c

data/.dockerignore

@@ -1,4 +1,4 @@
 /coverage
-/docker-compose.yml
-/Dockerfile
-/**/*.gem
+/docker-compose.*
+/Dockerfile*
+/**/*.gem

data/.gitignore

@@ -3,8 +3,10 @@
 /_yardoc/
 /coverage/
 /doc/
+/docker-compose.override.yml
+/Gemfile.lock
+/log/
+/pacts/
 /pkg/
 /spec/reports/
 /tmp/
-/Gemfile.lock
-

data/Dockerfile

@@ -11,6 +11,7 @@ RUN chown -R docker:docker /app
 USER docker
 RUN /bin/bash -l -c "cd /app && rvm-exec 2.4 bundle install --jobs 5"
 COPY . /app
+RUN rm -f Gemfile.lock
 
 USER root
 RUN chown -R docker:docker /app

data/Dockerfile.contracts

@@ -0,0 +1,19 @@
+FROM instructure/ruby:2.3
+
+USER root
+
+ENV APP_HOME /usr/src/app
+RUN mkdir -p $APP_HOME/log
+RUN mkdir -p $APP_HOME/pacts
+
+COPY quiz_api_client.gemspec Gemfile $APP_HOME/
+COPY lib/quiz_api_client/version.rb $APP_HOME/lib/quiz_api_client/version.rb
+
+USER docker
+RUN bundle install --quiet --jobs 8
+
+USER root
+COPY . $APP_HOME
+RUN chown -R docker:docker $APP_HOME
+
+USER docker

data/bin/contracts

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+function print_results() {
+  exit_code=$?
+  set +e
+
+  docker-compose rm -fv contracts-testrunner
+
+  if [[ "$exit_code" == "0" ]]; then
+    echo ""
+    echo "Success!"
+  fi
+}
+trap print_results INT TERM EXIT
+set -e
+
+docker-compose run --name contracts contracts-testrunner bundle exec rspec spec/contracts
+docker cp contracts:/usr/src/app/log .
+docker cp contracts:/usr/src/app/pacts .

data/bin/setup

@@ -1,8 +1,37 @@
 #!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
 
+function print_results() {
+  exit_code=$?
+  set +e
+
+  echo ""
+
+  if [[ "$exit_code" == "0" ]]; then
+    echo "Success!"
+  else
+    echo "Something went wrong! Check the output above for details."
+  fi
+}
+trap print_results INT TERM EXIT
+set -e
+
+echo ""
+echo "Preparing environment for native development..."
 bundle install
 
-# Do any other automated setup that you need to do here
+echo ""
+echo "Preparing environment for dockerized development (if you choose to use it)..."
+
+override_file='docker-compose.override.yml'
+dev_override_file='docker-compose.dev.override.yml'
+if [ -f ${override_file} ] && ! cmp ${override_file} ${dev_override_file} --silent; then
+  echo "We found an existing ${override_file}"
+  echo ""
+  echo "You'll want to merge that file with the version controlled
+docker-compose.dev.override.yml file to make sure you've got
+the most recent changes."
+  echo ""
+else
+  echo "We are copying the development example override file to docker-compose.override.yml for you."
+  cp ${dev_override_file} ${override_file}
+fi

data/build.sh

@@ -1,4 +1,12 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+
+set -ex
+
+function save_pact_files_to_s3()
+{
+  echo "Saving pact files to S3..."
+  aws s3 cp pacts s3://ci-asset-cache/pacts/${JOB_NAME} --recursive --only-show-errors --region us-east-1
+}
 
 function cleanup() {
   exit_code=$?
@@ -10,8 +18,14 @@ function cleanup() {
 }
 trap cleanup INT TERM EXIT
 
-set -e
-
 docker-compose build --pull
 echo "Running test suite..."
 docker-compose run --name coverage testrunner $@
+
+echo ""
+echo "Running contract tests..."
+docker-compose run --name contracts -T contracts-testrunner bundle exec rspec spec/contracts
+docker cp contracts:/usr/src/app/pacts .
+docker cp contracts:/usr/src/app/log .
+
+save_pact_files_to_s3

data/docker-compose.dev.override.yml

@@ -0,0 +1,10 @@
+version: '2'
+
+services:
+  testrunner:
+    volumes:
+      - .:/usr/src/app/
+
+  contracts-testrunner:
+    volumes:
+      - .:/usr/src/app/

data/docker-compose.yml

@@ -3,3 +3,8 @@ version: '2'
 services:
   testrunner:
     build: .
+
+  contracts-testrunner:
+    build:
+      context: .
+      dockerfile: Dockerfile.contracts

data/lib/quiz_api_client/services/jwt_service.rb

@@ -11,22 +11,15 @@ module QuizApiClient::Services
       @protocol = protocol
     end
 
-    def grant_permission(scope:, exp: nil, resource_id: nil)
+    def grant_permission(scope:, exp: nil, resource_id: nil, uuid: nil)
       payload = {
         host: URI.parse("#{protocol}://#{host}").host,
         consumer_key: consumer_key,
         scope: scope,
-        exp: exp || Time.now.utc.to_i + 60,
-
-        # FIXME: This is currently required on quiz_web
-        user: {
-          full_name: 'Fake Full Name',
-          given_name: 'Fake',
-          email: 'quizzes+fake@instructure.com',
-          id: 1
-        }
+        exp: exp || Time.now.utc.to_i + 60
       }
       payload[:resource_id] = resource_id if resource_id
+      payload[:user] = { uuid: uuid } if uuid
 
       JWT.encode(payload, shared_secret, HASHING_ALGORITHM)
     end

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '0.2.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/quiz_api_client.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
+  spec.add_dependency 'httparty', '0.14.0'
   spec.add_dependency 'jwt'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'pact', '~> 1.12.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Wang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pact
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,12 +135,15 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Dockerfile
+- Dockerfile.contracts
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
+- bin/contracts
 - bin/setup
 - build.sh
+- docker-compose.dev.override.yml
 - docker-compose.yml
 - lib/quiz_api_client.rb
 - lib/quiz_api_client/http_client.rb