onotole 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ea838d334c7fd268cb2c0b1b3eb9b3e7ef83e8
-  data.tar.gz: f71a350cfcd7c2e5bebec9e29a5e3d141155e033
+  metadata.gz: 69becb51cf5563e771e496aa5743128bd51a30a8
+  data.tar.gz: cf533690ac9787e013fb0fc115ad1f99e1bc3eba
 SHA512:
-  metadata.gz: 27f6cf1c85669532a15b33d18dd390eb66293b744d287b0c4590f29160a36a94e8f5e39331fed9d1b2873119c837edc3bc02fe342a3f424010aa79c03cbc5d3c
-  data.tar.gz: 07abb0223318ac2e99a68fa92f85d8b7e78704724f15002742cfa109c686cdfe3d509352ec133751796bfafb65d8e51b22aca09ed5c8d268d5be75588fe7f532
+  metadata.gz: 3b49e4638c9070060dfd32e063f8d295e100efd8c35e90143cebf120b2712bf77b00e7f1e987f268c72dd3bb43235567a37007f40d8401515d30c5cb761e4cc9
+  data.tar.gz: 4f1e0396723e421bb9994da228e6e5454afaebdb2e45cc9abeb2159f652af5059b133cfd1a39905ecdfea2f346fe95060edbad367155552ddb12cba427756036

data/README.md

@@ -26,6 +26,7 @@ will be installed as addition like default, if start `onotole` with out `-c`
 flag. You can provide automatic install with options, like `--haml`. Default 
 pack will not be installed with any gem option.
 
+### Flexible gem group
 
  * [Airbrake](https://github.com/airbrake/airbrake) For exception notification
  * [bootstrap3](https://github.com/seyhunak/twitter-bootstrap-rails) Bootstrap
@@ -129,16 +130,18 @@ or
 
     gem install onotole
 
-Create gemset if you need it. 
-
 Then run:
 
     onotole projectname [ -c ] [ * rails_genetator_flags ]
 
+There is 2 main ways of using:
+1. `onotole projectname` will generate project with default mandatory gems and 
+default flexible gems
+2. `onotole projectname -c` will generate project with mandatory gems and will 
+provide a menu for gem selection, where you will need to choose all options.
 
-This will create a Rails app in `projectname` using the latest version of Rails.
-
-    onotole projectname -c
+Of course you are free to add standard `rails new` flags, inasmuch as Onotole
+based on standard rails generator
 
 And command like this will add some magic
 
@@ -149,10 +152,6 @@ it with gemname flag, after app_name, like `onotole projectname --slim`.
 List of gems you always can get with `onotole --gems` command. Also, 
 `onotole --help` can be useful.
 
-!!! Note, that databases with names `projectname`_development and `projectname`_test
-will be dropped. For example, if your project calls `awesome`, databases
-`awesome_development` and `awesome_test` will be dropped.
-
 *NB: if you install custom gems, default user gem pack will not be installed.
 
 ## Gemfile
@@ -161,7 +160,7 @@ To see the latest and greatest gems, look at Onotole'
 [Gemfile](templates/Gemfile.erb), which will be appended to the default
 generated projectname/Gemfile. This gem will be installed anyway.
 
-It includes application gems like:
+### Mandatory gem group
 
 * [Autoprefixer Rails](https://github.com/ai/autoprefixer-rails) for CSS vendor prefixes
 * [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
@@ -250,7 +249,9 @@ Onotole also comes with:
 * Added style flash messagaes for `bootstrap-sass` gem
 * Auto add gem `devise_bootstrap_views` when `bootstrap-sass` and `devise` 
 selected for pretty view from the box
-* Added autoload js and scss from `vendor/assets/javascripts` and `vendor/assets/stylesheets`
+* Added autoload js and scss from `vendor/assets/javascripts` and 
+`vendor/assets/stylesheets`
+* Added autoload fonts from `app/assets/fonts/**/*`
 
 ## Heroku
 
@@ -262,8 +263,7 @@ This:
 
 * Creates a staging and production Heroku app
 * Sets them as `staging` and `production` Git remotes
-* Configures staging with `RACK_ENV` and `RAILS_ENV` environment variables set
-  to `staging`
+* Configures staging with `RACK_ENV` environment variable set to `staging`
 * Adds the [Rails Stdout Logging][logging-gem] gem
   to configure the app to log to standard out,
   which is how [Heroku's logging][heroku-logging] works.

data/lib/onotole/adapters/heroku.rb

@@ -26,7 +26,7 @@ module Onotole
       end
 
       def create_staging_heroku_app(flags)
-        rack_env = 'RACK_ENV=staging RAILS_ENV=staging'
+        rack_env = 'RACK_ENV=staging'
         app_name = heroku_app_name_for('staging')
 
         run_toolbelt_command "create #{app_name} #{flags}", 'staging'

data/lib/onotole/add_user_gems/after_install_patch.rb

@@ -52,7 +52,7 @@ module Onotole
       run 'touch .rubocop_todo.yml'
       t = <<-TEXT
 
-if ENV['RAILS_ENV'] == 'test' || ENV['RAILS_ENV'] == 'development'
+if ENV['RACK_ENV'] == 'test' || ENV['RACK_ENV'] == 'development'
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
 end
@@ -222,6 +222,7 @@ end
       return unless user_choose? :fotoramajs
       inject_into_file(AppBuilder.js_file, "\n//= require fotorama",
                        after: '//= require jquery_ujs')
+      append_file(AppBuilder.app_file_scss, "\n@import 'fotorama'")
     end
   end
 end

data/lib/onotole/add_user_gems/before_bundle_patch.rb

@@ -19,7 +19,7 @@ module Onotole
     def add_dotenv_heroku_gem
       inject_into_file('Gemfile', "\n  gem 'dotenv-heroku'",
                        after: 'group :development do')
-      append_file 'Rakefile', %(\nrequire 'dotenv-heroku/tasks' if ENV['RAILS_ENV'] == 'test' || ENV['RAILS_ENV'] == 'development'\n)
+      append_file 'Rakefile', %(\nrequire 'dotenv-heroku/tasks' if ENV['RACK_ENV'] == 'test' || ENV['RACK_ENV'] == 'development'\n)
     end
 
     def add_slim_gem

data/lib/onotole/default_frontend.rb

@@ -80,5 +80,10 @@ module Onotole
       vendor_css_path = "\nRails.application.config.assets.paths += Dir[(Rails.root.join('vendor/assets/stylesheets'))]"
       append_file 'config/initializers/assets.rb', vendor_css_path
     end
+
+    def add_fonts_autoload
+      fonts = "\nRails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf|otf)\z/"
+      append_file 'config/initializers/assets.rb', fonts
+    end
   end
 end

data/lib/onotole/generators/app_generator.rb

@@ -177,6 +177,7 @@ module Onotole
       build :set_up_forego
       build :apply_vendorjs_folder
       build :add_vendor_css_path
+      build :add_fonts_autoload
     end
 
     # def setup_stylesheets

data/lib/onotole/mail.rb

@@ -30,7 +30,7 @@ module Onotole
     def set_test_delivery_method
       inject_into_file(
         'config/environments/development.rb',
-        "\n  config.action_mailer.delivery_method = :test",
+        "\n  config.action_mailer.delivery_method = :file",
         after: 'config.action_mailer.raise_delivery_errors = true'
       )
     end

data/lib/onotole/tests.rb

@@ -28,7 +28,7 @@ end
       remove_file 'spec/rails_helper.rb'
       remove_file 'spec/spec_helper.rb'
       copy_file 'rails_helper.rb', 'spec/rails_helper.rb'
-      copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
+      template 'spec_helper.rb.erb', 'spec/spec_helper.rb'
     end
 
     def configure_generators

data/lib/onotole/version.rb

@@ -2,5 +2,5 @@
 module Onotole
   RAILS_VERSION = '~> 4.2.0'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/features/new_project_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe 'Suspend a new project with default configuration' do
 
   it 'configs :test email delivery method for development' do
     expect(dev_env_file)
-      .to match(/^ +config.action_mailer.delivery_method = :test$/)
+      .to match(/^ +config.action_mailer.delivery_method = :file$/)
   end
 
   it 'uses APPLICATION_HOST, not HOST in the production config' do

data/templates/app.json.erb

@@ -11,9 +11,6 @@
     "RACK_ENV":{
       "required":true
     },
-    "RAILS_ENV":{
-      "required":true
-    },
     "<%= "#{app_name.upcase}_SECRET_KEY_BASE" %>":{
       "generator":"secret"
     },

data/templates/browserslist

@@ -1,4 +1,3 @@
 Last 2 versions
-Explorer >= 10
-iOS >= 7.1
+Explorer >= 11
 Android >= 4.4

data/templates/circle.yml.erb

@@ -3,4 +3,4 @@ database:
     - bin/setup
 test:
   override:
-    - bin/rake
+    - COVERAGE=true bin/rake

data/templates/dotenv.erb

@@ -12,3 +12,4 @@ EXECJS_RUNTIME=Node
 <%= "#{app_name.upcase}_WEB_CONCURRENCY=1" %>
 <%= "#{app_name.upcase}_MAX_THREADS=16" %>
 <%= "#{app_name.upcase}_RAILS_SERVE_STATIC_FILES=true" %>
+<%= "#{app_name.upcase}_COVERAGE=false" %>

data/templates/postgresql_database.yml.erb

@@ -2,7 +2,6 @@ development: &default
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8
-  host: localhost
   min_messages: warning
   pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>

data/templates/rails_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-ENV['RAILS_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 
 require File.expand_path('../../config/environment', __FILE__)
 abort('DATABASE_URL environment variable is set') if ENV['DATABASE_URL']

data/templates/{spec_helper.rb → spec_helper.rb.erb}

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
-if ENV.fetch('COVERAGE', false)
+if ENV.fetch("#{app_name.upcase}_COVERAGE", false)
   require 'simplecov'
-  SimpleCov.start 'rails'
+
+  if ENV["CIRCLE_ARTIFACTS"]
+    dir = File.join(ENV["CIRCLE_ARTIFACTS"], "coverage")
+    SimpleCov.coverage_dir(dir)
+  end
+  
+  SimpleCov.start('rails') 
 end
 
 require 'webmock/rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onotole
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - kvokka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,7 +162,7 @@ files:
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
 - templates/smtp.rb.erb
-- templates/spec_helper.rb
+- templates/spec_helper.rb.erb
 - templates/staging.rb
 - templates/tinymce.yml
 homepage: http://github.com/kvokka/onotole