muwu 3.0.0.alpha → 3.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a3546ed2eb6f4dead8a472ef9460ce5696a5967892151210026e947303766e
-  data.tar.gz: f53c66c3a78df5157de9930c78444bc821eaa9de6484b628887b720c6cc4acea
+  metadata.gz: cd84d886de0b03ecaef0c6cb6eafe2f81e0f36e67b42d1d0a315b76968bff743
+  data.tar.gz: 01fec21c061156be890fd9445b3ba1b86f700893e929a1b51630017b6e5e3985
 SHA512:
-  metadata.gz: 862b1e8424005ce9f952e3609634a986c0c4d31f3697b24502d1175c643cc88caef93113bd4043c9be22c8f220d5a87721923e3b0554c04cad1856fd78f16881
-  data.tar.gz: 3e61b41b6dea81978e0226542a1e06ce1caec159bb55f070c2aee54452abd852e190c6328f77b9ee365272ff0dc9c3835dad5e3747eaf3b24196a764121e67fc
+  metadata.gz: eea61dd2032e8b8d25dd40236342a1a6753be24a3640d971727fd169e592ab78833d9d8152b36198bc7fb9199ceda36154794db2da2d9fb9a96af6165b5f4985
+  data.tar.gz: 7cd2c9592176fb8d45bac5ed55a20f72e20657577656d48c2e97a0781046521fbdcf97a7fc16712e14129ed2ffc92b655c9ddbb6c6432346b1dfd2984389e401

data/lib/{muwu_loader.rb → loader.rb}

@@ -24,7 +24,8 @@ paths = [
   'render_html_partial_builder',
   'render_inspector',
   'sync',
-  'var'
+  'var',
+  'viewer'
 ]
 
 
@@ -34,4 +35,3 @@ paths.map do |path|
     require file
   end
 end
-

data/lib/muwu.rb

@@ -1,7 +1,7 @@
 module Muwu
 
 
-  VERSION = '3.0.0.alpha'
+  VERSION = '3.0.0.beta'
 
   GEM_HOME_LIB = File.absolute_path(File.join(File.dirname(__FILE__)))
   GEM_HOME_LIB_MUWU = File.absolute_path(File.join(GEM_HOME_LIB, 'muwu'))
@@ -18,7 +18,7 @@ module Muwu
   require 'yaml'
 
 
-  require_relative 'muwu_loader'
+  require_relative 'loader'
 
 
 

data/lib/muwu/cli/cli.rb

@@ -3,7 +3,7 @@ module Muwu
 
 
     include Muwu
-    
+
 
     def initialize(args)
       @args = args.map do |a|
@@ -14,7 +14,7 @@ module Muwu
           a.downcase.strip
         end
       end
-      
+
       @current_working_directory = Dir.pwd
     end
 
@@ -44,6 +44,8 @@ module Muwu
           evaluate_command_reset
         when 'sync'
           evaluate_command_sync
+        when 'view'
+          evaluate_command_view
         when '--version'
           puts VERSION
         else
@@ -63,7 +65,7 @@ module Muwu
 
       elsif @args[1] == 'css'
         Controller.new(@current_working_directory).compile_css
-        
+
       elsif @args[1] == 'html'
         evaluate_command_compile_html
 
@@ -74,12 +76,12 @@ module Muwu
         puts CliHelp.new(:compile).message
       end
     end
-    
-    
+
+
     def evaluate_command_compile_html
       if @args[2] == nil
         Controller.new(@current_working_directory).compile_html
-        
+
       elsif @args[2] =~ /\A[0-9]+\z/
         Controller.new(@current_working_directory).compile_html_by_index(@args[2].to_i)
 
@@ -87,12 +89,12 @@ module Muwu
         puts CliHelp.new(:compile).message
       end
     end
-    
-    
+
+
     def evaluate_command_concat
       Controller.new(@current_working_directory).concat
     end
-      
+
 
 
     def evaluate_command_help
@@ -115,6 +117,8 @@ module Muwu
           puts CliHelp.new(:reset).message
         when 'sync'
           puts CliHelp.new(:sync).message
+        when 'view'
+          puts CliHelp.new(:view).message
         else
           puts CliHelp.new(:summary).message
         end
@@ -133,16 +137,18 @@ module Muwu
 
 
     def evaluate_command_publish
-      Controller.new(@current_working_directory).publish
+      Controller.new(@current_working_directory).publish(@args[1..(@args.length-1)])
     end
-    
-    
+
+
     def evaluate_command_reset
       if @args[1] == nil
         puts CliHelp.new(:reset).message
-        
+
       else
         case @args[1]
+        when 'compiled'
+          Controller.new(@current_working_directory).reset_compiled
         when 'css'
           Controller.new(@current_working_directory).reset_css
         else
@@ -150,24 +156,29 @@ module Muwu
         end
       end
     end
-    
-    
+
+
     def evaluate_command_sync
       if @args[1] == nil
         puts CliHelp.new(:sync).message
-        
+
       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)])
-        else 
+        else
           puts CliHelp.new(:sync).message
         end
       end
     end
-    
+
+
+    def evaluate_command_view
+      Controller.new(@current_working_directory).view
+    end
+
 
   end
 end

data/lib/muwu/cli/help/publish

@@ -1,7 +1,9 @@
-- muwu publish
-  - Publishes compiled documents (as indicated by the current outline and
-    manifest) to a remote location using scp. Scp must be installed on the
-    local system.
-    
-* Specify the remote host in 'options.yml' using the 'remote_publish' value.
+- muwu publish [options]
+  - 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.
 
+* Specify the remote host in 'options.yml' using the 'remote_publish' value.

data/lib/muwu/cli/help/reset

@@ -1,7 +1,10 @@
+- muwu reset compiled
+  - Clear the entire contentes of the `compiled/` folder.
+
 - muwu reset css
   - Reset the `config/css` folder. The following files and folders will
     revert to their original state:
-    
+
     - config/css/base/
     - config/css/colors/dark.scss
     - config/css/colors/index.scss
@@ -10,5 +13,5 @@
 
   * If `config/css/extensions` does exist, it and its contents will remain
     unchanged.
-    
+
   * If `config/css/extensions` does not exist, Muwu will create it.

data/lib/muwu/cli/help/summary

@@ -6,11 +6,13 @@ Command line:
   muwu help             show this message
   muwu inspect          inspect a project
   muwu new              create a new project directory
-  muwu publish          publish to a remote server (requires scp)
+  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 view             view a compiled project (requires lynx)
 
-All comands operate within the current working directory.
+All commands operate within the current working directory.
 
 For more detailed instructions:
   muwu help [command]

data/lib/muwu/cli/help/sync

@@ -1,18 +1,18 @@
 - muwu sync [down | up] [options]
   - Synchronize project from/to a remote location using rsync. Rsync must be
     installed on the local system.
-    
+
 - muwu sync down
   - Use rsync to download the project from a remote host.
-  
+
 - muwu sync up
   - Use rsync to upload to 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 files.
-      
+      transferred, but do not actually transfer any files.
+
 * Specify the remote host in 'options.yml' using the 'remote_sync' value.
-  
+
 * Muwu will invoke the rsync switches '-r' to recurse subdirectories, and
   '-v' to give a verbose description

data/lib/muwu/cli/help/view

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

data/lib/muwu/controller/controller.rb

@@ -3,7 +3,7 @@ module Muwu
 
 
     include Muwu
-    
+
 
     def initialize(current_working_directory)
       @current_working_directory = File.absolute_path(current_working_directory)
@@ -20,11 +20,11 @@ module Muwu
       if @project.does_not_have_crucial_files
         reply_folder_does_not_have_valid_project
       else
-        RenderHtml.new(@project).render
+        RenderHtml.new(@project).render_all
       end
     end
-    
-    
+
+
     def compile_css
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -33,8 +33,8 @@ module Muwu
         RenderHtml.new(@project).render_css_only
       end
     end
-    
-    
+
+
     def compile_html_by_index(index)
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -43,7 +43,7 @@ module Muwu
         RenderHtml.new(@project).render_html_by_index(index)
       end
     end
-    
+
 
     def compile_html
       @project = read_project_from_current_working_directory
@@ -53,8 +53,8 @@ module Muwu
         RenderHtml.new(@project).render_html_only
       end
     end
-    
-    
+
+
     def compile_js
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -63,8 +63,8 @@ module Muwu
         RenderHtml.new(@project).render_js_only
       end
     end
-    
-    
+
+
     def concat
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -73,8 +73,8 @@ module Muwu
         RenderConcat.new(@project).render
       end
     end
-    
-    
+
+
     def inspect
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -90,14 +90,30 @@ module Muwu
       @project = ProjectStarter.new(@current_working_directory, metadata).new_project
       ProjectWriter.new(@project).write
     end
-    
-    
-    def publish
+
+
+    def publish(args)
+      @project = read_project_from_current_working_directory
+      if @project.does_not_have_crucial_files
+        reply_folder_does_not_have_valid_project
+      else
+        Publish.new(@project, args: args).up
+      end
+    end
+
+
+    def reset_compiled
       @project = read_project_from_current_working_directory
-      Publish.new(@project).up
+      if @project.does_not_have_crucial_files
+        reply_folder_does_not_have_valid_project
+      else
+        if ControllerInteraction.new.confirm_reset_compiled(@project)
+          ProjectResetCompiled.new(@project).reset_compiled
+        end
+      end
     end
-    
-    
+
+
     def reset_css
       @project = read_project_from_current_working_directory
       if @project.does_not_have_crucial_files
@@ -106,24 +122,42 @@ module Muwu
         ProjectResetCss.new(@project).reset_css
       end
     end
-    
-    
+
+
     def sync_down(args)
       @project = read_project_from_current_working_directory
-      Sync.new(@project, args: args).down
+      if @project.does_not_have_crucial_files
+        reply_folder_does_not_have_valid_project
+      else
+        Sync.new(@project, args: args).down
+      end
     end
-    
-    
+
+
     def sync_up(args)
       @project = read_project_from_current_working_directory
-      Sync.new(@project, args: args).up
+      if @project.does_not_have_crucial_files
+        reply_folder_does_not_have_valid_project
+      else
+        Sync.new(@project, args: args).up
+      end
+    end
+
+
+    def view
+      @project = read_project_from_current_working_directory
+      if @project.does_not_have_crucial_files
+        reply_folder_does_not_have_valid_project
+      else
+        Viewer.new(@project)
+      end
     end
 
 
 
     private
-        
-    
+
+
     def read_project_from_current_working_directory
       ProjectReader.build { |b| b.load_path(@current_working_directory) }
     end
@@ -131,8 +165,9 @@ module Muwu
 
     def reply_folder_does_not_have_valid_project
       puts @project.exceptions
-      puts "Is this a Muwu project folder?"
+      puts "Is this a Muwu project home folder?"
     end
 
+
   end
 end

data/lib/muwu/default/default.rb

@@ -1,7 +1,7 @@
 module Muwu
   module Default
-    
-    
+
+
     FILENAMES = {
       css_manifest: 'index.scss',
       metadata: 'metadata.yml',
@@ -9,8 +9,9 @@ module Muwu
       outline: 'outline.yml'
     }
 
-    
+
     FILEPATHS = {
+      compiled: './compiled',
       css: './config/css',
       metadata: '',
       options: '',
@@ -18,8 +19,9 @@ module Muwu
       text: './text'
     }
 
-    
+
     PROJECT_OPTIONS = {
+      expunge_when_compiling_all: true,
       generate_navigators_automatically: true,
       generate_subcontents_automatically: false,
       html_head_includes_metadata_tags: true,
@@ -42,12 +44,12 @@ module Muwu
       render_title_section_metadata: ['title', 'subtitle', 'author'],
       warning_if_parent_heading_lacks_source: true
     }
-    
-    
+
+
     PROJECT_OUTLINE = {
       default_text_block_name: 'main'
     }
-    
-    
+
+
   end
-end
+end