jekyllpress 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d47d00a72a498e56cb38afbc882595b0f3d8d4
-  data.tar.gz: 406dfeb00c94677776c785ed4ca4bbd671f75835
+  metadata.gz: 2d303845fd7a9e5a934ffb643ed5be96f56132a1
+  data.tar.gz: 2b5ecd0f582606b9dc146fa46ae1e6ab48cc53a2
 SHA512:
-  metadata.gz: d8adf1efd5f87f1e2d91755d0e92eb1d492cb2375b285ccda81d389767288f3b542a26d15b22b05175a432cf392f6104f51b858c6514b2ab69637b0f9a378732
-  data.tar.gz: d652cea47db6747ce0308d6a872067ab76b7fc2c311022937ac91ab7f58a6ffc1d545301b8abd09eeef202b60b6d83f14affc61d007add7e93478766b7013794
+  metadata.gz: 3ba18e04440e399506f2d7d96f24f7ced67185eba89bf1e329130ac0bc464f8bcf9331a270d1ce088a9e4f49afa996ca8505641209b47232e6fc79bafa9211b0
+  data.tar.gz: 493444facb922e2cbbac1cec9d791ca1e60be2b03621990aad2319e95ac34fa2c44306c56223ad314f24be38514014929f2e97e07cadbe12790c04ec7a198be9

data/CHANGELOG

@@ -1,3 +1,9 @@
+2015-11-24  Tamara Temple  <tamouse.lists@gmail.com>
+
+	* lib/jekyllpress.rb (Jekyllpress::App#new_post): add a new
+	paramters to the new post command to set the location for the new
+	page to live.
+
 d1d64f0 (HEAD, origin/master, master) fix: reset @jekyll_config after reading location of configuration file.
 4822f67 (tag: v0.1.2) Update CHANGELOG, bump VERSION.
 6eed295 fix: left binding.pry in the code :((

data/lib/jekyllpress/version.rb

@@ -1,3 +1,3 @@
 module Jekyllpress
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/jekyllpress.rb

@@ -52,6 +52,7 @@ module Jekyllpress
     method_option :template, :desc => "specify an alternate template to use for the post", :type => :string
     method_option :date, :desc => "provide an alternate date for the post", :type => :string, :default => Date.today.iso8601
     method_option :time, :desc => "provide an alternate time of day for the post", :type => :string, :default => Time.now.strftime("%H:%M")
+    method_option :location, :desc => "Location for page to appear in directory", :type => :string, :aliases => %w[-L --loc], :default => nil
     def new_post(title="")
       check_templates
       @title = title.to_s
@@ -64,14 +65,13 @@ module Jekyllpress
       @layout = options[:layout]
       @url = options[:url]
       @template = options.fetch("template") { new_post_template }
+      @location = options.fetch("location", posts_dir) || posts_dir
 
       with_config do |config|
         check_templates
-        @filename = destination(source, posts_dir, post_filename(@title, @date))
-
+        @filename = destination(source, @location, post_filename(@title, @date))
         template(File.join(template_dir, @template), @filename)
-
-        [__method__, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template]
+        [__method__, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template, @location]
       end
     end
 

data/spec/lib/jekyllpress_spec.rb

@@ -31,6 +31,7 @@ describe "my Jekyllpress Thor script" do
         FileUtils.rm_rf TEST_SITE
         `jekyll new #{TEST_SITE}`
         Dir.chdir(TEST_SITE) do |test_site|
+          FileUtils.mkdir_p '_my_collection'
           load 'jekyllpress.rb'
           Jekyllpress::App.start(%w[setup])
         end
@@ -45,7 +46,7 @@ describe "my Jekyllpress Thor script" do
 
     context "when using all defaults" do
       before(:all) do
-        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template =
+        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template, @location =
           Jekyllpress::App.start(%w[new_post Using\ The\ Defaults])
       end
       it {expect(@action).to eq :new_post}
@@ -57,11 +58,12 @@ describe "my Jekyllpress Thor script" do
       it {expect(@filename).to be_a String}
       it {expect(@filename).not_to be_empty}
       it {expect(@filename).to match %r{/_posts/.*-using-the-defaults\.markdown} }
+      it {expect(@location).to eq "_posts"}
     end
 
     context "when using the default template" do
       before(:all) do
-        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template = Jekyllpress::App.start(%w[new_post A\ New\ Post --date=2001-01-01 --time=11:15 -c one two three -t able baker charlie -l post2 --url=https://github.com/tamouse])
+        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template, @location = Jekyllpress::App.start(%w[new_post A\ New\ Post --date=2001-01-01 --time=11:15 -c one two three -t able baker charlie -l post2 --url=https://github.com/tamouse])
       end
 
       it {expect(@action).to eq :new_post}
@@ -76,6 +78,7 @@ describe "my Jekyllpress Thor script" do
       it {expect(@filename).to be_a String}
       it {expect(@filename).not_to be_empty}
       it {expect(@filename).to include("/_posts/2001-01-01-a-new-post.markdown")}
+      it {expect(@location).to eq "_posts"}
     end
 
 
@@ -96,7 +99,7 @@ EOF
 
         File.write(alt_template_file, alt_template)
 
-        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template = Jekyllpress::App.start(%w[new_post A\ New\ Post\ With\ Alt\ Template -c one two three -t able baker charlie -l link --url=https://github.com/tamouse --template=alt_post.markdown --date=2001-01-01 --time=11:15])
+        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template, @location = Jekyllpress::App.start(%w[new_post A\ New\ Post\ With\ Alt\ Template -c one two three -t able baker charlie -l link --url=https://github.com/tamouse --template=alt_post.markdown --date=2001-01-01 --time=11:15])
       end
 
       it {expect(@action).to eq :new_post}
@@ -111,7 +114,26 @@ EOF
       it {expect(@filename).to be_a String}
       it {expect(@filename).not_to be_empty}
       it {expect(@filename).to include("/_posts/2001-01-01-a-new-post-with-alt-template.markdown")}
+      it {expect(@location).to eq "_posts"}
     end
+
+    context "when using a different location" do
+      before(:all) do
+        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template, @location =
+          Jekyllpress::App.start(%w[new_post Diff-Location --location=_my_collection])
+      end
+      it {expect(@action).to eq :new_post}
+      it {expect(@title).to eq "Diff-Location"}
+      it {expect(@date).to eq Date.today.iso8601}
+      it {expect(@categories).to eq []}
+      it {expect(@tags).to eq []}
+      it {expect(@template).to eq 'new_post.markdown'}
+      it {expect(@filename).to be_a String}
+      it {expect(@filename).not_to be_empty}
+      it {expect(@filename).to match %r{/_my_collection/.*-diff-location\.markdown} }
+      it {expect(@location).to eq "_my_collection"}
+    end
+
   end
 
   describe ":new_page" do
@@ -213,7 +235,7 @@ EOF
 
   end
 
-  describe ":redirect" do
+  xdescribe ":redirect" do
     before do
       kill_jekyll
       Dir.chdir("spec") do |spec_dir|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyllpress
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -216,3 +216,4 @@ test_files:
 - spec/jekyllpress_spec.rb
 - spec/lib/jekyllpress_spec.rb
 - spec/spec_helper.rb
+has_rdoc: