mr_hyde 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec62071e2cf42fc9b179c84964c68874b92babab
-  data.tar.gz: 6c6470ac9a73127c09b80618ec54c5b45ca0e25f
+  metadata.gz: 608e05d085560eb38898a27c5ffcef2dc1220c96
+  data.tar.gz: 98c227e6bec0118e0c7fa15bb5cbb474ba752262
 SHA512:
-  metadata.gz: 6ed4ab1d0e48757ec3640cbb0b099ac58b0ce2541eec6b38eb79847e3d917faee12e2291dd997fa64ed7eb2bf10779665a706edddf63f3b9f8c56284ceeb6920
-  data.tar.gz: b18c81a9d1d4923dbd8d0afe491909d711ba35587a094d472ea68fcbd8b0cee27050fcce25d559e1cdcb0fb356bd1156b5d52cf1d848f32d35dd7e29fe4bddb1
+  metadata.gz: 8e8b2dc18dd88fd38cc98a20bbc75d4a769c970e3b14038e1739d814a03b14c11d1427b592a7a8efc10deab4cd740f27ab2a5962b36b238255dee02751effd4c
+  data.tar.gz: 9df017b5e3c7c9dc2b0c83c3bc964c0d62d67d76f5ba368d24615f224893662c4bc813594948c550a6f93dbfd06864563e74c291a80067c62bbb2c7037051761

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .sass-cache/
+.DS_Store

data/README.md

@@ -1,8 +1,8 @@
+<img src="https://raw.githubusercontent.com/emoriarty/mr_hyde/master/resources/mrhyde-logo.png" alt="Mr.Hyde logo" height="100"/>
 # MrHyde
+Mr. Hyde lets you generate and manage as many static sites as you like, all nested from a parent site, for example, you can have several nested sites sharing the same assets than the parent site and other nested sites with its own assets.
 
-Mr. Hyde lets you generate and manage as many sites as you want.
-
-It's based on [Jekyll](https://github.com/jekyll/jekyll), in fact Mr. Hyde wraps Jekyll to give you the possibilty of managing many sites.
+All this work thanks to [Jekyll](http://jekyllrb.com) in fact Mr. Hyde wraps Jekyll so if you know Jekyll there is no much to learn about Mr. Hyde.
 
 The current version is based on [Jekyll 2.5.3](https://github.com/jekyll/jekyll/tree/v2.5.3).
 

data/Rakefile

@@ -2,6 +2,7 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 ENV["JEKYLL_LOG_LEVEL"] = "error"
+ENV["MRHYDE_LOG_LEVEL"] = "error"
 
 Rake::TestTask.new do |t|
   t.libs.push "lib"

data/bin/mrhyde

@@ -8,6 +8,9 @@ require 'io/console'
 require 'mercenary'
 require 'mr_hyde'
 require 'mr_hyde/commands/remove'
+require 'mr_hyde/commands/serve'
+require 'mr_hyde/commands/list'
+
 
 Mercenary.program(:mrhyde) do |p|
   p.version MrHyde::VERSION
@@ -15,9 +18,10 @@ Mercenary.program(:mrhyde) do |p|
   p.syntax "mrhyde <subcommand>"
 
   p.command(:new) do |c|
-    c.syntax "new <subcommand>"
-    c.description "Creates a new Mr. Hyde site scaffold in path"
-    c.option "force", "--force", "Force creation even if PATH already exists"
+    c.syntax "new [PATH]"
+    c.description "Creates a new Mr. Hyde site scaffold in path or current path."
+    c.option "force", "--force", "Force creation even if PATH already exists."
+    c.option "blank", "--blank", "Creates scaffolding but with empty files."
 
     c.action do |args, options|
       MrHyde::Commands::New.process(args, options)
@@ -33,7 +37,7 @@ Mercenary.program(:mrhyde) do |p|
       snew.description "Creates a new Jekyll site or sites"
 
       snew.option "force", "--force", "Force creation even if PATH already exists"
-      snew.option "blank", "--blank", "Creates scaffolding but with empty files"
+      snew.option "blank", "--blank", "Creates scaffolding with empty files and no nested site"
 
       snew.action do |args, options|
         MrHyde::Commands::New.process({ :type => :site, :args => args }, options)
@@ -46,9 +50,9 @@ Mercenary.program(:mrhyde) do |p|
 
       srm.alias(:rm)
 
-      srm.option "force", "--force", "Don't ask for remove blog"
-      srm.option "all", "--all", "Remove all built sites. This option works alone."
-      srm.option "full", "--full", "Remove all built and draft site or sites. This option can be used with the rest of options."
+      #srm.option "force", "--force", "Don't ask for remove blog"
+      srm.option "all", "--all", "Remove all built sites."
+      srm.option "full", "--full", "Remove all built and source site/s. This option can be used with the rest of options."
 
       srm.action do |args, options|
         MrHyde::Commands::Remove.process(args, options)
@@ -57,17 +61,59 @@ Mercenary.program(:mrhyde) do |p|
     
     site.command(:build) do |sbuild|
       sbuild.syntax "build name[ name ... n] "
-      sbuild.description "Build the named blog or blogs, by default if no name is indicated then all blog will be built"
+      sbuild.description "Build the named site or sites. By default if no name is indicated then all sites will be build."
 
-      sbuild.option "all", "--all", "Build all blogs"
+      sbuild.option "all", "--all", "Build all nested sites"
 
       sbuild.action do |args, options|
         MrHyde::Commands::Build.process args, options
       end
     end
-
   end 
+
+  p.command(:serve) do |serve|
+    serve.syntax "serve [options]"
+    serve.description "Serve your site locally"
+    serve.alias :server
+
+    serve.option 'detach', '-B', '--detach', 'Run the server in the background (detach)'
+    serve.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+    serve.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+    serve.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL'
+    serve.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.'
+
+    serve.action do |args, options|
+      options["serving"] = true
+      options["watch"] = true unless options.key?("watch")
+      MrHyde::Commands::Build.process(options['all'] = 'all') if options['build']
+      MrHyde::Commands::Serve.process(options)
+    end
+  end
+
+  
+  p.command(:build) do |build|
+    build.syntax "build"
+    build.description "Build the main site"
+
+    build.option "full", "--full", "Builds main site and nested sites."
+
+    build.action do |args, options|
+      options['main'] = true
+      MrHyde::Commands::Build.process args, options
+    end
+  end
   
+  p.command(:list) do |list|
+    list.syntax "list"
+    list.description "Shows a list of all sites within sources."
+
+    list.option "built", "--built", "Shows a list of built sites."
+
+    list.action do |args, options|
+      MrHyde::Commands::List.process options
+    end
+  end
+
   p.action do |args, options|
     if args.empty?
       puts p

data/lib/mr_hyde/commands/build.rb

@@ -4,7 +4,7 @@ require "mr_hyde"
 require "mr_hyde/configuration"
 require "mr_hyde/extensions/new"
 require "mr_hyde/command"
-require "mr_hyde/blog"
+require "mr_hyde/site"
 
 module MrHyde
   module Commands
@@ -12,7 +12,8 @@ module MrHyde
       class << self
         # Options
         def process(args, opts = {})
-          MrHyde::Blog.build args, opts
+          MrHyde::Site.build args, opts
+          MrHyde.logger.info "Built process is fisished, you can look the result in '#{MrHyde.destination}' folder"
         end
       end
     end

data/lib/mr_hyde/commands/list.rb

@@ -0,0 +1,41 @@
+require "mr_hyde/command"
+require "mr_hyde/site"
+
+module MrHyde
+  module Commands
+    class List < MrHyde::Command
+      class << self
+
+        def process(opts)
+          MrHyde.configuration
+
+          if opts['built']
+            show_built_sites
+          else 
+            show_sources_sites
+          end
+        end
+
+        def show_built_sites
+          if File.exist? MrHyde.destination
+            show_list "Built sites (#{MrHyde.destination})", Site.built_list
+          else
+            MrHyde.logger.warn "Still there is not a built site"
+          end
+        end
+
+        def show_sources_sites
+          show_list "Source Sites (#{MrHyde.sources_sites})", Site.sources_list
+        end
+
+        def show_list(title, list)
+          MrHyde.logger.info "#{title}\n#{'-' * title.length}"
+          list.each do |site|
+            MrHyde.logger.info site
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/mr_hyde/commands/new.rb

@@ -6,18 +6,13 @@ require "mr_hyde"
 require "mr_hyde/configuration"
 require "mr_hyde/extensions/new"
 require "mr_hyde/command"
-require "mr_hyde/blog"
+require "mr_hyde/site"
 
 module MrHyde
   module Commands
     class New < MrHyde::Command
       class << self
-        # Options
-        #  :type => what type of element we want to create [:blog|:site]
-        #     by default it creates a new MrHyde site
-        # if :type is :blog then
-        #   :name => blog's name
-        #
+        
         def process(args, opts = {})
           case args.delete(:type)
             when :site then new_site(args[:args], opts)
@@ -29,13 +24,12 @@ module MrHyde
 
           def scaffold(args, opts)
             new_site_path = MrHyde.create args, opts
-            MrHyde.logger.info "New Mr. Hyde Site installed in #{new_site_path}"
           rescue SystemExit => se
             MrHyde.logger.abort_with "Conflict:", se.message
           end
 
           def new_site(args, opts)
-            Blog.create(args, opts)
+            Site.create(args, opts)
           end
       end
     end

data/lib/mr_hyde/commands/remove.rb

@@ -1,12 +1,12 @@
 require "mr_hyde/command"
-require "mr_hyde/blog"
+require "mr_hyde/site"
 
 module MrHyde
   module Commands
     class Remove < MrHyde::Command
       class << self
         def process(args, opts = {})
-          Blog.remove args, opts
+          Site.remove args, opts
         end
       end
     end

data/lib/mr_hyde/commands/serve.rb

@@ -0,0 +1,26 @@
+require "fileutils"
+
+require "jekyll"
+require "jekyll/stevenson"
+require "jekyll/commands/serve"
+
+require "mr_hyde"
+require "mr_hyde/configuration"
+
+module MrHyde
+  module Commands
+    class Serve < MrHyde::Command
+      class << self
+        def process(opts = {})
+          opts = MrHyde.configuration(opts)
+          unless File.exist? MrHyde.destination
+            MrHyde.logger.abort_with "Cannot start server: There is no built content"
+          end
+          ENV['JEKYLL_LOG_LEVEL'] = 'info'
+          Jekyll.logger = Stevenson.new
+          Jekyll::Commands::Serve.process opts
+        end
+      end
+    end
+  end
+end

data/lib/mr_hyde/configuration.rb

@@ -5,12 +5,24 @@ module MrHyde
   class Configuration < Jekyll::Configuration
 
     DEFAULTS = {
-      'sources' => 'sources',
-      'destination' => 'site',
-      'config' => '_mrhyde.yml',
-      'jekyll_config' => '_jekyll.yml'
+      # Places
+      'source'        => Dir.pwd,
+      'sources'       => 'sources',
+      'sources_sites' => '_sites',
+      'destination'   => 'site',
+      'layouts'       => '_layouts',
+      'includes'      => '_includes',
+      'config'        => '_mrhyde.yml',
+      'jekyll_config' => '_config.yml',
+      'assets'        => '_assets',
+      'mainsite'      => 'main_site',
+      # Serving
+      'detach'  => false, # default to not detaching the server
+      'port'    => '4000',
+      'host'    => '127.0.0.1',
+      'baseurl' => ''
     }
-    
+
     def read_config_files(files)
       configuration = clone
 

data/lib/mr_hyde/extensions/new.rb

@@ -5,6 +5,10 @@ module MrHyde
   module Extensions
     class New < Jekyll::Commands::New 
       class << self
+        def subsite_template
+          File.expand_path "../../subsite_template", File.dirname(__FILE__)
+        end
+
         def template
           site_template
         end
@@ -13,10 +17,58 @@ module MrHyde
           File.join template, '_config.yml'
         end
 
-        def create_sample_site
-          create_sample_files
+        def process(args, options = {})
+          raise ArgumentError.new('You must specify a path.') if args.empty?
+
+          new_site_path = File.expand_path(args.join(" "), Dir.pwd)
+          FileUtils.mkdir_p new_site_path
+          if preserve_source_location?(new_site_path, options)
+            Jekyll.logger.abort_with "Conflict:", "#{new_site_path} exists and is not empty."
+          end
+
+          if options["blank"]
+            create_blank_site new_site_path, options
+          elsif options["full"]
+            create_independant_sample_files args, options
+          else 
+            create_sample_files new_site_path, options
+
+            File.open(File.expand_path(initialized_post_name, new_site_path), "w") do |f|
+              f.write(scaffold_post_content)
+            end
+          end
+
+          Jekyll.logger.info "New jekyll site installed in #{new_site_path}."
+        end
+
+        def create_blank_site(path, opts)
+          Dir.chdir(path) do
+            FileUtils.mkdir(%w(_posts _drafts))
+            FileUtils.touch("index.html")
+          end
         end
 
+        def create_sample_files(path, opts)
+          FileUtils.cp_r subsite_template + '/.', path
+          FileUtils.cp_r subsite_template + '/_posts', path
+          FileUtils.rm File.expand_path(scaffold_path, path) 
+        end
+        
+        def create_independant_sample_files(args, opts)
+          Jekyll::Commands::New.process args, opts
+        end
+
+        def scaffold_post_content
+            ERB.new(File.read(File.expand_path(scaffold_path, subsite_template))).result
+        end
+
+        def initialized_post_name
+          "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-mr-hyde.markdown"
+        end
+
+        def scaffold_path
+          "_posts/0000-00-00-welcome-to-mr-hyde.markdown.erb"
+        end
      end
     end
   end

data/lib/mr_hyde/jekyll_ext/converters/scss.rb

@@ -0,0 +1,18 @@
+require 'jekyll/converters/scss'
+require 'mr_hyde'
+
+include Jekyll
+
+module Converters
+  class Scss
+    alias_method :pristine_sass_load_paths, :sass_load_paths
+
+    def sass_load_paths
+      paths = pristine_sass_load_paths
+      common_assets = Jekyll.sanitized_path(File.join(MrHyde.sources, MrHyde.config['assets']), sass_dir)
+      paths << common_assets if File.directory? common_assets
+
+      paths
+    end
+  end
+end

data/lib/mr_hyde/jekyll_ext/jekyll.rb

@@ -0,0 +1,16 @@
+require 'jekyll'
+require 'mr_hyde'
+
+module Jekyll
+  class << self
+
+    def logger
+      @logger ||= LogAdapter.new(Stevenson.new, (ENV['JEKYLL_LOG_LEVEL'] || :error).to_sym)
+    end
+
+    def logger=(writer)
+      @logger = LogAdapter.new(writer, (ENV['JEKYLL_LOG_LEVEL'] || :error).to_sym)
+    end
+  end
+end
+

data/lib/mr_hyde/jekyll_ext/site.rb

@@ -0,0 +1,47 @@
+require 'jekyll/site'
+require 'mr_hyde'
+
+include Jekyll
+
+class Site
+  alias_method :pristine_site_payload, :site_payload
+
+  # First try to find the file referenced in the jekyll folder (by default _config.yml),
+  # in case is not there, then try to find it in the mrhyde folder (by default _config.yml)
+  def in_source_dir(*paths)
+    file_path = paths.reduce(source) do |base, path|
+      Jekyll.sanitized_path(base, path)
+    end
+    unless File.exist? file_path
+      file_path = paths.reduce(MrHyde.source) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+    file_path
+  end
+
+
+  # This patching ensures that if the site is the main, then adds to the payload 
+  # the sites value containing the sites payloads info within sources sites.
+  def site_payload
+    payload = pristine_site_payload
+
+    if source == MrHyde.main_site
+      site_names = MrHyde.built_list
+
+      unless site_names.empty?
+        sites_payload = site_names.map do |site_name|
+          opts = MrHyde.site_configuration(site_name)
+          opts = Jekyll.configuration(opts)
+          site = Site.new opts
+
+          Utils.deep_merge_hashes site.site_payload['site'], { 'name' => site_name }
+        end
+        payload['site'] = Utils.deep_merge_hashes(payload['site'], { 'sites' => sites_payload })
+      end
+    end
+
+    payload
+  end
+
+end

data/lib/mr_hyde/jekyll_ext/tags/include.rb

@@ -0,0 +1,23 @@
+require 'jekyll/tags/include'
+require 'mr_hyde'
+
+include Jekyll
+
+module Tags
+  class IncludeTag
+=begin
+    def tag_includes_dir
+      File.join MrHyde.sources, MrHyde.config['includes']
+=end
+
+    def resolved_includes_dir(context)
+      path = File.join(File.realpath(context.registers[:site].source), @includes_dir)
+
+      unless File.directory? path
+        path = File.join(File.realpath(MrHyde.source), MrHyde.sources, @includes_dir)
+      end
+
+      path
+    end
+  end
+end