multisync 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b40dd5c5699b8fe754bd06fc636e2675694bd300ee28a39eca17ee6ef50bfb7
-  data.tar.gz: 5b532fefc45be4f36aad50f943aae553502e858e91a3c739dd0dc38184998eab
+  metadata.gz: d0293de3d6bf07fd58fcaf551c5469aad676d1b51682dcf58a59b85024dbe1f5
+  data.tar.gz: 55170bd7e42c82b2f3e3dcb7c5a9caede2ad53980611f209d7adad2c2a613ffc
 SHA512:
-  metadata.gz: dcf5932ebd4519b0b32a68746cbfc9eb5398d4279bc62f86d2ec00d706b28f4ab979a79529b6523f21bff9cef9b76c707676d17c0e9e1bcf073518580a786285
-  data.tar.gz: c71f270b5e0000c7a41a7481b6e4321c5fe359bf2a6c4bc78ff634c9ec282441ae8866b156908901af4f8e57c380d65866219334d8f7127371d688c1d09263f8
+  metadata.gz: bf970e9e365204d4af64b975ec165ba616f17bcf90fb6e752cf22348dccf8c515d57471ea22b4410bee8a38fa2de08030922835b8d43eac1bcf88c434bd187a5
+  data.tar.gz: 4ce7a0b3dc4d9317883558e2c137c2da63e2ed4c8a9a103dffa6e4d24a3ae74f15af04ac07036f4868dc9e5425b769503d5be514df213035d1d34a0e5ab8b46c

data/lib/multisync.rb

@@ -4,6 +4,9 @@ module Multisync
   autoload :Cli, 'multisync/cli'
   autoload :Definition, 'multisync/definition'
   autoload :Catalog, 'multisync/catalog'
+  autoload :Selector, 'multisync/selector'
   autoload :Runtime, 'multisync/runtime'
   autoload :RsyncStat, 'multisync/rsync_stat'
+  autoload :Summary, 'multisync/summary'
+  autoload :List, 'multisync/list'
 end

data/lib/multisync/catalog.rb

@@ -1,8 +1,5 @@
 
 class Multisync::Catalog
-  autoload :List, 'multisync/catalog/list'
-  autoload :Filter, 'multisync/catalog/filter'
-  
   # top entity of definition
   attr_reader :definition
 
@@ -16,18 +13,10 @@ class Multisync::Catalog
     end
   end
   
-  def list
-    catalog_list = Multisync::Catalog::List.new
-    definition.accept(catalog_list)
-    catalog_list.result
+  def traverse visitor
+    definition.accept visitor
   end
   
-  def filter sets
-    catalog_filter = Multisync::Catalog::Filter.new sets
-    definition.accept(catalog_filter)
-    catalog_filter.result
-  end
-
   def path
     return @path if File.exist? @path
     sample_path = File.expand_path('../../../sample/multisync.rb', __FILE__)

data/lib/multisync/cli.rb

@@ -1,3 +1,4 @@
+
 require 'optparse'
 require 'rainbow/ext/string'
 require 'terminal-table'
@@ -43,73 +44,39 @@ class Multisync::Cli
   
   def start
     parser.parse!
-    @sets = ARGV
+    options[:quiet] = false if options[:print]
     
-    case
-    when options[:list]
-      list_definitions
-    else
-      run_tasks
-    end
-    puts
-  end
-  
-  def list_definitions
-    puts "Catalog: #{options[:file].color(:cyan)}"
-    table = Terminal::Table.new(rows: catalog.list, style: table_style)
-    puts
-    puts table
-  end
-  
-  def run_tasks
-    begin
-      tasks.each do |task|
-        runtime.run task
-      end
-      return if options[:print]
-    rescue Interrupt => e
-      $stderr.puts "\nAborted!".color(:red)
-    end
-    table = Terminal::Table.new(headings: summary_headings, rows: summary_data, style: table_style)
-    puts
-    puts
-    puts table
-  end
-  
-  def summary_headings
-    %w( Source Destination Files + - → ∑ ↑ ).zip(%i( left left right right right right right right )).map{|v,a| {value: v, alignment: a} }
-  end
-  
-  def summary_data
-    # Exclude tasks with an empty result (> not run) first
-    tasks.map do |task|
-      result = task.result
-      desc = [task.source_description, "--> #{task.destination_description}"]
-
-      case result[:action]
-      when :run
-        if result[:status] && result[:status].success?
-          # successfull run
-          stat = Multisync::RsyncStat.new(result[:stdout]).parse
-          [*desc, *stat.to_a.map{|e| {value: e.color(:green), alignment: :right} } ]
-        else
-          # failed or interrupted run
-          [*desc, { value: (result[:stderr] || 'n/a').strip.color(:red), colspan: 6 } ]
-        end
+    @sets = ARGV
 
-      when :skip
-        # skiped sync
-        [*desc, { value: result[:skip_message].color(:yellow), colspan: 6 } ]
+    if options[:list]
+      # List tasks
+      puts "Catalog: #{options[:file].color(:cyan)}"
+      puts
+      puts Multisync::List.new catalog
 
-      else
-        # not executed
-        [*desc, { value: 'not executed'.faint, colspan: 6 } ]
+    else
+      # Run tasks
+      return if tasks.empty?
+      begin
+        tasks.each do |task|
+          runtime.run task
+        end
+      rescue Interrupt => e
+        $stderr.puts "\nAborted!".color(:red)
+      end
+      unless options[:print]
+        puts
+        puts
+        puts Multisync::Summary.new tasks
       end
     end
+
+    puts
   end
   
   def tasks
-    @_tasks ||= catalog.filter sets
+    @_tasks ||= Multisync::Selector.new(catalog, sets).tasks
+    # @_tasks ||= catalog.filter sets
   end
   
   def catalog
@@ -130,8 +97,4 @@ class Multisync::Cli
       timeout: 31536000, # 1 year
     }
   end
-  
-  def table_style
-    { border_top: false,  border_bottom: false, border_x: '–', border_y: '', border_i: '', padding_left: 0, padding_right: 3 }
-  end
 end

data/lib/multisync/list.rb

@@ -0,0 +1,44 @@
+
+require 'rainbow/ext/string'
+
+class Multisync::List
+  
+  # Given catalog
+  attr_reader :catalog
+  
+  # Tasks
+  attr_reader :tasks
+
+  def initialize catalog
+    @catalog = catalog
+    @tasks = []
+  end
+  
+  def to_s
+    catalog.traverse self
+    table.to_s
+  end
+  
+  def table
+    Terminal::Table.new(rows: tasks, style: table_style)
+  end
+  
+  def visit subject, level
+    if level > 0
+      tab = ''.ljust(2*(level-1), ' ')
+      default = subject.default? ? ' *' : ''
+      name = "#{tab}#{subject.name}#{default}"
+      tasks << [name, *description(subject).map(&:faint)]
+      # puts "#{name.ljust(32, ' ')}#{description(subject)}"
+    end
+  end
+  
+  def description subject
+    desc = [subject.source_description, subject.destination_description]
+    desc.any?(&:empty?) ? [] : [desc.first, ['--> ', desc.last].join]
+  end
+
+  def table_style
+    { border_top: false,  border_bottom: false, border_x: '–', border_y: '', border_i: '', padding_left: 0, padding_right: 3 }
+  end
+end

data/lib/multisync/runtime.rb

@@ -81,7 +81,7 @@ class Multisync::Runtime
       puts rsync.command
     else
       sync.result[:action] = :run
-      puts rsync.command if dryrun?
+      puts rsync.command if dryrun? && !quiet?
       rsync.run_command
       sync.result[:status] = rsync.status
       sync.result[:stdout] = rsync.stdout

data/lib/multisync/{catalog/filter.rb → selector.rb}

@@ -1,16 +1,26 @@
 
-class Multisync::Catalog::Filter
-  # selected sets
+class Multisync::Selector
+  
+  # Given catalog
+  attr_reader :catalog
+  
+  # Given set names
   attr_reader :sets
   
-  # selected subjects
+  # Selected tasks
   attr_reader :result
 
-  def initialize sets
-    @sets = Array(sets)
+  def initialize catalog, sets
+    @catalog = catalog
+    @sets = sets
     @result = []
   end
-
+  
+  def tasks
+    catalog.traverse self
+    result
+  end
+  
   def visit subject, _level
     result << subject if selected?(subject)
   end
@@ -23,4 +33,4 @@ class Multisync::Catalog::Filter
     # subject matches any of the given sets
     sets.any? {|set| /\b#{set}\b/.match subject.fullname }
   end
-end
+end

data/lib/multisync/summary.rb

@@ -0,0 +1,55 @@
+
+class Multisync::Summary
+  
+  # All tasks to include in the summary
+  attr_reader :tasks
+  
+  def initialize tasks
+    @tasks = tasks
+  end
+  
+  def to_s
+    table.to_s
+  end
+  
+  def table
+    Terminal::Table.new(headings: headings, rows: data, style: table_style)
+  end
+  
+  def headings
+    %w( Source Destination Files + - → ∑ ↑ ).zip(%i( left left right right right right right right )).map{|v,a| {value: v, alignment: a} }
+  end
+  
+  def data
+    # Exclude tasks with an empty result (> not run) first
+    tasks.map do |task|
+      result = task.result
+      desc = [task.source_description, "--> #{task.destination_description}"]
+
+      case result[:action]
+      when :run
+        if result[:status] && result[:status].success?
+          # successfull run
+          stat = Multisync::RsyncStat.new(result[:stdout]).parse
+          [*desc, *stat.to_a.map{|e| {value: e.color(:green), alignment: :right} } ]
+        else
+          # failed or interrupted run
+          [*desc, { value: (result[:stderr] || 'n/a').strip.color(:red), colspan: 6 } ]
+        end
+
+      when :skip
+        # skiped sync
+        [*desc, { value: result[:skip_message].color(:yellow), colspan: 6 } ]
+
+      else
+        # not executed
+        [*desc, { value: 'not executed'.faint, colspan: 6 } ]
+      end
+    end
+  end
+  
+  def table_style
+    { border_top: false,  border_bottom: false, border_x: '–', border_y: '', border_i: '', padding_left: 0, padding_right: 3 }
+  end
+
+end

data/lib/multisync/version.rb

@@ -1,3 +1,3 @@
 module Multisync
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multisync
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Patrick Marchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -142,16 +142,17 @@ files:
 - exe/multisync
 - lib/multisync.rb
 - lib/multisync/catalog.rb
-- lib/multisync/catalog/filter.rb
-- lib/multisync/catalog/list.rb
 - lib/multisync/cli.rb
 - lib/multisync/definition.rb
 - lib/multisync/definition/dsl.rb
 - lib/multisync/definition/entity.rb
 - lib/multisync/definition/null.rb
 - lib/multisync/definition/template.rb
+- lib/multisync/list.rb
 - lib/multisync/rsync_stat.rb
 - lib/multisync/runtime.rb
+- lib/multisync/selector.rb
+- lib/multisync/summary.rb
 - lib/multisync/version.rb
 - multisync.gemspec
 - sample/multisync.rb
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DSL for rsync.

data/lib/multisync/catalog/list.rb

@@ -1,24 +0,0 @@
-
-class Multisync::Catalog::List
-  # result
-  attr_reader :result
-
-  def initialize
-    @result = []
-  end
-
-  def visit subject, level
-    if level > 0
-      tab = ''.ljust(2*(level-1), ' ')
-      default = subject.default? ? ' *' : ''
-      name = "#{tab}#{subject.name}#{default}"
-      @result << [name, *description(subject)]
-      # puts "#{name.ljust(32, ' ')}#{description(subject)}"
-    end
-  end
-  
-  def description subject
-    desc = [subject.source_description, subject.destination_description]
-    desc.any?(&:empty?) ? [] : [desc.first, ['--> ', desc.last].join]
-  end
-end