bulldozer 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 454d52670ea7c516c49d5202447deaab249dd3e6df59d5c257525b1b34a5f4af
-  data.tar.gz: dcf1e6219f32673b3fa9fda7464ad8a9f02b945ac67890aa28a3eb0d5903bfcf
+  metadata.gz: d56bb23f62c053e4d3e1bc9a1029576227bf967426d9475efd370ec00a9c66de
+  data.tar.gz: db2959e3ee675ce694f9f5b275249733fdd8e70c50b98227266fc53a9b2d2db6
 SHA512:
-  metadata.gz: b21054a99e8b21b6cee1e55a2811b576fbc46be89db5072be8a62202eb46d1eb4bd394cdcc4f5f18d88263cad36304706e3712e81ad31f2f9d0c92d99db0a26e
-  data.tar.gz: e77f8076dd8ce0c640e01758cd425fd7fc12829b1ab1337eb6a0c6b24780147744ce47d54e90de95d13dcbe57811868dee34dada3d12d644a74839e106437288
+  metadata.gz: 43a1783ea9fcf8622dd55cf42cc3e21f2320f15328d62509bc066b3830677fbd4ec5f7952f9d7ca3dbc8b29345df2355af985189e80369209d98c8c23403ee21
+  data.tar.gz: dd6c1a11652eb8bde9dbdde0c219d565f0566c2c0277d99d70271cb9757c88469c8a8051ff5d8ad55385a310a0cd705ffa533b7fecf7746d40c2b4211dc12e10

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 /.bundle
 /tmp
+bulldozer-*

data/NEWS.md

@@ -1,5 +1,10 @@
 1.6.0 (March 01, 2019)
 
+* Add docker support on the Gem
+* Add docker files to the created project by default
+
+1.6.0 (March 01, 2019)
+
 * Rename Project to bulldozer
 * All commands now will change from `suspenders` to `bulldozer`
 

data/dockerfile

@@ -3,9 +3,21 @@ FROM ruby:2.5.3
 RUN apt-get update && apt-get install -y vim
 ENV EDITOR="vim"
 # Install container dependencies
-RUN apt-get update && apt-get install -y libc-ares2 libv8-3.14.5 --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc-ares2 libv8-3.14.5 postgresql-client nodejs --no-install-recommends && rm -rf /var/lib/apt/lists/*
+# Install Chrome to use with Capybara JavaScript specs
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
+RUN apt-get update && apt-get -y install google-chrome-stable
 # Set the work directory inside container
 RUN mkdir /app
 WORKDIR /app
+# Copy the Gemfile inside the container
+COPY bulldozer.gemspec /app/
+COPY Gemfile* /app/
 # Copy all the rest inside work directory
-COPY . /app
+COPY . /app
+# Go inside the /app folder, without this you have problems with relative paths
+RUN cd /app
+# Install dependencies
+RUN gem install bundler
+RUN bundle install --jobs 32 --retry 4

data/lib/bulldozer/app_builder.rb

@@ -29,6 +29,11 @@ module Bulldozer
       template "Gemfile.erb", "Gemfile"
     end
 
+    def copy_dockerfiles
+      template "dockerfile.erb", "dockerfile"
+      copy_file "docker-compose.yml", "docker-compose.yml"
+    end
+
     def setup_rack_mini_profiler
       copy_file(
         "rack_mini_profiler.rb",

data/lib/bulldozer/generators/app_generator.rb

@@ -49,6 +49,7 @@ module Bulldozer
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :setup_dotfiles
+      invoke :setup_docker
       invoke :setup_database
       invoke :create_github_repo
       invoke :setup_bundler_audit
@@ -136,6 +137,10 @@ module Bulldozer
     def setup_dotfiles
       build :copy_dotfiles
     end
+    
+    def setup_docker
+      build :copy_dockerfiles
+    end
 
     def setup_default_directories
       build :setup_default_directories

data/lib/bulldozer/version.rb

@@ -4,5 +4,5 @@ module Bulldozer
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.6.0".freeze
+  VERSION = "1.6.1".freeze
 end

data/spec/features/new_project_spec.rb

@@ -21,6 +21,18 @@ RSpec.describe "Suspend a new project with default configuration" do
     )
   end
 
+  it "creates docker files" do
+    dockerfile = IO.read("#{project_path}/dockerfile")
+    docker_compose = IO.read("#{project_path}/docker-compose.yml")
+
+    expect(dockerfile).to match(
+      /^FROM ruby:"#{Bulldozer::RUBY_VERSION}"$/,
+    )
+    expect(docker_compose).to match(
+      /^ruby bin\/rails s -p 3000 -b "0.0.0.0"$/,
+    )
+  end
+
   it "ensures project specs pass" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do

data/templates/docker-compose.yml

@@ -0,0 +1,54 @@
+version: '3'
+
+services:
+  rails:
+    build: .
+    env_file:
+    - .env
+    command: ruby bin/rails s -p 3000 -b '0.0.0.0'
+    volumes:
+      - .:/app
+    links:
+      - redis
+      - postgres
+    ports:
+      - "3000:3000"
+    expose:
+      - "3000"
+
+  postgres:
+    image: postgres:10.4
+    env_file:
+    - .env
+    volumes:
+      - ".:/app"
+    ports:
+      - "5432:5432"
+    expose:
+      - "5432"
+  
+  redis:
+    image: redis:alpine
+    env_file:
+    - .env
+    command: redis-server
+    volumes:
+      - ".:/app"
+    ports:
+      - "6379:6379"
+    expose:
+      - "6379"
+  
+  sidekiq:
+    build: .
+    env_file:
+    - .env
+    environment:
+      - RAILS_URL=http://rails:3000 # overwrite to match docker
+    command: bundle exec sidekiq -C config/sidekiq.yml
+    volumes:
+      - ".:/app"
+    links:
+      - redis
+      - rails
+      - postgres

data/templates/dockerfile.erb

@@ -0,0 +1,20 @@
+FROM ruby:#{Bulldozer::RUBY_VERSION}
+# Install VIM to edit credentials.yml.enc file
+RUN apt-get update && apt-get install -y vim
+ENV EDITOR="vim"
+# Install container dependencies
+RUN apt-get update && apt-get install -y libc-ares2 libv8-3.14.5 postgresql-client nodejs --no-install-recommends && rm -rf /var/lib/apt/lists/*
+# Install Chrome to use with Capybara JavaScript specs
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
+RUN apt-get update && apt-get -y install google-chrome-stable
+# Set the work directory inside container
+RUN mkdir /app
+WORKDIR /app
+# Copy the Gemfile inside the container
+COPY Gemfile* /app/
+# Install dependencies
+RUN gem install bundler
+RUN bundle install --jobs 32 --retry 4
+# Copy all the rest inside work directory
+COPY . /app

data/templates/dotfiles/.env

@@ -1,4 +1,7 @@
 # https://github.com/ddollar/forego
+POSTGRES_HOST=localhost
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
 ASSET_HOST=localhost:3000
 APPLICATION_HOST=localhost:3000
 PORT=3000

data/templates/postgresql_database.yml.erb

@@ -1,4 +1,7 @@
 development: &default
+  host: <%= ENV.fetch("POSTGRES_HOST") { nil } %>
+  username: <%= ENV.fetch("POSTGRES_USER") { nil } %>
+  password: <%= ENV.fetch("POSTGRES_PASSWORD") { nil } %>
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulldozer
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - mpatrick
@@ -152,6 +152,8 @@ files:
 - templates/circle.yml.erb
 - templates/config_locales_en.yml.erb
 - templates/dev.rake
+- templates/docker-compose.yml
+- templates/dockerfile.erb
 - templates/dotfiles/.ctags
 - templates/dotfiles/.env
 - templates/email.rb