mr_hyde 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2470400bbbda23e77dcfe015b21bdd987278cbd
-  data.tar.gz: 2718ceeb1774698fd22038c0d30f733d0a2cc58b
+  metadata.gz: a63482aba4bba186b23e2b66afebbdc360d9085c
+  data.tar.gz: ce48375f3b63ff83d6c0efb4262f261d67ac925d
 SHA512:
-  metadata.gz: 59c238a5502a218ed2ac749bed0c7af83099c911aaca45554a73fa433250c7db42e57f6c46f3be65463c0a92aebee7f4a562637545c3ec6551dc2b621df8ce16
-  data.tar.gz: b79d839ad2d973a63768964da00542a1caf6caa35b1358a37d9ef31ca9a8519d0df36b818304138236ffeb7aa46c0bdcd1ed2cb8b9ab912ec3dc89fe4c3d675c
+  metadata.gz: 48e67b1184d55d5ae23d686004a613774e3d48c960377788c95290ac63b5c6537ff87aa526f388f461753ac444f2a2a75a37e89825d73f2ceb597db5b2b3797d
+  data.tar.gz: 39e1794f3841c515bd1a5999298b6531726f54230bf37b8610ad0ad41288e61a2161933daeb9722b992abb8930862b27086a4102d88a92e8da4a818c47c424cf

data/bin/mrhyde

@@ -30,12 +30,38 @@ end
 def cmd_build(command)
   command.option "all", "--all", "Builds main site and nested sites. Not applied when building a nested site."
 
+  add_build_options(command)
+
   command.action do |args, options|
     options['main'] = true if args.length == 0
     MrHyde::Commands::Build.process args, options
   end
 end
 
+# Add common options to a command for building configuration
+#
+# c - the Jekyll::Command to add these options to
+#
+# Returns nothing
+def add_build_options(c)
+  c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+  c.option 'quiet',   '-q', '--quiet', 'Silence output.'
+  c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
+=begin
+  c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
+  c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
+  c.option 'future',  '--future', 'Publishes posts with a future date'
+  c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
+  c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
+  c.option 'force_polling', '--force_polling', 'Force watch to use polling'
+  c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
+  c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
+  c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
+  c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.'
+=end
+end
+
 Mercenary.program(:mrhyde) do |p|
   p.version MrHyde::VERSION
   p.description "Mr. Hyde is a tool intended to manage as many blog as you want powered by Jekyll."

data/lib/mr_hyde.rb

@@ -1,4 +1,5 @@
 require "fileutils"
+require "pathname"
 require "logger"
 
 require "jekyll/log_adapter"
@@ -36,24 +37,26 @@ module MrHyde
     end
     
     # Jekyll Configuration
-    def main_site_configuration
+    def main_site_configuration(opts = nil)
       # The order is important here, the last one overrides the previous ones
-      site_configuration nil
+      site_configuration nil, opts
     end
   
     # Jekyll per site configuration
     # This method gets the config files which must be read from jekyll. 
     # _config.yml < sites/site/_config.yml < override
     #
-    def site_configuration(site_name = nil)
+    def site_configuration(site_name = nil, opts_args = nil)
+      clone_opts_args = opts_args.clone if opts_args
       jekyll_config = jekyll_defaults(site_name)
       site_name ||= config['mainsite']
       opts = {}
 
       # 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'] << Jekyll.sanitized_path(source, config['config']) if has_jekyll_config?
       opts['config'] << Site.custom_config(site_name, config) if Site.has_custom_config?(site_name, config)
+      opts['config'].concat(Configuration[Configuration::DEFAULTS].config_files(clone_opts_args)) if clone_opts_args and clone_opts_args['config']
 
       jekyll_config.merge(opts)
     end
@@ -63,18 +66,18 @@ module MrHyde
       conf = if site_name
         { 'baseurl'     => '/' + site_name,
           'destination' => File.join(MrHyde.destination, site_name),
-          'source'      => File.join(MrHyde.sources_sites, site_name) }
+          'source'      => Pathname.pwd.join(MrHyde.sources_sites, site_name).to_s }
       else
         site_name = config['mainsite']
-        { 'source' => File.join(site_name),
-          'destination' => File.join(MrHyde.destination) }
+        { 'source' => Pathname.pwd.join(site_name).to_s,
+          'destination' => File.join(MrHyde.destination).to_s }
       end
 
       conf.merge({ 'layouts_dir' => File.join(config['layouts_dir']) })
     end
 
     def has_jekyll_config?
-      File.exist? File.expand_path(File.join(source, @config['jekyll_config']))
+      File.exist? File.expand_path(File.join(source, @config['config']))
     end
     
     def sources_sites
@@ -93,7 +96,7 @@ module MrHyde
     #
     # Returns the LogAdapter instance.
     def logger
-      @logger = LogAdapter.new(Stevenson.new, (ENV['MRHYDE_LOG_LEVEL'] || :info).to_sym)
+      @logger ||= LogAdapter.new(Stevenson.new, (ENV['MRHYDE_LOG_LEVEL'] || :info).to_sym)
     end
 
     def logger=(writer)

data/lib/mr_hyde/commands/build.rb

@@ -12,6 +12,7 @@ module MrHyde
       class << self
         # Options
         def process(args, opts = {})
+          MrHyde.logger.adjust_verbosity opts
           MrHyde::Site.build args, opts
           MrHyde.logger.info "Built process is finished, you can see the result in '#{MrHyde.destination}' folder"
         end

data/lib/mr_hyde/configuration.rb

@@ -8,12 +8,16 @@ module MrHyde
       'source'        => Dir.pwd,
       'destination'   => 'site',
       'sources_sites' => '_sites',
-      'config'        => '_mrhyde.yml',
-      'jekyll_config' => '_config.yml',
+      'config'        => '_config.yml',
       'assets'        => '_assets',
       'mainsite'      => '_site'
     })
 
+    def config_files(override)
+      MrHyde.logger.adjust_verbosity(:quiet => quiet?(override), :verbose => verbose?(override))
+      super(override)
+    end
+
     def read_config_files(files)
       configuration = clone
 

data/lib/mr_hyde/site.rb

@@ -14,6 +14,7 @@ module MrHyde
                     File.join MrHyde.source, MrHyde.sources_sites
                   end
         yield if block_given?
+        opts
       end
 
       # Creates the directory and necessary files for the site
@@ -83,8 +84,8 @@ module MrHyde
       def build(args = nil, opts = {})
         init(args, opts)
 
-        # If there is no destinarion folder then will be created
-        mk_destination(opts) unless File.exist? MrHyde.destination
+        # If there is no destination folder then will be created
+        #mk_destination(opts) unless File.exist? MrHyde.destination
 
         if not args.nil? and not args.empty?
           build_sites args, opts 
@@ -150,13 +151,19 @@ module MrHyde
       end
       
       def custom_config(name, opts)
-        File.join site_path(name), opts['jekyll_config']
+        File.join site_path(name), opts['config']
       end
       
       def is_main?(name)
         File.directory? File.join(name)
       end
 
+      # Receives an array of files don't want to be removed
+      def keep_files(files, conf)
+        conf['keep_files'] = [] unless conf['keep_files']
+        conf['keep_files'] = conf['keep_files'].concat(files).uniq
+      end
+
       private
 
       def create_site(args, opts = {})
@@ -212,25 +219,25 @@ module MrHyde
         end
       end
 
-      def build_site(name, opts)
-        conf = MrHyde.site_configuration(name)
+      def build_site(name, opts = nil)
+        conf = MrHyde.site_configuration(name, opts)
         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
+      def build_main_site(opts = nil)
+        conf = MrHyde.main_site_configuration opts
         keep_built_sites conf
         Jekyll::Commands::Build.process conf
       end
 
       def keep_built_sites(conf)
-        conf['keep_files'] = built_list
+        keep_files built_list, conf
       end
 
       def mk_destination(opts)
-        conf = MrHyde.main_site_configuration
+        conf = MrHyde.main_site_configuration opts
         Dir.mkdir conf["destination"]
       end
 

data/lib/mr_hyde/version.rb

@@ -1,3 +1,3 @@
 module MrHyde
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/site_template/_config.yml

@@ -8,7 +8,9 @@ description: > # this means to ignore newlines until "baseurl:"
   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: "_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
+
+# Mr. Hyde settings
+mainsite: "_site" # this is the name of the root default (main) site, where all sites will be nested

data/mr_hyde.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.8", ">= 5.8.4"
   spec.add_development_dependency "minitest-reporters", "~> 1.1", ">= 1.1.7"
+  spec.add_development_dependency "nokogiri", "~> 1.6.7"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "byebug", "~> 8.2.2"
   

data/spec/build_spec.rb

@@ -1,8 +1,12 @@
 require "minitest/autorun"
 require "minitest/reporters"
+require "nokogiri"
 require "fileutils"
+require "pathname"
+require "yaml"
 require_relative "../lib/mr_hyde"
 require_relative "../lib/mr_hyde/site"
+require_relative "../lib/mr_hyde/commands/build"
 
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new, Minitest::Reporters::ProgressReporter.new]
 
@@ -62,4 +66,49 @@ describe "Checking MrHyde build command" do
     end
   end
 
+  describe "specifying another configuration file" do
+    def test_for_error 
+      yield
+      'ok'
+    rescue
+      $!
+    end
+
+    def fetch_title
+      # Checking the title provided by the new config file
+      html_file = Pathname.pwd.join(MrHyde.configuration['destination'], 'index.html')
+      doc       = Nokogiri::HTML Pathname.new(html_file)
+      res       = doc.search '.row hgroup h1.site-title a'
+      res.children.first.to_s
+    end
+
+    before do
+      @current_file      = Pathname.new(Dir.pwd).join MrHyde.configuration['config']
+      @yml_file          = YAML.load_file @current_file
+      @yml_file['title'] = "Copied file title"
+      @new_file          = Pathname.pwd.join("..").join(@current_file.basename)
+
+      File.open(@new_file.to_s, "w") do |f|
+        f.write @yml_file.to_yaml
+      end
+    end
+
+    it "can build site when --config option is used" do
+      # Building site
+      test_for_error do
+        MrHyde::Site.build([], {'config' => @new_file.to_s})
+      end.must_equal 'ok'
+
+      fetch_title().must_equal @yml_file['title']
+    end
+
+    it "can build all sites with --config and --all option" do
+      # Building site
+      test_for_error do
+        MrHyde::Site.build([], {'config' => @new_file.to_s, 'all' => true})
+      end.must_equal 'ok'
+      
+      fetch_title().must_equal @yml_file['title']
+    end
+  end
 end

data/spec/new_spec.rb

@@ -21,7 +21,6 @@ describe "Checking if mrhyde can create new sites" do
     MrHyde.create
 
     File.exist?(File.join '.', @defaults['config']).must_be :==, true
-    File.exist?(File.join '.', @defaults['jekyll_config']).must_be :==, true
     File.exist?(File.join '.', @defaults['layouts_dir']).must_be :==, true
     File.exist?(File.join '.', @defaults['includes_dir']).must_be :==, true
     File.exist?(File.join '.', @defaults['assets']).must_be :==, true
@@ -36,7 +35,6 @@ describe "Checking if mrhyde can create new sites" do
     File.exist?(@site_name).must_be :==, true
     File.exist?(File.join @site_name).must_be :==, true
     File.exist?(File.join @site_name, @defaults['config']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['jekyll_config']).must_be :==, true
     File.exist?(File.join @site_name, @defaults['layouts_dir']).must_be :==, true
     File.exist?(File.join @site_name, @defaults['includes_dir']).must_be :==, true
     File.exist?(File.join @site_name, @defaults['assets']).must_be :==, true
@@ -51,7 +49,6 @@ describe "Checking if mrhyde can create new sites" do
     File.exist?(@site_name).must_be :==, true
     File.exist?(File.join @site_name).must_be :==, true
     File.exist?(File.join @site_name, @defaults['config']).must_be :==, false
-    File.exist?(File.join @site_name, @defaults['jekyll_config']).must_be :==, false
     File.exist?(File.join @site_name, @defaults['layouts_dir']).must_be :==, true
     File.exist?(File.join @site_name, @defaults['includes_dir']).must_be :==, true
     File.exist?(File.join @site_name, @defaults['assets']).must_be :==, false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_hyde
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Enrique Arias Cervero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +205,6 @@ files:
 - lib/site_template/_layouts/default.html
 - lib/site_template/_layouts/page.html
 - lib/site_template/_layouts/post.html
-- lib/site_template/_mrhyde.yml
 - lib/site_template/_site/about.md
 - lib/site_template/_site/css/main.scss
 - lib/site_template/_site/css/normalize.css

data/lib/site_template/_mrhyde.yml

@@ -1,2 +0,0 @@
-# Mr. Hyde settings
-mainsite: "_site" # this is the name of the root default site, where all sites will be nested