mr_poole 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8339685aaa22211c91533a49cba616ba46aacabb
-  data.tar.gz: d2c44f32264be8788ab6943375facca7997938a2
+  metadata.gz: eec4c40ee2d85be9a8dc6646397716f639dc7251
+  data.tar.gz: 5d5d5d3da895a594bed5bc5b315406f419b3a332
 SHA512:
-  metadata.gz: 87a6cb8cddb2d309cda58c73cdc2160813f1e6476f57f17ebe87b0130132d0da49ecd07c6ae77d24cc56d744b106a1adec9cdd0e6f7e40234462852f81c52430
-  data.tar.gz: 6e98bd90942106f15719e0eff7c1f381e739014f06c2d0234bf0755e54012f6fadf4dc01814f640ecabfd358652718ba11ad98dec29209250915d036d0e745f0
+  metadata.gz: 79d2435f0d2c597b47fa137c0d02756c733c6003f67f065525605a7ebbb4c8d5e899fa35ed8fc7fb13b2240b83d1741e99d6fc7f3ce4e11478ceb2221adf6632
+  data.tar.gz: a92a2c785b51e9a013c9e51cb9301deb31c7e9232db59775d82d0e42402af83eac9a023f731b6833f4ad4a6415b0a1bbcc157483ec8426a7c2ef0d9bab728b80

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### v0.4.3 (2014-01-28)
+
+- Make echoed paths reflect custom source directory. Now you can `poole post
+  "post title" | vim` even if you are using a custom source directory in your
+  `_config.yml`.
+
 ### v0.4.2 (2013-12-25)
 
 - Change gemspec development dependencies (wouldn't release a new version

data/lib/mr_poole/cli.rb

@@ -6,7 +6,7 @@ module MrPoole
 
     def initialize(args)
       @helper = Helper.new
-      @helper.ensure_jekyll_dir
+      @src_dir = @helper.ensure_jekyll_dir
 
       @params = args
       @config = Config.new
@@ -25,6 +25,8 @@ module MrPoole
       when '-v' then @helper.version_statement
       else @helper.gen_usage
       end
+
+      @helper.restore_orig_directory
     end
 
     def handle_post
@@ -33,7 +35,7 @@ module MrPoole
 
       @helper.post_usage unless options.title
       fn = @commands.post(options)
-      puts fn
+      puts "#{@src_dir}/#{fn}"
     end
 
     def handle_draft
@@ -42,7 +44,7 @@ module MrPoole
 
       @helper.draft_usage unless options.title
       fn = @commands.draft(options)
-      puts fn
+      puts "#{@src_dir}/#{fn}"
     end
 
     def handle_publish
@@ -60,7 +62,7 @@ module MrPoole
       path = @params.first
       @helper.publish_usage unless path
       fn = @commands.publish(path, options)
-      puts fn
+      puts "#{@src_dir}/#{fn}"
     end
 
     def handle_unpublish
@@ -78,7 +80,7 @@ module MrPoole
       path = @params.first
       @helper.unpublish_usage unless path
       fn = @commands.unpublish(path, options)
-      puts fn
+      puts "#{@src_dir}/#{fn}"
     end
 
     def do_creation_options

data/lib/mr_poole/commands.rb

@@ -68,7 +68,7 @@ module MrPoole
 
     # Todo make this take a path instead?
     #
-    # @param draftpath [String] path to the draft
+    # @param draftpath [String] path to the draft, relative to source directory
     # @option options :keep_draft [Boolean] if true, keep the draft file
     # @option options :keep_timestamp [Boolean] if true, don't change the timestamp
     def publish(draftpath, opts={})

data/lib/mr_poole/helper.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'pathname'
 
 module MrPoole
   class Helper
@@ -7,24 +8,37 @@ module MrPoole
       # nothing to do here
     end
 
-    # Check for a _posts directory in current directory
-    # If we don't find one, puke an error message and die
+    # Check for a _posts directory in current directory. If there's not one,
+    # check for a _config.yml and look for a custom src directory.  If we
+    # don't find one, puke an error message and die. If we do, return the name
+    # of the directory
     def ensure_jekyll_dir
+      @orig_dir = Dir.pwd
+      start_path = Pathname.new(@orig_dir)
+
       ok = File.exists?('./_posts')
+      new_path = nil
 
       # if it doesn't exist, check for a custom source dir in _config.yml
       if !ok
-        check_custom_src_dir
+        check_custom_src_dir!
         ok = File.exists?('./_posts')
+        new_path = Pathname.new(Dir.pwd)
       end
 
-      if !ok
+      if ok
+        return (new_path ? new_path.relative_path_from(start_path) : '.')
+      else
         puts 'ERROR: Cannot locate _posts directory. Double check to make sure'
         puts '       that you are in a jekyll directory.'
         exit
       end
     end
 
+    def restore_orig_directory
+      Dir.chdir(@orig_dir)
+    end
+
     def ensure_open_struct(opts)
       return opts.instance_of?(Hash) ?  OpenStruct.new(opts) : opts
     end
@@ -144,7 +158,7 @@ module MrPoole
 
     # If a user has a custom 'source' defined in their _config.yml, change
     # to that directory for everything else
-    def check_custom_src_dir
+    def check_custom_src_dir!
       srcdir = nil
 
       if File.exists?('_config.yml')

data/lib/mr_poole/version.rb

@@ -1,3 +1,3 @@
 module MrPoole
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/cli_spec.rb

@@ -112,7 +112,7 @@ module MrPoole
         it 'echoes path to newly created post on success' do
           argv = ['post', 'post title']
           output = poole_no_stdout(argv).call.chomp
-          determined = Dir.glob("_posts/*.md").first
+          determined = Dir.glob("./_posts/*.md").first
           expect(output).to eq(determined)
         end
 
@@ -198,7 +198,7 @@ module MrPoole
         it 'echoes path to newly created post on success' do
           argv = ['draft', 'post title']
           output = poole_no_stdout(argv).call.chomp
-          determined = Dir.glob("_drafts/*.md").first
+          determined = Dir.glob("./_drafts/*.md").first
           expect(output).to eq(determined)
         end
       end   # context exit message
@@ -280,7 +280,7 @@ module MrPoole
         it 'echoes path to newly created post on success' do
           argv = ['publish', d_path]
           output = poole_no_stdout(argv).call.chomp
-          determined = Dir.glob("_posts/*.md").first
+          determined = Dir.glob("./_posts/*.md").first
           expect(output).to eq(determined)
         end
       end   # context exit message
@@ -301,7 +301,7 @@ module MrPoole
           expect(content).to match(/^date: \d{4}-\d{2}-\d{2}$/)
         end
       end
-    end
+    end   # describe publish
 
     describe "action 'unpublish'" do
       let(:p_path) { Commands.new.post({:title => 'test_post'}) }
@@ -341,7 +341,7 @@ module MrPoole
         it 'echoes path to newly created post on success' do
           argv = ['unpublish', p_path]
           output = poole_no_stdout(argv).call.chomp
-          determined = Dir.glob("_drafts/*.md").first
+          determined = Dir.glob("./_drafts/*.md").first
           expect(output).to eq(determined)
         end
       end   # context exit message
@@ -404,5 +404,57 @@ module MrPoole
 
     end
 
+    context 'with custom source directory' do
+      before(:each) do
+        @olddir, @tmpdir = make_irregular_jekyll_dir
+      end
+
+      after(:each) { clean_tmp_files(@tmpdir, @olddir) }
+
+      it "'post' echoes correct path with custom source directory" do
+        argv = ['post', 'post_title']
+        output = poole_no_stdout(argv).call.chomp
+        determined = Dir.glob("src/_posts/*.md").first
+        expect(output).to eq(determined)
+      end
+
+      it "'draft' echoes correct path with custom source directory" do
+        argv = ['draft', 'post_title']
+        output = poole_no_stdout(argv).call.chomp
+        determined = Dir.glob("src/_drafts/*.md").first
+        expect(output).to eq(determined)
+      end
+
+      it "'publish' echoes correct path with custom source directory" do
+        # make a draft first
+        Dir.chdir('src')
+        draft_path = Commands.new.draft({:title => 'test_draft'})
+        Dir.chdir('..')
+
+        argv = ['publish', draft_path]
+        output = poole_no_stdout(argv).call.chomp
+
+        determined = Dir.glob("src/_posts/*.md").first
+        expect(output).to eq(determined)
+      end
+
+      it "'unpublish' echoes correct path with custom source directory" do
+        olddir, tmpdir = make_irregular_jekyll_dir
+
+        # make a post in the src directory
+        Dir.chdir('src')
+        post_path = Commands.new.post({:title => 'touch_post'})
+        Dir.chdir('..')
+
+        argv = ['unpublish', post_path]
+        output = poole_no_stdout(argv).call.chomp
+
+        determined = Dir.glob("src/_drafts/*.md").first
+        expect(output).to eq(determined)
+
+        clean_tmp_files(tmpdir, olddir)
+      end
+
+    end
   end
 end

data/spec/spec_helper.rb

@@ -42,8 +42,10 @@ def make_irregular_jekyll_dir
   newdir = Dir.mktmpdir('jekyll')
   srcdir = File.join(newdir, 'src')
   posts = File.join(srcdir, '_posts')
+  drafts = File.join(srcdir, '_drafts')
   Dir.mkdir(srcdir)
   Dir.mkdir(posts)
+  Dir.mkdir(drafts)
   Dir.chdir(newdir)
   # ensure write custom yml file
   write_config_file_custom_src_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mr_poole
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Michael McClimon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2014-01-28 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.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A butler for Jekyll. Provides a command-line interface (called `poole`) for