muwu 3.0.0.beta2 → 3.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004b5b4bcff5064b7e92494afb02f04b34947f44d139c92bb9ad329d4ca5abfb
-  data.tar.gz: 2f1e3a3d6c973488921ed9904b1afdd698a251b21ec88639a514960e32f5955b
+  metadata.gz: 0a763a6ef4bc3f58893ea96ce27730e5bfc906b4fcc64aa587421413b8cc9e55
+  data.tar.gz: be89ad33637f0d913fa990f8b997672be8a5d1d775411225a2db8e7dbbec1651
 SHA512:
-  metadata.gz: e2ad7a17cbbf04131c7a2377d032df0e0def82349b7dcb64ec07e79846f500fb792c3452882235acf8a34b7be91f75a7ab617e41e3c0c2fbc681e5c88875a31b
-  data.tar.gz: e3da5b0145e28f1bf7a944900e11c5f33b6b5f9c40739f72557154ce90221ed457a9474cf230da6ba0b7caa7176009227e044e2509d39ab2401c17001cf42bf3
+  metadata.gz: 7583d200eccf408768f7f19c58a20ce453c97f562663daa3afd2336015ee3863c7784a5a8a59bac3d948c35d866a4d790df9c65630288dfbefb8c1c38fce89c8
+  data.tar.gz: 2b54db763ffcd73e063a01887b31240bf7db6e60bf9e98d0224fe48f1bce99f91f2b86f76c2c92ccb2f9374a5eacd29951000a8cb47346d00b9f2bbd0edae618

data/lib/muwu.rb

@@ -1,7 +1,7 @@
 module Muwu
 
 
-  VERSION = '3.0.0.beta2'
+  VERSION = '3.0.0.beta4'
 
   GEM_HOME_LIB = File.absolute_path(File.join(File.dirname(__FILE__)))
   GEM_HOME_LIB_MUWU = File.absolute_path(File.join(GEM_HOME_LIB, 'muwu'))

data/lib/muwu/cli/help/publish

@@ -2,8 +2,19 @@
   - Publishes compiled documents currently in `compiled/` to a remote location
     using rsync. Rsync must be installed on the local system.
 
-  - [options]
-    - dry-run: invoke the rsync '-n' switch to show which files will be
-        transferred, but do not actually transfer any files.
+- [options]
+  - Muwu will pass any further command-line arguments to rsync. See the rsync
+    man page for more information about valid rsync options.
+
+  - Other useful options: (verify against the rsync man page before using)
+      --delete    Delete files from the target host that aren't present on the
+                    source host.
+      --dry-run   Show which changes would be made, but don't perform them.
+      --update    Only update the files on the target host that have older
+                    timestamps than on the source; do not change files on the
+                    target host that have newer timestamps.
+
+* [options] for rsync can also be specified in 'options.yml' using the
+  'rsync_options' value.
 
 * Specify the remote host in 'options.yml' using the 'remote_publish' value.

data/lib/muwu/cli/help/sync

@@ -12,11 +12,6 @@
   - Muwu will pass any further command-line arguments to rsync. See the rsync
     man page for more information about valid rsync options.
 
-  - Muwu will automatically include the following options:
-      --itemize-changes
-      --recursive
-      --verbose
-
   - Other useful options: (verify against the rsync man page before using)
       --delete    Delete files from the target host that aren't present on the
                     source host.
@@ -25,4 +20,7 @@
                     timestamps than on the source; do not change files on the
                     target host that have newer timestamps.
 
+* [options] for rsync can also be specified in 'options.yml' using the
+  'rsync_options' value.
+
 * Specify the remote host in 'options.yml' using the 'remote_sync' value.

data/lib/muwu/default/default.rb

@@ -44,6 +44,7 @@ module Muwu
       render_section_numbers: true,
       render_sections_distinctly_depth_max: nil,
       render_title_section_metadata: ['title', 'subtitle', 'author'],
+      rsync_options: '--itemize-changes --recursive --verbose',
       warning_if_parent_heading_lacks_source: true
     }
 

data/lib/muwu/project_options/project_options.rb

@@ -25,6 +25,7 @@ module Muwu
       :render_section_numbers,
       :render_sections_distinctly_depth_max,
       :render_title_section_metadata,
+      :rsync_options,
       :warning_if_parent_heading_lacks_source
     )
 

data/lib/muwu/project_options_builder/project_option_validator_value.rb

@@ -308,6 +308,11 @@ module Muwu
     end
 
 
+    def validate_option_rsync_options
+      return value_provided_as_array
+    end
+
+
     def validate_option_warning_if_parent_heading_lacks_source
       return validate_option_boolean
     end

data/lib/muwu/publish/publish.rb

@@ -6,38 +6,13 @@ module Muwu
 
 
     def initialize(project, args: [])
-      # @documents_css = project.manifest.documents_css
-      # @documents_html = project.manifest.documents_html
-      # @documents_js = project.manifest.documents_js
-      # @path_local = project.path_compiled
-      # @path_remote = project.options.remote_publish
       @path_local = project.path_compiled + File::SEPARATOR
       @path_remote = project.options.remote_publish
       @project = project
-
-      switches = ['i','r','v']
-      @args = args.map { |a| a.to_s.downcase }
-      if @args.include?('dry-run')
-        @dry_run = true
-        switches << 'n'
-      end
-      @switches = switches.sort.join
+      @switches = args.push(project.options.rsync_options).sort.join(' ')
     end
 
 
-    # def up
-    #   if @project.exceptions_include?(ProjectException::OptionRemotePublishValueNil)
-    #     raise ProjectExceptionHandler::Fatal.new(ProjectException::OptionRemotePublishValueNil.new)
-    #   else
-    #     filenames = []
-    #     filenames << @documents_css.map { |d| d.destination.filename }
-    #     filenames << @documents_html.map { |d| d.destination.filename }
-    #     filenames << @documents_js.map { |d| d.destination.filename }
-    #     filenames.flatten.each { |f| scp f }
-    #   end
-    # end
-
-
     def up
       if @project.exceptions_include?(ProjectException::OptionRemotePublishValueNil)
         raise ProjectExceptionHandler::Fatal.new(ProjectException::OptionRemotePublishValueNil.new)
@@ -56,9 +31,9 @@ module Muwu
         puts "source: #{source.inspect}"
         puts "target: #{target.inspect}"
         puts "args: #{@args}"
-        puts "switches: -#{@switches}"
+        puts "switches: #{@switches}"
         begin
-          system "rsync -#{@switches} #{source} #{target}", exception: true
+          system "rsync #{@switches} #{source} #{target}", exception: true
         rescue Errno::ENOENT
           raise ProjectExceptionHandler::Fatal.new(ProjectException::RsyncNotAvailable.new)
         end
@@ -66,6 +41,16 @@ module Muwu
     end
 
 
+    def exec_rsync_demo(source: nil, target: nil)
+      if source && target
+        puts "** demo rsync"
+        puts "source: #{source.inspect}"
+        puts "target: #{target.inspect}"
+        puts "switches: #{@switches}"
+        puts "command: rsync #{@switches} #{source} #{target}"
+      end
+    end
+
 
     # def scp(filename)
     #   filename_local = File.join(@path_local, filename)
@@ -78,6 +63,5 @@ module Muwu
     # end
 
 
-
   end
 end

data/lib/muwu/sync/sync.rb

@@ -9,7 +9,7 @@ module Muwu
       @path_local = project.working_directory + File::SEPARATOR
       @path_remote = project.options.remote_sync
       @project = project
-      @switches = args.push('--itemize-changes', '--recursive', '--verbose').sort.join(' ')
+      @switches = args.push(project.options.rsync_options).sort.join(' ')
     end
 
 
@@ -60,9 +60,10 @@ module Muwu
 
     def exec_rsync_demo(source: nil, target: nil)
       if source && target
+        puts "** demo rsync"
         puts "source: #{source.inspect}"
         puts "target: #{target.inspect}"
-        puts "switches: -#{@switches}"
+        puts "switches: #{@switches}"
         puts "command: rsync #{@switches} #{source} #{target}"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muwu
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta4
 platform: ruby
 authors:
 - Eli Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker