jekyllpress 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb2cb90d22fa0b368ec4e7def04966f91fa9cce
-  data.tar.gz: 44b872c9516a654f601a496c42957498c2f85f4f
+  metadata.gz: 625954e5d29b533a49daf60f58d4ed0b12a83589
+  data.tar.gz: a7a76f682448eb9a94fadb754681b9bedf8b8c84
 SHA512:
-  metadata.gz: c213b8d99c204c76c21c1332a9a472d88d873d76153dee373e21fc1ea489db75e9709803dcd5a00cfcf807f57e090bde1ad8fd9f719f232132078ce1d8fd71f3
-  data.tar.gz: 098b81d69ea6f71156d4b75acec098b1c20448ecf6f7efbbc4f0ef212d05bd62214b302bb5ea0109b0ca642da1fed1edeb36a1fd22cab4e9b5db81e89b265a28
+  metadata.gz: b74b0248aaa5463ccfc6678fe1a461d46d3b43834b57ab9ce5c8dc80dc248e2e441ee39139e262617acd51e00a7e53cc38e5f9276f5562562bd60a797ba51675
+  data.tar.gz: 7a8ced63a9e6b5369cac84462f4e8840ad954afb1df9f0beac2912ab2a803b39349c20b0807e130a2edefa9fe483dad289846f4b4033d7f744aedc5910a58d74

data/README.md

@@ -8,7 +8,102 @@ A [Thor](http://whatisthor.com) script that provides several actions to help sup
 
 ## Usage
 
+### New Post
+
+Creating a new post is done with:
+
+    $ jekyllpress new_post 'This is my new post!!' --categories=new really --tags=so what
+    Configuration file: /Volumes/muis1t/Projects/rubystuff/jekyll/test_jekyll_2.1/_config.yml
+          create  _posts/2014-07-28-this-is-my-new-post.markdown
+
+This creates a new file in `_posts` with the current date stamp, and contents as:
+
+```
+---
+layout: post
+title: This is my new post!!
+date: 2014-07-28 01:15
+categories: ["new", "really"]
+tags: ["so", "what"]
+---
+```
+
+### New Page
+
+Creating a new page is just as simple:
+
+    $ jekyllpress new_page "Some Page" --location=pages
+    Configuration file: /Volumes/muis1t/Projects/rubystuff/jekyll/test_jekyll_2.1/_config.yml
+          create  pages/some-page/index.markdown
+
+The content is:
+
+```
+---
+layout: page
+title: Some Page
+date: 2014-07-28 01:17
+---
+```
+
+### Getting Help
+
+Actions and options can be seen by running `jekyllpress` with no paramters, or with the `help` action:
+
     $ jekyllpress help
+    Jekyllpress::App commands:
+      jekyllpress help [COMMAND]  # Describe available commands or one specific command
+      jekyllpress new_page TITLE  # Create a new page with title TITLE
+      jekyllpress new_post TITLE  # Create a new posts with title TITLE
+      jekyllpress setup           # Set up templates
+      jekyllpress version         # Display Jekyllpress::App version string
+
+To see the options for `new_post`, enter:
+
+    $ jekyllpress help new_post
+
+```
+Usage:
+  jekyllpress new_post TITLE
+
+Options:
+  -c, [--categories=one two three]  # list of categories to assign this post
+  -t, [--tags=one two three]        # list of tags to assign this post
+
+Create a new post with title TITLE
+```
+
+* `categories` and `tags` are arrays. Give each category or tag item after the parameter.
+* The equals sign after the option name is ... *optional*.
+
+To see the options for `new_page`, enter:
+
+    $ jekyllpress help new_page
+
+```
+Usage:
+  jekyllpress new_page TITLE
+
+Options:
+  -l, --loc, [--location=LOCATION]  # Location for page to appear in directory
+
+Create a new page with title TITLE
+```
+
+* the `location` option lets you specify a path down to where the page will live.
+* the location *must* be relative, and will placed starting from the source folder.
+
+### Setting Up Templates
+
+If you don't have templates specified in your `_config.yml` file or in your `source` folder, you can create them with the `setup` action:
+
+    $ jekyllpress setup
+    Configuration file: /Volumes/muis1t/Projects/rubystuff/jekyll/test_jekyll_2.1/_config.yml
+          create  _templates
+          create  _templates/new_post.markdown
+          create  _templates/new_page.markdown
+
+You can edit the markdown templates to your heart's delight. :)
 
 ## Contributing
 

data/lib/jekyllpress/version.rb

@@ -1,3 +1,3 @@
 module Jekyllpress
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/jekyllpress.rb

@@ -70,6 +70,7 @@ module Jekyllpress
       @title = ask("Page title: ") if @title.empty?
 
       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)

data/spec/lib/jekyllpress_spec.rb

@@ -3,92 +3,120 @@ require 'spec_helper'
 jekyll_match = %r[(gems/jekyll-.+/lib/jekyll)]
 # load 'jekyllpress.rb'; STDERR.puts $".grep(jekyll_match);  exit;
 
-Dir.chdir('spec/test_site') do |test_dir|
+Dir.chdir(Pathname.new('spec/test_site')) do |test_dir|
   $".delete_if{|x| x.match(jekyll_match)} ; load 'jekyllpress.rb' # Have to load this *after* we're in the working directory
-  # load 'jekyllpress.rb'
+  # STDERR.puts Jekyll::Configuration::DEFAULTS["source"]
+
   describe Jekyllpress::App do
-    describe ":version returns the version string" do
+
+    # it "should bloody well be in the damn spec/test_site directory!!!" do
+    #   expect(Jekyll::Configuration::DEFAULTS["source"]).to include("spec/test_site")
+    # end
+
+    describe ":version" 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  
 
-    describe ":new_post returns the title, categories and tags" do
-      FileUtils.rm_rf "_posts/"
-      action, title, filename, categories, tags = Jekyllpress::App.start(%w[new_post A\ New\ Post -c=one two three -t=a b c])
-
-      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[a b c]}
-      it {expect(filename).to be_a String}
-      it {expect(filename).not_to be_empty}
-      it {expect(filename).to include("#{test_dir}/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
+    describe ":new_post" do
+      before(:all) do
+        # STDERR.puts "test_dir is #{test_dir}"
+        Dir.chdir(test_dir) do |test_dir|
+          # binding.pry
+          @posts_dir = Pathname.new('_posts')
+          raise "#{@posts_dir} does not exist!" unless @posts_dir.directory?
+          @posts_dir.children.each(&:unlink)
+          @templates = Pathname.new('_templates')
+          @templates.rmtree if @templates.exist?
+          Jekyllpress::App.start(%w[setup])
+          @action, @title, @filename, @categories, @tags = Jekyllpress::App.start(%w[new_post A\ New\ Post -c=one two three -t=a b c])
+        end
+      end
+      # it "should bloody well be in the damn spec/test_site directory!!!" do
+      #   expect(Jekyll::Configuration::DEFAULTS["source"]).to include("spec/test_site")
+      # 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[a b c]}
+      it {expect(@filename).to be_a String}
+      it {expect(@filename).not_to be_empty}
+      it {expect(@filename).to include("#{test_dir}/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
     end
 
-    describe ":new_page returns title, filename, location" do
-      FileUtils.rm_rf "pages/a-new-page"
-      action, title, filename, location = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages])
+    describe ":new_page" do
+      it "should report an error if location is an absolute path" do
+        expect{Jekyllpress::App.start(%w[new_page bogus --location /pages])}.to raise_error(RuntimeError, "location can not be an absolute path: /pages")
+      end
 
-      it {expect(action).to eq :new_page}
-      it {expect(title).to eq "A New Page"}
-      it {expect(location).to eq "pages"}
-      it {expect(filename).to be_a String}
-      it {expect(filename).not_to be_empty}
-      it {expect(filename).to include("#{test_dir}/pages/a-new-page/index.markdown")}
+      context "create a new page" do
+        before(:all) do
+          Dir.chdir(test_dir) do |test_dir|
+            @pages_dir = Pathname.new('pages')
+            raise "#{@pages_dir} does not exist!" unless @pages_dir.directory?
+            @pages_dir.children.each(&:rmtree)
+            @templates = Pathname.new('_templates')
+            @templates.rmtree if @templates.exist?
+            Jekyllpress::App.start(%w[setup])
+            @action, @title, @filename, @location = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages])
+          end
+        end
+        it {expect(@action).to eq :new_page}
+        it {expect(@title).to eq "A New Page"}
+        it {expect(@location).to eq "pages"}
+        it {expect(@filename).to be_a String}
+        it {expect(@filename).not_to be_empty}
+        it {expect(@filename).to include("#{test_dir}/pages/a-new-page/index.markdown")}
+      end
     end
-  end
-end
-
-Dir.chdir('tmp') do |test_dir|
 
-  FileUtils.rm_rf 'blank'
-  raise "failed to erase blank" if File.directory?('blank')
-  x = `bundle exec jekyll new blank`
-  raise "jekyll new failed: #{x}" unless $?.success?
-  Dir.chdir('blank') do |blank|
-    $".delete_if{|x| x.match(jekyll_match)} ; load 'jekyllpress.rb' # Have to load this *after* we're in the working directory
-    describe "pristine jekyll installation" do
+    describe "no templates" do
 
-      it "should bloody well be inside the blank directory!!!" do
-        expect(Jekyll::Configuration::DEFAULTS["source"]).to include("blank")
+      before(:all) do
+        Dir.chdir(test_dir) do |test_dir|
+          @templates = Pathname.new('_templates')
+          @templates.rmtree if @templates.exist?
+        end
       end
+      
       it "should abort when no templates are found" do
-        templates_dir = File.join(test_dir, blank, '_templates')
-        FileUtils.rm_rf templates_dir
         expect{Jekyllpress::App.start(%w[new_page blah])}.to raise_error(::Errno::ENOENT)
-        expect(File.directory?(templates_dir)).not_to eq(true)
+        expect(@templates.directory?).not_to eq(true)
       end
-
-      describe ":setup creates the template directory and contents" do
+      
+      context ":setup" do
         before(:all) do
-          @templates_dir = File.join(test_dir, blank, '_templates')
-          FileUtils.rm_rf @templates_dir
-          @result = Jekyllpress::App.start(%w[setup])
+          @action, @source, @template_dir, @new_post_template, @new_page_template = Jekyllpress::App.start(%w[setup])
         end
-
-        it {expect(@result[0]).to eq(:setup)}
-        it {expect(@result[1]).to include('blank')}
-        it {expect(@result[2]).to eq("_templates")}
-        it {expect(@result[4]).to eq("new_page.markdown")}
-        it {expect(@result[3]).to eq("new_post.markdown")}
-        it "templates directory exists" do
-          expect(File.directory?(@templates_dir)).to eq(true)
+      
+        it { expect(@action).to eq(:setup) }
+        it { expect(@source).to include("spec/test_site") }
+        it { expect(@template_dir).to eq("_templates") }
+        it { expect(@new_post_template).to eq("new_post.markdown") }
+        it { expect(@new_page_template).to eq("new_page.markdown") }
+      
+        it "templates directory created" do
+          Dir.chdir(test_dir) do |test_dir|
+            expect(File.directory?(@template_dir)).to eq true
+          end
         end
-        it "new_page_template exists" do
-          Dir.chdir(@templates_dir) do |templates_dir|
-            expect(File.exist?("new_page.markdown")).to eq(true)
+      
+        it "new_post_template created" do
+          Dir.chdir(test_dir) do |test_dir|
+            expect(File.exist?(File.join(@template_dir, @new_post_template)))
           end
         end
-        it "new_post_template exists" do
-          Dir.chdir(@templates_dir) do |templates_dir|
-            expect(File.exist?("new_post.markdown")).to eq(true)
+      
+        it "new_page_template created" do
+          Dir.chdir(test_dir) do |test_dir|
+            expect(File.exist?(File.join(@template_dir, @new_page_template)))
           end
         end
+      
       end
-    end
 
+    end
 
   end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'pry'
 require 'fileutils'
+require 'pathname'
 $0 = 'jekyllpress'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyllpress
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tamara Temple