Prepare release 0.7.1 (#2121)

* Fix generators (extracted from #2119) * Bump CHANGELOG * Update versions * Bump docker version on CircleCI
decidim · Oct 26, 2017 · 668dcf5 · 668dcf5
1 parent 02230c8
commit 668dcf5
Show file tree

Hide file tree

Showing 25 changed files with 84 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 
 defaults: &defaults
   docker:
-    - image: codegram/decidim:0.7.0
+    - image: codegram/decidim:0.7.1
       environment:
         SIMPLECOV: true
         DATABASE_USERNAME: postgres
@@ -49,9 +49,6 @@ jobs:
             mv phantomjs-2.1.1-linux-x86_64 /usr/local/share
             ln -sf /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin
             rm phantomjs-2.1.1-linux-x86_64.tar.bz2
-      - run:
-          name: Install dependencies
-          command: gem install decidim
       - run:
           name: Create test DB
           command: |

diff --git a/.decidim-version b/.decidim-version
@@ -1 +1 @@
-0.7.0
+0.7.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
-## [v0.7.0](https://github.com/decidim/decidim/tree/v0.7.0) (2017-10-23)
+## [v0.7.1](https://github.com/decidim/decidim/tree/v0.7.1) (2017-10-26)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.7.0...v0.7.1)
+
+**Fixed**:
+
+- **decidim**: Fixed app generators [\#2119](https://github.com/decidim/decidim/pull/2119)
+
+## [v0.7.0](https://github.com/decidim/decidim/tree/v0.7.0) (2017-10-25)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.8...v0.7.0)
 
 **Added**

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,54 +1,54 @@
 PATH
   remote: .
   specs:
-    decidim (0.7.0)
-      decidim-accountability (= 0.7.0)
-      decidim-admin (= 0.7.0)
-      decidim-api (= 0.7.0)
-      decidim-budgets (= 0.7.0)
-      decidim-comments (= 0.7.0)
-      decidim-core (= 0.7.0)
-      decidim-meetings (= 0.7.0)
-      decidim-pages (= 0.7.0)
-      decidim-participatory_processes (= 0.7.0)
-      decidim-proposals (= 0.7.0)
-      decidim-surveys (= 0.7.0)
-      decidim-system (= 0.7.0)
-    decidim-accountability (0.7.0)
-      decidim-comments (= 0.7.0)
-      decidim-core (= 0.7.0)
+    decidim (0.7.1)
+      decidim-accountability (= 0.7.1)
+      decidim-admin (= 0.7.1)
+      decidim-api (= 0.7.1)
+      decidim-budgets (= 0.7.1)
+      decidim-comments (= 0.7.1)
+      decidim-core (= 0.7.1)
+      decidim-meetings (= 0.7.1)
+      decidim-pages (= 0.7.1)
+      decidim-participatory_processes (= 0.7.1)
+      decidim-proposals (= 0.7.1)
+      decidim-surveys (= 0.7.1)
+      decidim-system (= 0.7.1)
+    decidim-accountability (0.7.1)
+      decidim-comments (= 0.7.1)
+      decidim-core (= 0.7.1)
       kaminari (~> 1.0.1)
       searchlight (~> 4.1.0)
-    decidim-admin (0.7.0)
+    decidim-admin (0.7.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.7.0)
+      decidim-core (= 0.7.1)
       devise (~> 4.2)
       devise-i18n (~> 1.2.0)
       devise_invitable (~> 1.7.0)
       foundation_rails_helper (~> 3.0.0.rc)
       jquery-rails (~> 4.3.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.7.0)
+    decidim-api (0.7.1)
       graphiql-rails (~> 1.4.2, < 1.4.5)
       graphql (~> 1.6.0)
       rack-cors (~> 1.0.1)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.7.0)
-      decidim-comments (= 0.7.0)
-      decidim-core (= 0.7.0)
+    decidim-budgets (0.7.1)
+      decidim-comments (= 0.7.1)
+      decidim-core (= 0.7.1)
       kaminari (~> 1.0.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.7.0)
-      decidim-core (= 0.7.0)
+    decidim-comments (0.7.1)
+      decidim-core (= 0.7.1)
       jquery-rails (~> 4.0)
-    decidim-core (0.7.0)
+    decidim-core (0.7.1)
       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.7.0)
+      decidim-api (= 0.7.1)
       devise (~> 4.3)
       devise-i18n (~> 1.2.0)
       file_validators (~> 2.1.0)
@@ -76,14 +76,14 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.10)
       wisper (~> 2.0.0)
-    decidim-dev (0.7.0)
+    decidim-dev (0.7.1)
       byebug
       capybara (~> 2.15)
       capybara-screenshot (~> 1.0)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.7.0)
+      decidim (= 0.7.1)
       factory_girl_rails
       i18n-tasks (= 0.9.18)
       listen (~> 3.1)
@@ -98,29 +98,29 @@ PATH
       simplecov (~> 0.13)
       webmock (~> 3.0)
       wisper-rspec (~> 0.0.3)
-    decidim-meetings (0.7.0)
+    decidim-meetings (0.7.1)
       date_validator (~> 0.9)
-      decidim-core (= 0.7.0)
+      decidim-core (= 0.7.1)
       httparty (~> 0.15.0)
       icalendar (~> 2.4.1)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       searchlight (~> 4.1.0)
-    decidim-pages (0.7.0)
-      decidim-core (= 0.7.0)
-    decidim-participatory_processes (0.7.0)
-      decidim-core (= 0.7.0)
-    decidim-proposals (0.7.0)
-      decidim-comments (= 0.7.0)
-      decidim-core (= 0.7.0)
+    decidim-pages (0.7.1)
+      decidim-core (= 0.7.1)
+    decidim-participatory_processes (0.7.1)
+      decidim-core (= 0.7.1)
+    decidim-proposals (0.7.1)
+      decidim-comments (= 0.7.1)
+      decidim-core (= 0.7.1)
       kaminari (~> 1.0.1)
       social-share-button (~> 1.0.0)
-    decidim-surveys (0.7.0)
-      decidim-core (= 0.7.0)
+    decidim-surveys (0.7.1)
+      decidim-core (= 0.7.1)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.7.0)
+    decidim-system (0.7.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.7.0)
+      decidim-core (= 0.7.1)
       devise (~> 4.2)
       devise-i18n (~> 1.2.0)
       devise_invitable (~> 1.7.1)
@@ -254,10 +254,10 @@ GEM
     equalizer (0.0.11)
     erubi (1.6.1)
     execjs (2.7.0)
-    factory_girl (4.8.1)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_girl_rails (4.9.0)
+      factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
     faker (1.8.4)
       i18n (~> 0.5)
@@ -403,7 +403,7 @@ GEM
     public_suffix (3.0.0)
     puma (3.10.0)
     rack (2.0.3)
-    rack-cors (1.0.1)
+    rack-cors (1.0.2)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rails (5.1.4)

diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ The easiest way to work on decidim is to clone decidim's repository and install
 ```bash
 $ git clone git@github.com:decidim/decidim.git
 $ cd decidim
-$ gem install decidim
 $ bundle install
 $ npm install
 ```

diff --git a/Rakefile b/Rakefile
@@ -66,6 +66,16 @@ task :update_versions do
   )
 end
 
+desc "Installs all gems locally."
+task :install_all do
+  sh "rake install", verbose: false
+  DECIDIM_GEMS.each do |gem_name|
+    Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
+      sh "rake install", verbose: false
+    end
+  end
+end
+
 desc "Pushes a new build for each gem."
 task release_all: [:update_versions, :check_locale_completeness, :webpack] do
   sh "rake release"

diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/version.rb b/decidim-api/lib/decidim/api/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/version.rb b/decidim-assemblies/lib/decidim/assemblies/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-budgets/lib/decidim/budgets/version.rb b/decidim-budgets/lib/decidim/budgets/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-comments/lib/decidim/comments/version.rb b/decidim-comments/lib/decidim/comments/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/version.rb b/decidim-dev/lib/decidim/dev/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/version.rb b/decidim-meetings/lib/decidim/meetings/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-pages/lib/decidim/pages/version.rb b/decidim-pages/lib/decidim/pages/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/version.rb b/decidim-proposals/lib/decidim/proposals/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-surveys/lib/decidim/surveys/version.rb b/decidim-surveys/lib/decidim/surveys/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/decidim-system/lib/decidim/system/version.rb b/decidim-system/lib/decidim/system/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.7.0"
+      "0.7.1"
     end
   end
 end
diff --git a/lib/decidim/version.rb b/lib/decidim/version.rb
@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.7.0"
+    "0.7.1"
   end
 end
diff --git a/lib/generators/decidim/app_generator.rb b/lib/generators/decidim/app_generator.rb
@@ -2,7 +2,7 @@
 
 require "rails/generators"
 require "rails/generators/rails/app/app_generator"
-require "decidim/core/version"
+require "decidim/version"
 require_relative "install_generator"
 
 module Decidim

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git"

diff --git a/spec/generator_spec.rb b/spec/generator_spec.rb
@@ -14,7 +14,7 @@
   end
 
   context "without flags" do
-    let(:command) { "bin/decidim #{test_app}" }
+    let(:command) { "bundle exec rake install_all && bin/decidim #{test_app}" }
 
     it_behaves_like "a sane generator"
   end