mr_poole 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67256569815765464405bb90b8428e79705ab4c8
-  data.tar.gz: b8926eec3f3d7be762486da2e43f97c213d67461
+  metadata.gz: 4790b814a5e143fa4beae53dd72d2cd5d3a47798
+  data.tar.gz: a60ed789cd16fc12c57ff5ca566f0e34d489e413
 SHA512:
-  metadata.gz: c225e8d61c813b6eadc0ffe9fee4d8cd5340a5ce6bc85422af4723806bffecead4dd490c095345499f4e153e3e6c1525704023b2d88de55a8a2bc5fc87e40033
-  data.tar.gz: d5e0ea460ce3a45aa25ae8f07c09afd4de24462dcb35d1df738ec70de57b71ac44008f8ed46720a433bae40820118b3fc5f488e5fe48780e9713b1a613e9fe46
+  metadata.gz: cd29e6389bd96860c050412b85c8e4ae95fbfec6bcf58bba661c985d2e587f374d88a97c8430e085dbe31847f7c71037b4d327db5e71b37760ad128dd1b4f09d
+  data.tar.gz: 78b28c146104ff78506333b4ca1d33f86639ef4500ae6e60d5c0d17c4ff659432efb3445561ad160c8bd532a38a09649a42c7ccc637a27152239af89bc040e41

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.4.1 (2013-12-25)
+
+- Add custom source dir detection from _config.yml (Merry Christmas!)
+
 ### v0.4.0 (2013-09-28)
 
 - Add options for unpublish

data/lib/mr_poole/helper.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module MrPoole
   class Helper
 
@@ -8,7 +10,15 @@ module MrPoole
     # Check for a _posts directory in current directory
     # If we don't find one, puke an error message and die
     def ensure_jekyll_dir
-      unless File.exists?('./_posts')
+      ok = File.exists?('./_posts')
+
+      # if it doesn't exist, check for a custom source dir in _config.yml
+      if !ok
+        check_custom_src_dir
+        ok = File.exists?('./_posts')
+      end
+
+      if !ok
         puts 'ERROR: Cannot locate _posts directory. Double check to make sure'
         puts '       that you are in a jekyll directory.'
         exit
@@ -128,5 +138,22 @@ module MrPoole
       exit
     end
 
+    # Private methods
+    #################
+    private
+
+    # If a user has a custom 'source' defined in their _config.yml, change
+    # to that directory for everything else
+    def check_custom_src_dir
+      srcdir = nil
+
+      if File.exists?('_config.yml')
+        yaml = YAML.load(File.read('_config.yml'))
+        srcdir = yaml['source']
+      end
+
+      Dir.chdir(srcdir) if srcdir
+    end
+
   end
 end

data/lib/mr_poole/version.rb

@@ -1,3 +1,3 @@
 module MrPoole
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/cli_spec.rb

@@ -17,6 +17,23 @@ module MrPoole
         expect { cli = CLI.new([]) }.not_to raise_error
         clean_tmp_files(tmpdir, olddir)
       end
+
+      context 'with _config.yml' do
+
+        it "should not exit if _config.yml has 'source' key" do
+          olddir, tmpdir = make_irregular_jekyll_dir
+          expect { cli = CLI.new([]) }.not_to raise_error
+          clean_tmp_files(tmpdir, olddir)
+        end
+
+        it "should exit if custom src dir doesn't have _posts dir" do
+          olddir, tmpdir = make_bad_irregular_jekyll_dir
+          expect {
+            capture_stdout { cli = CLI.new([]) }
+          }.to raise_error(SystemExit)
+          clean_tmp_files(tmpdir, olddir)
+        end
+      end
     end   # context determine jekyll dir
 
     context 'no correct action' do

data/spec/spec_helper.rb

@@ -35,7 +35,31 @@ def make_jekyll_dir
   Dir.mkdir(posts)
   Dir.chdir(newdir)
   return olddir, newdir
+end
+
+def make_irregular_jekyll_dir
+  olddir = Dir.pwd()
+  newdir = Dir.mktmpdir('jekyll')
+  srcdir = File.join(newdir, 'src')
+  posts = File.join(srcdir, '_posts')
+  Dir.mkdir(srcdir)
+  Dir.mkdir(posts)
+  Dir.chdir(newdir)
+  # ensure write custom yml file
+  write_config_file_custom_src_dir
+  return olddir, newdir
+end
 
+# make a dir with a custom source dir but with no _posts directory
+def make_bad_irregular_jekyll_dir
+  olddir = Dir.pwd()
+  newdir = Dir.mktmpdir('jekyll')
+  srcdir = File.join(newdir, 'src')
+  Dir.mkdir(srcdir)
+  Dir.chdir(newdir)
+  # ensure write custom yml file
+  write_config_file_custom_src_dir
+  return olddir, newdir
 end
 
 def clean_tmp_files(tmpdir, restoredir)
@@ -130,3 +154,9 @@ def write_config_file_custom_extension
   c.puts "  default_extension: textile"
   c.close
 end
+
+def write_config_file_custom_src_dir
+  c = File.open('_config.yml', 'w')
+  c.puts 'source: src'
+  c.close
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_poole
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael McClimon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A butler for Jekyll. Provides a command-line interface (called `poole`) for