mr_hyde 0.1.0 → 0.2.0

data/lib/mr_hyde/site.rb

@@ -0,0 +1,234 @@
+require "jekyll"
+require "fileutils"
+require "mr_hyde"
+require "mr_hyde/configuration"
+
+module MrHyde
+  class Site
+    class << self
+      def init(args, opts)
+        opts = MrHyde.configuration(opts)
+        @source = if opts['main']
+                    File.join MrHyde.source, MrHyde.sources
+                  else
+                    File.join MrHyde.source, MrHyde.sources_sites
+                  end
+        yield if block_given?
+      end
+
+      # Creates the directory and necessary files for the site
+      # Params:
+      #   args
+      #     String => creates the concrete site
+      #     Array[String] => creates the correspondings site names
+      #   opts
+      #     Hash 
+      #       'force' => 'force' Install the new site over an exiting path
+      #       'blank' => 'blank' Creates a blank site
+      #
+      def create(args, opts = {})
+        init(args, opts)
+
+        if args.kind_of? Array and not args.empty?
+          args.each do |bn| 
+            begin
+              create_site(bn, opts)
+            rescue Exception => e
+              raise e unless e.class == SystemExit
+            end
+          end
+        elsif args.kind_of? String
+          create_site args, opts
+        end
+      rescue Exception => e
+        MrHyde.logger.error "cannot create site: #{e}"
+      end
+
+      # Removes the site directory
+      # Params:
+      #   args
+      #     String => removes the concrete site
+      #     Array[String] => removes the correspondings site names
+      #     empty => remove all sites with the option 'all'
+      #   opts
+      #     Hash 
+      #       'all' => 'all' Removes all built sites
+      #       'full' => 'full' Removes built and source site/s
+      #
+      def remove(args, opts = {})
+        init(args, opts)
+
+        if opts['all']
+          list(MrHyde.sources_sites).each do |sm|
+            remove_site sm, opts
+          end
+        elsif args.kind_of? Array
+          args.each do |sm|
+            remove_site sm, opts
+          end
+        else
+          remove_site args, opts
+        end
+      rescue Exception => e
+        MrHyde.logger.error "cannot remove the site: #{e}"
+      end
+
+      # Builds the site
+      # Params:
+      #   :name
+      #     String => builds the concrete site
+      #     Array[String] => builds the correspondings site names
+      #     empty => builds all sites with option 'all'
+      #   opts
+      #     Hash 
+      #       'all' => 'all' Builds all built sites
+      #
+      def build(args, opts = {})
+        init(args, opts)
+
+        unless opts.delete('main')
+          # If there is no main site then it is built
+          build_main_site(opts) unless File.exist? MrHyde.destination
+
+          if opts["all"]
+            build_sites list(MrHyde.sources_sites), opts
+          elsif args.kind_of? Array
+            build_sites args, opts 
+          elsif args.kind_of? String
+            build_site args, opts
+          end
+        else
+          # Fetching the list of built sites to rebuild again once the main site has been built
+          if File.exist? MrHyde.destination
+            nested_sites = built_list
+            build_main_site(opts)
+            build_sites nested_sites, opts
+          else
+            build_main_site(opts)
+          end
+        end
+      rescue Exception => e
+        MrHyde.logger.error "cannot build site: #{e}"
+        MrHyde.logger.error e.backtrace
+      end
+
+      # This method returns a list of nested sites
+      #
+      def list(path)
+        entries = Dir.entries(path)
+        entries.reject! { |item| item == '.' or item == '..' }
+        entries
+      end
+
+      def sources_list
+        list MrHyde.sources_sites
+      end
+
+      def built_list
+        return [] unless File.exist? MrHyde.destination
+        sources = sources_list
+        builts  = list(MrHyde.destination)
+
+        builts.select do |site|
+          site if sources.include?(site)
+        end
+      end
+
+      def exist?(name, opts)
+        File.exist? File.join(@source, name)
+      end
+        
+      def built?(name, opts)
+        File.exist? File.join(MrHyde.destination, name)
+      end
+
+      def has_custom_config?(name, opts)
+        File.exist? custom_config(name, opts)
+      end
+
+      def site_path(name)
+        source = is_main?(name) ? @source : File.join(MrHyde.source, MrHyde.sources_sites)
+        Jekyll.sanitized_path(source , name)
+      end
+      
+      def custom_config(name, opts)
+        File.join site_path(name), opts['jekyll_config']
+      end
+      
+      def is_main?(name)
+        File.directory? File.join(MrHyde.sources, name)
+      end
+
+      private
+
+      def create_site(args, opts = {})
+        begin
+          if args.kind_of? Array
+            args.each do |name|
+              raise() if is_main(args)
+            end
+          else
+            raise() if is_main?(args)
+          end
+        rescue Exception => e
+          raise ArgumentError, 'The site\'s name cannot be the same than the main site name'
+        end
+
+        MrHyde::Extensions::New.process [File.join(MrHyde.sources_sites, args)], opts
+        MrHyde.logger.info "New #{args} created in #{MrHyde.sources_sites}"
+        exist? args, opts
+      end
+
+      def remove_site(name, opts = {})
+        # OBSOLOTE
+        # This checking is not mandatory, never can be removed form here the main site
+        if is_main?(name)
+          MrHyde.logger.warning "Cannot remove main site: #{name}"
+          return
+        end
+
+        if opts['full'] and File.exist? File.join(MrHyde.sources_sites, name)
+          FileUtils.remove_dir File.join(MrHyde.sources_sites, name)
+          MrHyde.logger.info "#{name} removed from #{MrHyde.sources_sites}"
+        end
+        if File.exist? File.join(MrHyde.destination, name)
+          FileUtils.remove_dir File.join(MrHyde.destination, name)
+          MrHyde.logger.info "#{name} removed from #{MrHyde.destination}"
+        end
+      end
+
+      def build_sites(site_names, opts)
+        site_names.each do |sn| 
+          begin
+            build_site(sn, opts)
+          rescue Exception => e
+            MrHyde.logger.error e
+          end
+        end
+      end
+
+      def build_site(name, opts)
+        conf = MrHyde.site_configuration(name)
+        Jekyll::Commands::Build.process conf
+        MrHyde.logger.info "#{name} built in #{MrHyde.destination}"
+        built? name, opts
+      end
+
+      def build_main_site(opts)
+        conf = MrHyde.main_site_configuration
+        Jekyll::Commands::Build.process conf
+      end
+
+
+      def check_site(site_name, method, message)
+        if not send(method, site_name)
+          MrHyde.logger.debug message
+          return false
+        end
+        true
+      end
+
+    end
+
+  end
+end

data/lib/mr_hyde/version.rb

@@ -1,3 +1,3 @@
 module MrHyde
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/mr_hyde.rb

@@ -1,50 +1,112 @@
-require "mr_hyde/version"
-require "mr_hyde/blog"
-require "mr_hyde/configuration"
-require "mr_hyde/commands/new"
-require "mr_hyde/commands/build"
-
-require "logger"
 require "fileutils"
+require "logger"
 
-require "jekyll/stevenson"
 require "jekyll/log_adapter"
 require "jekyll/utils"
 
+require "mr_hyde/version"
+require "mr_hyde/site"
+require "mr_hyde/configuration"
+require "mr_hyde/commands/new"
+require "mr_hyde/commands/build"
+
 module MrHyde
+  require "mr_hyde/jekyll_ext/jekyll"
+  require "mr_hyde/jekyll_ext/site"
+  require "mr_hyde/jekyll_ext/tags/include"
+  require "mr_hyde/jekyll_ext/converters/scss"
+
   class << self
+    attr_reader :source, :config
     attr_accessor :configuration
 
+    # OBSOLETE
     def configure
       self.configuration ||= Configuration.new
       yield(configuration) if block_given?
     end
 
+    # Mr.Hyde Configuration
     def configuration(override = Hash.new)
-      config = Configuration[Configuration::DEFAULTS]
-      override = Configuration[override].stringify_keys
+      @config = private_configuration(override, Configuration::DEFAULTS)
+      @source = File.expand_path(config['source'])
+      @source = Dir.pwd unless @source == Dir.pwd
+      @source = @source.freeze
+      @config
+    end
+    
+    # Jekyll Configuration
+    def main_site_configuration
+      # The order is important here, the last one overrides the previous ones
+      site_configuration nil
+    end
+  
+    # Jekyll per site configuration
+    # This method gets the config files which must be read from jekyll. 
+    # _config.yml < sources/sites/site/_config.yml < override
+    #
+    def site_configuration(site_name = nil)
+      jekyll_config = jekyll_defaults(site_name)
+      site_name ||= config['mainsite']
+      opts = {}
 
-      unless override.delete('skip_config_files')
-        override['config'] ||= config['config']
-        config = config.read_config_files(config.config_files(override))
+      # The order is important here, the last one overrides the previous one
+      opts['config'] = []
+      opts['config'] << Jekyll.sanitized_path(source, config['jekyll_config']) if has_jekyll_config?
+      opts['config'] << Site.custom_config(site_name, config) if Site.has_custom_config?(site_name, config)
+
+      jekyll_config.merge(opts)
+    end
+    
+    # If no site name is passed in then the configuration defaults are set for the main site
+    def jekyll_defaults(site_name = nil)
+      conf = if site_name
+        { 'baseurl'     => '/' + site_name,
+          'destination' => File.join(MrHyde.destination, site_name),
+          'source'      => File.join(MrHyde.sources_sites, site_name) }
+      else
+        site_name = config['mainsite']
+        { 'source' => File.join(sources, site_name),
+          'destination' => File.join(MrHyde.destination) }
       end
-      # Merge DEFAULTS < _config.yml < override
-      config = Jekyll::Utils.deep_merge_hashes(config, override).stringify_keys
-      set_timezone(config['timezone']) if config['timezone']
-      
-      config
+
+      conf.merge({ 'layouts' => File.join(MrHyde.sources, config['layouts']) })
+    end
+
+    def has_jekyll_config?
+      File.exist? File.expand_path(source, @config['jekyll_config'])
+    end
+
+    def sources
+      config['sources']
+    end
+    
+    def sources_sites
+      File.join config['sources'], config['sources_sites']
+    end
+
+    def destination
+      config['destination']
+    end
+
+    def main_site
+      File.join source, sources, config['mainsite']
     end
 
     # Public: Fetch the logger instance for this Jekyll process.
     #
     # Returns the LogAdapter instance.
     def logger
-      Jekyll.logger
+      @logger = LogAdapter.new(Stevenson.new, (ENV['MRHYDE_LOG_LEVEL'] || :info).to_sym)
+    end
+
+    def logger=(writer)
+      @logger = LogAdapter.new(writer)
     end
 
     # Creates the folders for the sources and destination, 
     # by default will be created under root folder.
-    # Copies the default _config.yml for all blogs, in root folder.
+    # Copies the default _config.yml for all sites, in root folder.
     #
     # Throws a SystemExit exception
     #
@@ -57,7 +119,7 @@ module MrHyde
       end
 
       if opts['blank']
-        create_black_site new_site_path
+        create_blank_site new_site_path
       else
         create_sample_files new_site_path
       end
@@ -68,6 +130,14 @@ module MrHyde
       Commands::Build.process opts
     end
 
+    def built_list
+      Site.built_list
+    end
+
+    def sources_list
+      Site.sources_list
+    end
+
     private 
 
     def preserve_source_location?(path, opts)
@@ -76,18 +146,49 @@ module MrHyde
 
     def create_sample_files(path)
       FileUtils.cp_r site_template + '/.', path
-      FileUtils.copy_file MrHyde::Extensions::New.default_config_file, 
-        File.join(path, '_jekyll.yml')
+      MrHyde.logger.info "New Mr. Hyde Site installed in #{path}"
+      # Copying the original _config.yml from jekyll to mrhyde folder
+      # jekyll_config = MrHyde::Extensions::New.default_config_file
+      # FileUtils.copy_file(jekyll_config, File.join(path, File.basename(jekyll_config)))
+      # Creating the default jekyll site in mrhyde
       Dir.chdir(path) do
         FileUtils.mkdir(%w(sources)) unless File.exist? 'sources'
-        Blog.create ['welcome_site'], { 'force' => 'force' }
+        Site.create ['sample-site'], { 'force' => 'force' }
+        Site.create ['sample-full-site'], { 'full' => 'full', 'force' => 'force' }
       end
+    end
 
+    def create_blank_site(path)
+      Dir.chdir(path) do
+        FileUtils.mkdir('sources')
+        Dir.chdir('sources') do 
+          FileUtils.mkdir %w(_layouts _includes main_site) 
+        end
+        Dir.chdir(File.join('sources', 'main_site')) do
+          FileUtils.touch 'index.html' 
+        end
+      end
+      MrHyde.logger.info "New Mr. Hyde Site installed in #{path}"
     end
 
     def site_template
       File.expand_path("./site_template", File.dirname(__FILE__))
     end
+
+    def private_configuration(override = Hash.new, defaults)
+      config = Configuration[defaults]
+      override = Configuration[override].stringify_keys
+
+      unless override.delete('skip_config_files')
+        override['config'] ||= config['config']
+        config = config.read_config_files(config.config_files(override))
+      end
+      # Merge DEFAULTS < _config.yml < override
+      config = Jekyll::Utils.deep_merge_hashes(config, override).stringify_keys
+      set_timezone(config['timezone']) if config['timezone']
+
+      config
+    end
   end
 
 end

data/lib/site_template/_config.yml

@@ -0,0 +1,14 @@
+# Site settings
+title: Global Site Title
+subtitle: This is is the global subtitle
+email: your-email@domain.com
+description: > # this means to ignore newlines until "baseurl:"
+  This is the parent site of all generated sites by Mr. Hyde.
+  Write an awesome description for your new site here. You can edit this
+  line in _config.yml. It will appear in your document head meta (for
+  Google search results) and in your feed.xml site description.
+baseurl: "" # the subpath of your site, e.g. /blog/
+mainsite: "main_site" # this is the name of the root default site, where all sites will be nested
+url: "http://yourdomain.com" # the base hostname & protocol for your site
+twitter_username: mrhyderb
+github_username:  mrhyde

data/lib/site_template/_mrhyde.yml

@@ -1,11 +1,2 @@
-# Site settings
-title: Your awesome title
-email: your-email@domain.com
-description: > # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://yourdomain.com" # the base hostname & protocol for your site
-twitter_username: mrhyderb
-github_username:  mrhyde
+# Mr. Hyde settings
+mainsite: "main_site" # this is the name of the root default site, where all sites will be nested

data/lib/site_template/sources/_assets/_sass/_base.scss

@@ -0,0 +1,204 @@
+/**
+ * Reset some basic elements
+ */
+body, h1, h2, h3, h4, h5, h6,
+p, blockquote, pre, hr,
+dl, dd, ol, ul, figure {
+    margin: 0;
+    padding: 0;
+}
+
+
+
+/**
+ * Basic styling
+ */
+body {
+    font-family: $base-font-family;
+    font-size: $base-font-size;
+    line-height: $base-line-height;
+    font-weight: 300;
+    color: $text-color;
+    background-color: $background-color;
+    -webkit-text-size-adjust: 100%;
+}
+
+
+
+/**
+ * Set `margin-bottom` to maintain vertical rhythm
+ */
+h1, h2, h3, h4, h5, h6,
+p, blockquote, pre,
+ul, ol, dl, figure,
+%vertical-rhythm {
+    margin-bottom: $spacing-unit / 2;
+}
+
+
+
+/**
+ * Images
+ */
+img {
+    max-width: 100%;
+    vertical-align: middle;
+}
+
+
+
+/**
+ * Figures
+ */
+figure > img {
+    display: block;
+}
+
+figcaption {
+    font-size: $small-font-size;
+}
+
+
+
+/**
+ * Lists
+ */
+ul, ol {
+    margin-left: $spacing-unit;
+}
+
+li {
+    > ul,
+    > ol {
+         margin-bottom: 0;
+    }
+}
+
+
+
+/**
+ * Headings
+ */
+h1, h2, h3, h4, h5, h6 {
+    font-weight: 300;
+}
+
+
+
+/**
+ * Links
+ */
+a {
+    color: $brand-color;
+    text-decoration: none;
+
+    &:visited {
+        color: darken($brand-color, 15%);
+    }
+
+    &:hover {
+        color: $text-color;
+        text-decoration: underline;
+    }
+}
+
+
+
+/**
+ * Blockquotes
+ */
+blockquote {
+    color: $grey-color;
+    border-left: 4px solid $grey-color-light;
+    padding-left: $spacing-unit / 2;
+    font-size: 18px;
+    letter-spacing: -1px;
+    font-style: italic;
+
+    > :last-child {
+        margin-bottom: 0;
+    }
+}
+
+
+
+/**
+ * Code formatting
+ */
+pre,
+code {
+    font-size: 15px;
+    border: 1px solid $grey-color-light;
+    border-radius: 3px;
+    background-color: #eef;
+}
+
+code {
+    padding: 1px 5px;
+}
+
+pre {
+    padding: 8px 12px;
+    overflow-x: scroll;
+
+    > code {
+        border: 0;
+        padding-right: 0;
+        padding-left: 0;
+    }
+}
+
+
+
+/**
+ * Wrapper
+ */
+.wrapper {
+    max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
+    max-width:         calc(#{$content-width} - (#{$spacing-unit} * 2));
+    margin-right: auto;
+    margin-left: auto;
+    padding-right: $spacing-unit;
+    padding-left: $spacing-unit;
+    @extend %clearfix;
+
+    @include media-query($on-laptop) {
+        max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
+        max-width:         calc(#{$content-width} - (#{$spacing-unit}));
+        padding-right: $spacing-unit / 2;
+        padding-left: $spacing-unit / 2;
+    }
+}
+
+
+
+/**
+ * Clearfix
+ */
+%clearfix {
+
+    &:after {
+        content: "";
+        display: table;
+        clear: both;
+    }
+}
+
+
+
+/**
+ * Icons
+ */
+.icon {
+
+    > svg {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        vertical-align: middle;
+
+        path {
+            fill: $grey-color;
+        }
+    }
+}

data/lib/site_template/sources/_assets/_sass/_functions.scss

@@ -0,0 +1,11 @@
+@mixin media-query($device) {
+    @media screen and (max-width: $device) {
+        @content;
+    }
+}
+
+@mixin media-query-between($minDevice, $maxDevice) {
+    @media screen and (min-width: $minDevice) and (max-width: $maxDevice) {
+        @content;
+    }
+}