mr_hyde 0.1.0 → 0.2.0

data/spec/build_spec.rb

@@ -1,48 +1,47 @@
 require "minitest/autorun"
 require "minitest/pride"
-require "mr_hyde"
-require "mr_hyde/blog"
 require "fileutils"
+require_relative "../lib/mr_hyde"
+require_relative "../lib/mr_hyde/site"
 
-describe "MrHyde" do
+describe "Checking if MrHyde can build sites" do
   before do
-    @path = 'mthyde_build_test'
-    MrHyde.create @path
+    @site_name = 'test'
+    @nested_site_name = 'nested_site'
+    @defaults = MrHyde::Configuration::DEFAULTS
+    @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
+    Dir.chdir(@tmp_dir)
+    MrHyde.create @site_name
+    Dir.chdir(@site_name)
   end
 
   after do
-    FileUtils.remove_dir(@path) if File.exist? @path
+    FileUtils.remove_dir(@site_name) if File.exist? @site_name
   end
 
   it "can build a single site" do
-    Dir.chdir(File.join Dir.pwd, @path) do
-      MrHyde::Blog.create 'site_test'
-      MrHyde::Blog.build 'site_test'
-      File.exist?(File.join MrHyde::Configuration::DEFAULTS['destination'], 'site_test').must_be :==, true
-    end
+    MrHyde::Site.create @nested_site_name
+    MrHyde::Site.build @nested_site_name
+    File.exist?(File.join @defaults['destination'], @nested_site_name).must_be :==, true
   end
 
   it "can build an array of sites" do
-    Dir.chdir(File.join Dir.pwd, @path) do
-      site_names = []
-      5.times { |i| site_names << "site_test_#{i}" }
-      MrHyde::Blog.create site_names
-      MrHyde::Blog.build site_names
-      site_names.each do |bn|
-        File.exist?(File.join MrHyde::Configuration::DEFAULTS['destination'], bn).must_be :==, true
-      end
+    site_names = []
+    5.times { |i| site_names << "#{@nested_site_name}_#{i}" }
+    MrHyde::Site.create site_names
+    MrHyde::Site.build site_names
+    site_names.each do |sn|
+      File.exist?(File.join @defaults['destination'], sn).must_be :==, true
     end
   end
 
   it "can build all sites in sources path" do
-    Dir.chdir(File.join Dir.pwd, @path) do
-      site_names = []
-      5.times { |i| site_names << "blog_test_#{i}" }
-      MrHyde::Blog.create site_names
-      MrHyde::Blog.build [], { 'all' => 'all' } 
-      site_names.each do |bn|
-        File.exist?(File.join MrHyde::Configuration::DEFAULTS['destination'], bn).must_be :==, true
-      end
+    site_names = []
+    5.times { |i| site_names << "#{@nested_site_name}_#{i}" }
+    MrHyde::Site.create site_names
+    MrHyde::Site.build [], { 'all' => 'all' } 
+    site_names.each do |sn|
+      File.exist?(File.join @defaults['destination'], sn).must_be :==, true
     end
   end
 

data/spec/list_spec.rb

@@ -0,0 +1,37 @@
+require "minitest/autorun"
+require "minitest/pride"
+require "fileutils"
+require_relative "../lib/mr_hyde"
+require_relative "../lib/mr_hyde/site"
+
+describe "Mr. Hyde Listing" do
+  before do
+    @site_name = 'test'
+    @nested_site_name = 'nested_site'
+    @defaults = MrHyde::Configuration::DEFAULTS
+    @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
+    Dir.chdir(@tmp_dir)
+    MrHyde.create @site_name
+    Dir.chdir(@site_name)
+  end
+
+  after do
+    FileUtils.remove_dir(@site_name) if File.exist? @site_name
+  end
+
+  def fetch_entries(path)
+    entries = Dir.entries path
+    entries.reject{ |entry| entry == '.' or entry == '..' }
+  end
+
+  it "can list all sites in sources" do
+    MrHyde.sources_list.length.must_be :==, fetch_entries(MrHyde.sources_sites).length 
+  end
+
+  it "can list all built sites" do
+    sources = MrHyde.sources_list
+    entries = MrHyde::Site.build [], { 'all' => true }
+    entries.select! { |entry| entry if sources.include? entry }
+    MrHyde.built_list.length.must_be :==, entries.length 
+  end
+end

data/spec/new_spec.rb

@@ -1,53 +1,81 @@
 require "minitest/autorun"
 require "minitest/pride"
-require "mr_hyde"
-require "mr_hyde/blog"
 require "fileutils"
+require_relative "../lib/mr_hyde"
+require_relative "../lib/mr_hyde/site"
 
-describe "MrHyde" do
+describe "Checking if mrhyde can create new sites" do
   before do
-    #@path = Dir.mktmpdir('mrhyde_new_test')
-    @path = 'mrhyde_new_test'
+    @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
+    Dir.chdir(@tmp_dir)
+    @site_name = 'test'
+    @nested_site_name = 'nested_site'
+    @defaults = MrHyde::Configuration::DEFAULTS
   end
 
   after do
-    FileUtils.remove_dir(@path) if File.exist? @path
+    FileUtils.remove_dir(@site_name) if File.exist? @site_name
   end
 
-  it "creates a new MrHyde folder with the basics" do
-    MrHyde.create @path
+  it "creates a new MrHyde folder" do
+    MrHyde.create @site_name
     
-    File.exist?(@path).must_be :==, true
-    File.exist?(File.join @path, MrHyde::Configuration::DEFAULTS['sources']).must_be :==, true
-    File.exist?(File.join @path, MrHyde::Configuration::DEFAULTS['destination']).must_be :==, true
-    File.exist?(File.join @path, MrHyde::Configuration::DEFAULTS['config']).must_be :==, true
-    File.exist?(File.join @path, MrHyde::Configuration::DEFAULTS['jekyll_config']).must_be :==, 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, @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
   end
 
-  it "cannot create over an existing project" do
-    MrHyde.create @path
-    lambda { MrHyde.create @path }.must_raise SystemExit
+  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, @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
+  end
+
+  it "cannot create over an existing folder" do
+    MrHyde.create @site_name
+    lambda { MrHyde.create @site_name }.must_raise SystemExit
+  end
+
+  it "force create over an existing folder" do
+    MrHyde.create @site_name
+    lambda { MrHyde.create(@site_name, 'force' => true)}.must_be_silent
   end
 
-  describe "creating new sites" do
+  describe "nested sites" do
     before do
-      MrHyde.create @path
+      MrHyde.create @site_name
     end
       
     it "can create a single site" do 
-      Dir.chdir(File.join Dir.pwd, @path) do
-        MrHyde::Blog.create 'site_test'
-        File.exist?(File.join MrHyde::Configuration::DEFAULTS['sources'], 'site_test').must_be :==, true
+      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
       end
     end
 
     it "can create an array of sites" do 
-      Dir.chdir(File.join Dir.pwd, @path) do
+      Dir.chdir(@site_name) do
         arr_blog_names = []
-        10.times { |i| arr_blog_names << "site_test_#{i}" }
-        MrHyde::Blog.create arr_blog_names
+        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 MrHyde::Configuration::DEFAULTS['sources'], bn).must_be :==, true
+          File.exist?(File.join @defaults['sources'], @defaults['sources_sites'], bn).must_be :==, true
         end
       end
     end

data/spec/rm_spec.rb

@@ -1,75 +1,74 @@
 require "minitest/autorun"
 require "minitest/pride"
-require "mr_hyde"
-require "mr_hyde/blog"
 require "fileutils"
+require_relative "../lib/mr_hyde"
+require_relative "../lib/mr_hyde/site"
 
 describe "MrHyde" do
   before do
-    #@path = Dir.mktmpdir('mrhyde_new_test')
-    @path = 'mrhyde_new_test'
-    @site = 'site_test'
-    MrHyde.create @path
+    @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
+    @site_name = 'test'
+    @nested_site_name = 'nested_site'
+    @defaults = MrHyde::Configuration::DEFAULTS
+    Dir.chdir(@tmp_dir)
+    MrHyde.create @site_name
+    Dir.chdir(@site_name)
   end
 
   after do
-    FileUtils.remove_dir(@path) if File.exist? @path
+    FileUtils.remove_dir(@tmp_dir) if File.exist? @tmp_dir
   end
 
   # Helpers
   def create_build_remove(site, opts = {})
-    MrHyde::Blog.create site
-    MrHyde::Blog.build site
+    MrHyde::Site.create site
+    MrHyde::Site.build site
     if opts['all']
-      MrHyde::Blog.remove [], opts
+      MrHyde::Site.remove [], opts
     else
-      MrHyde::Blog.remove site, opts
+      MrHyde::Site.remove site, opts
     end
   end
 
-  def remove_site(path, site, opts = {})
-    Dir.chdir(File.join Dir.pwd, path) do
-      create_build_remove site, opts
-      File.exist?(File.join MrHyde::Configuration::DEFAULTS['sources'], site).must_be :==, (opts['full'] ? false : true)
-      File.exist?(File.join MrHyde::Configuration::DEFAULTS['destination'], site).must_be :==, false
-    end
+  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['destination'], site).must_be :==, false
   end
   
-  def remove_sites(path, sites_number, opts = {})
+  def remove_sites(name, sites_number, opts = {})
     site_names = []
-    sites_number.times { |i| site_names << "site_test_#{i}" }
+    sites_number.times { |i| site_names << "#{name}_#{i}" }
 
-    Dir.chdir(File.join Dir.pwd, path) do
-      create_build_remove site_names, opts
-      site_names.each do |sn|
-        File.exist?(File.join MrHyde::Configuration::DEFAULTS['sources'], sn).must_be :==, (opts['full'] ? false : true)
-        File.exist?(File.join MrHyde::Configuration::DEFAULTS['destination'], sn).must_be :==, false
-      end
+    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['destination'], sn).must_be :==, false
     end
   end
 
   # Specs
   it "can remove a built site" do
-    remove_site @path, @site
+    remove_site @nested_site_name
   end
 
   it "can remove a list of built sites" do
-    remove_sites @path, 5
+    remove_sites @nested_site_name, 5
   end
 
   it "can remove all built sites" do
-    remove_sites @path, 5, { 'all' => 'all' }
+    remove_sites @nested_site_name, 5, { 'all' => 'all' }
   end
   
   it "can remove a site completely" do
-    remove_site @path, @site, { 'full' => 'full' }
+    remove_site @nested_site_name, { 'full' => 'full' }
   end
 
   it "can remove a list of sites completely" do
-    remove_sites @path, 5, { 'full' => 'full' }
+    remove_sites @nested_site_name, 5, { 'full' => 'full' }
   end
 
   it "can remove all sites completely" do
-    remove_sites @path, 5, { 'all' => 'all', 'full' => 'full' }
+    remove_sites @nested_site_name, 5, { 'all' => 'all', 'full' => 'full' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_hyde
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Enrique Arias Cervero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,23 +95,53 @@ files:
 - Rakefile
 - bin/mrhyde
 - lib/mr_hyde.rb
-- lib/mr_hyde/blog.rb
 - lib/mr_hyde/command.rb
 - lib/mr_hyde/commands/build.rb
+- lib/mr_hyde/commands/list.rb
 - lib/mr_hyde/commands/new.rb
 - lib/mr_hyde/commands/remove.rb
+- lib/mr_hyde/commands/serve.rb
 - lib/mr_hyde/configuration.rb
-- lib/mr_hyde/extensions/.new.rb.swp
 - lib/mr_hyde/extensions/new.rb
+- lib/mr_hyde/jekyll_ext/converters/scss.rb
+- lib/mr_hyde/jekyll_ext/jekyll.rb
+- lib/mr_hyde/jekyll_ext/site.rb
+- lib/mr_hyde/jekyll_ext/tags/include.rb
+- lib/mr_hyde/site.rb
 - lib/mr_hyde/version.rb
+- lib/site_template/_config.yml
 - lib/site_template/_mrhyde.yml
-- lib/site_template/site/css/main.css
-- lib/site_template/site/index.html
+- 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/subsite_template/_config.yml
+- lib/subsite_template/_posts/0000-00-00-welcome-to-mr-hyde.markdown.erb
+- lib/subsite_template/about.md
+- lib/subsite_template/assets/dr_jekyll_and_mr_hyde_poster.png
+- lib/subsite_template/feed.xml
+- lib/subsite_template/index.html
 - mr_hyde.gemspec
+- resources/mrhyde-logo-red.png
+- resources/mrhyde-logo.png
 - spec/build_spec.rb
+- spec/list_spec.rb
 - spec/new_spec.rb
 - spec/rm_spec.rb
-- test/blog_test.rb
 homepage: ''
 licenses:
 - MIT
@@ -138,6 +168,6 @@ specification_version: 4
 summary: Mr. Hyde lets you generate and manage as many sites as you want.
 test_files:
 - spec/build_spec.rb
+- spec/list_spec.rb
 - spec/new_spec.rb
 - spec/rm_spec.rb
-- test/blog_test.rb

data/lib/mr_hyde/blog.rb

@@ -1,146 +0,0 @@
-require "jekyll"
-require "fileutils"
-require "mr_hyde"
-require "mr_hyde/configuration"
-
-# TODO: The site place must be taken from the default config or the one provided by user
-module MrHyde
-  class Blog
-    
-    class << self
-      # Creates the directory and necessary files for the blog
-      # args
-      #   :name
-      #     String => creates the concrete blog
-      #     Array[String] => creates the correspondings blog names
-      # Returns
-      #   boolean
-      def create(args, opts = {})
-        opts = MrHyde.configuration(opts)
-
-        if args.kind_of? Array and not args.empty?
-          args.each do |bn| 
-            begin
-              create_blog(bn, opts)
-            rescue Exception => e
-              raise e unless e.class == SystemExit
-            end
-          end
-        elsif args.kind_of? String
-          create_blog args, opts
-        end
-      rescue Exception => e
-        MrHyde.logger.error "cannot create blog: #{e}"
-      end
-
-      # Removes the blog directory
-      # Params:
-      #   Hash[:path] (String)
-      # Returns
-      #   boolean
-      def remove(args, opts = {})
-        opts = MrHyde.configuration(opts)
-
-        if opts['all']
-          list(opts['sources']).each do |sm|
-            remove_blog sm, opts
-          end
-        elsif args.kind_of? Array
-          args.each do |sm|
-            remove_blog sm, opts
-          end
-        else
-          remove_blog args, opts
-        end
-      rescue Exception => e
-        MrHyde.logger.error "cannot remove the blog: #{e}"
-      end
-
-      # Builds the blog
-      # Params:
-      #   :name
-      #     String => builds the concrete blog
-      #     Array[String] => builds the correspondings blog names
-      #     empty => It builds all blogs
-      # Returns
-      #   boolean
-      def build(args, opts = {})
-        args = [args] if args.kind_of? String
-        opts = MrHyde.configuration(opts)
-
-        if opts["all"]
-          build_blogs list(opts['sources']), opts
-        elsif args.kind_of? Array
-          build_blogs args, opts 
-        elsif args.kind_of? String
-          build_blog args
-        end
-      rescue Exception => e
-        MrHyde.logger.error "cannot build site: #{e}"
-        MrHyde.logger.error e.backtrace
-      end
-
-      def list(path)
-        entries = Dir.entries(path)
-        entries.reject! { |item| item == '.' or item == '..' }
-        entries
-      end
-
-      def exist?(name, opts)
-        File.exist? File.join(opts['sources'], name)
-      end
-        
-      def built?(name, opts)
-        File.exist? File.join(opts['destination'], name)
-      end
-
-      private
-
-      def create_blog(args, opts = {})
-        Jekyll::Commands::New.process [File.join(opts['sources'], args)], opts
-        exist? args, opts
-      end
-
-      def remove_blog(name, opts = {})
-        if opts['full'] and File.exist? File.join(opts['sources'], name)
-          FileUtils.remove_dir File.join(opts['sources'], name)
-          MrHyde.logger.info "#{name} removed from #{opts['sources']}"
-        end
-        if File.exist? File.join(opts['destination'], name)
-          FileUtils.remove_dir File.join(opts['destination'], name)
-          MrHyde.logger.info "#{name} removed from #{opts['destination']}"
-        end
-      end
-
-      def build_blogs(site_names, opts)
-        site_names.each do |sn| 
-          begin
-            build_blog(sn, opts)
-          rescue Exception => e
-            MrHyde.logger.error e
-          end
-        end
-      end
-
-      def build_blog(name, opts)
-        Jekyll::Commands::Build.process 'source' => File.join(opts['sources'], name), 
-          'destination' => File.join(opts['destination'], name)
-        built? name, opts
-      end
-
-      def site?
-        File.exist? MrHyde.configuration.root
-      end
-
-      def check_blog(blog_name, method, message)
-        if not send(method, blog_name)
-          MrHyde.logger.debug message
-          return false
-        end
-        true
-      end
-
-    end
-
-  end
-end

data/test/blog_test.rb

@@ -1,46 +0,0 @@
-require "mr_hyde"
-require "mr_hyde/blog"
-require "minitest/autorun"
-require "minitest/unit"
-require "minitest/pride"
-
-require "fileutils"
-
-class TestBlog < Minitest::Test
-  def setup
-    @tmp_dir = File.join(File.expand_path(File.dirname(__FILE__)), 'tmp')
-    @blog_dir = 'test_blog'
-    MrHyde.configure do |config|
-      config.root_path = @tmp_dir
-    end
-    MrHyde::Blog.create name: @blog_dir
-  end
-
-  def teardown
-    FileUtils.remove_dir @tmp_dir
-  end
-
-  def test_create
-    assert File.exist?(File.join MrHyde.configuration.source_path, @blog_dir) 
-  end
-
-  def test_remove
-    MrHyde::Blog.remove name: @blog_dir
-    assert !Dir.entries(MrHyde.configuration.source_path).include?(@blog_dir)
-  end
-
-  def test_build
-    MrHyde::Blog.build name: @blog_dir
-    assert File.exist?(File.join MrHyde.configuration.destination_path, @blog_dir)
-  end
-
-  def test_exists
-    assert MrHyde::Blog.exist? @blog_dir
-  end
-  
-  def test_is_build
-    MrHyde::Blog.build name: @blog_dir
-    assert MrHyde::Blog.built? @blog_dir
-  end
-
-end