gridium 1.0.1 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc29df3a04ae8f95ff1c46bcfa7a89c674d8093
-  data.tar.gz: 9f6ebb099df861db7955dff000b64d4e150ee975
+  metadata.gz: a2308c591e8510889e1757c6ba7a3d06cda13676
+  data.tar.gz: 1d2b86fcc8e680a7c8c34209a40188333d6096a0
 SHA512:
-  metadata.gz: a7d619fc44d6ad485bd3f3eba756004128e7cc294ed96432e14099d72a6751758f5a468326c76a7a13fabddba2be8f71237a5488b8071d9558ec07b8d8f7325b
-  data.tar.gz: 58b0c9a013a9e2edfc59a6e3f8323acfc8da377c01edad71853d33f2784d97e90c69eb70aa07e64c54d2988c2d00afb57ce96619172c8d11dd7e0f82d6279b86
+  metadata.gz: d85b1f0c1e566f810afa8f95ab969174210fbf8e33b31507a73cdd72c316594d241821c139d25219242b4499433077248df8e794ed9a47b4262633a9b8f46351
+  data.tar.gz: b2072f20624c7ac16f0e8b0991068243f0d05db665015ba21dd20c9ecc9c3da5c00f185ec460952f4e9b9a40463eaf50676a4791be40a81a1c552b8f4113c64a

data/.jenkins-docker

@@ -18,10 +18,13 @@ _init_env() {
   export NAMESPACE
   export APPNAME
   export COMPOSE_PROJECT_NAME
+  export BUILD_NUMBER
 
 }
 
 run_test(){
+  docker exec $(docker-compose ps -q gridium) bundle install;
+  sleep 4
   docker exec $(docker-compose ps -q gridium) rake spec
 }
 
@@ -40,7 +43,6 @@ main() {
   fi
 
   bin/start -i
-  sleep 2
 
   run_test
 }

data/Dockerfile

@@ -5,4 +5,3 @@ WORKDIR /gridium
 COPY . /gridium
 
 CMD gem install bundle;
-RUN bundle;

data/Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gridium.gemspec
 gemspec
-
-gem 'rspec-mocks'
-gem 'rspec'
-gem 'rake'
-gem 'dotenv'

data/Rakefile

@@ -1,5 +1,4 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/*_spec.rb'

data/bin/builder

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+main() {
+  docker-compose up -d gridium
+
+  trap bin/cleanup EXIT
+
+  docker exec $(docker-compose ps -q gridium) bash -c "echo -e '---\n:rubygems_api_key: $1' >> ~/.gem/credentials; chmod 0600 ~/.gem/credentials; cat ~/.gem/credentials"
+  docker exec $(docker-compose ps -q gridium) bash -c "gem build gridium.gemspec"
+  docker exec $(docker-compose ps -q gridium) bash -c "gem push gridium-1.0.$BUILD_NUMBER.gem"
+}
+
+main $1

data/bin/cleanup

@@ -6,6 +6,8 @@ main() {
   docker-compose rm -fv
 
   docker rmi $(docker images -f "dangling=true" -q)
+  #remove images created during this build
+  docker rmi -f $(docker images *_gridium -q)
 
   docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes
 

data/bin/start

@@ -2,11 +2,15 @@
 
 main(){
   case $1 in
-    -i) #start normally
+    -i) #start normally - used for jenkins
       docker-compose up -d
+      docker exec $(docker-compose ps -q gridium) bundle install;
       ;;
     -d) #start in development mode
+      ${BUILD_NUMBER:=dev}
+      export BUILD_NUMBER
       docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
+      docker exec $(docker-compose ps -q gridium) bundle install;
       ;;
     *)
       echo "Usage: $0 [-i] isolated [-d] gridium dev" 1>&2; exit 1;

data/docker-compose.yml

@@ -21,4 +21,5 @@ services:
       - S3_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY
       - S3_DEFAULT_REGION=$S3_DEFAULT_REGION
       - S3_ROOT_BUCKET=$S3_ROOT_BUCKET
+      - BUILD_NUMBER=$BUILD_NUMBER
     command: "tail -f /dev/null"

data/lib/gridium/version.rb

@@ -1,3 +1,3 @@
 module Gridium
-  VERSION = "1.0.1"
+  VERSION = "1.0.#{ENV['BUILD_NUMBER']}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.17
 platform: ruby
 authors:
 - Seth Urban
@@ -147,6 +147,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/builder
 - bin/cleanup
 - bin/pull
 - bin/start