monoz 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8690b4b3d6adc785adfa22b77c24f72fb2524aa57f337b9d58723b29d9c95e37
-  data.tar.gz: ffce67da4773d0a25c7c0844fcbe35e5ee21b6e8aff7ada1541e5cf7fdaf6feb
+  metadata.gz: 6625aa97c175ce57eaff342c214f583d6ab09487d097b578ceedabfe6363cbdd
+  data.tar.gz: 145ca2d3ac1e2d07fc4ec4a10b2e560ab7724d5544d270ce5ea3eb5ebbbdfbda
 SHA512:
-  metadata.gz: bf09e686e3baddbe8bb618d7372044f0d862a0cbe2b2f787490d98b8d5dce1f40d0c78891c4a910c1d162c3998586d9d96e24671c49a8ea6f23b54d6a4f4fe2d
-  data.tar.gz: 21015ca0dbdf5b9ac345043415156003c1ed02e46244b0ca6f20858a8d9b9d99d35060d6f23a4f44ca9076c2ece7f6868466b0a73bbe660336de79284340f95d
+  metadata.gz: 8c59650aab90cb11f99e137433da29d74fa67de8ae9242edca28b8b68abb25b2358f3952bd47337a8ebb8cb97183b773890142905bbe81772c4a8dc7c72e16c5
+  data.tar.gz: 250473dcdb394005cb58cd4413c7f2eb5103e4ce0935f098e4f85b6a8cebceb0be1789db1dda1f300422d3778d6f07f1929e1b93b0cacee73b574c36c6400416

data/lib/monoz/action.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Monoz
+  class ActionCommand
+    attr_reader :filter, :command
+    def initialize(filter, command)
+      @filter = filter
+      @command = command
+    end
+  end
+
+  class Action
+    attr_reader :name, :commands
+
+    def initialize(name, raw_commands)
+      @name = name
+      @commands = []
+      parse_commands(raw_commands)
+    end
+
+    private
+      def parse_commands(raw_commands)
+        raw_commands.each do |command|
+          @commands << Monoz::ActionCommand.new(command.dig("in"), command.dig("run"))
+        end
+      end
+  end
+end

data/lib/monoz/action_collection.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/module/delegation"
+
+module Monoz
+  class ActionCollection
+    include Enumerable
+    delegate_missing_to :@items
+
+    def initialize
+      @items = []
+      populate_items
+    end
+
+    def exist?(name)
+      !!find(name)
+    end
+
+    def find(name)
+      @items.select { |i| i.name == name.to_s }&.first
+    end
+
+    def all
+      @items
+    end
+
+    private
+      def populate_items
+        actions = Monoz.config.dig("actions")
+        return if actions.empty?
+
+        raise "Invalid format, actions must be a hash." unless actions.is_a?(Hash)
+
+        actions.each do |action_name, config_raw_data|
+          @items << Monoz::Action.new(action_name, config_raw_data)
+        end
+      end
+  end
+end

data/lib/monoz/application.rb

@@ -6,7 +6,7 @@ require "fileutils"
 
 module Monoz
   class Application < Thor
-    class_option :tty, type: :boolean, aliases: ["--verbose", "-t"], default: false
+    class_option :verbose, type: :boolean, aliases: ["--tty", "-t"], default: false
     class_option :filter
 
     def initialize(*args)
@@ -49,5 +49,11 @@ module Monoz
     def version
       say "Monoz version: #{Monoz::VERSION}"
     end
+
+    # This method will be called when a command is not found
+    desc "[ACTION]", "Custom action"
+    def method_missing(action_name, *args)
+      Monoz::Services::ActionService.new(self).call(action_name)
+    end
   end
 end

data/lib/monoz/project_collection.rb

@@ -11,7 +11,7 @@ module Monoz
 
     def initialize(file_path)
       @items = []
-      project_folders = Monoz.config.dig("folders") || ["apps", "gems"]
+      project_folders = Monoz.folders
 
       search_paths = project_folders.map { |folder| File.join(file_path, folder) }
 

data/lib/monoz/services/action_service.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "yaml"
+require "fileutils"
+
+module Monoz
+  module Services
+    class ActionService < Monoz::Services::BaseService
+      def call(action)
+        @action = Monoz.actions.find(action)
+        say_invalid_action(action) if @action.nil?
+        Monoz.verbose = true
+        run_action
+      end
+
+      private
+        def run_action
+          say "Running Monoz action: "
+          say @action.name, [:bold, :blue]
+
+          @action.commands.each do |action_command|
+            projects = Monoz.projects.filter(action_command.filter).order(:dependants)
+            command = action_command.command.split(" ")
+            Monoz::Services::RunService.new(self).call(projects, *command)
+          end
+        end
+
+        def say_invalid_action(cmd_or_action)
+          say "Error: The command or action ", :red
+          say "#{cmd_or_action} ", [:red, :bold]
+          say "does not exist.", [:red]
+          exit(1)
+        end
+    end
+  end
+end

data/lib/monoz/services/run_service.rb

@@ -2,68 +2,26 @@
 
 require "yaml"
 require "fileutils"
-require "open3"
+require "pty"
 
 module Monoz
-  class Spinner
-    include Thor::Shell
+  module Responses
+    class RunServiceResponse
+      attr_reader :output, :exit_code
 
-    def initialize(message, prefix: nil)
-      @spinner = nil
-      @message = message
-      @prefix = prefix
-    end
-
-    def start
-      @spinner = main
-      self
-    end
-
-    def success!
-      @spinner.kill
-      say_formatted(" \u2713 ", [:bold, :green])
-      say() # line break
-    end
-
-    def error!
-      @spinner.kill
-      say_formatted(" \u2717 ", [:bold, :red])
-      say() # line break
-    end
-
-    private
-      def reset
-        say("\r", nil, false)
+      def initialize(output, exit_code)
+        @output = output
+        @exit_code = exit_code
       end
 
-      def say_formatted(suffix, suffix_formatting = nil)
-        if @prefix != nil
-          say "\r[#{@prefix}] ", [:blue, :bold], nil
-          say @message, nil, false
-          say suffix, suffix_formatting, false
-        else
-          say "\r#{@message}", nil, false
-          say suffix, suffix_formatting, false
-        end
+      def success?
+        exit_code == 0
       end
 
-      def main
-        spinner_count = 0
-
-        Thread.new do
-          loop do
-            dots = case spinner_count % 3
-                   when 0 then "."
-                   when 1 then ".."
-                   when 2 then "..."
-            end
-
-            say_formatted(dots)
-            spinner_count += 1
-            sleep(0.5)
-          end
-        end
+      def failed?
+        !!success?
       end
+    end
   end
 
   module Services
@@ -71,27 +29,17 @@ module Monoz
       attr_reader :errors, :warnings
 
       def initialize(thor_instance)
+        super(thor_instance)
         @projects = nil
         @errors = []
         @warnings = []
-        super(thor_instance)
-      end
-
-      def success?
-        !errors? && !warnings?
-      end
-
-      def errors?
-        @errors.any?
-      end
-
-      def warnings?
-        @warnings.any?
+        @command = []
       end
 
       def call(projects, *command)
-        raise ArgumentError.new("Missing command") if command.empty?
+        raise ArgumentError, "Missing command" if command.empty?
 
+        @command = command
         if projects.is_a?(Monoz::ProjectCollection)
           @projects = projects.all
         elsif projects.is_a?(Monoz::Project)
@@ -100,37 +48,16 @@ module Monoz
           raise "Invalid projects"
         end
 
-        @projects.each do |project|
-          # say "#{project.name}: ", [:bold, :blue]
-          # Monoz.tty? ? say(command.join(" ")) : say("#{command.join(" ")} ")
-
-          if Monoz.tty?
-            say "[#{project.name}] ", [:blue, :bold], nil
-            say command.join(" ")
-          else
-            spinner = Monoz::Spinner.new(command.join(" "), prefix: project.name).start
-          end
-
-          response = run_commands_in_project(project, *command)
-
-          if response.success?
-            spinner.success! unless Monoz.tty?
-          else
-            spinner.error! unless Monoz.tty?
-            say response.output
-            say "" # line break
-            @errors << {
-              project: project.name,
-              command: command.join(" "),
-              exit_code: response.exit_code,
-              output: response.output
-            }
-          end
-        end
+        say "Running ", nil, false
+        say command.join(" "), [:bold], false
+        say " in #{@projects.map { |p| p.name }.join(", ")}:"
 
+        say ""
+        run_commands
         say ""
 
         if errors?
+          say ""
           say "Error: The command ", :red
           say "#{command.join(" ")} ", [:red, :bold]
           say "failed to run in one or more project directories", [:red]
@@ -138,32 +65,74 @@ module Monoz
         end
       end
 
+      def success?
+        !errors? && !warnings?
+      end
+
+      def errors?
+        @errors.any?
+      end
+
+      def warnings?
+        @warnings.any?
+      end
+
       private
-        def run_commands_in_project(project, *command)
-          raise ArgumentError.new("Invalid command") if command.empty?
+        def run_commands
+          @projects.each do |project|
+            if spinner?
+              spinner = Monoz::Spinner.new(@command.join(" "), prefix: project.name).start
+            else
+              say "[#{project.name}] ", [:blue, :bold], nil
+              say @command.join(" ")
+            end
+
+            response = run_in_project(project, *@command)
+
+            if response.success?
+              spinner&.success! if spinner?
+            else
+              spinner&.error! if spinner?
+              say response.output
+              say "" # line break
+              @errors << {
+                project: project.name,
+                command: @command.join(" "),
+                exit_code: response.exit_code,
+                output: response.output
+              }
+            end
+          end
+        end
+
+        def spinner?
+          !Monoz.verbose?
+        end
+
+        def run_in_project(project, *command)
+          raise ArgumentError, "Invalid command" if command.empty?
 
           output = ""
           exit_status = nil
 
           FileUtils.chdir(project.root_path) do
-            if Monoz.tty?
-              Open3.popen2e(*command.map { |arg| Shellwords.escape(arg) }) do |stdin, stdout_err, wait_thr|
-                while line = stdout_err.gets
+            PTY.spawn(*command.map { |arg| Shellwords.escape(arg) }) do |stdout, stdin, pid|
+              begin
+                stdout.each do |line|
                   output += line
-                  print line
+                  print line if Monoz.verbose?
                 end
-
-                exit_status = wait_thr.value.exitstatus
+              rescue Errno::EIO
               end
 
-              say ""
-            else
-              output, status = Open3.capture2e(*command.map { |arg| Shellwords.escape(arg) })
-              exit_status = status.exitstatus
+              Process.wait(pid)
+              exit_status = $?.exitstatus
             end
           end
 
-          return Monoz::Responses::CaptureRunResponse.new(output, exit_status)
+          Monoz::Responses::RunServiceResponse.new(output, exit_status)
+        rescue Errno::ENOENT => e
+          Monoz::Responses::RunServiceResponse.new(e.message, 1)
         end
     end
   end

data/lib/monoz/spinner.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Monoz
+  class Spinner
+    include Thor::Shell
+
+    def initialize(message, prefix: nil)
+      @spinner = nil
+      @message = message
+      @prefix = prefix
+    end
+
+    def start
+      @spinner = main
+      self
+    end
+
+    def success!
+      @spinner.kill
+      say_formatted(" \u2713 ", [:bold, :green])
+      say() # line break
+    end
+
+    def error!
+      @spinner.kill
+      say_formatted(" \u2717 ", [:bold, :red])
+      say() # line break
+    end
+
+    private
+      def reset
+        say("\r", nil, false)
+      end
+
+      def say_formatted(suffix, suffix_formatting = nil)
+        if @prefix != nil
+          say "\r[#{@prefix}] ", [:blue, :bold], nil
+          say @message, nil, false
+          say suffix, suffix_formatting, false
+        else
+          say "\r#{@message}", nil, false
+          say suffix, suffix_formatting, false
+        end
+      end
+
+      def main
+        spinner_count = 0
+
+        Thread.new do
+          loop do
+            dots = case spinner_count % 3
+                   when 0 then "."
+                   when 1 then ".."
+                   when 2 then "..."
+            end
+
+            say_formatted(dots)
+            spinner_count += 1
+            sleep(0.5)
+          end
+        end
+      end
+  end
+end

data/lib/monoz/version.rb

@@ -1,3 +1,3 @@
 module Monoz
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 end

data/lib/monoz.rb

@@ -11,35 +11,20 @@ module Monoz
     class ConfigurationNotFound < StandardError; end
   end
 
-  module Responses
-    class CaptureRunResponse
-      attr_reader :output, :exit_code
-
-      def initialize(output, exit_code)
-        @output = output
-        @exit_code = exit_code
-      end
-
-      def success?
-        exit_code == 0
-      end
-
-      def error?
-        exit_code == 1
-      end
-    end
-  end
-
   module Services
+    autoload "ActionService", "monoz/services/action_service"
     autoload "BaseService", "monoz/services/base_service"
     autoload "InitService", "monoz/services/init_service"
     autoload "RunService", "monoz/services/run_service"
   end
 
+  autoload "Action", "monoz/action"
+  autoload "ActionCollection", "monoz/action_collection"
   autoload "Application", "monoz/application"
   autoload "Configuration", "monoz/configuration"
   autoload "Project", "monoz/project"
   autoload "ProjectCollection", "monoz/project_collection"
+  autoload "Spinner", "monoz/spinner"
 
   class << self
     def app
@@ -54,12 +39,24 @@ module Monoz
       @config ||= Monoz::Configuration.new(pwd)
     end
 
+    def actions
+      @actions ||= Monoz::ActionCollection.new
+    end
+
     def options
       @app&.options
     end
 
-    def tty?
-      Monoz.options.dig("tty") == true
+    def folders
+      config.dig("folders") || ["apps", "gems"]
+    end
+
+    def verbose?
+      @verbose ||= Monoz.options.dig("verbose") == true
+    end
+
+    def verbose=(value)
+      @verbose = value
     end
 
     def projects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monoz
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - kjellberg
@@ -64,13 +64,17 @@ files:
 - README.md
 - bin/monoz
 - lib/monoz.rb
+- lib/monoz/action.rb
+- lib/monoz/action_collection.rb
 - lib/monoz/application.rb
 - lib/monoz/configuration.rb
 - lib/monoz/project.rb
 - lib/monoz/project_collection.rb
+- lib/monoz/services/action_service.rb
 - lib/monoz/services/base_service.rb
 - lib/monoz/services/init_service.rb
 - lib/monoz/services/run_service.rb
+- lib/monoz/spinner.rb
 - lib/monoz/version.rb
 homepage: https://github.com/kjellberg/monoz
 licenses:
@@ -94,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Command line tool for managing ruby monorepos.