muwu 3.0.0.alpha → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a3546ed2eb6f4dead8a472ef9460ce5696a5967892151210026e947303766e
-  data.tar.gz: f53c66c3a78df5157de9930c78444bc821eaa9de6484b628887b720c6cc4acea
+  metadata.gz: 2b9cc00d550f704b40f42c5b9082a0be65cafe79a35084840c1e304aff46c4a4
+  data.tar.gz: 64101f110b1e983bb42494910c7898a5d41bb6a4865156b7402d7d24d5f763a5
 SHA512:
-  metadata.gz: 862b1e8424005ce9f952e3609634a986c0c4d31f3697b24502d1175c643cc88caef93113bd4043c9be22c8f220d5a87721923e3b0554c04cad1856fd78f16881
-  data.tar.gz: 3e61b41b6dea81978e0226542a1e06ce1caec159bb55f070c2aee54452abd852e190c6328f77b9ee365272ff0dc9c3835dad5e3747eaf3b24196a764121e67fc
+  metadata.gz: fd06f9f0e7c0cdfbadd1a833c2e8ef7475ae8005dec20e6fb0d83dbc688b6bd157dc226e82beb45ef969aea720f2b777563d7ce3a264b03dc19c25df68b616a8
+  data.tar.gz: 8a575c78319de6e524947ff67b3b484949e593d022cdcf05be6436b3d6e7cb12845cec1fce540c15b966ba269491695e002f62ef9f91a6d48db9086e2064c514

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'
 
   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'
 
 
 
@@ -26,7 +26,7 @@ module Muwu
 
 
   def debug(file, line, info)
-    logger.new(STDERR).debug("#{file} #{line} #{info}")
+    Logger.new(STDERR).debug("#{file} #{line} #{info}")
   end
 
 

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..-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 
+        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
       end
     end
-    
+
+
+    def evaluate_command_view
+      Controller.new(@current_working_directory).view
+    end
+
 
   end
 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/publish

@@ -1,7 +1,20 @@
-- 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]
+  - 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/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,11 @@ 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)
-
-All comands operate within the current working directory.
+  muwu sync             synchronize from/to a remote location (requires rsync)
+  muwu view             view a compiled project (requires lynx)
 
 For more detailed instructions:
   muwu help [command]

data/lib/muwu/cli/help/sync

@@ -1,18 +1,26 @@
-- 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
+- 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 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 files.
-      
+  - 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_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,3 @@
+- muwu view
+  - View a compiled project 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)
+
+
+    def sync_pull(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).pull
+      end
     end
-    
-    
-    def sync_up(args)
+
+
+    def sync_push(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).push
+      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