docker-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd13b3e449ebecf3beeeaf1ccce34d9d8a4d82ad
-  data.tar.gz: ef722489bc87dd8c6078d470360289456633f0f7
+  metadata.gz: 8076e4ce6d1d20d727afadb4c99e5b9e57c18e21
+  data.tar.gz: 235f58b8be4f973954bbad1055df04b7bfb2a523
 SHA512:
-  metadata.gz: 5a166ca39b19deacf676c1794066b51c05ff3885f76398785c3d28f2d95d2d977926cec5fbb11ed3703925df04b5ae676debe4d0a2a3ac1a6a4e64c6529a8ee8
-  data.tar.gz: 51f1969e15638ecdd42f8cf20d2c8838d7e947c19158a7af6ed41b4406f28ecc91ee24b72f2d92905e2b0146eef8df14216e79a60a3b106721edc945dd2d0706
+  metadata.gz: 92189a1adf213f3cbb9def7fc31e95819c251c7b2a2e196add0971ce97bcc1c733d9af9154a8597d28eb03518fda597627df3418421e0b1d242899afe05e28ed
+  data.tar.gz: 5f977d58eebb066ce2a7717000dc60d6836010e55633dcd4b07e74f5ee61b48be34a417479e02186d4656a8df0f34775c7663dfa08630624cea6ae9e2e795aa9

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 2.2.0
+  - 2.2.2
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
+script: rake

data/README.md

@@ -1,15 +1,17 @@
 # docker-rails
+[![Gem Version](https://badge.fury.io/rb/docker-rails.svg)](https://rubygems.org/gems/docker-rails)
+[![Build Status](https://travis-ci.org/alienfast/docker-rails.svg)](https://travis-ci.org/alienfast/docker-rails)
+[![Code Climate](https://codeclimate.com/github/alienfast/docker-rails/badges/gpa.svg)](https://codeclimate.com/github/alienfast/docker-rails)
 
 A simplified pattern to execute rails applications within Docker (with a CI build emphasis).
 
 ## Features
 - Provides individual functions for development/test usage, or a full workflow for CI usage (with automated container, volume, and image cleanup).
-- Automated cached global gems data volume (automatic) based on ruby version
+- Automated cached global gems data volume based on ruby version
 - DRY declarative `docker-rails.yml` allowing multiple environments to be defined with an inherited `docker-compose` configuration
 - Interpolates `docker-compose.yml` making CI builds much easier
 - DB check CLI function provided for docker-compose `command` to check if db is ready
 
-
 ## Usage
 
 ```bash
@@ -75,7 +77,7 @@ ENV DEBIAN_FRONTEND newt
 ### 2. Add a docker-rails.yml
 
 Environment variables will be interpolated, so feel free to use them. 
-Below shows an example with all of the environments `development | test | parallel_tests | staging' to show reuse of the primary `docker-compose' configuration. 
+Below shows an example with all of the environments `development | test | parallel_tests | staging` to show reuse of the primary `docker-compose' configuration. 
 
 ```yaml
 verbose: true
@@ -88,7 +90,7 @@ elasticsearch: &elasticsearch
       - "9200"
 
 development:
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -123,7 +125,7 @@ development:
 
 test:
   before_command: rm -Rf target
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -151,7 +153,7 @@ test:
 
 parallel_tests:
   before_command: rm -Rf target
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -179,7 +181,7 @@ parallel_tests:
         "
 
 staging:
-  docker-compose:
+  compose:
     web:
       environment:
         - RAILS_ENV=staging
@@ -206,7 +208,8 @@ staging:
         && foreman start
         "
 
-docker-compose:
+# base docker-compose configuration for all environments
+compose:
   web:
     build: .
     working_dir: /project/spec/dummy

data/docker-rails.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '~> 1.6'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+
+  # only needed at runtime for db_check mysql
   s.add_development_dependency 'mysql2', '~> 0.3.18' # http://stackoverflow.com/a/32466950/2363935
   s.add_development_dependency 'activerecord'
 

data/lib/docker/rails/{CLI → cli}/db_check.rb

@@ -1,7 +1,6 @@
 module Docker
   module Rails
     module CLI
-      require 'thor'
       class DbCheck < Thor
 
         default_task :help
@@ -14,9 +13,6 @@ module Docker
         option :password, desc: 'Password-less login if unspecified'
 
         def mysql
-
-          App.instance
-
           # ping db to see if it is ready before continuing
           require 'rubygems'
           require 'active_record'

data/lib/docker/rails/config.rb

@@ -14,7 +14,7 @@ module Docker
 
       def load!(environment, *filenames)
         if environment.nil?
-          puts 'Environment unspecified, generating docker-compose.yml based on root docker-compose yaml key.'
+          puts 'Environment unspecified, generating docker-compose.yml based on root :compose yaml key.'
           environment = 'docker-compose'
         end
 
@@ -27,7 +27,7 @@ module Docker
       end
 
       def write_docker_compose_file(output_filename = 'docker-compose.yml')
-        write_yaml_file(output_filename, self[:'docker-compose'])
+        write_yaml_file(output_filename, self[:'compose'])
       end
 
       def to_yaml(config = @configuration)

data/lib/docker/rails/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Rails
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/docker/rails/config_spec.rb

@@ -44,11 +44,11 @@ describe Docker::Rails::Config do
     it 'should read default file' do
       assert_common_top_level_settings
 
-      web = config[:'docker-compose'][:web]
+      web = config[:'compose'][:web]
       expect(web[:links]).to match_array %w(elasticsearch db)
       expect(web[:ports]).to match_array ['3000']
 
-      elasticsearch = config[:'docker-compose'][:elasticsearch]
+      elasticsearch = config[:'compose'][:elasticsearch]
       expect(elasticsearch[:ports]).to match_array ['9200']
 
       # ensure no unnecessary environments make it into the resolved configuration

data/spec/docker/rails/docker-rails.yml

@@ -8,7 +8,7 @@ elasticsearch: &elasticsearch
       - "9200"
 
 development:
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -43,7 +43,7 @@ development:
 
 test:
   before_command: rm -Rf target
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -71,7 +71,7 @@ test:
 
 parallel_tests:
   before_command: rm -Rf target
-  docker-compose:
+  compose:
     <<: *elasticsearch
     web:
       links:
@@ -99,7 +99,7 @@ parallel_tests:
         "
 
 staging:
-  docker-compose:
+  compose:
     web:
       environment:
         - RAILS_ENV=staging
@@ -126,7 +126,7 @@ staging:
         && foreman start
         "
 
-docker-compose:
+compose:
   web:
     build: .
     working_dir: /project/spec/dummy
@@ -143,7 +143,7 @@ docker-compose:
       # Mount the gems data volume container for cached bundler gem files
       - #{GEMS_VOLUME_NAME}
 
-    # https://docs.docker.com/v1.6/docker-compose/cli/#environment-variables
+    # https://docs.docker.com/v1.6/compose/cli/#environment-variables
     environment:
       # Tell bundler where to get the files
       - GEM_HOME=#{GEMS_VOLUME_PATH}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -141,10 +142,10 @@ files:
 - bin/docker-rails
 - docker-rails.gemspec
 - lib/docker/rails.rb
-- lib/docker/rails/CLI/db_check.rb
-- lib/docker/rails/CLI/gems_volume.rb
-- lib/docker/rails/CLI/main.rb
 - lib/docker/rails/app.rb
+- lib/docker/rails/cli/db_check.rb
+- lib/docker/rails/cli/gems_volume.rb
+- lib/docker/rails/cli/main.rb
 - lib/docker/rails/compose_config.rb
 - lib/docker/rails/config.rb
 - lib/docker/rails/version.rb