docker-rails 0.0.2 → 0.1.0

data/lib/docker/rails/version.rb

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

data/spec/docker/rails/config_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe Docker::Rails::Config do
+
+  subject(:options) { {} }
+  subject(:config) { Docker::Rails::Config.new }
+
+  it 'should not raise error when key is not found' do
+    config.clear
+    expect(config.foo).to be_nil
+  end
+
+  it 'should provide seed configuration' do
+    config.clear
+    assert_common_seed_settings
+
+    # ensure no unnecessary environments make it into the resolved configuration
+    expect(config.development).to be_nil
+    expect(config.production).to be_nil
+  end
+
+  it 'should read default env and file' do
+    Dir.chdir(File.dirname(__FILE__)) do
+      config.clear
+      config.load!(nil)
+    end
+
+    assert_common_top_level_settings
+
+    # ensure no unnecessary environments make it into the resolved configuration
+    expect(config.development).to be_nil
+    expect(config.production).to be_nil
+  end
+
+  context ':development' do
+
+    before(:each){
+      Dir.chdir(File.dirname(__FILE__)) do
+        config.clear
+        config.load!(:development)
+      end
+    }
+
+    it 'should read default file' do
+      assert_common_top_level_settings
+
+      web = config[:'docker-compose'][:web]
+      expect(web[:links]).to match_array %w(elasticsearch db)
+      expect(web[:ports]).to match_array ['3000']
+
+      elasticsearch = config[:'docker-compose'][:elasticsearch]
+      expect(elasticsearch[:ports]).to match_array ['9200']
+
+      # ensure no unnecessary environments make it into the resolved configuration
+      expect(config.development).to be_nil
+      expect(config.production).to be_nil
+    end
+
+    it 'should write a docker-compose file' do
+      file = tmp_file
+      config.write_docker_compose_file(file)
+    end
+
+    it 'should manipulate command to yaml single line' do
+      yaml = config.to_yaml
+      expect(yaml).to include 'command: >'
+      expect(yaml).not_to include 'command: |'
+    end
+  end
+
+  # it 'should read specific file' do
+  #   config.clear
+  #   config.load!(nil, config_file_path)
+  # end
+
+  private
+
+  def assert_common_seed_settings
+    expect(config[:verbose]).to eql false
+  end
+
+  def assert_common_top_level_settings
+    expect(config[:verbose]).to eql true
+  end
+
+  def tmp_file(name = 'foo')
+    file = File.expand_path("../../../../tmp/#{name}-docker-rails.yml", __FILE__)
+    FileUtils.mkdir_p File.dirname file
+    file
+  end
+
+  def config_file_path
+    File.expand_path('../sample-docker-rails.yml', __FILE__)
+  end
+end

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

@@ -0,0 +1,159 @@
+verbose: true
+
+# local environments need elasticsearch, staging/production connects to existing running instance.
+elasticsearch: &elasticsearch
+  elasticsearch:
+    image: library/elasticsearch:1.7
+    ports:
+      - "9200"
+
+development:
+  docker-compose:
+    <<: *elasticsearch
+    web:
+      links:
+        - elasticsearch # standard yaml doesn't merge arrays so we have to add this explicitly
+      environment:
+        - RAILS_ENV=development
+      command: >
+        bash -c "
+
+        echo 'Bundling gems'
+        && bundle install --jobs 4 --retry 3
+
+        && echo 'Generating Spring binstubs'
+        && bundle exec spring binstub --all
+
+        && echo 'Clearing logs and tmp dirs'
+        && bundle exec rake log:clear tmp:clear
+
+        && echo 'Check and wait for database connection'
+        && bundle exec docker-rails db_check mysql
+
+        && echo 'Setting up new db if one doesn't exist'
+        && bundle exec rake db:version || { bundle exec rake db:setup; }
+
+        && echo "Starting app server"
+        && bundle exec rails s -p 3000
+
+        && echo 'Setup and start foreman'
+        && gem install foreman
+        && foreman start
+        "
+
+test:
+  before_command: rm -Rf target
+  docker-compose:
+    <<: *elasticsearch
+    web:
+      links:
+        - elasticsearch # standard yaml doesn't merge arrays so we have to add this explicitly
+      environment:
+        - RAILS_ENV=test
+      command: >
+        bash -c "
+        echo 'Bundling gems'
+        && bundle install --jobs 4 --retry 3
+
+        && echo 'Clearing logs and tmp dirs'
+        && bundle exec rake log:clear tmp:clear
+
+        && echo 'Check and wait for database connection'
+        && bundle exec docker-rails db_check mysql
+
+        && echo 'Setting up new db if one doesn't exist'
+        && bundle exec rake db:version || { bundle exec rake db:setup; }
+
+        && echo 'Tests'
+        && cd ../..
+        && xvfb-run -a bundle exec rake spec cucumber
+        "
+
+parallel_tests:
+  before_command: rm -Rf target
+  docker-compose:
+    <<: *elasticsearch
+    web:
+      links:
+        - elasticsearch # standard yaml doesn't merge arrays so we have to add this explicitly
+      environment:
+        - RAILS_ENV=test
+      command: >
+        bash -c "
+
+        echo 'Bundling gems'
+        && bundle install --jobs 4 --retry 3
+
+        && echo 'Clearing logs and tmp dirs'
+        && bundle exec rake log:clear tmp:clear
+
+        && echo 'Check and wait for database connection'
+        && bundle exec docker-rails db_check mysql
+
+        && echo 'Setting up new db if one doesn't exist'
+        && bundle exec rake parallel:drop parallel:create parallel:migrate parallel:seed
+
+        && echo 'Tests'
+        && cd ../..
+        && xvfb-run -a bundle exec rake parallel:spec parallel:features
+        "
+
+staging:
+  docker-compose:
+    web:
+      environment:
+        - RAILS_ENV=staging
+      command: >
+        bash -c "
+
+        echo 'Bundling gems'
+        && bundle install --jobs 4 --retry 3
+
+        && echo 'Clearing logs and tmp dirs'
+        && bundle exec rake log:clear tmp:clear
+
+        && echo 'Check and wait for database connection'
+        && bundle exec docker-rails db_check mysql
+
+        && echo 'Setting up new db if one doesn't exist'
+        && bundle exec rake db:migrate
+
+        && echo "Starting app server"
+        && bundle exec rails s -p 3000
+
+        && echo 'Setup and start foreman'
+        && gem install foreman
+        && foreman start
+        "
+
+docker-compose:
+  web:
+    build: .
+    working_dir: /project/spec/dummy
+    ports:
+      - "3000"
+
+    links:
+      - db
+
+    volumes:
+      - .:/project
+
+    volumes_from:
+      # 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
+    environment:
+      # Tell bundler where to get the files
+      - GEM_HOME=#{GEMS_VOLUME_PATH}
+
+  db:
+    # https://github.com/docker-library/docs/tree/master/mysql
+    image: library/mysql:5.7.6
+    ports:
+      - "3306"
+
+    # https://github.com/docker-library/docs/tree/master/mysql#environment-variables
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=true

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+
+# our gem
+require 'docker/rails'
+
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
+
+RSpec.configure do |config|
+  # config.include Dry::Config::Foo
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.18
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.18
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -58,38 +100,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '0'
 description: ''
 email:
 - kevin.ross@alienfast.com
 executables:
 - docker-rails
-- docker-rails-db-check
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
@@ -97,11 +139,18 @@ files:
 - README.md
 - Rakefile
 - bin/docker-rails
-- bin/docker-rails-db-check
 - 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/compose_config.rb
+- lib/docker/rails/config.rb
 - lib/docker/rails/version.rb
+- spec/docker/rails/config_spec.rb
+- spec/docker/rails/docker-rails.yml
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -127,4 +176,7 @@ signing_key:
 specification_version: 4
 summary: A simplified pattern to execute rails applications within Docker (with a
   CI build emphasis)
-test_files: []
+test_files:
+- spec/docker/rails/config_spec.rb
+- spec/docker/rails/docker-rails.yml
+- spec/spec_helper.rb

data/bin/docker-rails-db-check

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-
-# TODO: make docker-rails CLI and put this in the lib, add optional ! method to raise if failed
-
-# ping db to see if it is ready before continuing
-require 'rubygems'
-require 'active_record'
-require 'mysql2'
-
-LOOP_LIMIT=60
-puts "\n"
-printf 'Waiting for confirmation of db service startup...'
-LOOP_LIMIT.times do |i|
-  if i == LOOP_LIMIT - 1
-    printf 'failed to connect.'
-    raise 'Failed to connect to db service.'
-  end
-
-  ActiveRecord::Base.establish_connection ({
-                                              adapter: 'mysql2',
-                                              host: 'db',
-                                              port: 3306,
-                                              username: 'root'})
-  connected =
-      begin
-        ActiveRecord::Base.connection_pool.with_connection { |con| con.active? }
-      rescue => e
-        # puts "#{e.class.name}: #{e.message}"
-        false
-      end
-  printf '.'
-  if connected
-    printf 'connected.'
-    break
-  end
-  sleep 1
-end
-puts "\n"