mr_hyde 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608e05d085560eb38898a27c5ffcef2dc1220c96
-  data.tar.gz: 98c227e6bec0118e0c7fa15bb5cbb474ba752262
+  metadata.gz: d579e8f6091be07c9c6fd4ac4093a4b0f4996358
+  data.tar.gz: 169be6e63526f66e802575c7985fe66d136500b9
 SHA512:
-  metadata.gz: 8e8b2dc18dd88fd38cc98a20bbc75d4a769c970e3b14038e1739d814a03b14c11d1427b592a7a8efc10deab4cd740f27ab2a5962b36b238255dee02751effd4c
-  data.tar.gz: 9df017b5e3c7c9dc2b0c83c3bc964c0d62d67d76f5ba368d24615f224893662c4bc813594948c550a6f93dbfd06864563e74c291a80067c62bbb2c7037051761
+  metadata.gz: 4c216b1cbf271516184c0f09abac6a477524f86d96f2e1075395fb00126b9ba7d0042b677a3589d44faa937d33f84b0bf2c97536ad3b5f96fdd2025880545d92
+  data.tar.gz: bd02909e7c8d1fa097775ef1cfa1300fa725725ee3c2e5d7299924f30ffdcad4cf19965d9f1c3882b17280609fc4e113508ce97d51d87074f2fc44d41309188b

data/bin/mrhyde

@@ -11,6 +11,30 @@ require 'mr_hyde/commands/remove'
 require 'mr_hyde/commands/serve'
 require 'mr_hyde/commands/list'
 
+# Helpers
+def cmd_remove(command)
+  command.syntax "remove name[ name ... n] "
+  command.description "Remove a nested site within Mr.Hyde folder. By default it removes just the built site."
+
+  command.alias(:rm)
+
+  #srm.option "force", "--force", "Don't ask for remove blog"
+  command.option "all", "--all", "Remove all built sites."
+  command.option "full", "--full", "Remove all built and source site/s. This option can be used with the rest of options."
+
+  command.action do |args, options|
+    MrHyde::Commands::Remove.process(args, options)
+  end
+end
+
+def cmd_build(command)
+  command.option "all", "--all", "Builds main site and nested sites. Not applied when building a nested site."
+
+  command.action do |args, options|
+    options['main'] = true if args.length == 0
+    MrHyde::Commands::Build.process args, options
+  end
+end
 
 Mercenary.program(:mrhyde) do |p|
   p.version MrHyde::VERSION
@@ -45,29 +69,14 @@ Mercenary.program(:mrhyde) do |p|
     end
 
     site.command(:remove) do |srm|
-      srm.syntax "remove name[ name ... n] "
-      srm.description "Remove a Jekyll site when on Mr.Hyde root folder. By default it removes just the built site."
-
-      srm.alias(:rm)
-
-      #srm.option "force", "--force", "Don't ask for remove blog"
-      srm.option "all", "--all", "Remove all built sites."
-      srm.option "full", "--full", "Remove all built and source site/s. This option can be used with the rest of options."
-
-      srm.action do |args, options|
-        MrHyde::Commands::Remove.process(args, options)
-      end
+      cmd_remove srm
     end
     
     site.command(:build) do |sbuild|
       sbuild.syntax "build name[ name ... n] "
       sbuild.description "Build the named site or sites. By default if no name is indicated then all sites will be build."
 
-      sbuild.option "all", "--all", "Build all nested sites"
-
-      sbuild.action do |args, options|
-        MrHyde::Commands::Build.process args, options
-      end
+      cmd_build sbuild
     end
   end 
 
@@ -92,15 +101,9 @@ Mercenary.program(:mrhyde) do |p|
 
   
   p.command(:build) do |build|
-    build.syntax "build"
+    build.syntax "build [site name]"
     build.description "Build the main site"
-
-    build.option "full", "--full", "Builds main site and nested sites."
-
-    build.action do |args, options|
-      options['main'] = true
-      MrHyde::Commands::Build.process args, options
-    end
+    cmd_build build
   end
   
   p.command(:list) do |list|
@@ -108,11 +111,16 @@ Mercenary.program(:mrhyde) do |p|
     list.description "Shows a list of all sites within sources."
 
     list.option "built", "--built", "Shows a list of built sites."
+    list.option "draft", "--drafts", "Shows a list of sites not built."
 
     list.action do |args, options|
       MrHyde::Commands::List.process options
     end
   end
+    
+  p.command(:remove) do |rm|
+    cmd_remove rm
+  end
 
   p.action do |args, options|
     if args.empty?

data/lib/mr_hyde/commands/build.rb

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

data/lib/mr_hyde/commands/list.rb

@@ -1,5 +1,4 @@
 require "mr_hyde/command"
-require "mr_hyde/site"
 
 module MrHyde
   module Commands
@@ -11,6 +10,8 @@ module MrHyde
 
           if opts['built']
             show_built_sites
+          elsif opts['draft']
+            show_draft_sites
           else 
             show_sources_sites
           end
@@ -18,14 +19,22 @@ module MrHyde
 
         def show_built_sites
           if File.exist? MrHyde.destination
-            show_list "Built sites (#{MrHyde.destination})", Site.built_list
+            show_list "Built sites (#{MrHyde.destination})", MrHyde.built_list
           else
             MrHyde.logger.warn "Still there is not a built site"
           end
         end
 
+        def show_draft_sites
+          if File.exist? MrHyde.destination
+            show_list "Draft sites (#{MrHyde.sources_sites})", MrHyde.draft_list
+          else
+            show_sources_sites
+          end
+        end
+
         def show_sources_sites
-          show_list "Source Sites (#{MrHyde.sources_sites})", Site.sources_list
+          show_list "Source Sites (#{MrHyde.sources_sites})", MrHyde.sources_list
         end
 
         def show_list(title, list)

data/lib/mr_hyde/commands/remove.rb

@@ -6,7 +6,11 @@ module MrHyde
     class Remove < MrHyde::Command
       class << self
         def process(args, opts = {})
-          Site.remove 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.") 
+          else
+            Site.remove args, opts
+          end
         end
       end
     end

data/lib/mr_hyde/configuration.rb

@@ -28,8 +28,10 @@ module MrHyde
 
       begin
         files.each do |config_file|
-          new_config = read_config_file(config_file)
-          configuration = Jekyll::Utils.deep_merge_hashes(configuration, new_config)
+          if File.exist? config_file
+            new_config = read_config_file(config_file)
+            configuration = Jekyll::Utils.deep_merge_hashes(configuration, new_config)
+          end
         end
       rescue ArgumentError => err
         MrHyde.logger.warn "WARNING:", "Error reading configuration. " +

data/lib/mr_hyde/site.rb

@@ -91,20 +91,25 @@ module MrHyde
           build_main_site(opts) unless File.exist? MrHyde.destination
 
           if opts["all"]
-            build_sites list(MrHyde.sources_sites), opts
+            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
-          # 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
+          if opts["all"]
             build_main_site(opts)
-            build_sites nested_sites, opts
+            build_sites sources_list, opts
           else
-            build_main_site(opts)
+            # 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
         end
       rescue Exception => e
@@ -134,6 +139,16 @@ module MrHyde
         end
       end
 
+      def draft_list
+        return sources_list unless File.exist? MrHyde.destination
+        sources = sources_list
+        builts  = built_list
+
+        sources.reject do |site|
+          site if builts.include?(site)
+        end
+      end
+
       def exist?(name, opts)
         File.exist? File.join(@source, name)
       end

data/lib/mr_hyde/version.rb

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

data/lib/mr_hyde.rb

@@ -74,7 +74,7 @@ module MrHyde
     end
 
     def has_jekyll_config?
-      File.exist? File.expand_path(source, @config['jekyll_config'])
+      File.exist? File.expand_path(File.join(source, @config['jekyll_config']))
     end
 
     def sources
@@ -138,6 +138,10 @@ module MrHyde
       Site.sources_list
     end
 
+    def draft_list
+      Site.draft_list
+    end
+
     private 
 
     def preserve_source_location?(path, opts)

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

@@ -4,7 +4,7 @@ title:  "Welcome to Mr. Hyde!"
 date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>
 categories: mrhyde jekyll update
 ---
-![Dr. Jekyll and Mr. Hyde]({{ site.baseurl }}/assets/dr_jekyll_and_mr_hyde_poster.png)
+![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.
 

data/spec/list_spec.rb

@@ -11,27 +11,47 @@ describe "Mr. Hyde Listing" do
     @defaults = MrHyde::Configuration::DEFAULTS
     @tmp_dir = Dir.mktmpdir('mrhyde_new_test')
     Dir.chdir(@tmp_dir)
-    MrHyde.create @site_name
+    MrHyde.create @site_name, { 'blank' => true }
     Dir.chdir(@site_name)
   end
 
   after do
+    Dir.chdir(@tmp_dir)
     FileUtils.remove_dir(@site_name) if File.exist? @site_name
   end
 
+  def create_sites(sites_number)
+    sites_name = []
+    sites_number.times { |i| sites_name << "#{@nested_site_name}_#{i}" } 
+    MrHyde::Site.create sites_name, { 'blank' => true }
+  end
+
+  def build_sites(sites_number = 0)
+    entries = fetch_entries(MrHyde.sources_sites)
+    sites_number = entries.length if sites_number == 0
+
+    MrHyde::Site.build entries[0..sites_number - 1]
+  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 
+    create_sites(5)
+    MrHyde.sources_list.length.must_be :==, 5 
   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 
+    create_sites(5)
+    build_sites(3)
+    MrHyde.built_list.length.must_be :==, 3
+  end
+
+  it "can list all draft sites" do
+    create_sites(5)
+    build_sites(3)
+    MrHyde.draft_list.length.must_be :==, 2 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_hyde
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Enrique Arias Cervero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ files:
 - 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/assets/dr_jekyll_and_mr_hyde_poster.jpg
 - lib/subsite_template/feed.xml
 - lib/subsite_template/index.html
 - mr_hyde.gemspec