jekyll-compose 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6626f1690b5584b65e7d569272b59eb416414a5
-  data.tar.gz: 7d57720c9bdefd1f9bebb577829fde1371ff4150
+SHA256:
+  metadata.gz: d49ea59f89aedfd68afd1fcecb02231d342058f4dbdbcd00b5d3474c2cf8a986
+  data.tar.gz: 3a618debf77511ef6858b0bde412dc1a7fa37701b4be12de0a1d2f0ffcc4a012
 SHA512:
-  metadata.gz: 19cca9b6e9f8b0e2d743c05daa6463ed574663994e7cd3dc495f04a04870df5624758a890f12f730bfdbb22de8276424d53329f6d1c9ce7b69e91679221ce560
-  data.tar.gz: 37130e32cfa032e7690da8685a7e257e9037a91e4273539fa01ee355c4196d3fe0b4820adf0e3af0dc1be2d7d9b8ba0900ecf531ea1cde737f96f6fbb395bcdc
+  metadata.gz: 37a8c477f69c8d073fb5491946c0420298a71b2f2a228fa84066ad3eea87344d30e6f9c911c88a5f4081a182e5759367def2dd19fdbd92d5486222d264919da6
+  data.tar.gz: 4e7951b4ffa4bde211cd877d5c9ad6a8b56194e414c534668aebf39dd11bd19ee7e2c1cd6f4f1c01d248b6cbc081139252c79e0e43048a3a84588227f2ba597f

data/lib/jekyll-compose.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "jekyll-compose/version"
 require "jekyll-compose/arg_parser"
 require "jekyll-compose/movement_arg_parser"
@@ -13,6 +15,6 @@ module Jekyll
   end
 end
 
-%w{draft post publish unpublish page}.each do |file|
+%w(draft post publish unpublish page).each do |file|
   require File.expand_path("jekyll/commands/#{file}.rb", __dir__)
 end

data/lib/jekyll-compose/arg_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::Compose::ArgParser
   attr_reader :args, :options, :config
   def initialize(args, options)

data/lib/jekyll-compose/file_creator.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Compose
     class FileCreator
       attr_reader :file, :force, :root
-      def initialize(fileInfo, force = false, root = nil)
-        @file = fileInfo
+      def initialize(file_info, force = false, root = nil)
+        @file = file_info
         @force = force
         @root = root
       end

data/lib/jekyll-compose/file_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::Compose::FileInfo
   attr_reader :params
   def initialize(params)

data/lib/jekyll-compose/file_mover.rb

@@ -1,24 +1,32 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Compose
     class FileMover
-      attr_reader :movement, :root
-      def initialize(movement, root = nil)
+      attr_reader :force, :movement, :root
+      def initialize(movement, force = false, root = nil)
         @movement = movement
+        @force = force
         @root = root
       end
 
-      def resource_type
+      def resource_type_from
+        "file"
+      end
+
+      def resource_type_to
         "file"
       end
 
       def move
         validate_source
+        validate_should_write!
         ensure_directory_exists
         move_file
       end
 
       def validate_source
-        raise ArgumentError, "There was no #{resource_type} found at '#{from}'." unless File.exist? from
+        raise ArgumentError, "There was no #{resource_type_from} found at '#{from}'." unless File.exist? from
       end
 
       def ensure_directory_exists
@@ -26,9 +34,13 @@ module Jekyll
         Dir.mkdir(dir) unless Dir.exist?(dir)
       end
 
+      def validate_should_write!
+        raise ArgumentError, "A #{resource_type_to} already exists at #{to}" if File.exist?(to) && !force
+      end
+
       def move_file
         FileUtils.mv(from, to)
-        puts "#{resource_type.capitalize} #{from} was moved to #{to}"
+        puts "#{resource_type_from.capitalize} #{from} was moved to #{to}"
       end
 
       private

data/lib/jekyll-compose/movement_arg_parser.rb

@@ -1,12 +1,8 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Compose
-    class MovementArgParser
-      attr_reader :args, :options, :config
-      def initialize(args, options)
-        @args = args
-        @options = options
-        @config = Jekyll.configuration(options)
-      end
+    class MovementArgParser < ArgParser
 
       def validate!
         raise ArgumentError, "You must specify a #{resource_type} path." if args.empty?
@@ -15,10 +11,6 @@ module Jekyll
       def path
         args.join " "
       end
-
-      def source
-        source = config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
-      end
     end
   end
 end

data/lib/jekyll-compose/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Compose
-    VERSION = "0.6.0".freeze
+    VERSION = "0.7.0".freeze
   end
 end

data/lib/jekyll/commands/draft.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Draft < Command

data/lib/jekyll/commands/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Page < Command
@@ -33,7 +35,7 @@ module Jekyll
 
       class PageArgParser < Compose::ArgParser
         def layout
-          layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT_PAGE
+          options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT_PAGE
         end
       end
 

data/lib/jekyll/commands/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Post < Command
@@ -34,7 +36,7 @@ module Jekyll
 
       class PostArgParser < Compose::ArgParser
         def date
-          options["date"].nil? ? Time.now : DateTime.parse(options["date"])
+          options["date"].nil? ? Time.now : Date.parse(options["date"])
         end
       end
 

data/lib/jekyll/commands/publish.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Publish < Command
@@ -8,6 +10,7 @@ module Jekyll
 
           c.option "date", "-d DATE", "--date DATE", "Specify the post date"
           c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"
+          c.option "force", "-f", "--force", "Overwrite a post if it already exists"
           c.option "source", "-s", "--source SOURCE", "Custom source directory"
 
           c.action do |args, options|
@@ -22,7 +25,7 @@ module Jekyll
 
         movement = DraftMovementInfo.new params
 
-        mover = DraftMover.new movement, params.source
+        mover = DraftMover.new movement, params.force?, params.source
         mover.move
       end
     end
@@ -58,9 +61,12 @@ module Jekyll
     end
 
     class DraftMover < Compose::FileMover
-      def resource_type
+      def resource_type_from
         "draft"
       end
+      def resource_type_to
+        "post"
+      end
     end
   end
 end

data/lib/jekyll/commands/unpublish.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Unpublish < Command
@@ -7,6 +9,7 @@ module Jekyll
           c.description "Moves a post back into the _drafts directory"
 
           c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"
+          c.option "force", "-f", "--force", "Overwrite a draft if it already exists"
           c.option "source", "-s", "--source SOURCE", "Custom source directory"
 
           c.action do |args, options|
@@ -21,7 +24,7 @@ module Jekyll
 
         movement = PostMovementInfo.new params
 
-        mover = PostMover.new movement, params.source
+        mover = PostMover.new movement, params.force?, params.source
         mover.move
       end
     end
@@ -52,9 +55,12 @@ module Jekyll
     end
 
     class PostMover < Compose::FileMover
-      def resource_type
+      def resource_type_from
         "post"
       end
+      def resource_type_to
+        "draft"
+      end
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compose
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.51'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.51'
 description: Streamline your writing in Jekyll with these commands.
 email:
 - parkrmoore@gmail.com
@@ -105,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Streamline your writing in Jekyll with these commands.