decidim 0.24.3 → 0.25.0.rc4

data/lib/decidim/gem_manager.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/module/delegation"
 require "open3"
 
 module Decidim
@@ -53,9 +54,9 @@ module Decidim
       end
     end
 
-    def replace_version
+    def replace_gem_version
       Dir.chdir(@dir) do
-        self.class.replace_file(
+        replace_file(
           "lib/#{name.tr("-", "/")}/version.rb",
           /def self\.version(\s*)"[^"]*"/,
           "def self.version\\1\"#{version}\""
@@ -63,6 +64,16 @@ module Decidim
       end
     end
 
+    def replace_package_version
+      Dir.chdir(@dir) do
+        replace_file(
+          "package.json",
+          /^  "version": "[^"]*"/,
+          "  \"version\": \"#{semver_friendly_version(version)}\""
+        )
+      end
+    end
+
     def short_name
       name.gsub(/decidim-/, "")
     end
@@ -85,14 +96,12 @@ module Decidim
       end
 
       def replace_versions
-        replace_file(
-          "package.json",
-          /^  "version": "[^"]*"/,
-          "  \"version\": \"#{semver_friendly_version}\""
-        )
-
         all_dirs do |dir|
-          new(dir).replace_version
+          new(dir).replace_gem_version
+        end
+
+        package_dirs do |dir|
+          new(dir).replace_package_version
         end
       end
 
@@ -129,6 +138,14 @@ module Decidim
         end
       end
 
+      def run_packages(command, out: $stdout)
+        package_dirs do |dir|
+          status = new(dir).run(command, out: out)
+
+          break unless status || ENV["FAIL_FAST"] == "false"
+        end
+      end
+
       def version
         @version ||= File.read(version_file).strip
       end
@@ -146,20 +163,26 @@ module Decidim
         dirs.each { |dir| yield(dir) }
       end
 
+      def package_dirs
+        dirs = Dir.glob("#{root}/packages/*")
+
+        dirs.each { |dir| yield(dir) }
+      end
+
       def plugins
         Dir.glob("#{root}/decidim-*/")
       end
 
+      def semver_friendly_version(a_version)
+        a_version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev").gsub(/.rc(\d*)/, "-rc\\1")
+      end
+
       private
 
       def root
         File.expand_path(File.join("..", ".."), __dir__)
       end
 
-      def semver_friendly_version
-        version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev").gsub(/.rc(\d*)/, "-rc\\1")
-      end
-
       def version_file
         File.join(root, ".decidim-version")
       end
@@ -167,6 +190,8 @@ module Decidim
 
     private
 
+    delegate :plugins, :replace_file, :semver_friendly_version, :version, to: :class
+
     def interpolated_in_folder(command)
       Dir.chdir(@dir) do
         yield command.gsub("%version", version).gsub("%name", name)
@@ -178,11 +203,7 @@ module Decidim
     end
 
     def name
-      self.class.plugins.map { |name| File.expand_path(name) }.include?(@dir) ? folder_name : "decidim"
-    end
-
-    def version
-      self.class.version
+      plugins.map { |name| File.expand_path(name) }.include?(@dir) ? folder_name : "decidim"
     end
   end
 end

data/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.24.3"
+    "0.25.0.rc4"
   end
 end

data/lib/decidim.rb

@@ -23,7 +23,3 @@ require "decidim/accountability"
 require "decidim/debates"
 require "decidim/sortitions"
 require "decidim/blogs"
-
-# Module declaration.
-module Decidim
-end

data/lib/tasks/decidim_tasks.rake

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+def ensure_log_goes_to_stdout
+  old_logger = Webpacker.logger
+  Webpacker.logger = ActiveSupport::Logger.new($stdout)
+  yield
+ensure
+  Webpacker.logger = old_logger
+end
+
+namespace :decidim do
+  namespace :webpacker do
+    desc "Install deps with npm"
+    task :npm_install do
+      Dir.chdir(File.join(__dir__, "../..")) do
+        system "npm install"
+      end
+    end
+
+    desc "Compile JavaScript packs using webpack for production with digests"
+    task compile: [:npm_install, :environment] do
+      Webpacker.with_node_env("production") do
+        ensure_log_goes_to_stdout do
+          if Decidim.webpacker.commands.compile
+            # Successful compilation!
+            puts "SUCCESS"
+            Dir.chdir(File.join(__dir__, "../..")) do
+              system "cp -r public/* #{Rails.root.join("public")}"
+            end
+          else
+            # Failed compilation
+            puts "FAIL"
+            exit!
+          end
+        end
+      end
+    end
+  end
+end
+
+def npm_install_available?
+  rails_major = Rails::VERSION::MAJOR
+  rails_minor = Rails::VERSION::MINOR
+
+  rails_major > 5 || (rails_major == 5 && rails_minor >= 1)
+end
+
+def enhance_assets_precompile
+  # npm:install was added in Rails 5.1
+  deps = npm_install_available? ? [] : ["decidim:webpacker:npm_install"]
+  Rake::Task["assets:precompile"].enhance(deps) do
+    Rake::Task["decidim:webpacker:compile"].invoke
+  end
+end
+
+# Compile packs after we've compiled all other assets during precompilation
+skip_webpacker_precompile = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
+
+unless skip_webpacker_precompile
+  if Rake::Task.task_defined?("assets:precompile")
+    enhance_assets_precompile
+  else
+    Rake::Task.define_task("assets:precompile" => "decidim:webpacker:compile")
+  end
+end
+
+namespace :decidim do
+  namespace :assets do
+    desc "Remove 'node_modules' folder"
+    task rm_node_modules: :environment do
+      Dir.chdir(File.join(__dir__, "../..")) do
+        puts "Removing node_modules folder"
+        system "rm -rf node_modules"
+      end
+    end
+  end
+end
+
+def enhance_assets_clean
+  # npm:install was added in Rails 5.1
+  Rake::Task["assets:clean"].enhance([]) do
+    Rake::Task["decidim:assets:rm_node_modules"].invoke
+  end
+end
+
+unless skip_webpacker_precompile
+  if Rake::Task.task_defined?("assets:clean")
+    enhance_assets_clean
+  else
+    Rake::Task.define_task("assets:clean" => "decidim:assets:rm_node_modules")
+  end
+end