muwu 3.0.0.beta → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd84d886de0b03ecaef0c6cb6eafe2f81e0f36e67b42d1d0a315b76968bff743
-  data.tar.gz: 01fec21c061156be890fd9445b3ba1b86f700893e929a1b51630017b6e5e3985
+  metadata.gz: 004b5b4bcff5064b7e92494afb02f04b34947f44d139c92bb9ad329d4ca5abfb
+  data.tar.gz: 2f1e3a3d6c973488921ed9904b1afdd698a251b21ec88639a514960e32f5955b
 SHA512:
-  metadata.gz: eea61dd2032e8b8d25dd40236342a1a6753be24a3640d971727fd169e592ab78833d9d8152b36198bc7fb9199ceda36154794db2da2d9fb9a96af6165b5f4985
-  data.tar.gz: 7cd2c9592176fb8d45bac5ed55a20f72e20657577656d48c2e97a0781046521fbdcf97a7fc16712e14129ed2ffc92b655c9ddbb6c6432346b1dfd2984389e401
+  metadata.gz: e2ad7a17cbbf04131c7a2377d032df0e0def82349b7dcb64ec07e79846f500fb792c3452882235acf8a34b7be91f75a7ab617e41e3c0c2fbc681e5c88875a31b
+  data.tar.gz: e3da5b0145e28f1bf7a944900e11c5f33b6b5f9c40739f72557154ce90221ed457a9474cf230da6ba0b7caa7176009227e044e2509d39ab2401c17001cf42bf3

data/lib/muwu.rb

@@ -1,7 +1,7 @@
 module Muwu
 
 
-  VERSION = '3.0.0.beta'
+  VERSION = '3.0.0.beta2'
 
   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/cli.rb

@@ -137,7 +137,7 @@ module Muwu
 
 
     def evaluate_command_publish
-      Controller.new(@current_working_directory).publish(@args[1..(@args.length-1)])
+      Controller.new(@current_working_directory).publish(@args[1..-1])
     end
 
 
@@ -164,10 +164,10 @@ module Muwu
 
       else
         case @args[1]
-        when 'down'
-          Controller.new(@current_working_directory).sync_down(@args[2..(@args.length-1)])
-        when 'up'
-          Controller.new(@current_working_directory).sync_up(@args[2..(@args.length-1)])
+        when 'pull'
+          Controller.new(@current_working_directory).sync_pull(@args[2..-1])
+        when 'push'
+          Controller.new(@current_working_directory).sync_push(@args[2..-1])
         else
           puts CliHelp.new(:sync).message
         end

data/lib/muwu/cli/help/compile

@@ -14,9 +14,9 @@
     number of a document.
 
 - muwu compile js
-  - Compile only the javascript library (if applicable) for the project.
+  - Compile only the Javascript library (if applicable) for the project.
 
 * Compiling a project will overwrite any previous output files without
-  any warning. 
-  
-* You can specify output filenames in `options.yml`.
+  any warning.
+
+* Specify output filenames in `options.yml`.

data/lib/muwu/cli/help/summary

@@ -9,10 +9,8 @@ Command line:
   muwu publish          publish to a remote server (requires rsync)
   muwu reset compiled   reset the `compiled/` subdirectory
   muwu reset css        reset the default CSS files
-  muwu sync             syncronize from/to a remote server (requires rsync)
+  muwu sync             synchronize from/to a remote location (requires rsync)
   muwu view             view a compiled project (requires lynx)
 
-All commands operate within the current working directory.
-
 For more detailed instructions:
   muwu help [command]

data/lib/muwu/cli/help/sync

@@ -1,18 +1,28 @@
-- muwu sync [down | up] [options]
-  - Synchronize project from/to a remote location using rsync. Rsync must be
-    installed on the local system.
+- muwu sync (pull/push) [options]
+  - Synchronize the project from/to a remote location using rsync. Rsync must
+    be installed on the local system.
 
-- muwu sync down
+- muwu sync pull
   - Use rsync to download the project from a remote host.
 
-- muwu sync up
-  - Use rsync to upload to project to a remote host.
+- muwu sync push
+  - Use rsync to upload the project to a remote host.
 
 - [options]
-  - dry-run: invoke the rsync '-n' switch to show which files will be
-      transferred, but do not actually transfer any files.
+  - Muwu will pass any further command-line arguments to rsync. See the rsync
+    man page for more information about valid rsync options.
 
-* Specify the remote host in 'options.yml' using the 'remote_sync' value.
+  - 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.
+      --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.
 
-* Muwu will invoke the rsync switches '-r' to recurse subdirectories, and
-  '-v' to give a verbose description
+* Specify the remote host in 'options.yml' using the 'remote_sync' value.

data/lib/muwu/cli/help/view

@@ -1,4 +1,3 @@
 - muwu view
-  - View a compiled porject in `compiled/` using lynx. Lynx must be installed
+  - View a compiled project in `compiled/` using lynx. Lynx must be installed
     on the local system.
-    

data/lib/muwu/controller/controller.rb

@@ -124,22 +124,22 @@ module Muwu
     end
 
 
-    def sync_down(args)
+    def sync_pull(args)
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
         reply_folder_does_not_have_valid_project
       else
-        Sync.new(@project, args: args).down
+        Sync.new(@project, args: args).pull
       end
     end
 
 
-    def sync_up(args)
+    def sync_push(args)
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
         reply_folder_does_not_have_valid_project
       else
-        Sync.new(@project, args: args).up
+        Sync.new(@project, args: args).push
       end
     end
 

data/lib/muwu/controller/controller_interaction.rb

@@ -8,12 +8,24 @@ module Muwu
     def initialize
       @slug = ''
     end
-    
-    
-    
+
+
+
     public
-    
-    
+
+
+    def confirm_reset_compiled(project)
+      render_reset_compiled_heading
+      render_reset_compiled_prompt
+      @answer = $stdin.gets.chomp.strip.downcase
+      if @answer == 'y'
+        return true
+      else
+        return false
+      end
+    end
+
+
     def confirm_reset_css(project)
       render_reset_css_heading(project)
       render_reset_css_prompt
@@ -24,21 +36,21 @@ module Muwu
         return false
       end
     end
-    
-    
+
+
     def request_metadata
       request_metadata_phase_1_render_heading
       request_metadata_phase_2_request_and_set_slug
       { slug: @slug }
     end
-    
-    
+
+
     def request_metadata_phase_1_render_heading
       render_new_project_heading
       render_lf
     end
-    
-    
+
+
     def request_metadata_phase_2_request_and_set_slug
       render_slug_heading
       while @slug == ''
@@ -52,13 +64,13 @@ module Muwu
       end
       render_lf
     end
-        
-    
-    
+
+
+
     private
-    
-    
-    
+
+
+
     def determine_reset_css_files(project)
       [
         File.join(project.path_css_base),
@@ -68,75 +80,85 @@ module Muwu
         File.join(project.path_css, 'index.scss'),
       ]
     end
-        
+
 
     def render_lf
       puts "\n"
     end
-    
-    
+
+
     def render_new_project_heading
       puts '# Muwu'
       puts '# New Project'
     end
-    
-    
+
+
+    def render_reset_compiled_heading
+      puts '# Muwu'
+      puts '# Reset `compiled/`'
+      puts '- This will remove all contents of the `compiled/` folder.'
+      puts '- This action cannot be undone.'
+    end
+
+
+    def render_reset_compiled_prompt
+      print '> Continue resetting the `compiled/` folder? (y/N) '
+    end
+
+
     def render_reset_css_heading(project)
       puts '# Muwu'
       puts '# Reset CSS'
-      puts 
       puts '- This will reset the following files and folders to their original state:'
-      puts 
       determine_reset_css_files(project).each do |file|
-        puts "  - #{file}"
+        puts "  * #{file}"
       end
-      puts
-      puts "* If #{project.path_css_extensions} does not exist, it will be created."
+      puts "- If #{project.path_css_extensions} does not exist, it will be created."
       puts '  Otherwise, its existing contents will remain unchanged.'
-      puts
+      puts '- This action cannot be undone'
     end
-    
-    
+
+
     def render_reset_css_prompt
       print '> Continue with CSS reset? (y/N) '
     end
-    
-    
+
+
     def render_slug_heading
       puts '# Project Directory Name'
       puts '- Word characters `[a-zA-Z0-9_]` only; non-word characters will be removed.'
     end
-    
-    
+
+
     def render_slug_prompt
       print '> Directory Name for project: '
     end
-    
-    
+
+
     def render_slug_can_not_be_blank
       puts '- Directory Name can not be blank.'
     end
-    
-    
+
+
     def render_slug_was_sanitized(result: nil)
       puts '- Directory Name contained non-word characters that were removed.'
       if result
         puts "  - Modified Directory Name: `#{result}`"
       end
     end
-    
-    
+
+
     def render_title_heading
       puts "\n"
       puts '# Project Title'
     end
-    
-    
+
+
     def render_title_prompt
       print '> Title of project: '
     end
-    
-    
+
+
     def render_title_can_not_be_blank
       puts '- Title can not be blank.'
     end

data/lib/muwu/default/default.rb

@@ -21,7 +21,9 @@ module Muwu
 
 
     PROJECT_OPTIONS = {
-      expunge_when_compiling_all: true,
+      # TODO: this was probably an anti-pattern
+      # compile_all_resets_compiled_folder: true,
+      contents_section_numbers_receive_link: true,
       generate_navigators_automatically: true,
       generate_subcontents_automatically: false,
       html_head_includes_metadata_tags: true,

data/lib/muwu/project/project.rb

@@ -27,17 +27,6 @@ module Muwu
     end
 
 
-    def inspect
-      ["#{self.to_s}", "{", inspect_instance_variables, "}"].join(' ')
-    end
-
-
-    def inspect_instance_variables
-      self.instance_variables.map { |v| "#{v}=#<#{instance_variable_get(v).class}>" }.join(", ")
-    end
-
-
-
     public
 
 
@@ -65,13 +54,6 @@ module Muwu
     end
 
 
-    # def does_not_have_crucial_files
-    #   exceptions_include?(ProjectException::MetadataFileNotFound) &&
-    #   exceptions_include?(ProjectException::OptionsFileNotFound) &&
-    #   exceptions_include?(ProjectException::OutlineFileNotFound)
-    # end
-
-
     def does_not_have_crucial_files
       metadata_file_does_not_exist &&
       options_file_does_not_exist &&
@@ -108,6 +90,16 @@ module Muwu
     end
 
 
+    def inspect
+      ["#{self.to_s}", "{", inspect_instance_variables, "}"].join(' ')
+    end
+
+
+    def inspect_instance_variables
+      self.instance_variables.map { |v| "#{v}=#<#{instance_variable_get(v).class}>" }.join(", ")
+    end
+
+
     def js_basename
       if @options.output_file_js_basename.to_s == ''
         SanitizerHelper::sanitize_destination_file_basename(slug).downcase
@@ -295,9 +287,10 @@ module Muwu
     end
 
 
-    def path_images
-      File.absolute_path(File.join(@working_directory, 'images'))
-    end
+    # DEPRECATED
+    # def path_images
+    #   File.absolute_path(File.join(@working_directory, 'images'))
+    # end
 
 
     def path_outline

data/lib/muwu/project_builder/assets/config/css/base/html_elements.scss

@@ -17,16 +17,19 @@
 // proportional, while the content box could shrink). An HTML document with
 // adequately-defined heirarchial organization has no need for `padding-box`
 // sizing, and a layout editor working with a mindset of variable-size media
-// can successfully rely on `content-box` sizing. 
+// can successfully rely on `content-box` sizing.
 //
 
+$muwu-root-font-size: 1rem;
+$muwu-root-line-height: ($muwu-root-font-size * 1.16667);
+
 * {
   box-sizing: content-box;
-  line-height: 1.16667;
+  font-size: $muwu-root-font-size;
+  line-height: $muwu-root-line-height;
   margin: 0;
   padding: 0;
   text-indent: 0;
-  font-size: 1rem;
 }
 
 
@@ -41,16 +44,16 @@ body {
 }
 
 blockquote {
-  margin: 1rem 2rem;
+  margin: $muwu-root-line-height 2rem;
 }
 
 code {
-  font-size: 1rem;
+  font-size: $muwu-root-font-size;
   padding: 0rem 0.15rem;
 }
 
 dl {
-  margin: 1rem 0;
+  margin: $muwu-root-line-height 0;
   div {
     dt {
       display: list-item;
@@ -63,7 +66,7 @@ dl {
     dd {
       display: list-item;
       list-style-type: none;
-      p { 
+      p {
         display: inline;
       }
     }
@@ -77,30 +80,31 @@ img {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  font-size: 1.125rem;
+  font-size: ($muwu-root-font-size * 1.125);
+  margin: $muwu-root-line-height 0rem;
 }
 
 hr {
-  margin: 1rem 0;
+  margin: $muwu-root-line-height 0;
   border-width: 0;
 }
 
 ol {
-  margin: 1rem;
+  margin: $muwu-root-line-height;
   ol, ul {
     margin: 0rem 1rem;
   }
 }
 
 p {
-  margin: 1rem 0rem;
+  margin: $muwu-root-line-height 0rem;
 }
 
 pre {
-  font-size: 0.9rem;
-  margin: 1rem 0;
+  font-size: ($muwu-root-font-size * 0.9);
+  margin: $muwu-root-line-height 0;
   >code {
-    font-size: 0.8rem;
+    font-size: ($muwu-root-font-size * 0.8);
     padding: 0rem 0rem;
   }
 }
@@ -110,7 +114,7 @@ q {
 }
 
 ul {
-  margin: 1rem;
+  margin: $muwu-root-line-height;
   ol, ul {
     margin: 0rem 1rem;
   }

data/lib/muwu/project_builder/assets/config/css/base/mixin_text_section_heading.scss

@@ -1,27 +1,3 @@
-// @mixin text_section_heading($font-size, $margin-bottom) {
-//   >.section_number {
-//     font-size: $font-size;
-//     & + h1:first-of-type,
-//     & + h2:first-of-type,
-//     & + h3:first-of-type,
-//     & + h4:first-of-type,
-//     & + h5:first-of-type,
-//     & + h6:first-of-type {
-//       font-size: $font-size;
-//       margin-bottom: $margin-bottom;
-//     }
-//   }
-//   >h1:first-child,
-//   >h2:first-child,
-//   >h3:first-child,
-//   >h4:first-child,
-//   >h5:first-child,
-//   >h6:first-child {
-//     font-size: $font-size;
-//     margin-bottom: $margin-bottom;
-//   }
-// }
-
 @mixin text_section_heading($font-size, $margin-bottom) {
   >h1:first-child,
   >h2:first-child,

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_contents.scss

@@ -1,8 +1,8 @@
 body >div.contents {
-  margin: 4em 0;
+  margin: ($muwu-root-line-height * 4) 0;
   >h1 {
-    font-size: 1.25em;
-    margin: 0 0 2rem 0;
+    font-size: ($muwu-root-font-size * 1.25);
+    margin: 0 0 ($muwu-root-line-height * 2) 0;
     text-align: left;
   }
   .compiler_warning {
@@ -33,7 +33,7 @@ body >div.contents {
       }
       td.heading {
         text-align: left;
-      }          
+      }
       td.number {
         text-align: right;
       }
@@ -44,7 +44,7 @@ body >div.contents {
     display: block;
     margin: 0rem;
     li {
-      margin: 0.5rem 0rem;
+      margin: ($muwu-root-line-height * 0.5) 0rem;
       a {
         display: inline;
       }

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_metadata.scss

@@ -1,8 +1,8 @@
 body >div.metadata {
-  margin: 4em 0;
+  margin: ($muwu-root-line-height * 4) 0;
   dl {
     div {
-      margin: 1rem 0;
+      margin: $muwu-root-line-height 0;
       dt {
         font-weight: bold;
         display: block;
@@ -13,5 +13,3 @@ body >div.metadata {
     }
   }
 }
-
-

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_navigator.scss

@@ -1,13 +1,12 @@
 body >div.navigator {
-  margin: 0.5rem 0;
+  margin: ($muwu-root-line-height * 0.5) 0;
   nav.document_links {
     width: 100%;
     display: flex;
     justify-content: space-around;
     a.document_link {
-      font-size: 0.8rem;
-      padding: 0.5rem;
+      font-size: ($muwu-root-font-size * 0.8);
+      padding: ($muwu-root-line-height * 0.5);
     }
   }
 }
-

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_subcontents.scss

@@ -1,8 +1,8 @@
 body >div.subcontents {
-  margin: 4em 0;
+  margin: ($muwu-root-line-height * 4) 0;
   >h1 {
-    font-size: 1.75em;
-    margin: 0 0 2rem 0;
+    font-size: ($muwu-root-font-size * 1.75);
+    margin: 0 0 ($muwu-root-line-height * 2) 0;
     text-align: left;
   }
   .compiler_warning {
@@ -33,7 +33,7 @@ body >div.subcontents {
       }
       td.heading {
         text-align: left;
-      }          
+      }
       td.number {
         text-align: right;
       }
@@ -44,7 +44,7 @@ body >div.subcontents {
     display: block;
     margin: 0rem 0.5rem;
     li {
-      margin: 0.5rem 0rem;
+      margin: ($muwu-root-line-height * 0.5) 0rem;
       a {
         display: inline;
       }

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_text.scss

@@ -1,7 +1,7 @@
 @import 'mixin_text_section_heading';
 
 body >div.text {
-  margin: 6rem 0rem;
+  margin: ($muwu-root-line-height * 6) 0rem;
   ol {
     padding-left: 1rem;
   }
@@ -9,40 +9,41 @@ body >div.text {
     padding-left: 1rem;
   }
 
-  section[data-section_depth] {      
+  section[data-section_depth] {
     >.section_number {
       font-weight: bold;
       display: block;
+      margin-bottom: none;
       text-decoration: none;
     }
     nav.document_links {
       width: 100%;
-      margin: 2rem 0rem 4rem 0rem;
+      margin: ($muwu-root-line-height * 2) 0rem ($muwu-root-line-height * 4) 0rem;
       text-align: right;
       a.document_link {
-        font-size: 0.75em;
+        font-size: ($muwu-root-font-size * 0.75);
         margin: 0rem 0.5rem
       }
     }
   }
-  
+
   section[data-section_depth='1'] {
-    margin: 6rem 0;
-    @include text_section_heading(1.5rem, 2rem);
+    margin: ($muwu-root-line-height * 6) 0;
+    @include text_section_heading(($muwu-root-font-size * 1.5), ($muwu-root-line-height * 2));
   }
-  
+
   section[data-section_depth='2'] {
-    margin: 4rem 0;
-    @include text_section_heading(1.375rem, 1.5rem);
+    margin: ($muwu-root-line-height * 4) 0;
+    @include text_section_heading(($muwu-root-font-size * 1.375), ($muwu-root-line-height * 1.5));
   }
 
   section[data-section_depth='3'] {
-    margin: 2rem 0;
-    @include text_section_heading(1.25rem, 1.5rem);
+    margin: ($muwu-root-line-height * 2) 0;
+    @include text_section_heading(($muwu-root-font-size * 1.25), ($muwu-root-line-height * 1.5));
     section[data-section_depth] {
-      margin: 2rem 0;
-      @include text_section_heading(1rem, 1.5rem);
+      margin: ($muwu-root-line-height * 2) 0;
+      @include text_section_heading(($muwu-root-font-size * 1), ($muwu-root-line-height * 1.5));
     }
   }
 
-}  
+}

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_title.scss

@@ -1,20 +1,23 @@
 body >div.title {
-  margin: 4em 0;
+  margin: ($muwu-root-line-height * 4) 0;
   text-align: left;
   h1 {
     display: block;
     font-weight: bold;
-    margin: 0.5rem 0;
+    margin: ($muwu-root-line-height * 0.5) 0;
   }
   [data-metadata_key='title'] {
-    font-size: 2.0em;
+    font-size: ($muwu-root-font-size * 2);
+    line-height: ($muwu-root-line-height * 2);
   }
   [data-metadata_key='subtitle'] {
-    font-size: 1.5em;
+    font-size: ($muwu-root-font-size * 1.5);
+    line-height: ($muwu-root-line-height * 1.5);
   }
   [data-metadata_key='author'] {
-    margin: 2rem 0rem;
-    font-size: 1.25em;
+    font-size: ($muwu-root-font-size * 1.25);
+    line-height: ($muwu-root-line-height * 1.25);
+    margin: ($muwu-root-line-height * 2) 0rem;
   }
   h1:first-child {
     margin-top: 0;

data/lib/muwu/project_builder/project_reset_compiled.rb

@@ -13,10 +13,17 @@ module Muwu
     end
 
 
+    public
+
+
     def reset_compiled
       puts "- Resetting #{@project.path_compiled}"
-      FileUtils.remove_entry_secure(@project.path_compiled)
-      FileUtils.mkdir(@project.path_compiled)
+      begin
+        FileUtils.remove_entry_secure(@project.path_compiled)
+      rescue Errno::ENOENT
+      ensure
+        FileUtils.mkdir(@project.path_compiled)
+      end
     end
 
 

data/lib/muwu/project_builder/project_starter.rb

@@ -1,10 +1,10 @@
 module Muwu
   class ProjectStarter
-    
-    
+
+
     include Muwu
-    
-    
+
+
     def initialize(current_working_directory, metadata)
       @current_working_directory = File.absolute_path(current_working_directory)
       @metadata = metadata
@@ -21,7 +21,7 @@ module Muwu
       project.working_directory = File.absolute_path(File.join(@current_working_directory, @metadata[:slug]))
       project
     end
-    
-    
+
+
   end
-end
+end

data/lib/muwu/project_builder/project_writer.rb

@@ -50,7 +50,7 @@ module Muwu
     def phase_2_make_project_subfolders
       announce_and_execute_dir_mkdir(@project.path_compiled)
       announce_and_execute_dir_mkdir(@project.path_config)
-      announce_and_execute_dir_mkdir(@project.path_images)
+      # announce_and_execute_dir_mkdir(@project.path_images)    # DEPRECATED
       announce_and_execute_dir_mkdir(@project.path_text)
     end
 

data/lib/muwu/project_options/project_options.rb

@@ -3,7 +3,8 @@ module Muwu
 
 
     attr_accessor(
-      :expunge_when_compiling_all,
+      # TODO: this was probably an anti-pattern
+      # :expunge_when_compiling_all,
       :generate_navigators_automatically,
       :generate_subcontents_automatically,
       :html_head_includes_metadata_tags,

data/lib/muwu/project_options_builder/project_option_validator.rb

@@ -1,26 +1,26 @@
 module Muwu
   class ProjectOptionValidator
-   
-   
+
+
     include Muwu
-    
-    
+
+
     attr_reader(
       :key,
       :value
     )
-   
-   
+
+
     def initialize(key, value, project)
       key_validator = ProjectOptionValidatorKey.new(key, value, project)
       @key = key_validator.validated_key
       @value = key_validator.validated_value
     end
-    
-    
-         
+
+
+
     protected
-    
+
 
     def self.new_if_valid_key(key, value, project)
       option_validator = new(key, value, project)
@@ -32,6 +32,6 @@ module Muwu
     end
 
 
-    
+
   end
-end
+end

data/lib/muwu/project_options_builder/project_option_validator_value.rb

@@ -106,7 +106,13 @@ module Muwu
     end
 
 
-    def validate_option_expunge_when_compiling_all
+    # TODO: this was probably an anti-pattern
+    # def validate_option_compile_all_resets_compiled_folder
+    #   return validate_option_boolean
+    # end
+
+
+    def validate_option_contents_section_numbers_receive_link
       return validate_option_boolean
     end
 

data/lib/muwu/render_concat/render_concat.rb

@@ -1,20 +1,21 @@
 module Muwu
   class RenderConcat
-    
-    
+
+
     def initialize(project)
-      @output_path = project.working_directory
+      @output_path = project.path_compiled
       @output_filename = project.html_basename + '.md'
       @project = project
       @manifest = project.manifest
     end
-    
-    
+
+
     public
-    
-    
+
+
     def render
       destination = File.join(@output_path, @output_filename)
+      puts "- Writing `#{@output_filename}`"
       File.open(destination, 'w') do |f|
         @manifest.text_blocks.each do |text|
           text.sections.each do |text_item|
@@ -23,15 +24,15 @@ module Muwu
         end
       end
     end
-    
-    
+
+
     def render_text_item(f, text_item)
       render_text_item_head(f, text_item)
       render_text_item_source(f, text_item)
       render_text_item_sections(f, text_item)
     end
-    
-    
+
+
     def render_text_item_head(f, text_item)
       f.puts '# ' + text_item.numbering.join('.')
       if heading_origin_is_basename_or_outline(text_item)
@@ -39,8 +40,8 @@ module Muwu
         f.puts "\n"
       end
     end
-    
-    
+
+
     def render_text_item_sections(f, text_item)
       if text_item.does_have_child_sections
         text_item.sections.each do |ti|
@@ -49,32 +50,30 @@ module Muwu
         render_text_item_spacer(f, text_item)
       end
     end
-    
-    
+
+
     def render_text_item_source(f, text_item)
       if text_item.source_file_does_exist
         f.puts text_item.source.strip
       end
       render_text_item_spacer(f, text_item)
     end
-    
-    
+
+
     def render_text_item_spacer(f, text_item)
       f.puts "\n\n\n\n"
     end
-      
-      
-      
+
+
+
     private
-    
-    
+
+
     def heading_origin_is_basename_or_outline(text_item)
       [:basename, :outline].include?(text_item.heading_origin)
     end
-    
-      
-    
-    
+
+
+
   end
 end
-      

data/lib/muwu/render_html/render_html.rb

@@ -20,9 +20,6 @@ module Muwu
 
 
     def render_all
-      if @project.options.expunge_when_compiling_all == true
-        ProjectResetCompiled.new(@project).reset_compiled
-      end
       if @manifest.does_have_documents
         build_and_render(@manifest.documents)
       else

data/lib/muwu/sync/sync.rb

@@ -9,50 +9,48 @@ module Muwu
       @path_local = project.working_directory + File::SEPARATOR
       @path_remote = project.options.remote_sync
       @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('--itemize-changes', '--recursive', '--verbose').sort.join(' ')
     end
 
 
     public
 
 
-    def down
+    def pull
       if @project.exceptions_include?(ProjectException::OptionRemoteSyncValueNil)
         raise ProjectExceptionHandler::Fatal.new(ProjectException::OptionRemoteSyncValueNil.new)
       else
-        exec_sync(source: @path_remote, target: @path_local)
+        sync(source: @path_remote, target: @path_local)
       end
     end
 
 
-    def up
+    def push
       if @project.exceptions_include?(ProjectException::OptionRemoteSyncValueNil)
         raise ProjectExceptionHandler::Fatal.new(ProjectException::OptionRemoteSyncValueNil.new)
       else
-        exec_sync(source: @path_local, target: @path_remote)
+        sync(source: @path_local, target: @path_remote)
       end
     end
 
 
+    def sync(source: nil, target: nil)
+      if source && target
+        exec_rsync(source: source, target: target)
+      end
+    end
+
 
     private
 
 
-    def exec_sync(source: nil, target: nil)
+    def exec_rsync(source: nil, target: nil)
       if source && target
         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
@@ -60,6 +58,15 @@ module Muwu
     end
 
 
+    def exec_rsync_demo(source: nil, target: nil)
+      if source && target
+        puts "source: #{source.inspect}"
+        puts "target: #{target.inspect}"
+        puts "switches: -#{@switches}"
+        puts "command: rsync #{@switches} #{source} #{target}"
+      end
+    end
+
 
   end
 end

metadata

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