jekyll-compose 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a7e1e8ddabb24a170461b367ff5ad49f1c69ba
-  data.tar.gz: 43936ac4575ca3e17d7d12911f3464c6354e57c0
+  metadata.gz: e03c15157254e0feae330dd9cb474290f59264b7
+  data.tar.gz: 932af0b45c76a9f3a14dc58bfe240df4af47ae55
 SHA512:
-  metadata.gz: 1d6ba84f64e43a5014a36a2ffa0e446471e012817e8db0ca3ab19c11cb6d31b5a725b1f878fc159e48801d23724c293f6ac10cb9415b3a7b4f8a0da59d8fd0ee
-  data.tar.gz: 7fb63991827471be533c0546d68d56bfa7e01e0fb29ad75322a357cffedae645b154d32aba6ec99d83e19765a41f622ec1339b472a4bbefd9b56f785ac50602c
+  metadata.gz: 88782ba853339b97e59489f88bd615f4b862a879b08475518984ff1459d3760b31a84fdec8ab71e472920038ca468f97e0b57f9b8bb556d064d445756c49b922
+  data.tar.gz: dd0601beaea3745d4ea703c9393ca40c360b4fb1c79350df26d45a64f9097687c6c634ad17223f55cf91144f759d168989d9435114ed57e0caa9764aea53b7c8

data/lib/jekyll-compose.rb

@@ -0,0 +1,12 @@
+require "jekyll-compose/version"
+
+module Jekyll
+  module Compose
+    DEFAULT_TYPE = "md"
+    DEFAULT_LAYOUT = "post"
+  end
+end
+
+%w{draft post publish}.each do |file|
+  require File.expand_path("jekyll/commands/#{file}.rb", File.dirname(__FILE__))
+end

data/lib/{jekyll/compose → jekyll-compose}/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Compose
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/jekyll/commands/draft.rb

@@ -16,11 +16,11 @@ module Jekyll
         end
       end
 
-      def self.process(args, options = {})
+      def self.process(args = [], options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
-        
-        type = options["type"].nil? ? "markdown" : options["type"]
-        layout = options["layout"].nil? ? "post" : options["layout"]
+
+        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
+        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
 
         title = args.shift
         name = title.gsub(' ', '-').downcase
@@ -34,19 +34,19 @@ module Jekyll
         end
 
         puts "New draft created at ./#{draft_path}.\n"
-      end 
+      end
       # Internal: Gets the filename of the draft to be created
       #
       # Returns the filename of the draft, as a String
-      def self.draft_name(name, ext='markdown')
+      def self.draft_name(name, ext=Jekyll::Compose::DEFAULT_TYPE)
         "_drafts/#{name}.#{ext}"
       end
 
       def self.front_matter(layout, title)
-        "---
-layout: #{layout}
-title: #{title}
----"
+        {
+          "layout" => layout,
+          "title"  => title,
+        }.to_yaml + "\n---\n"
       end
     end
   end

data/lib/jekyll/commands/post.rb

@@ -17,11 +17,11 @@ module Jekyll
         end
       end
 
-      def self.process(args, options = {})
+      def self.process(args = [], options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
-        
-        type = options["type"].nil? ? "markdown" : options["type"]
-        layout = options["layout"].nil? ? "post" : options["layout"]
+
+        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
+        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
 
         date = options["date"].nil? ? Time.now : DateTime.parse(options["date"])
 
@@ -37,7 +37,7 @@ module Jekyll
         end
 
         puts "New post created at ./#{post_path}.\n"
-      end 
+      end
       # Internal: Gets the filename of the draft to be created
       #
       # Returns the filename of the draft, as a String

data/lib/jekyll/commands/publish.rb

@@ -3,7 +3,7 @@ module Jekyll
     class Publish < Command
       def self.init_with_program(prog)
         prog.command(:publish) do |c|
-          c.syntax 'publish NAME'
+          c.syntax 'publish DRAFT_PATH'
           c.description 'Moves a draft into the _posts directory and sets the date'
 
           c.option 'date', '-d DATE', '--date DATE', 'Specify the post date'
@@ -14,17 +14,19 @@ module Jekyll
         end
       end
 
-      def self.process(args, options = {})
-        raise ArgumentError.new('You must specify a name.') if args.empty?
-        
+      def self.process(args = [], options = {})
+        raise ArgumentError.new('You must specify a draft path.') if args.empty?
+
         date = options["date"].nil? ? Date.today : Date.parse(options["date"])
-        file = args.shift
+        draft_path = args.shift
+
+        raise ArgumentError.new("There was no draft found at '#{draft_path}'.") unless File.exist? draft_path
 
-        post_path = post_name(date, file)
-        FileUtils.mv(draft_name(file), post_path)
+        post_path = post_name(date, draft_name(draft_path))
+        FileUtils.mv(draft_path, post_path)
 
-        puts "Draft #{file} was published to ./#{post_path}"
-      end 
+        puts "Draft #{draft_path} was published to ./#{post_path}"
+      end
 
       # Internal: Gets the filename of the post to be created
       #
@@ -33,8 +35,8 @@ module Jekyll
         "_posts/#{date.strftime('%Y-%m-%d')}-#{name}"
       end
 
-      def self.draft_name(name)
-        "_drafts/#{name}"
+      def self.draft_name(path)
+        File.basename(path)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compose
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Streamline your writing in Jekyll with these commands.
 email:
 - parkrmoore@gmail.com
@@ -73,11 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jekyll-compose.rb
+- lib/jekyll-compose/version.rb
 - lib/jekyll/commands/draft.rb
 - lib/jekyll/commands/post.rb
 - lib/jekyll/commands/publish.rb
-- lib/jekyll/compose.rb
-- lib/jekyll/compose/version.rb
 homepage: https://github.com/jekyll/jekyll-compose
 licenses:
 - MIT

data/lib/jekyll/compose.rb

@@ -1,10 +0,0 @@
-require "jekyll/compose/version"
-
-module Jekyll
-  module Compose
-  end
-end
-
-require "jekyll/commands/draft"
-require "jekyll/commands/post"
-require "jekyll/commands/publish"