ichiban 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9160a6af9ff5f9c21a2e6a5ca27f7488de6055
-  data.tar.gz: 9091f8368c5e34f12471910c537ab2e45ea1317d
+  metadata.gz: a67d27e89bd72f4afd96687d4bdd0497433fc4c4
+  data.tar.gz: 725e54db4c392ce2437c7499aa6674733f7abbf5
 SHA512:
-  metadata.gz: 2faa7ec8f821e61c0d39dad65ee70354ddcee0bf5c338a355c6ef901c0ffe5784717b99a0501e97eaca4e3c8bef096dd1d5e97609e5f14d957ce781f140c5b81
-  data.tar.gz: de957b1070e3f0f85f03065135c10660bf3e049749bcbadc3db593e6c26ce8fbfdeef7e21483d7822f21d7e694c2ed29b791d5f7cb148970bbc3263569b867e2
+  metadata.gz: b95a07d33bb48d4c6f8b36272d011c661e5253dc578935573fade28f8dc28f26784fe5da7ace00b3cb369942e9c38cbbacd8c94369c24bb760e2cc383ae7efeb
+  data.tar.gz: ec539fd3c4224f33112b85fdff5efe33d4e535d58c53783a6f9dfae15f7055e5e3aa25b2345e96b788bf45a8ef03df725286da3c3eebeede684e644d6da24e18

data/lib/ichiban/command.rb

@@ -1,8 +1,9 @@
 module Ichiban
   class Command
-    def initialize(args)
+    def initialize(args, dev = false)
       @task = args.shift
       @args = args
+      @dev = dev
     end
     
     def print_usage
@@ -10,6 +11,7 @@ module Ichiban
         "\nUsage: ichiban [command]\n" +
         "Available commands: \n" +
         "  watch\n" +
+        "  compile [-a] [path]\n" +
         "  new [path]\n" +
         "  help\n\n" +
         "https://github.com/jarrett/ichiban\n\n"
@@ -20,8 +22,15 @@ module Ichiban
       case @task
       when 'watch'
         Ichiban.project_root = Dir.getwd
-        Ichiban.load_bundle
         Ichiban::Watcher.new.start
+      when 'compile'
+        Ichiban.project_root = Dir.getwd
+        compiler = Ichiban::ManualCompiler.new
+        if @args.first == '-a'
+          compiler.all
+        else
+          compiler.paths @args
+        end
       when 'new'
         Ichiban::ProjectGenerator.new(
           File.expand_path(@args[0])

data/lib/ichiban/manual_compiler.rb

@@ -0,0 +1,27 @@
+module Ichiban
+  class ManualCompiler
+    def all
+      paths(
+        Dir.glob(File.join(Ichiban.project_root, 'html',      '**', '*')) +
+        Dir.glob(File.join(Ichiban.project_root, 'assets',    '**', '*')) +
+        Dir.glob(File.join(Ichiban.project_root, 'scripts',   '**', '*')) +
+        Dir.glob(File.join(Ichiban.project_root, 'webserver', '**', '*'))
+      )
+    end
+    
+    def paths(paths_to_compile)
+      paths_to_compile.each do |path|
+        unless path.start_with? Ichiban.project_root
+          path = File.join(Ichiban.project_root, path)
+        end
+        begin
+          if project_file = Ichiban::ProjectFile.from_abs(path)
+            project_file.update
+          end
+        rescue Exception => exc
+          Ichiban.logger.exception(exc)
+        end
+      end
+    end
+  end
+end

data/lib/ichiban/nav_helper.rb

@@ -2,6 +2,9 @@ module Ichiban
   module NavHelper
   
     def nav(items, options = {})
+      unless items.is_a?(Array)
+        raise "Expected first parameter of NavHelper#nav to be an Array, but got: #{items.inspect}"
+      end
       Nav.new(items, options, self).to_html
     end
     
@@ -28,15 +31,7 @@ module Ichiban
       def current_path_starts_with?(path)
         @ctx.path_with_slashes(@ctx.current_path).start_with?(@ctx.path_with_slashes(path))
       end
-      
-      
-      
-      #def merge_classes(current_classes, added_classes)
-      #  current_classes = current_classes.split(/ +/)
-      #  added_classes = added_classes.split(/ +/)
-      #  (current_classes + added_classes).uniq.join(' ')
-      #end
-      
+            
       # Recursive. Checks whether any item in the menu, or any item in any of its descendant
       # menus, has a path that *starts with* the current path. E.g. if a menu or its descendants
       # have a link to '/a/b/c/', and we're at '/a/b/c/d/e/f/', then this method returns true.
@@ -50,26 +45,11 @@ module Ichiban
             # If an item has a sub-menu, then that menu must be the third element of the array.
             # (The format is [text, path, sub_menu, li_options].) So we recursively search the
             # descendant menu(s) of this item.
-            menu_matches_current_path?(items[2])
+            menu_matches_current_path?(item[2])
           end
         end.nil?
       end
       
-      # Recursive
-      #def sub_menu_contains_current_path?(items)
-      #  !items.detect do |item|
-      #    if current_path?(item[1])
-      #      true
-      #    elsif item[2].is_a?(Array)
-      #      sub_menu_contains_current_path?(item[2])
-      #    elsif item[3].is_a?(Array)
-      #      sub_menu_contains_current_path?(item[3])
-      #    else
-      #      false
-      #    end
-      #  end.nil?
-      #end
-      
       # Recursive
       def ul(items, depth)
         # If we're in the outermost menu, add any passed-in <ul> attributes
@@ -152,20 +132,6 @@ module Ichiban
               li_inner_html
             end
             
-            #lis << @ctx.content_tag('li', li_attrs) do
-            #  in_sub_path = (path != '/' and @options[:consider_sub_paths] and @ctx.path_with_slashes(@ctx.current_path).start_with?(@ctx.path_with_slashes(path)))
-            #  if current_path?(path)
-            #    li_inner_html = @ctx.content_tag('span', text, 'class' => 'selected')
-            #  elsif (sub_menu and sub_menu_contains_current_path?(sub_menu)) or in_sub_path
-            #    li_inner_html = @ctx.link_to(text, path, 'class' => 'ancestor_of_selected')
-            #  else
-            #    li_inner_html = @ctx.link_to(text, path)
-            #  end
-            #  if sub_menu and (current_path?(path) or sub_menu_contains_current_path?(sub_menu) or in_sub_path)
-            #    li_inner_html << ul(sub_menu, depth + 1)
-            #  end
-            #  li_inner_html
-            #end
             lis
           end
         end

data/lib/ichiban.rb

@@ -18,7 +18,6 @@ require 'therubyracer'
 require 'source_map'
 
 # Ichiban files. Order matters!
-require 'ichiban/bundle'
 require 'ichiban/config'
 require 'ichiban/logger'
 require 'ichiban/command'
@@ -26,6 +25,7 @@ require 'ichiban/project_generator'
 require 'ichiban/dependencies'
 require 'ichiban/loader'
 require 'ichiban/watcher'
+require 'ichiban/manual_compiler'
 require 'ichiban/deleter'
 require 'ichiban/project_file'
 require 'ichiban/helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ichiban
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejs
@@ -331,7 +331,6 @@ files:
 - empty_project/webserver/htaccess.txt
 - lib/ichiban.rb
 - lib/ichiban/asset_compiler.rb
-- lib/ichiban/bundle.rb
 - lib/ichiban/command.rb
 - lib/ichiban/config.rb
 - lib/ichiban/deleter.rb
@@ -342,6 +341,7 @@ files:
 - lib/ichiban/js_compiler.rb
 - lib/ichiban/loader.rb
 - lib/ichiban/logger.rb
+- lib/ichiban/manual_compiler.rb
 - lib/ichiban/markdown.rb
 - lib/ichiban/nav_helper.rb
 - lib/ichiban/project_file.rb

data/lib/ichiban/bundle.rb

@@ -1,7 +0,0 @@
-module Ichiban
-  def self.load_bundle
-    if Ichiban.project_root and File.exists?(File.join(Ichiban.project_root, 'Gemfile'))
-      Bundler.require
-    end
-  end
-end