jekyllpress 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40003eab401d98373cda9aa83d94274f39f0ec45
-  data.tar.gz: e8b16da84b7c7faea06f24c4a100251cae354796
+  metadata.gz: f0d47d00a72a498e56cb38afbc882595b0f3d8d4
+  data.tar.gz: 406dfeb00c94677776c785ed4ca4bbd671f75835
 SHA512:
-  metadata.gz: 6dd9f62443222eed5addde8334ae8daf67b9c90b2dfc16c1e55edbb5f3c75546223e8a3ec13d2200a49449ed4eba19f66b942829de986ffc584f2df5ebae1c11
-  data.tar.gz: 983810146b58fac82a5cf32e71b230d31c84e9309a8d9ee55be7941ef164921108de3ff3e7eae774e4fdb5752f98fc70d3bb63496cbf92b584ec7181a53100e6
+  metadata.gz: d8adf1efd5f87f1e2d91755d0e92eb1d492cb2375b285ccda81d389767288f3b542a26d15b22b05175a432cf392f6104f51b858c6514b2ab69637b0f9a378732
+  data.tar.gz: d652cea47db6747ce0308d6a872067ab76b7fc2c311022937ac91ab7f58a6ffc1d545301b8abd09eeef202b60b6d83f14affc61d007add7e93478766b7013794

data/.rspec

@@ -1,2 +1,2 @@
 --format documentation
---color
+--no-color

data/jekyllpress.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", ">= 0.19"
-  spec.add_dependency "jekyll", ">= 2.1"
+  spec.add_dependency "jekyll"
   spec.add_dependency "stringex", ">= 2"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/jekyllpress/version.rb

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

data/lib/jekyllpress.rb

@@ -28,17 +28,16 @@ module Jekyllpress
           '---
            layout: <%= @layout %>
            title: "<%= @title %>"
-           date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
+           date: <%= @date %> <%= @time %>
            categories: <%= Array(@categories) %>
            tags: <%= Array(@tags) %>
            source: "<%= @url %>"
            ---
           '.gsub(/^\s*/,''))
-        create_file(File.join(source, template_dir, new_page_template), 
+        create_file(File.join(source, template_dir, new_page_template),
           '---
            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]
@@ -51,24 +50,28 @@ module Jekyllpress
     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
+    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")
     def new_post(title="")
       check_templates
       @title = title.to_s
       @title = ask("Title for your post: ") if @title.empty?
 
+      @date = options.fetch("date", Date.today.iso8601)
+      @time = options.fetch("time", Time.now.strftime("%H:%M"))
       @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, @date))
 
         template(File.join(template_dir, @template), @filename)
 
-        [__method__, @title, @filename, @categories, @tags, @layout, @url, @template]
+        [__method__, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template]
       end
     end
 
@@ -84,7 +87,7 @@ module Jekyllpress
       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)
 
@@ -104,7 +107,7 @@ module Jekyllpress
       with_posts({"permalink" => permalink_template}) do |post|
         if post.data.has_key?("redirect_from") && !force_redirect
           say "skipping #{post.name} - redirect_from detected"
-          next 
+          next
         end
 
         time_now = Time.now
@@ -179,8 +182,8 @@ redirect_from:
       jekyll_config['source']
     end
 
-    def post_filename(title)
-      "#{Time.now.strftime("%Y-%m-%d")}-#{title.to_url}.#{new_ext}"
+    def post_filename(title, date=Date.today.iso8601)
+      "#{date}-#{title.to_url}.#{new_ext}"
     end
 
     def page_dirname(title)

data/spec/lib/jekyllpress_spec.rb

@@ -7,7 +7,7 @@ def kill_jekyll
   # I'm not altogether sure why I have to do this, but apparently
   # the way thor, rspec, and jekyll all meld, something goes haywire.
   $".delete_if{|x| x.match(%r[(/gems/jekyll-.+/lib/jekyll)])}
-  # run `load 'jekyllpress.rb'` in each test setup where you have a 
+  # run `load 'jekyllpress.rb'` in each test setup where you have a
   # jekyll test directory to work with
 end
 
@@ -22,7 +22,7 @@ describe "my Jekyllpress Thor script" do
     it {expect(Jekyllpress::App.start(%w[version])).to include(Jekyllpress::VERSION)}
     it {expect(Jekyllpress::App.start(%w[-V])).to include(Jekyllpress::VERSION)}
     it {expect(Jekyllpress::App.start(%w[--version])).to include(Jekyllpress::VERSION)}
-  end  
+  end
 
   describe ":new_post" do
     before(:all) do
@@ -43,13 +43,31 @@ describe "my Jekyllpress Thor script" do
       end
     end
 
+    context "when using all defaults" do
+      before(:all) do
+        @action, @title, @date, @time, @filename, @categories, @tags, @layout, @url, @template =
+          Jekyllpress::App.start(%w[new_post Using\ The\ Defaults])
+      end
+      it {expect(@action).to eq :new_post}
+      it {expect(@title).to eq "Using The Defaults"}
+      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{/_posts/.*-using-the-defaults\.markdown} }
+    end
+
     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])
+        @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])
       end
 
       it {expect(@action).to eq :new_post}
       it {expect(@title).to eq "A New Post"}
+      it {expect(@date).to eq '2001-01-01'}
+      it {expect(@time).to eq '11:15'}
       it {expect(@categories).to eq %w[one two three]}
       it {expect(@tags).to eq %w[able baker charlie]}
       it {expect(@layout).to eq 'post2'}
@@ -57,7 +75,7 @@ describe "my Jekyllpress Thor script" do
       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")}
+      it {expect(@filename).to include("/_posts/2001-01-01-a-new-post.markdown")}
     end
 
 
@@ -77,12 +95,14 @@ EOF
 
 
         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])
+
+        @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])
       end
 
       it {expect(@action).to eq :new_post}
       it {expect(@title).to eq "A New Post With Alt Template"}
+      it {expect(@date).to eq '2001-01-01'}
+      it {expect(@time).to eq '11:15'}
       it {expect(@categories).to eq %w[one two three]}
       it {expect(@tags).to eq %w[able baker charlie]}
       it {expect(@layout).to eq 'link'}
@@ -90,7 +110,7 @@ EOF
       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")}
+      it {expect(@filename).to include("/_posts/2001-01-01-a-new-post-with-alt-template.markdown")}
     end
   end
 
@@ -203,9 +223,9 @@ EOF
           load 'jekyllpress.rb'
           File.open(File.join("_posts","2013-12-31-an-old-post.markdown"), 'w') do |post|
             frontmatter = {
-              "title" => "An old post", 
+              "title" => "An old post",
               "date" => "2013-12-31 12:31",
-              "layout" => "post", 
+              "layout" => "post",
               "redirect_from" => Array("/oldsite/2013/12/31/an-old-post/")
             }
             post.puts frontmatter.to_yaml
@@ -236,7 +256,7 @@ EOF
         expect(@posts.count).to eq(1)
         @posts.each do |post|
           post_content = File.read post[:file]
-          expect(post_content).to match(%r{^redirect_from:$}) 
+          expect(post_content).to match(%r{^redirect_from:$})
           expect(post_content).to  match(%r{^  - /BLOG/})
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyllpress
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Thor utility to do neat jekyll stuff.