generapp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2f7f132f1a6fc39fb0bd0304425054f5350e55
-  data.tar.gz: a6eb1cfc96e80b7046e78ae97cf7255dc058c2f7
+  metadata.gz: e4f1fe0fc28a191ec82da9cd272336fc8e5c010a
+  data.tar.gz: 3f1e6427e22485d87d3fe14d4755692539c52af5
 SHA512:
-  metadata.gz: 790a0e7d32698228e39c76961383483609952aa3c4c59ddc444a88f41838f78f5b0c38c7c97a7b6d2e772fbf91b5187d3bf970fad8a11e3a360426531d54eae0
-  data.tar.gz: a920e3e00cb734613c491f674899978e9634ec8cadc03da99efbc2269976923f172f9632948914e60e647891e64eb3853383aeb4acd8eb3531b706b06a0e645d
+  metadata.gz: 32a11439297b5aae323a5b9101408fbc2928e7ecde7b53adb5dff360ea351ee2f040333c7605aace9356ac4f2de6845139b154671369bc7ee6409a48a792ca6e
+  data.tar.gz: 43dfc60ef2bace760290f263bf582a6316eb5f9e1f2a0fcfe29ba105593c7b4d624ac54545d88c5141ad54d4aeec3715cc6d35b20ee990b8ab8e6cec500a003e

data/.rubocop.yml

@@ -1,8 +1,8 @@
-inherit_from:
-  - .rubocop_defaults.yml
-  - .rubocop_todo.yml
+inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
     - 'spec/**/*'
+  Include:
+    - Rakefile
+    - bin/generapp
   TargetRubyVersion: 2.3
-

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-01-15 16:49:41 -0500 using RuboCop version 0.35.1.
+# on 2016-05-02 09:43:28 -0500 using RuboCop version 0.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,10 +11,11 @@
 Metrics/ClassLength:
   Max: 109
 
-# Offense count: 8
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 6
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
-  Max: 104
+  Max: 92
 
 # Offense count: 2
 # Configuration parameters: CountComments.
@@ -25,23 +26,3 @@ Metrics/MethodLength:
 Style/AccessorMethodName:
   Exclude:
     - 'lib/generapp/generators/app_generator.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/ExtraSpacing:
-  Exclude:
-    - 'templates/config/puma.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
-  Exclude:
-    - 'templates/config/puma.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'templates/config/puma.rb'

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
   - ruby-head
 
 sudo: false

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ### master
 
+### 0.3.1 - 2016-05-02
+
+* enhances
+    * Add RELEASING and CONTRIBUTING docs to generated app
+    * Improve integration with circleci
+    * Add file to track app version to generated app (`config/initializer/version.rb`)
+    * Add setup script
+    * Update to Ruby 2.3.1
+
+### 0.3.0 - 2016-01-15
+
+* enhances
+    * Improve annotate defaults
+    * Improve hound code review
+    * Improve code base
+    * Integrate coverage with circle ci
+
 ### 0.2.0 - 2016-01-13
 
 * bug fixes

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in generapp.gemspec

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'

data/bin/generapp

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'bundler/setup'
 require 'generapp'
 

data/generapp.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'generapp/version'
@@ -29,6 +30,6 @@ Feel free to use it to jump start your project and don't waste any time configur
   spec.add_dependency 'rails', Generapp::RAILS_VERSION
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'rubocop', '~> 0.35', '>= 0.35'
-  spec.add_development_dependency 'coveralls', '~>0.8.0', '>= 0.8.0'
+  spec.add_development_dependency 'coveralls', '~> 0.8.0', '>= 0.8.0'
   spec.add_development_dependency 'yard', '~> 0.8.7', '>= 0.8.0'
 end

data/lib/generapp/actions/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App configuration associated actions
@@ -12,9 +13,12 @@ module Generapp
         copy_file 'config/puma.rb', 'config/puma.rb'
       end
 
-      def set_up_foreman
+      def set_up_version
+        template 'config/version.rb.erb', 'config/initializers/version.rb'
+      end
+
+      def set_up_procfile
         copy_file 'Procfile', 'Procfile'
-        copy_file 'Procfile.dev', 'Procfile.dev'
       end
 
       def generate_devise

data/lib/generapp/actions/database.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App database associated actions

data/lib/generapp/actions/develop.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App develop environment
@@ -44,6 +44,11 @@ module Generapp
         copy_file 'config/application.yml', 'config/application.yml'
       end
 
+      def provide_setup_script
+        template 'bin/setup', 'bin/setup', force: true
+        run 'chmod a+x bin/setup'
+      end
+
       protected
 
       def generapp_generators

data/lib/generapp/actions/production.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App production environment

data/lib/generapp/actions/test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App test environment

data/lib/generapp/actions/views.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Generapp
   module Actions #:nodoc
     # App views configuration
@@ -27,6 +28,16 @@ module Generapp
                  'app/views/layouts/application.html.erb',
                  force: true
       end
+
+      def create_humans_txt
+        copy_file 'public/humans.txt',
+                  'public/humans.txt'
+      end
+
+      def create_manifest
+        template 'public/manifest.json.erb',
+                 'public/manifest.json'
+      end
     end
   end
 end

data/lib/generapp/app_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators/rails/app/app_generator'
 
 module Generapp
@@ -12,10 +13,12 @@ module Generapp
 
     def readme
       template 'README.md.erb', 'README.md'
+      copy_file 'RELEASING.md', 'RELEASING.md'
+      copy_file 'CONTRIBUTING.md', 'CONTRIBUTING.md'
     end
 
     def gitignore
-      template 'generapp_gitignore', '.gitignore'
+      copy_file 'generapp_gitignore', '.gitignore'
     end
 
     def gemfile

data/lib/generapp/generators/app_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 

data/lib/generapp/version.rb

@@ -5,9 +5,9 @@
 # with some of Koombea's standards and practices
 module Generapp
   # Default Rails Version
-  RAILS_VERSION = '~> 4.2.0'.freeze
+  RAILS_VERSION = '~> 4.2.0'
   # Default Ruby Version
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
   # Gem Version
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'
 end

data/lib/generapp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Rails app generator with some minor modification and customizations
 # Allows to jump start a project
 # with some of Koombea's standards and practices

data/templates/CONTRIBUTING.md

@@ -0,0 +1,60 @@
+# Contributing
+
+We try to keep master as a reflection of production and all work is done in the develop branch.
+To facilitate this work you can install `git flow`, a series of commands on top of git
+that allow feature branching and versioning release
+
+Make your change. Write tests. Follow the [ruby style guide](https://github.com/bbatsov/ruby-style-guide).
+
+## Install git-flow
+
+Check [git flow page](https://github.com/nvie/gitflow/wiki/Installation) for instructions
+
+## Initialize git-flow
+
+```sh
+$ git flow init
+```
+
+### Features:
+
+Every new change should be done in a feature branch,
+these are the instructions for working with features and git flow
+
+  + Start a new feature from the 'develop' branch:
+
+    ```sh
+    $ git flow feature start <your feature>
+    ```
+
+    This action creates a new feature branch based on 'develop' and switches to it.
+
+  + Publish a feature:
+
+    ```sh
+    $ git flow feature publish <your feature>
+    ```
+
+    Publish a feature to the remote server so it can be used or reviewed by other users.
+
+  + Getting a published feature:
+
+    ```sh
+    $ git flow feature pull origin <your feature>
+    ```
+
+    Get a feature published by another user.
+
+  + Finish a feature:
+
+    ```sh
+    $ git flow feature finish <your feature>
+    ```
+
+    - Merged <your feature> into 'develop'.
+    - Removes the feature branch.
+    - Switches back to 'develop' branch.
+
+## More
+
+On using git flow: http://nvie.com/posts/a-successful-git-branching-model/

data/templates/Gemfile.erb

@@ -18,7 +18,7 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'bullet' # N+1 queries reporter
-  gem 'lol_dba', require: false # Missing index reporter
+  gem 'lol_dba' # Missing index reporter
   gem 'quiet_assets'
   gem 'rails-erd' # ER Diagrams
   gem 'spring'
@@ -29,7 +29,6 @@ group :development, :test do
   gem 'bundler-audit', require: false
   gem 'factory_girl_rails'
   gem 'figaro' # Secrets
-  gem 'foreman'
   gem 'pry-rails'
   gem 'pry-remote'
   gem 'rspec-rails'
@@ -38,6 +37,7 @@ end
 group :test do
   gem 'database_cleaner'
   gem 'faker'
+  gem 'rspec_junit_formatter', '~> 0.2.2'
   gem 'shoulda-matchers'
   gem 'simplecov', require: false
   gem 'timecop' # Time manipulation

data/templates/README.md.erb

@@ -14,7 +14,14 @@
 
 ## Troubleshooting
 
-## How to Contribute
+## Contributing
+
+See our [CONTRIBUTING](CONTRIBUTING.md) guide.
+
+## Releasing
+
+See our [RELEASING](RELEASING.md) guide.
 
 ## License
+
 Copyright <%= Time.now.year %>

data/templates/RELEASING.md

@@ -0,0 +1,23 @@
+# Releasing
+
+Check the version number on `config/initializers/version.rb` then start the release for the next version.
+Remember to follow [semantic versioning](config/initializers/version.rb).
+
+```sh
+$ git flow release start <version>
+```
+
+Update `config/initializers/version.rb` with the new version number and commit your changes.
+
+```sh
+$ git commit -am "Bump version to <version>"
+$ git flow release finish <version>
+```
+
+Indicate changes when prompted and then push to remotes
+
+```sh
+$ git push origin master
+$ git push origin develop
+$ git push --tags
+```

data/templates/bin/setup

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
+
+  puts "\n== Copying sample application secrets =="
+  unless File.exist?('config/application.yml')
+    system 'cp config/application.yml.example config/application.yml'
+  end
+
+  puts "\n== Preparing database =="
+  system 'bin/rake db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
+
+  puts "\n== Restarting application server =="
+  system 'touch tmp/restart.txt'
+end

data/templates/circle.yml

@@ -4,4 +4,4 @@ dependencies:
     - cp config/application.yml.example config/application.yml
 test:
   override:
-    - bundle exec rspec
+    - RAILS_ENV=test bundle exec rspec -r rspec_junit_formatter --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec/junit.xml

data/templates/config/application.yml

@@ -1,5 +1,5 @@
 defaults: &defaults
-  DB_POOL:                      '12'                                              # Max number of active DB connection
+  DB_POOL:                      '10'                                              # Max number of active DB connection
   MAX_THREADS:                  '3'                                               # Puma max number of threads
   REAPING_FREQUENCY:            '5'                                               # Enable database reaping connections
   WEB_CONCURRENCY:              '2'                                               # Puma processes
@@ -10,8 +10,5 @@ development:
 test:
   <<: *defaults
 
-staging:
-  <<: *defaults
-
 production:
   <<: *defaults

data/templates/config/puma.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 workers Integer(ENV['WEB_CONCURRENCY'] || 2)
 threads_count = Integer(ENV['MAX_THREADS'] || 3)
 threads threads_count, threads_count

data/templates/config/version.rb.erb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module <%= app_name.classify %>
+  class Application
+    # App Version
+    VERSION = '0.1.0'.freeze
+  end
+end

data/templates/generapp_gitignore

@@ -31,13 +31,6 @@ backup*.dump
 *.dump
 *.orig
 
-# Idea
-.idea
-.idea/**/*
-
-# rbenv
-.rbenv-gemsets
-
 # Ignore application configuration
 /config/application.yml
 

data/templates/public/{manifest.json → manifest.json.erb}

@@ -1,5 +1,5 @@
 {
-  "name": "App",
+  "name": "<%= app_name.humanize %>",
   "icons": [
     {
       "src": "\/android-icon-36x36.png",

data/templates/spec/database_cleaner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction

data/templates/spec/devise.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
 end

data/templates/spec/rails_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 

data/templates/spec/shoulda_matchers_config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
     with.test_framework :rspec

data/templates/tasks/auto_annotate_models.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # NOTE: only doing this in development as some production environments (Heroku)
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.

data/templates/tasks/bundler_audit.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if Rails.env.development? || Rails.env.test?
   require 'bundler/audit/cli'
 

data/templates/views/_head.html.erb.erb

@@ -20,11 +20,10 @@
 <meta name="theme-color" content="#fff">
 
 <meta name="robots" content="index,follow">
-<meta name="description" content="Saasler is the easiest way to create an “integrations directory” for your app.">
-<meta name="keywords" content="integrations,lists,applications">
-<link rel="author" href="humans.txt" />
+<meta name="description" content="">
+<meta name="keywords" content="">
+<link rel="author" href="/humans.txt" />
 
 <%%= stylesheet_link_tag 'application' %>
 <%%= csrf_meta_tags %>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link href='https://fonts.googleapis.com/css?family=Roboto:400,700,300' rel='stylesheet' type='text/css'>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: generapp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gustavo Bazan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,10 +130,8 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_defaults.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -157,19 +155,22 @@ files:
 - lib/generapp/app_builder.rb
 - lib/generapp/generators/app_generator.rb
 - lib/generapp/version.rb
+- templates/CONTRIBUTING.md
 - templates/Gemfile.erb
 - templates/Procfile
-- templates/Procfile.dev
 - templates/README.md.erb
+- templates/RELEASING.md
 - templates/application.scss
+- templates/bin/setup
 - templates/circle.yml
 - templates/config/application.yml
 - templates/config/newrelic.yml.erb
 - templates/config/postgresql_database.yml.erb
 - templates/config/puma.rb
+- templates/config/version.rb.erb
 - templates/generapp_gitignore
 - templates/public/humans.txt
-- templates/public/manifest.json
+- templates/public/manifest.json.erb
 - templates/simplecov
 - templates/spec/database_cleaner.rb
 - templates/spec/devise.rb
@@ -193,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -201,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Koombea Rails app generator

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .rubocop.yml