diff --git a/.gitignore b/.gitignore index 7bad0952..022a289f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ test/fixtures/rake/rake_tasks/db/*.sqlite test/fixtures/rake/rake_tasks_app/db/*.sqlite vendor .byebug_history +.rubocop-* diff --git a/.rubocop.yml b/.rubocop.yml index 7a086e90..4c7638b3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,20 +1,12 @@ # Please keep AllCops, Bundler, Style, Metrics groups and then order cops # alphabetically +inherit_from: + - https://raw.githubusercontent.com/hanami/devtools/master/.rubocop.yml AllCops: - DisplayCopNames: true - DisplayStyleGuide: true - ExtraDetails: false -Bundler/OrderedGems: - Enabled: false -Style/AndOr: - Enabled: false -Style/EmptyMethod: - Enabled: false -Style/RaiseArgs: - Enabled: false -Style/RegexpLiteral: - Enabled: false -Style/StringLiterals: - Enabled: false -Metrics/LineLength: - Enabled: false + Exclude: + - "vendor/**/*" + - "spec/support/**/*" + - "**/*.gemspec" +Style/MixinGrouping: + Exclude: + - "spec/support/**/*" diff --git a/CHANGELOG.md b/CHANGELOG.md index 96298b16..0f51855a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Hanami The web, with simplicity. +## v1.1.0.beta2 - 2017-10-03 +### Added +- [Luca Guidi] Introduce `:plugins` group for `Gemfile` in order enable Hanami plugin gems +- [Alfonso Uceda] CLI: `hanami db rollback` to revert one or more migrations at once + ## v1.1.0.beta1 - 2017-08-11 ### Added - [Ben Johnson] Allow to use custom logger as `Hanami.logger` (eg. `Hanami.configure { logger Timber::Logger.new($stdout) }`) diff --git a/Gemfile b/Gemfile index 206defbf..d9e32631 100644 --- a/Gemfile +++ b/Gemfile @@ -7,16 +7,16 @@ unless ENV['TRAVIS'] end gem 'i18n' -gem 'hanami-utils', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/utils.git', branch: 'develop' -gem 'hanami-validations', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/validations.git', branch: 'develop' -gem 'hanami-router', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/router.git', branch: 'develop' -gem 'hanami-controller', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/controller.git', branch: 'develop' -gem 'hanami-view', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/view.git', branch: 'develop' -gem 'hanami-model', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/model.git', branch: 'develop' -gem 'hanami-helpers', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/helpers.git', branch: 'develop' -gem 'hanami-mailer', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/mailer.git', branch: 'develop' -gem 'hanami-assets', '1.1.0.beta1', require: false, git: 'https://github.com/hanami/assets.git', branch: 'develop' -gem 'hanami-cli', '0.1.0.beta1', require: false, git: 'https://github.com/hanami/cli.git', branch: 'develop' +gem 'hanami-utils', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/utils.git', branch: 'develop' +gem 'hanami-validations', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/validations.git', branch: 'develop' +gem 'hanami-router', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/router.git', branch: 'develop' +gem 'hanami-controller', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/controller.git', branch: 'develop' +gem 'hanami-view', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/view.git', branch: 'develop' +gem 'hanami-model', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/model.git', branch: 'develop' +gem 'hanami-helpers', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/helpers.git', branch: 'develop' +gem 'hanami-mailer', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/mailer.git', branch: 'develop' +gem 'hanami-assets', '1.1.0.beta2', require: false, git: 'https://github.com/hanami/assets.git', branch: 'develop' +gem 'hanami-cli', '0.1.0.beta2', require: false, git: 'https://github.com/hanami/cli.git', branch: 'develop' platforms :ruby do gem 'sqlite3' @@ -53,5 +53,6 @@ gem 'excon', require: false gem 'dotenv', '~> 2.0', require: false gem 'shotgun', '~> 0.9', require: false -gem 'rubocop', '0.48.0', require: false -gem 'coveralls', require: false + +gem 'hanami-devtools', require: false, git: 'https://github.com/hanami/devtools.git' +gem 'coveralls', require: false diff --git a/hanami.gemspec b/hanami.gemspec index 9e07d499..605a29fd 100644 --- a/hanami.gemspec +++ b/hanami.gemspec @@ -21,20 +21,20 @@ Gem::Specification.new do |spec| spec.metadata['allowed_push_host'] = 'https://rubygems.org' - spec.add_dependency 'hanami-utils', '1.1.0.beta1' - spec.add_dependency 'hanami-validations', '1.1.0.beta1' - spec.add_dependency 'hanami-router', '1.1.0.beta1' - spec.add_dependency 'hanami-controller', '1.1.0.beta1' - spec.add_dependency 'hanami-view', '1.1.0.beta1' - spec.add_dependency 'hanami-helpers', '1.1.0.beta1' - spec.add_dependency 'hanami-mailer', '1.1.0.beta1' - spec.add_dependency 'hanami-assets', '1.1.0.beta1' - spec.add_dependency 'hanami-cli', '0.1.0.beta1' + spec.add_dependency 'hanami-utils', '1.1.0.beta2' + spec.add_dependency 'hanami-validations', '1.1.0.beta2' + spec.add_dependency 'hanami-router', '1.1.0.beta2' + spec.add_dependency 'hanami-controller', '1.1.0.beta2' + spec.add_dependency 'hanami-view', '1.1.0.beta2' + spec.add_dependency 'hanami-helpers', '1.1.0.beta2' + spec.add_dependency 'hanami-mailer', '1.1.0.beta2' + spec.add_dependency 'hanami-assets', '1.1.0.beta2' + spec.add_dependency 'hanami-cli', '0.1.0.beta2' spec.add_dependency 'concurrent-ruby', '~> 1.0' - spec.add_dependency 'bundler', '~> 1.13' + spec.add_dependency 'bundler' - spec.add_development_dependency 'rspec', '~> 3.5' + spec.add_development_dependency 'rspec', '~> 3.6' spec.add_development_dependency 'rack-test', '~> 0.6' spec.add_development_dependency 'aruba', '~> 0.14' - spec.add_development_dependency 'rake', '~> 11.3' + spec.add_development_dependency 'rake', '~> 12.0' end diff --git a/lib/hanami/cli/commands/new.rb b/lib/hanami/cli/commands/new.rb index a40765d4..b7041c96 100644 --- a/lib/hanami/cli/commands/new.rb +++ b/lib/hanami/cli/commands/new.rb @@ -299,7 +299,7 @@ module Hanami application_name: options.fetch(:application_name), application_base_url: options.fetch(:application_base_url), hanami_head: options.fetch(:hanami_head), - hanami_model_version: '1.1.0.beta1', + hanami_model_version: '1.1.0.beta2', code_reloading: code_reloading?, hanami_version: hanami_version, project_module: Utils::String.classify(project), diff --git a/lib/hanami/version.rb b/lib/hanami/version.rb index a2ec14da..81fddf37 100644 --- a/lib/hanami/version.rb +++ b/lib/hanami/version.rb @@ -6,7 +6,7 @@ module Hanami module Version # @since 0.9.0 # @api private - VERSION = '1.1.0.beta1'.freeze + VERSION = '1.1.0.beta2'.freeze # @since 0.9.0 # @api private diff --git a/spec/integration/cli/new_spec.rb b/spec/integration/cli/new_spec.rb index bfcbdefb..1f261371 100644 --- a/spec/integration/cli/new_spec.rb +++ b/spec/integration/cli/new_spec.rb @@ -125,7 +125,7 @@ source 'https://rubygems.org' gem 'rake' gem 'hanami', '#{Hanami::Version.gem_requirement}' -gem 'hanami-model', '1.1.0.beta1' +gem 'hanami-model', '1.1.0.beta2' gem 'sqlite3' @@ -156,7 +156,7 @@ source 'https://rubygems.org' gem 'rake' gem 'hanami', '#{Hanami::Version.gem_requirement}' -gem 'hanami-model', '1.1.0.beta1' +gem 'hanami-model', '1.1.0.beta2' gem 'jdbc-sqlite3' diff --git a/spec/unit/version_spec.rb b/spec/unit/version_spec.rb index 65069b4e..4af33a5e 100644 --- a/spec/unit/version_spec.rb +++ b/spec/unit/version_spec.rb @@ -1,5 +1,5 @@ RSpec.describe "Hanami::VERSION" do it "returns current version" do - expect(Hanami::VERSION).to eq("1.1.0.beta1") + expect(Hanami::VERSION).to eq("1.1.0.beta2") end end