From c580b0f46709098041d1c19def5e3755e0f8629f Mon Sep 17 00:00:00 2001 From: Marc Riera Date: Mon, 9 Oct 2017 09:37:37 +0200 Subject: [PATCH] Prepare for 0.6.7 release (#2001) * Fix test app generators for installations (#1994) * Bump version to 0.6.7 * Update CHANGELOG * Bump docker image version on CircleCI --- .circleci/config.yml | 2 +- CHANGELOG.md | 6 ++ Gemfile.lock | 86 +++++++++---------- decidim-core/lib/decidim/core/version.rb | 2 +- .../lib/generators/decidim/dummy_generator.rb | 6 +- decidim-dev/lib/tasks/test_app.rake | 12 +++ lib/generators/decidim/app_generator.rb | 7 ++ lib/generators/decidim/install_generator.rb | 4 - package-lock.json | 2 +- package.json | 2 +- 10 files changed, 77 insertions(+), 52 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f9b8dcd69f7..8eaaeda57d84 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: codegram/decidim:0.6.6 + - image: codegram/decidim:0.6.7 environment: SIMPLECOV: true DATABASE_USERNAME: postgres diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb60a36b7c3..183cf99d2483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [v0.6.7](https://github.com/decidim/decidim/tree/v0.6.7) (2017-10-06) +[Full Changelog](https://github.com/decidim/decidim/compare/v0.6.6...v0.6.7) + +**Fixed** +- **decidim**: A bug in the test app generator prevented installations to properly run the tests. [\#1994](https://github.com/decidim/decidim/pull/1994) + ## [v0.6.6](https://github.com/decidim/decidim/tree/v0.6.6) (2017-10-05) [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.5...v0.6.6) diff --git a/Gemfile.lock b/Gemfile.lock index f4ee110b1b93..6b7b620702ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,22 @@ PATH remote: . specs: - decidim (0.6.6) - decidim-admin (= 0.6.6) - decidim-api (= 0.6.6) - decidim-budgets (= 0.6.6) - decidim-comments (= 0.6.6) - decidim-core (= 0.6.6) - decidim-meetings (= 0.6.6) - decidim-pages (= 0.6.6) - decidim-participatory_processes (= 0.6.6) - decidim-proposals (= 0.6.6) - decidim-results (= 0.6.6) - decidim-surveys (= 0.6.6) - decidim-system (= 0.6.6) - decidim-admin (0.6.6) + decidim (0.6.7) + decidim-admin (= 0.6.7) + decidim-api (= 0.6.7) + decidim-budgets (= 0.6.7) + decidim-comments (= 0.6.7) + decidim-core (= 0.6.7) + decidim-meetings (= 0.6.7) + decidim-pages (= 0.6.7) + decidim-participatory_processes (= 0.6.7) + decidim-proposals (= 0.6.7) + decidim-results (= 0.6.7) + decidim-surveys (= 0.6.7) + decidim-system (= 0.6.7) + decidim-admin (0.6.7) active_link_to (~> 1.0.0) - decidim-core (= 0.6.6) + decidim-core (= 0.6.7) devise (~> 4.2) devise-i18n (~> 1.1.0) devise_invitable (~> 1.7.0) @@ -26,29 +26,29 @@ PATH rectify (~> 0.9.1) sassc-rails (~> 1.3.0) select2-rails (~> 4.0.3) - decidim-api (0.6.6) + decidim-api (0.6.7) graphiql-rails (= 1.4.4) graphql (~> 1.6.0) rack-cors (~> 0.4.0) rails (~> 5.1.3) sprockets-es6 (~> 0.9.2) - decidim-budgets (0.6.6) - decidim-comments (= 0.6.6) - decidim-core (= 0.6.6) + decidim-budgets (0.6.7) + decidim-comments (= 0.6.7) + decidim-core (= 0.6.7) kaminari (~> 1.0.1) rectify (~> 0.9.1) searchlight (~> 4.1.0) - decidim-comments (0.6.6) - decidim-core (= 0.6.6) + decidim-comments (0.6.7) + decidim-core (= 0.6.7) jquery-rails (~> 4.0) rails (~> 5.1.3) - decidim-core (0.6.6) + decidim-core (0.6.7) active_link_to (~> 1.0.4) autoprefixer-rails (~> 7.1.1) cancancan (~> 2.0.0) carrierwave (~> 1.1.0) date_validator (~> 0.9.0) - decidim-api (= 0.6.6) + decidim-api (= 0.6.7) devise (~> 4.3) devise-i18n (~> 1.1.0) file_validators (~> 2.1.0) @@ -76,14 +76,14 @@ PATH sprockets-es6 (~> 0.9.2) truncato (~> 0.7.9) wisper (~> 2.0.0) - decidim-dev (0.6.6) + decidim-dev (0.6.7) byebug capybara (~> 2.15.0) capybara-screenshot (~> 1.0.14) codecov (~> 0.1.9) database_cleaner (~> 1.6.0) db-query-matchers (~> 0.9.0) - decidim (= 0.6.6) + decidim (= 0.6.7) factory_girl_rails faker (~> 1.8.4) i18n-tasks (= 0.9.18) @@ -98,39 +98,39 @@ PATH simplecov (~> 0.13) webmock (~> 3.0.1) wisper-rspec (~> 0.0.3) - decidim-meetings (0.6.6) + decidim-meetings (0.6.7) date_validator (~> 0.9) - decidim-core (= 0.6.6) + decidim-core (= 0.6.7) httparty (~> 0.15.0) icalendar (~> 2.4.1) jquery-tmpl-rails (~> 1.1.0) kaminari (~> 1.0.1) rectify (~> 0.8) searchlight (~> 4.1.0) - decidim-pages (0.6.6) - decidim-core (= 0.6.6) + decidim-pages (0.6.7) + decidim-core (= 0.6.7) rectify (~> 0.9.1) - decidim-participatory_processes (0.6.6) - decidim-core (= 0.6.6) + decidim-participatory_processes (0.6.7) + decidim-core (= 0.6.7) rails (~> 5.1.3) - decidim-proposals (0.6.6) - decidim-comments (= 0.6.6) - decidim-core (= 0.6.6) + decidim-proposals (0.6.7) + decidim-comments (= 0.6.7) + decidim-core (= 0.6.7) kaminari (~> 1.0.1) rectify (~> 0.9.1) social-share-button (~> 0.10.0) - decidim-results (0.6.6) - decidim-comments (= 0.6.6) - decidim-core (= 0.6.6) + decidim-results (0.6.7) + decidim-comments (= 0.6.7) + decidim-core (= 0.6.7) kaminari (~> 1.0.1) rectify (~> 0.9.1) searchlight (~> 4.1.0) - decidim-surveys (0.6.6) - decidim-core (= 0.6.6) + decidim-surveys (0.6.7) + decidim-core (= 0.6.7) jquery-tmpl-rails (~> 1.1.0) - decidim-system (0.6.6) + decidim-system (0.6.7) active_link_to (~> 1.0.0) - decidim-core (= 0.6.6) + decidim-core (= 0.6.7) devise (~> 4.2) devise-i18n (~> 1.1.0) devise_invitable (~> 1.7.1) @@ -202,7 +202,7 @@ GEM builder (3.2.3) byebug (9.1.0) cancancan (2.0.0) - capybara (2.15.1) + capybara (2.15.3) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -457,7 +457,7 @@ GEM activesupport (>= 4.1.0) virtus (~> 1.0.5) wisper (>= 1.6.1) - redis (3.3.3) + redis (3.3.5) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb index b4b08cc484f5..5cd2ec416986 100644 --- a/decidim-core/lib/decidim/core/version.rb +++ b/decidim-core/lib/decidim/core/version.rb @@ -3,7 +3,7 @@ # This holds Decidim's version and the Rails version on which it depends. module Decidim def self.version - "0.6.6" + "0.6.7" end def self.rails_version diff --git a/decidim-dev/lib/generators/decidim/dummy_generator.rb b/decidim-dev/lib/generators/decidim/dummy_generator.rb index a0fa5a85940c..6d1aa653b5ba 100644 --- a/decidim-dev/lib/generators/decidim/dummy_generator.rb +++ b/decidim-dev/lib/generators/decidim/dummy_generator.rb @@ -21,6 +21,9 @@ class DummyGenerator < Rails::Generators::Base class_option :dummy_app_path, type: :string, desc: "The path where the dummy app will be installed" + class_option :skip_gemfile, type: :boolean, + default: false, + desc: "Don't generate a Gemfile for the application" def source_paths [ @@ -38,7 +41,8 @@ def create_dummy_app "--path", "../..", "--app_const_base=DummyApplication", - "--recreate_db" + "--recreate_db", + "--skip_gemfile=#{options[:skip_gemfile]}" ] end diff --git a/decidim-dev/lib/tasks/test_app.rake b/decidim-dev/lib/tasks/test_app.rake index 3457d0b4ab86..637995f3fe2b 100644 --- a/decidim-dev/lib/tasks/test_app.rake +++ b/decidim-dev/lib/tasks/test_app.rake @@ -15,4 +15,16 @@ namespace :decidim do ) end end + + desc "Generates a dummy app for testing in external installations" + task :generate_external_test_app do + dummy_app_path = File.expand_path(File.join(Dir.pwd, "spec", "decidim_dummy_app")) + + Decidim::Generators::DummyGenerator.start( + [ + "--dummy_app_path=#{dummy_app_path}", + "--skip_gemfile" + ] + ) + end end diff --git a/lib/generators/decidim/app_generator.rb b/lib/generators/decidim/app_generator.rb index 7f6ed6577a00..84b200d4eaaa 100644 --- a/lib/generators/decidim/app_generator.rb +++ b/lib/generators/decidim/app_generator.rb @@ -48,6 +48,10 @@ def source_paths class_option :skip_bundle, type: :boolean, aliases: "-B", default: true, desc: "Don't run bundle install" + class_option :skip_gemfile, type: :boolean, + default: false, + desc: "Don't generate a Gemfile for the application" + def database_yml template "database.yml.erb", "config/database.yml", force: true end @@ -70,6 +74,8 @@ def readme end def gemfile + return if options[:skip_gemfile] + path = File.expand_path(File.join("..", "..", "..", "Gemfile"), __dir__) template path, "Gemfile", force: true @@ -85,6 +91,7 @@ def gemfile end gsub_file "Gemfile", /gem "decidim([^"]*)".*/, "gem \"decidim\\1\", #{gem_modifier}" + run "bundle install" end def secret_token diff --git a/lib/generators/decidim/install_generator.rb b/lib/generators/decidim/install_generator.rb index e1c8fa40fd38..ab3ae8414574 100644 --- a/lib/generators/decidim/install_generator.rb +++ b/lib/generators/decidim/install_generator.rb @@ -21,10 +21,6 @@ class InstallGenerator < Rails::Generators::Base class_option :seed_db, type: :boolean, default: false, desc: "Seed db after installing decidim" - def bundle_install - run "bundle install" - end - def install route "mount Decidim::Core::Engine => '/'" end diff --git a/package-lock.json b/package-lock.json index 33d48e19361e..a98d4b298cae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "decidim", - "version": "0.6.6", + "version": "0.6.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 32f78a584f0c..dfaf59a62a94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "decidim", - "version": "0.6.6", + "version": "0.6.7", "repository": { "url": "git@github.com:decidim/decidim.git", "type": "git"