jekyllpress 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05da1c5d837f760d088d87a3dd9f7ee3ad71319
-  data.tar.gz: 8cdd262990c8988d80710cdaaba27b29840ad8d5
+  metadata.gz: 40003eab401d98373cda9aa83d94274f39f0ec45
+  data.tar.gz: e8b16da84b7c7faea06f24c4a100251cae354796
 SHA512:
-  metadata.gz: 6374d5f07ed37b9406e4c9395d820bb10fe1c25be92c200be161dcb53552b9ef0c1ada997495d772a269454823521038095c70f1bfba66164f0eacae89d7d583
-  data.tar.gz: 74f5bcf18f9de5f22da424541cd2eb121472fafbf1952baacf0718a2eb7f391109c2866378c1e3bbae1a2456ac264f0933b997c0deb2fa718c7ae9f6d50f2ed8
+  metadata.gz: 6dd9f62443222eed5addde8334ae8daf67b9c90b2dfc16c1e55edbb5f3c75546223e8a3ec13d2200a49449ed4eba19f66b942829de986ffc584f2df5ebae1c11
+  data.tar.gz: 983810146b58fac82a5cf32e71b230d31c84e9309a8d9ee55be7941ef164921108de3ff3e7eae774e4fdb5752f98fc70d3bb63496cbf92b584ec7181a53100e6

data/lib/jekyllpress/version.rb

@@ -1,3 +1,3 @@
 module Jekyllpress
-  VERSION = "0.1.4"
+  VERSION = "1.0.0"
 end

data/lib/jekyllpress.rb

@@ -25,21 +25,22 @@ module Jekyllpress
       with_config do |config|
         empty_directory(File.join(source, template_dir))
         create_file(File.join(source, template_dir, new_post_template),
-          %q{---
-            layout: post
-            title: "<%= @title %>"
-            date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
-            categories: [<%= Array(@categories).join(", ") %>]
-            tags: [<%= Array(@tags).join(", ") %>]
-            ---
-            }.gsub(/^\s*/,''))
+          '---
+           layout: <%= @layout %>
+           title: "<%= @title %>"
+           date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
+           categories: <%= Array(@categories) %>
+           tags: <%= Array(@tags) %>
+           source: "<%= @url %>"
+           ---
+          '.gsub(/^\s*/,''))
         create_file(File.join(source, template_dir, new_page_template), 
-          %q{---
-            layout: page
-            title: "<%= @title %>"
-            date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
-            ---
-            }.gsub(/^\s*/,''))
+          '---
+           layout: <%= @layout %>
+           title: "<%= @title %>"
+           date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
+           ---
+          '.gsub(/^\s*/,''))
         [__method__, source, template_dir, new_post_template, new_page_template]
       end
     end
@@ -47,6 +48,9 @@ module Jekyllpress
     desc "new_post TITLE", "Create a new posts with title TITLE"
     method_option :categories, :desc => "list of categories to assign this post", :type => :array, :aliases => %w[-c]
     method_option :tags, :desc => "list of tags to assign this post", :type => :array, :aliases => %w[-t]
+    method_option :layout, :desc => "specify an alternate layout for the post", :type => :string, :aliases => %w[-l], :default => "post"
+    method_option :url, :desc => "source URL for blog post", :type => :string
+    method_option :template, :desc => "specify an alternate template to use for the post", :type => :string
     def new_post(title="")
       check_templates
       @title = title.to_s
@@ -54,33 +58,37 @@ module Jekyllpress
 
       @categories = options.fetch("categories", [])
       @tags = options.fetch("tags", [])
-
+      @layout = options[:layout]
+      @url = options[:url]
+      @template = options.fetch("template") { new_post_template }
+      
       with_config do |config|
         check_templates
-        filename = destination(source, posts_dir, post_filename(title))
+        @filename = destination(source, posts_dir, post_filename(title))
 
-        template(File.join(template_dir,new_post_template), filename)
+        template(File.join(template_dir, @template), @filename)
 
-        [__method__, @title, filename, @categories, @tags]
+        [__method__, @title, @filename, @categories, @tags, @layout, @url, @template]
       end
     end
 
     desc "new_page TITLE", "Create a new page with title TITLE"
     method_option :location, :desc => "Location for page to appear in directory", :type => :string, :aliases => %w[-l --loc]
+    method_option :layout, :desc => "specify an alternate layout for the page", :type => :string, :default => "page"
     def new_page(title="")
       check_templates
       @title = title.to_s
       @title = ask("Page title: ") if @title.empty?
-
+      @layout = options["layout"]
       location = options.fetch("location", nil)
       raise "location can not be an absolute path: #{location}" if location[0] == ?/
 
       with_config do |config|
-        filename = destination(source, location, page_dirname(title), index_name)
+        @filename = destination(source, location, page_dirname(title), index_name)
 
-        template(File.join(template_dir, new_page_template), filename)
+        template(File.join(template_dir, new_page_template), @filename)
 
-        [__method__, @title, filename, location]
+        [__method__, @title, @filename, location, @layout]
       end
     end
 
@@ -196,7 +204,7 @@ redirect_from:
     end
 
     def new_post_template
-      jekyll_config["templates"]["new_post_template"]      
+      jekyll_config["templates"]["new_post_template"]
     end
 
     def new_page_template

data/spec/lib/jekyllpress_spec.rb

@@ -33,7 +33,6 @@ describe "my Jekyllpress Thor script" do
         Dir.chdir(TEST_SITE) do |test_site|
           load 'jekyllpress.rb'
           Jekyllpress::App.start(%w[setup])
-          @action, @title, @filename, @categories, @tags = Jekyllpress::App.start(%w[new_post A\ New\ Post -c one two three -t able baker charlie])
         end
       end
     end
@@ -44,13 +43,55 @@ describe "my Jekyllpress Thor script" do
       end
     end
 
-    it {expect(@action).to eq :new_post}
-    it {expect(@title).to eq "A New Post"}
-    it {expect(@categories).to eq %w[one two three]}
-    it {expect(@tags).to eq %w[able baker charlie]}
-    it {expect(@filename).to be_a String}
-    it {expect(@filename).not_to be_empty}
-    it {expect(@filename).to include("/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
+    context "when using the default template" do
+      before(:all) do
+        @action, @title, @filename, @categories, @tags, @layout, @url, @template = Jekyllpress::App.start(%w[new_post A\ New\ Post -c one two three -t able baker charlie -l post2 --url=https://github.com/tamouse])
+      end
+
+      it {expect(@action).to eq :new_post}
+      it {expect(@title).to eq "A New Post"}
+      it {expect(@categories).to eq %w[one two three]}
+      it {expect(@tags).to eq %w[able baker charlie]}
+      it {expect(@layout).to eq 'post2'}
+      it {expect(@url).to eq 'https://github.com/tamouse'}
+      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 include("/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
+    end
+
+
+    context "when giving an alternate template" do
+      before(:all) do
+        alt_template = <<-EOF
+--
+layout: link
+title: <%= @title %>
+date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
+---
+alternate template
+
+EOF
+        test_dir = File.expand_path('../../',__FILE__)
+        alt_template_file = File.join(test_dir, TEST_SITE, "_templates", "alt_post.markdown")
+
+
+        File.write(alt_template_file, alt_template)
+        
+        @action, @title, @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])
+      end
+
+      it {expect(@action).to eq :new_post}
+      it {expect(@title).to eq "A New Post With Alt Template"}
+      it {expect(@categories).to eq %w[one two three]}
+      it {expect(@tags).to eq %w[able baker charlie]}
+      it {expect(@layout).to eq 'link'}
+      it {expect(@url).to eq 'https://github.com/tamouse'}
+      it {expect(@template).to eq "alt_post.markdown"}
+      it {expect(@filename).to be_a String}
+      it {expect(@filename).not_to be_empty}
+      it {expect(@filename).to include("/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post-with-alt-template.markdown")}
+    end
   end
 
   describe ":new_page" do
@@ -79,7 +120,7 @@ describe "my Jekyllpress Thor script" do
 
     context "create a new page" do
       before(:all) do
-        @action, @title, @filename, @location = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages])
+        @action, @title, @filename, @location, @layout = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages --layout=page2])
       end
 
       after(:all) do
@@ -88,6 +129,7 @@ describe "my Jekyllpress Thor script" do
 
       it {expect(@action).to eq :new_page}
       it {expect(@title).to eq "A New Page"}
+      it {expect(@layout).to eq "page2"}
       it {expect(@location).to eq "pages"}
       it {expect(@filename).to be_a String}
       it {expect(@filename).not_to be_empty}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyllpress
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Thor utility to do neat jekyll stuff.