electric_monk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eca1985ed6f721ba7fadd3aeadeb1dc4ca91b8c
-  data.tar.gz: 80aff1f5707dc05e6ca2d7b919a34a9b1ad08479
+  metadata.gz: 5fdfdaae4c92e5e8022a74520096288cb223d15a
+  data.tar.gz: '05250191c08281ba24c7ed36ab47741d3bcbebbf'
 SHA512:
-  metadata.gz: 3f5a7204eecb4c4cbed24ce4266df0312c6f061aac1d38d680b91f4b7dee510a55340558e42394441cd0599bbcf761eb434199f381912b0b84c76c1a3192741b
-  data.tar.gz: 35d8c63a5a670b6ce6a089c7cdae131fb679ecd9bb297b1b3d97a80863794343dfc4c6caec37a33f35edbd49d3fc1bf206497816c328497ad642ad2098e44d32
+  metadata.gz: e0aa2604ed8edf53aaf82013f52c58f23ce54379f7930c902ef3f10b03d0d52c476b76eceb47ef75f1f0e66f01c1b35600507665533b9b34cb9c4faf126ae0b6
+  data.tar.gz: e099cbc0b6a154aa1b7bf54397179bf9b50ee3af11b7ffe759081daa05622a64c9ba8091c440681bbf7a144926efd6745781ae64f4aab67c23642a3818673f69

data/lib/electric_monk.rb

@@ -6,22 +6,34 @@ require "singleton"
 module ElectricMonk
   class CLI
     attr_reader :config
+    attr_reader :reporter
 
     def initialize(config_path:, reporter: Reporter.instance)
-      @config = Config.new(config_path, reporter)
+      @reporter = reporter
+      @config = Config.new(config_path)
     end
 
     def run
       config.projects.each do |project|
-        project.ensure_existence
+        reporter.start(project.name)
+
+        unless project.exists?
+          reporter.update_progress("Cloning #{project.name}")
+          project.clone_project
+        end
+
+        if project.valid?
+          reporter.fail(project.failures)
+        else
+          reporter.succeed(project.name)
+        end
       end
     end
   end
 
   class Config
-    def initialize(path, reporter)
+    def initialize(path)
       @config = TomlRB.load_file(path)
-      @reporter = reporter
     end
 
     def root
@@ -33,8 +45,7 @@ module ElectricMonk
         Project.new(
           root: root,
           name: name,
-          origin: attributes.fetch("origin"),
-          reporter: @reporter
+          origin: attributes.fetch("origin")
         )
       end
     end
@@ -44,35 +55,32 @@ module ElectricMonk
     attr_reader :root
     attr_reader :name
     attr_reader :origin
-    attr_reader :reporter
+    attr_reader :failures
 
-    def initialize(root:, name:, origin:, reporter:)
+    def initialize(root:, name:, origin:)
       @root = root
       @name = name
       @origin = origin
-      @reporter = reporter
     end
 
-    def ensure_existence
-      if exists?
-        if remote_correct?
-          if dirty_files?
-            reporter.warn("#{name}: #{dirty_files} dirty files")
-          elsif unpushed_commits?
-            reporter.warn("#{name}: #{unpushed_commits} unpushed commits")
-          else
-            reporter.info(name)
-          end
-        else
-          reporter.warn("#{name}: Wrong remote '#{current_remote}'")
+    def valid?
+      if remote_correct?
+        if dirty_files? || unpushed_commits?
+          @failures = "#{name}: #{dirty_files} dirty files and #{unpushed_commits} unpushed commits"
         end
       else
-        reporter.wait("Cloning #{name}", name) do
-          clone_project
-        end
+        @failures = "#{name}: Wrong remote '#{current_remote}'"
       end
     end
 
+    def exists?
+      File.exist?(path)
+    end
+
+    def clone_project
+      execute("git clone #{origin} #{name}", chdir: root)
+    end
+
     private
 
     def dirty_files?
@@ -95,18 +103,10 @@ module ElectricMonk
       execute("git remote get-url origin", chdir: path)
     end
 
-    def clone_project
-      execute("git clone #{origin} #{name}", chdir: root)
-    end
-
     def remote_correct?
       origin == current_remote
     end
 
-    def exists?
-      File.exist?(path)
-    end
-
     def path
       File.join(root, name)
     end
@@ -119,32 +119,34 @@ module ElectricMonk
   class Reporter
     include Singleton
 
-    def info(msg)
-      puts "✓ #{msg}"
-    end
-
-    def warn(msg)
-      puts "✗ #{msg}"
-    end
+    def start(task_name)
+      @task_name = task_name
+      @final_message = nil
 
-    def wait(waiting_msg, done_msg)
-      chars = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].cycle
-      show_spinner = true
-
-      spinner = Thread.new do
-        while show_spinner do
-          print "#{chars.next} #{waiting_msg}"
+      @spinner = Thread.new do
+        chars = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].cycle
+        until @final_message do
+          current_task_name = @task_name
+          print "#{chars.next} #{current_task_name}"
           sleep 0.1
-          print "\b" * (waiting_msg.length + 2)
+          print "\b \b" * (current_task_name.length + 2)
         end
-        padding = waiting_msg.length > done_msg.length ? " " * (waiting_msg.length - done_msg.length) : ""
-        info(done_msg + padding)
+        puts @final_message
       end
+    end
+
+    def update_progress(task_name)
+      @task_name = task_name
+    end
+
+    def succeed(msg)
+      @final_message = "✓ #{msg}"
+      @spinner.join
+    end
 
-      yield.tap {
-        show_spinner = false
-        spinner.join
-      }
+    def fail(msg)
+      @final_message = "✗ #{msg}"
+      @spinner.join
     end
   end
 end

data/lib/electric_monk/version.rb

@@ -1,3 +1,3 @@
 module ElectricMonk
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: electric_monk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lucas Dohmen