mecha 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fbcf2b45c57741a3fdd4e2e8a925799b6bff3dc
-  data.tar.gz: 0c008950d2c7a33540eb9502d6c8a0a3eca1d8ab
+  metadata.gz: e461461b41e1ee3f08ca4c3fd3ff2a786c74dae4
+  data.tar.gz: f6910fd26d550b55c053f729b67c9585f2585b10
 SHA512:
-  metadata.gz: 421ca89e1e32d11925a7ee7858a85d859190ccd4accfd089e38dcb810e30ebf072d93b72bb5bfdcdb734a93a29a3402f764a6504f3835472a9561d4a237b0da5
-  data.tar.gz: 0c69d84f1ee92116ec408e6e8bad688e0a7b2f0e581b881161e73348505b45abab082d5e7b20ae4f73077e566363c7fa4267e288431a06144086df4a41a76924
+  metadata.gz: 6c5264e23e41413986231588de9dd64639d32ed04b80ca9354d4237775b7c3731e96e56d7ce63802c282ab4c6beb1e64664f7c66b751aeb0276fa9b0494a7332
+  data.tar.gz: b59e0005c3f3da57bcd6d59fc871fd816232b73143c21989c0519909990996468c7f9db71310d781b68a960ac504586df45bb4a24b37756c563c82b053868231

data/README.md

@@ -40,6 +40,7 @@ Bug reports and pull requests are welcome on [GitHub](https://github.com/magrath
 intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the
 [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/mecha

@@ -6,12 +6,16 @@ require 'slop'
 require 'mecha'
 
 Mecha.opts = Slop.parse do |o|
-  o.bool '-d', '--devise', 'Install and config Devise'
-  o.bool '-bp', '--bitbucket-pipelines', 'Config Bitbucket Pipelines'
-  o.on '--version', 'print the version' do
+  o.bool '-d', '--devise', 'install and config Devise'
+  o.bool '-bp', '--bitbucket-pipelines', 'config Bitbucket Pipelines'
+  o.on '--version', 'print the gem version' do
     puts Mecha::VERSION
     exit
   end
+  o.on '--help', 'list options' do
+    puts o
+    exit
+  end
 end
 
 Mecha.config_templates_path

data/lib/mecha/app_builder.rb

@@ -45,6 +45,7 @@ module Mecha
     def database_yml
       template "config/databases/#{options[:database]}.yml.erb", 'config/database.example.yml'
       template "config/databases/#{options[:database]}.yml.erb", 'config/database.yml'
+      template "config/databases/#{options[:database]}.ci.yml.erb", 'config/database.ci.yml'
     end
 
     def gemfile
@@ -68,9 +69,9 @@ module Mecha
       config_application
       config_bitbucket_pipelines
       config_devise
-      config_simplecov
       config_guardfile
       config_rubocop
+      config_simplecov
       config_test
     end
 

data/lib/mecha/support/string.rb

@@ -6,7 +6,8 @@ class String
   #
   # @return [String] the object converted to underscore format.
   def underscore
-    tr('-', '_')
+    gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
       .gsub(/\s/, '_')
       .gsub(/__+/, '_')
       .downcase

data/lib/mecha/templates/README.md.erb

@@ -65,7 +65,7 @@ We're using Heroku as Staging environment. Take a look in the
 
 ```sh
 git push heroku master
-heroku run rake db:migrate
+heroku run rails db:migrate
 ```
 
 ## Style

data/lib/mecha/templates/bitbucket-pipelines.yml.erb

@@ -10,10 +10,10 @@ pipelines:
           - /etc/init.d/postgresql start
           - sudo -u postgres sh -c 'createuser <%= app_name.underscore %>_test & createdb <%= app_name.underscore %>_test'
           - sudo -u postgres psql -c "ALTER USER <%= app_name.underscore %>_test PASSWORD '<%= app_name.underscore %>_test' CREATEDB SUPERUSER;"
-          - cp config/database.yml.example config/database.yml
+          - cp config/database.ci.yml config/database.yml
           - apt-get update -yqqq
           - apt-get -qq -y --force-yes install apt-utils bzip2 nodejs-legacy npm
           - npm install -g phantomjs-prebuilt
           - bundle install --jobs $(nproc)
-          - bundle exec rake db:schema:load RAILS_ENV=test
-          - bundle exec rake test
+          - bundle exec rails db:schema:load RAILS_ENV=test
+          - bundle exec rails test

data/lib/mecha/templates/config/databases/postgresql.ci.yml.erb

@@ -0,0 +1,11 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  encoding: utf8
+  host: localhost
+  timeout: 5000
+  database: <%= app_name.underscore %>_test
+  username: <%= app_name.underscore %>_test
+  password: <%= app_name.underscore %>_test
+  template: template0

data/lib/mecha/templates/config/databases/postgresql.yml.erb

@@ -18,12 +18,9 @@ test:
   host: localhost
   timeout: 5000
   database: <%= app_name.underscore %>_test
-  username: <%= app_name.underscore %>_test
-  password: <%= app_name.underscore %>_test
-  template: template0
 
 production:
   <<: *default
   database: <%= app_name.underscore %>_production
   username: <%= app_name.underscore %>
-  password: <%%= ENV['KAVO_DATABASE_PASSWORD'] %>
+  password: <%%= ENV['POSTGRESQL_PASSWORD'] %>

data/lib/mecha/version.rb

@@ -1,5 +1,5 @@
 module Mecha
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
   RUBY_VERSION = '>= 2.4'.freeze
   RAILS_VERSION = '~> 5.0.0'.freeze
 end

data/lib/mecha.rb

@@ -1,7 +1,7 @@
 require 'mecha/version'
-require 'mecha/support/string'
 require 'mecha/generators/app_generator'
 require 'mecha/app_builder'
+require 'mecha/support/string'
 
 module Mecha
   @opts = nil

data/mecha.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mecha/version'
@@ -29,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', Mecha::RAILS_VERSION
   spec.add_dependency 'slop'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mecha
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Magrathea Labs
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: Mecha is used by MLabs to bootstrap working apps with our defaults.
 email:
 - contact@magrathealabs.com
@@ -109,6 +109,7 @@ files:
 - lib/mecha/templates/Guardfile
 - lib/mecha/templates/README.md.erb
 - lib/mecha/templates/bitbucket-pipelines.yml.erb
+- lib/mecha/templates/config/databases/postgresql.ci.yml.erb
 - lib/mecha/templates/config/databases/postgresql.yml.erb
 - lib/mecha/templates/rubocop.yml
 - lib/mecha/templates/simplecov