mr_hyde 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d579e8f6091be07c9c6fd4ac4093a4b0f4996358
-  data.tar.gz: 169be6e63526f66e802575c7985fe66d136500b9
+  metadata.gz: be4ff45145b0410676993b7b61ad2c16d57a359e
+  data.tar.gz: 9f39ac565f3179c71730618c3315ba210d2da606
 SHA512:
-  metadata.gz: 4c216b1cbf271516184c0f09abac6a477524f86d96f2e1075395fb00126b9ba7d0042b677a3589d44faa937d33f84b0bf2c97536ad3b5f96fdd2025880545d92
-  data.tar.gz: bd02909e7c8d1fa097775ef1cfa1300fa725725ee3c2e5d7299924f30ffdcad4cf19965d9f1c3882b17280609fc4e113508ce97d51d87074f2fc44d41309188b
+  metadata.gz: 582235b101b3d514d1c60e197d7b29a7e508d96fc1f646289b04265dd77651ba95e9736f4865f69652dc42aea8d0815856fa261771c5cc566099294931498d31
+  data.tar.gz: d0851cc6dabc5528c0f61b8c6f6ef1a8d0cf4d680901f2e0423dcb223107a25593249c481866454dad5135d364c140d2c4b257b5cacedc297c9267317f36b273

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 .sass-cache/
 .DS_Store
+.byebug_history

data/Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in mr_hyde.gemspec
 gemspec
 
-gem 'jekyll', '2.5.3'
-gem 'mercenary', '0.3.5'

data/README.md

@@ -1,10 +1,10 @@
 <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 static sites as you like, all nested from a parent site, for example, you can have several nested sites sharing the same assets than parent site and other nested sites with its own assets.
 
-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.
+All this works thanks to [Jekyll](http://jekyllrb.com) tool, 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).
+The current version is based on [Jekyll 3.1.1](https://github.com/jekyll/jekyll/tree/v3.1.1).
 
 ## Installation
 
@@ -28,15 +28,15 @@ $ gem install mr_hyde
 
 ## Usage
 
-In order to use Mr. Hyde the first thing you must do is creating the Mr. Hyde rootl folder with the next command:
+In order to use Mr. Hyde the first thing you must do is creating the Mr. Hyde root folder using the next command:
 
 ```bash
-$ mrhyde new [PATH]
+$ mrhyde new [NAME]
 ```
 
-The previuos command creates the basic structure folder in the passed in PATH or in the same folder if no PATH given.
+The previuos command creates the basic structure folder within the new folder NAME, in case the name is not provided then the same folder will be used.
 
-Once created get in the Mr. Hyde root folder and you can execute the next commands:
+Once created cd the Mr. Hyde root folder (or the same if no NAME was given) and you can execute the next commands:
 
 ```bash
 $ cd PATH

data/Rakefile

@@ -4,10 +4,29 @@ require "rake/testtask"
 ENV["JEKYLL_LOG_LEVEL"] = "error"
 ENV["MRHYDE_LOG_LEVEL"] = "error"
 
-Rake::TestTask.new do |t|
-  t.libs.push "lib"
-  t.test_files = FileList["spec/*_spec.rb"]
-  #t.test_files = FileList["test/*_test.rb"]
-  #t.pattern = "test/*_test.rb"
-  t.verbose = true
+task :test_task do
+  Rake::TestTask.new do |t|
+    t.libs.push "lib"
+    t.test_files = FileList["spec/*_spec.rb"]
+    #t.pattern = "test/*_test.rb"
+    #t.verbose = true
+  end
+end
+
+task :unit_task do
+  Rake::TestTask.new("unit") do |t|
+    t.libs.push "lib"
+    t.test_files = FileList["test/*_test.rb"]
+  end
+end
+
+
+task :test do
+  Rake::Task["unit_task"].clear
+  Rake::Task["test_task"].invoke
+end
+
+task :unit do
+  Rake::Task["test_task"].clear
+  Rake::Task["unit_task"].invoke
 end

data/lib/mr_hyde.rb

@@ -43,7 +43,7 @@ module MrHyde
   
     # Jekyll per site configuration
     # This method gets the config files which must be read from jekyll. 
-    # _config.yml < sources/sites/site/_config.yml < override
+    # _config.yml < sites/site/_config.yml < override
     #
     def site_configuration(site_name = nil)
       jekyll_config = jekyll_defaults(site_name)
@@ -66,23 +66,19 @@ module MrHyde
           'source'      => File.join(MrHyde.sources_sites, site_name) }
       else
         site_name = config['mainsite']
-        { 'source' => File.join(sources, site_name),
+        { 'source' => File.join(site_name),
           'destination' => File.join(MrHyde.destination) }
       end
 
-      conf.merge({ 'layouts' => File.join(MrHyde.sources, config['layouts']) })
+      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']))
     end
-
-    def sources
-      config['sources']
-    end
     
     def sources_sites
-      File.join config['sources'], config['sources_sites']
+      File.join config['sources_sites']
     end
 
     def destination
@@ -90,7 +86,7 @@ module MrHyde
     end
 
     def main_site
-      File.join source, sources, config['mainsite']
+      File.join source, config['mainsite']
     end
 
     # Public: Fetch the logger instance for this Jekyll process.
@@ -156,7 +152,6 @@ module MrHyde
       # 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'
         Site.create ['sample-site'], { 'force' => 'force' }
         Site.create ['sample-full-site'], { 'full' => 'full', 'force' => 'force' }
       end
@@ -164,11 +159,8 @@ module MrHyde
 
     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.mkdir %w(_layouts _includes _site) 
+        Dir.chdir(File.join('_site')) do
           FileUtils.touch 'index.html' 
         end
       end

data/lib/mr_hyde/commands/remove.rb

@@ -6,8 +6,8 @@ module MrHyde
     class Remove < MrHyde::Command
       class << self
         def process(args, opts = {})
-          if args.length == 0
-          MrHyde.logger.warn("A site name must be typed. You can see a list of nested sites using the 'list' command.") 
+          if args.length == 0 and not opts['all']
+            MrHyde.logger.warn("A site name must be typed. You can see a list of nested sites using the 'list' command.") 
           else
             Site.remove args, opts
           end

data/lib/mr_hyde/configuration.rb

@@ -3,25 +3,16 @@ require "jekyll/configuration"
 module MrHyde
 
   class Configuration < Jekyll::Configuration
-
-    DEFAULTS = {
+    DEFAULTS.merge!({
       # Places
       'source'        => Dir.pwd,
-      'sources'       => 'sources',
-      'sources_sites' => '_sites',
       'destination'   => 'site',
-      'layouts'       => '_layouts',
-      'includes'      => '_includes',
+      'sources_sites' => '_sites',
       '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' => ''
-    }
+      'mainsite'      => '_site'
+    })
 
     def read_config_files(files)
       configuration = clone

data/lib/mr_hyde/extensions/new.rb

@@ -28,6 +28,7 @@ module MrHyde
 
           if options["blank"]
             create_blank_site new_site_path, options
+            Jekyll.logger.info "New jekyll site installed in #{new_site_path}."
           elsif options["full"]
             create_independant_sample_files args, options
           else 
@@ -36,9 +37,9 @@ module MrHyde
             File.open(File.expand_path(initialized_post_name, new_site_path), "w") do |f|
               f.write(scaffold_post_content)
             end
+            Jekyll.logger.info "New jekyll site installed in #{new_site_path}."
           end
 
-          Jekyll.logger.info "New jekyll site installed in #{new_site_path}."
         end
 
         def create_blank_site(path, opts)
@@ -69,7 +70,7 @@ module MrHyde
         def scaffold_path
           "_posts/0000-00-00-welcome-to-mr-hyde.markdown.erb"
         end
-     end
+      end
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Converters
 
     def sass_load_paths
       paths = pristine_sass_load_paths
-      common_assets = Jekyll.sanitized_path(File.join(MrHyde.sources, MrHyde.config['assets']), sass_dir)
+      common_assets = Jekyll.sanitized_path(File.join(MrHyde.config['assets']), sass_dir)
       paths << common_assets if File.directory? common_assets
 
       paths

data/lib/mr_hyde/jekyll_ext/site.rb

@@ -32,6 +32,7 @@ class Site
       unless site_names.empty?
         sites_payload = site_names.map do |site_name|
           opts = MrHyde.site_configuration(site_name)
+          opts['quiet'] = true
           opts = Jekyll.configuration(opts)
           site = Site.new opts
 

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

@@ -7,14 +7,14 @@ module Tags
   class IncludeTag
 =begin
     def tag_includes_dir
-      File.join MrHyde.sources, MrHyde.config['includes']
+      File.join 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)
+        path = File.join(File.realpath(MrHyde.source), @includes_dir)
       end
 
       path

data/lib/mr_hyde/site.rb

@@ -9,7 +9,7 @@ module MrHyde
       def init(args, opts)
         opts = MrHyde.configuration(opts)
         @source = if opts['main']
-                    File.join MrHyde.source, MrHyde.sources
+                    File.join MrHyde.source
                   else
                     File.join MrHyde.source, MrHyde.sources_sites
                   end
@@ -55,20 +55,17 @@ module MrHyde
       #       'all' => 'all' Removes all built sites
       #       'full' => 'full' Removes built and source site/s
       #
-      def remove(args, opts = {})
+      def remove(args = nil, opts = {})
         init(args, opts)
 
-        if opts['all']
+        if not args.nil? and not args.empty?
+          remove_sites args, opts
+        elsif 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
+        build
       rescue Exception => e
         MrHyde.logger.error "cannot remove the site: #{e}"
       end
@@ -83,35 +80,21 @@ module MrHyde
       #     Hash 
       #       'all' => 'all' Builds all built sites
       #
-      def build(args, opts = {})
+      def build(args = nil, 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 there is no destinarion folder then will be created
+        mk_destination(opts) unless File.exist? MrHyde.destination
 
-          if opts["all"]
-            build_sites sources_list, opts
-          elsif args.kind_of? Array
-            build_sites args, opts 
-          elsif args.kind_of? String
-            build_site args, opts
-          end
-        else
-          if opts["all"]
-            build_main_site(opts)
-            build_sites sources_list, opts
-          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
+        if not args.nil? and not args.empty?
+          build_sites args, opts 
+        elsif opts["all"]
+          # Build all sites and after build/rebuild the main site
+          # so all global variables referent to nested site will be loaded
+          build_sites sources_list, opts
         end
+        # By default the main site is built
+        build_main_site(opts)
       rescue Exception => e
         MrHyde.logger.error "cannot build site: #{e}"
         MrHyde.logger.error e.backtrace
@@ -171,7 +154,7 @@ module MrHyde
       end
       
       def is_main?(name)
-        File.directory? File.join(MrHyde.sources, name)
+        File.directory? File.join(name)
       end
 
       private
@@ -179,24 +162,29 @@ module MrHyde
       def create_site(args, opts = {})
         begin
           if args.kind_of? Array
-            args.each do |name|
-              raise() if is_main(args)
-            end
+            args.each{ |name| raise() if is_main(name) }
           else
             raise() if is_main?(args)
           end
-        rescue Exception => e
+        rescue
           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_sites(args, opts = {})
+        args = [args] if args.kind_of? String
+
+        args.each do |sm|
+          remove_site sm, opts
+        end
+      end
+
       def remove_site(name, opts = {})
-        # OBSOLOTE
-        # This checking is not mandatory, never can be removed form here the main site
+        # OBSOLETE
+        # This checking is not mandatory, never can be removed from here the main site
         if is_main?(name)
           MrHyde.logger.warning "Cannot remove main site: #{name}"
           return
@@ -213,6 +201,8 @@ module MrHyde
       end
 
       def build_sites(site_names, opts)
+        site_names = [site_names] if site_names.kind_of? String
+
         site_names.each do |sn| 
           begin
             build_site(sn, opts)
@@ -231,9 +221,18 @@ module MrHyde
 
       def build_main_site(opts)
         conf = MrHyde.main_site_configuration
+        keep_built_sites conf
         Jekyll::Commands::Build.process conf
       end
 
+      def keep_built_sites(conf)
+        conf['keep_files'] = built_list
+      end
+
+      def mk_destination(opts)
+        conf = MrHyde.main_site_configuration
+        Dir.mkdir conf["destination"]
+      end
 
       def check_site(site_name, method, message)
         if not send(method, site_name)

data/lib/mr_hyde/version.rb

@@ -1,3 +1,3 @@
 module MrHyde
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/site_template/_config.yml

@@ -8,7 +8,7 @@ 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: "main_site" # this is the name of the root default site, where all sites will be nested
+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

data/lib/site_template/{sources/_layouts → _layouts}/default.html

@@ -18,8 +18,6 @@
     </section>
 
     {% include footer.html %}
-
-    <script src="/js/main.js"></script>
   </body>
 
 </html>

data/lib/site_template/_mrhyde.yml

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

data/lib/site_template/_site/about.md

@@ -0,0 +1,9 @@
+---
+layout: page
+title: About
+permalink: /about/
+id: about
+---
+
+This is the base Mr. Hyde theme. You can customize it modifying the styles assets include in `root-folder/_assets/_sass` or just include you css files in the sites folder of your Mr. Hyde project and reference them in your html header.
+

data/lib/site_template/{sources/main_site → _site}/index.md

@@ -5,7 +5,9 @@ permalink: /
 id: home
 ---
 
-Welcome to your first Mr. Hyde site. This page is a sample that is created by default when you make a new Mr. Hyde site, you can use it as a scaffold for your site or creqte a blank one. You can find this file in `root-folder/sources/welcome/index.html`. Below you can see a list of sample subsites created at the same time than the parent, click on them to know more about subsites. All sites are created using [Jekyll](http://jekyllrb.com) including the main site. You can read more about Mr. Hyde usage documentation at [Mr. Hyde wiki](https://github.com/emoriarty/mr_hyde/wiki).
+Welcome to your first Mr. Hyde site. This page is a sample created by default when you make a new Mr. Hyde site, you can use it as a scaffold for your site or create a blank one (look options). You can find this file in `root-folder/site/index.html` but if you like to modify this file then open `root-folder/_site/index.md`. 
+Below you can see a list of sample subsites, click on them to know more about subsites. 
+All sites are created using [Jekyll](http://jekyllrb.com) including the main site. You can read more about Mr. Hyde usage documentation at [Mr. Hyde wiki](https://github.com/emoriarty/mr_hyde/wiki).
 
 You can find the source code for the Mr. Hyde at: <a href="https://github.com/emoriarty/mr_hyde/">https://github.com/emoriarty/mr_hyde</a>.
 

data/lib/subsite_template/_posts/0000-00-00-welcome-to-mr-hyde.markdown.erb

@@ -1,12 +1,12 @@
 ---
 layout: post
 title:  "Welcome to Mr. Hyde!"
-date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>
+date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>
 categories: mrhyde jekyll update
 ---
 ![Dr. Jekyll and Mr. Hyde]({{ site.baseurl }}/assets/dr_jekyll_and_mr_hyde_poster.jpg)
 
-You’ll find this post in your `sources/_sites/sample-site/_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `mrhyde build`, which build your site, and after `mrhyde serve`, which launches a web server.
+You’ll find this post in your `root-folder/_sites/sample-site/_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `mrhyde build`, which build your site, and after `mrhyde serve`, which launches a web server.
 
 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
 

data/lib/subsite_template/about.md

@@ -5,5 +5,5 @@ permalink: /about/
 id: about
 ---
 
-This is the base Mr. Hyde theme. You can customize it modifying the styles assets include in `sources/_assets/_sass` or just include you css files in the sites folder of your Mr. Hyde project and reference them in your html header.
+This is the base Mr. Hyde theme. You can customize it modifying the styles assets include in `root-fodler/_assets/_sass` or just include you css files in the sites folder of your Mr. Hyde project and reference them in your html header.
 

data/mr_hyde.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["enrique.arias.cervero@gmail.com"]
   spec.summary       = %q{Mr. Hyde lets you generate and manage as many sites as you want.}
   spec.description   = %q{Mr. Hyde lets you generate and manage as many sites as you want, something similar like Medium. It's based on Jekyll.} 
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/emoriarty/mr_hyde"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -20,7 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.4", ">= 5.4.3"
+  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 "pry"
+  spec.add_development_dependency "byebug", "~> 8.2.2"
   
-  spec.add_runtime_dependency "jekyll", "~> 2.5", "2.5.3"
+  spec.add_runtime_dependency "jekyll", "~> 3.1", ">=3.1.1"
+  spec.add_runtime_dependency "mercenary", "~> 0.3", ">=0.3.5"
 end

data/spec/build_spec.rb

@@ -1,10 +1,12 @@
 require "minitest/autorun"
-require "minitest/pride"
+require "minitest/reporters"
 require "fileutils"
 require_relative "../lib/mr_hyde"
 require_relative "../lib/mr_hyde/site"
 
-describe "Checking if MrHyde can build sites" do
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new, Minitest::Reporters::ProgressReporter.new]
+
+describe "Checking MrHyde build command" do
   before do
     @site_name = 'test'
     @nested_site_name = 'nested_site'
@@ -19,6 +21,11 @@ describe "Checking if MrHyde can build sites" do
     FileUtils.remove_dir(@site_name) if File.exist? @site_name
   end
 
+  it "can build the default site (main)" do
+    MrHyde::Site.build
+    File.exist?(@defaults['destination']).must_be :==, true
+  end
+
   it "can build a single site" do
     MrHyde::Site.create @nested_site_name
     MrHyde::Site.build @nested_site_name
@@ -35,14 +42,24 @@ describe "Checking if MrHyde can build sites" do
     end
   end
 
-  it "can build all sites in sources path" do
+  it "can build all nested sites with --all option" do
     site_names = []
     5.times { |i| site_names << "#{@nested_site_name}_#{i}" }
     MrHyde::Site.create site_names
-    MrHyde::Site.build [], { 'all' => 'all' } 
+    MrHyde::Site.build [], { 'all' => true } 
     site_names.each do |sn|
       File.exist?(File.join @defaults['destination'], sn).must_be :==, true
     end
   end
 
+  describe "building posts" do
+    it "all sites build a post within mrhyde or jekyll dir" do
+      MrHyde::Site.build nil, {'all' => true}
+      MrHyde::Site.built_list.each do |ns|
+        (File.exist?(File.join @defaults['destination'], ns, 'mrhyde') || 
+        File.exist?(File.join @defaults['destination'], ns, 'jekyll')).must_be :==, true
+      end
+    end
+  end
+
 end

data/spec/list_spec.rb

@@ -1,5 +1,4 @@
 require "minitest/autorun"
-require "minitest/pride"
 require "fileutils"
 require_relative "../lib/mr_hyde"
 require_relative "../lib/mr_hyde/site"

data/spec/new_spec.rb

@@ -1,5 +1,5 @@
 require "minitest/autorun"
-require "minitest/pride"
+require "minitest/reporters"
 require "fileutils"
 require_relative "../lib/mr_hyde"
 require_relative "../lib/mr_hyde/site"
@@ -21,30 +21,30 @@ describe "Checking if mrhyde can create new sites" do
     MrHyde.create @site_name
     
     File.exist?(@site_name).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources']).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['sources'], @defaults['layouts']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['includes']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['assets']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['mainsite']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['sources_sites']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['mainsite'], 'index.md').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
+    File.exist?(File.join @site_name, @defaults['mainsite']).must_be :==, true
+    File.exist?(File.join @site_name, @defaults['sources_sites']).must_be :==, true
+    File.exist?(File.join @site_name, @defaults['mainsite'], 'index.md').must_be :==, true
   end
 
   it "creates a new MrHyde blank folder" do
     MrHyde.create @site_name, 'blank' => true 
     
     File.exist?(@site_name).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources']).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['sources'], @defaults['layouts']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['includes']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['assets']).must_be :==, false
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['mainsite']).must_be :==, true
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['sources_sites']).must_be :==, false
-    File.exist?(File.join @site_name, @defaults['sources'], @defaults['mainsite'], 'index.html').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 :==, false
+    File.exist?(File.join @site_name, @defaults['mainsite']).must_be :==, true
+    File.exist?(File.join @site_name, @defaults['sources_sites']).must_be :==, false
+    File.exist?(File.join @site_name, @defaults['mainsite'], 'index.html').must_be :==, true
   end
 
   it "cannot create over an existing folder" do
@@ -57,6 +57,14 @@ describe "Checking if mrhyde can create new sites" do
     lambda { MrHyde.create(@site_name, 'force' => true)}.must_be_silent
   end
 
+  describe "sample files" do
+    it "are generated" do
+      MrHyde.create @site_name
+      File.exist?(File.join @site_name, @defaults['sources_sites'], 'sample-site').must_be :==, true
+      File.exist?(File.join @site_name, @defaults['sources_sites'], 'sample-full-site').must_be :==, true
+    end
+  end
+
   describe "nested sites" do
     before do
       MrHyde.create @site_name
@@ -65,7 +73,7 @@ describe "Checking if mrhyde can create new sites" do
     it "can create a single site" do 
       Dir.chdir(@site_name) do
         MrHyde::Site.create @nested_site_name
-        File.exist?(File.join @defaults['sources'], @defaults['sources_sites'],  @nested_site_name).must_be :==, true
+        File.exist?(File.join @defaults['sources_sites'],  @nested_site_name).must_be :==, true
       end
     end
 
@@ -75,7 +83,7 @@ describe "Checking if mrhyde can create new sites" do
         10.times { |i| arr_blog_names << "#{@nested_site_name}_#{i}" }
         MrHyde::Site.create arr_blog_names
         arr_blog_names.each do |bn|
-          File.exist?(File.join @defaults['sources'], @defaults['sources_sites'], bn).must_be :==, true
+          File.exist?(File.join @defaults['sources_sites'], bn).must_be :==, true
         end
       end
     end

data/spec/rm_spec.rb

@@ -1,10 +1,9 @@
 require "minitest/autorun"
-require "minitest/pride"
 require "fileutils"
 require_relative "../lib/mr_hyde"
 require_relative "../lib/mr_hyde/site"
 
-describe "MrHyde" do
+describe "Checking is Mr. Hyde remove command" do
   before do
     @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
     @site_name = 'test'
@@ -32,7 +31,7 @@ describe "MrHyde" do
 
   def remove_site(site, opts = {})
     create_build_remove site, opts
-    File.exist?(File.join @defaults['sources'], @defaults['sources_sites'], site).must_be :==, (opts['full'] ? false : true)
+    File.exist?(File.join @defaults['sources_sites'], site).must_be :==, (opts['full'] ? false : true)
     File.exist?(File.join @defaults['destination'], site).must_be :==, false
   end
   
@@ -42,7 +41,7 @@ describe "MrHyde" do
 
     create_build_remove site_names, opts
     site_names.each do |sn|
-      File.exist?(File.join @defaults['sources'], @defaults['sources_sites'], sn).must_be :==, (opts['full'] ? false : true)
+      File.exist?(File.join @defaults['sources_sites'], sn).must_be :==, (opts['full'] ? false : true)
       File.exist?(File.join @defaults['destination'], sn).must_be :==, false
     end
   end
@@ -56,19 +55,19 @@ describe "MrHyde" do
     remove_sites @nested_site_name, 5
   end
 
-  it "can remove all built sites" do
-    remove_sites @nested_site_name, 5, { 'all' => 'all' }
+  it "can remove all built sites with option --all" do
+    remove_sites @nested_site_name, 5, { 'all' => true }
   end
   
-  it "can remove a site completely" do
-    remove_site @nested_site_name, { 'full' => 'full' }
+  it "can remove a site completely with option --full" do
+    remove_site @nested_site_name, { 'full' => true }
   end
 
-  it "can remove a list of sites completely" do
-    remove_sites @nested_site_name, 5, { 'full' => 'full' }
+  it "can remove a list of sites completely with option --full" do
+    remove_sites @nested_site_name, 5, { 'full' => true }
   end
 
-  it "can remove all sites completely" do
-    remove_sites @nested_site_name, 5, { 'all' => 'all', 'full' => 'full' }
+  it "can remove all sites completely (--all and --full)" do
+    remove_sites @nested_site_name, 5, { 'all' => true, 'full' => true }
   end
 end

data/test/configuraton_test.rb

@@ -0,0 +1,16 @@
+require "minitest/autorun"
+require "minitest/reporters"
+require "jekyll"
+require_relative "../lib/mr_hyde"
+
+Minitest::Reporters.use!
+
+class TestConfiguration < Minitest::Test
+  def setup
+    @jekyll_config = Jekyll::Configuration::DEFAULTS
+    @mrhyde_config = MrHyde::Configuration::JEKYLL_DEFAULTS
+  end
+
+  def test_that_if_configuration_defaults_ids_match
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_hyde
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Enrique Arias Cervero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,40 +44,108 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.8.4
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.2
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-    - - '='
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-    - - '='
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: mercenary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 0.3.5
 description: Mr. Hyde lets you generate and manage as many sites as you want, something
   similar like Medium. It's based on Jekyll.
 email:
@@ -109,26 +177,25 @@ files:
 - lib/mr_hyde/jekyll_ext/tags/include.rb
 - lib/mr_hyde/site.rb
 - lib/mr_hyde/version.rb
+- lib/site_template/_assets/_sass/_base.scss
+- lib/site_template/_assets/_sass/_functions.scss
+- lib/site_template/_assets/_sass/_grid.scss
+- lib/site_template/_assets/_sass/_layout.scss
+- lib/site_template/_assets/_sass/_newbase.scss
+- lib/site_template/_assets/_sass/_normalize.scss
+- lib/site_template/_assets/_sass/_syntax-highlighting.scss
 - lib/site_template/_config.yml
+- lib/site_template/_includes/footer.html
+- lib/site_template/_includes/head.html
+- lib/site_template/_includes/header.html
+- 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/sources/_assets/_sass/_base.scss
-- lib/site_template/sources/_assets/_sass/_functions.scss
-- lib/site_template/sources/_assets/_sass/_grid.scss
-- lib/site_template/sources/_assets/_sass/_layout.scss
-- lib/site_template/sources/_assets/_sass/_newbase.scss
-- lib/site_template/sources/_assets/_sass/_normalize.scss
-- lib/site_template/sources/_assets/_sass/_syntax-highlighting.scss
-- lib/site_template/sources/_includes/footer.html
-- lib/site_template/sources/_includes/head.html
-- lib/site_template/sources/_includes/header.html
-- lib/site_template/sources/_layouts/default.html
-- lib/site_template/sources/_layouts/page.html
-- lib/site_template/sources/_layouts/post.html
-- lib/site_template/sources/main_site/about.md
-- lib/site_template/sources/main_site/css/main.scss
-- lib/site_template/sources/main_site/css/normalize.css
-- lib/site_template/sources/main_site/index.md
-- lib/site_template/sources/main_site/js/main.coffee
+- lib/site_template/_site/about.md
+- lib/site_template/_site/css/main.scss
+- lib/site_template/_site/css/normalize.css
+- lib/site_template/_site/index.md
 - lib/subsite_template/_config.yml
 - lib/subsite_template/_posts/0000-00-00-welcome-to-mr-hyde.markdown.erb
 - lib/subsite_template/about.md
@@ -142,7 +209,8 @@ files:
 - spec/list_spec.rb
 - spec/new_spec.rb
 - spec/rm_spec.rb
-homepage: ''
+- test/configuraton_test.rb
+homepage: https://github.com/emoriarty/mr_hyde
 licenses:
 - MIT
 metadata: {}
@@ -162,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Mr. Hyde lets you generate and manage as many sites as you want.
@@ -171,3 +239,4 @@ test_files:
 - spec/list_spec.rb
 - spec/new_spec.rb
 - spec/rm_spec.rb
+- test/configuraton_test.rb

data/lib/site_template/sources/main_site/about.md

@@ -1,9 +0,0 @@
----
-layout: page
-title: About
-permalink: /about/
-id: about
----
-
-This is the base Mr. Hyde theme. You can customize it modifying the styles assets include in `sources/_assets/_sass` or just include you css files in the sites folder of your Mr. Hyde project and reference them in your html header.
-

data/lib/site_template/sources/main_site/js/main.coffee

@@ -1,27 +0,0 @@
----
----
-setCurrentPage = ->
-  pathname = document.location.pathname
-  currentLink = undefined
-  baseurl = document.querySelector('[data-baseurl]').getAttribute('data-baseurl')
-  cleanBaseUrl = pathname.replace(baseurl, '')
-  if cleanBaseUrl == '/'
-    currentLink = document.getElementById('home')
-  else
-    navLinks = document.querySelectorAll('.main-navigation ul li')
-    i = 0
-    while i < navLinks.length
-      navLink = navLinks[i]
-      regexp = new RegExp('/' + navLink.id + '/')
-      matchResult = cleanBaseUrl.match(regexp)
-      if matchResult and matchResult.length > 0
-        currentLink = navLink
-      i++
-  currentLink.classList.add 'current-menu-item'
-  return
-
-init = ->
-  setCurrentPage()
-  return
-
-window.addEventListener 'DOMContentLoaded', init