jekyll-recker 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d0b79e8f6f9370433856ad0d89a1ae7996d0900644739fa915bd5f155e60c9
-  data.tar.gz: 630418f988d9e17ac451be9932aa6e3f881cb71a37570b7d4e70bd3f1b629477
+  metadata.gz: f0acecf9f429bcd83a0cbe8204e046bee16c5a30de1e458b4080db7502e3a831
+  data.tar.gz: 2b579e98cd7b81c71f063652a45b791708825b58d6ba83d2146ab2f321b0ce2e
 SHA512:
-  metadata.gz: 141f627ae47682e8cd42320cd522693e33f01970f8f229c7394f26d66e1a13284ac1f73f8ac90fc4361093dccef209698a89ea168be299b9fae264efe6106523
-  data.tar.gz: 9563f420e21f8a343c409521b06065c5d36f8aad3f503303511e913ec37b1d15ee476819bcffa1ccf4a6c8781b6c1da8d52b474c25dbc007a68e3d27395412aa
+  metadata.gz: a8b792c90336432c126993937c45dafcb88b1741bfbe2f0eafb32f8c6cc7607d402c442a782409b69a52664cbffe886cf8be39efff0890c15a2f96d84c5f83a9
+  data.tar.gz: 14da6696ecf19dc25ea9d02a7ef1904c7e975f8137f0a41ee333da524ff1d242391673a2d6c31d81a77a0ce11d45aed03677b7173e24dae6a91716255f146689

data/lib/jekyll-recker.rb

@@ -6,7 +6,6 @@ require 'jekyll'
 #
 # The greatest jekyll plugin in the world
 module JekyllRecker
-  autoload :Configuration, 'jekyll_recker/configuration.rb'
   autoload :Mixins, 'jekyll_recker/mixins.rb'
   autoload :Shell, 'jekyll_recker/shell.rb'
   autoload :Social, 'jekyll_recker/social.rb'

data/lib/jekyll_recker/commands.rb

@@ -17,8 +17,11 @@ module JekyllRecker
       end
 
       def self.action(args, options)
-        JekyllRecker::Social.action(args, options)
-      rescue Error => e
+        site = Jekyll::Site.new(configuration_from_options(options))
+        site.reset
+        site.read
+        Social.action(site, args, options)
+      rescue StandardError => e
         logger.error e.message
         exit 1
       end

data/lib/jekyll_recker/social.rb

@@ -5,11 +5,12 @@ require 'twitter'
 
 module JekyllRecker
   module Social
-    def self.action(args, options)
+    def self.action(site, args, options)
       args += %w[slack twitter] if args.empty?
-      Slack.share(dry: options['dry']) if args.include?('slack')
-      Twitter.share(dry: options['dry']) if args.include?('twitter')
+      Slack.share(site, dry: options['dry']) if args.include?('slack')
+      Twitter.share(site, dry: options['dry']) if args.include?('twitter')
     end
+
     # Backend
     #
     # Backend base class for social sharing backends.
@@ -18,8 +19,8 @@ module JekyllRecker
       include Mixins::Introspection
       include Mixins::Logging
 
-      def self.share(dry: false)
-        backend = new(dry: dry)
+      def self.share(site, dry: false)
+        backend = new(site, dry: dry)
         logger.info "#{backend.name} - building configuration"
         backend.configure!
 
@@ -27,7 +28,8 @@ module JekyllRecker
         backend.post!
       end
 
-      def initialize(dry: false)
+      def initialize(site, dry: false)
+        @site = site
         @dry = dry
       end
 
@@ -36,7 +38,7 @@ module JekyllRecker
       end
 
       def config
-        @config ||= JekyllRecker::Configuration.recker.fetch(config_key)
+        @site.config.fetch('recker', {}).fetch(config_key, {})
       end
 
       def config_key
@@ -45,7 +47,7 @@ module JekyllRecker
       alias name config_key
 
       def post_body
-        url = File.join Configuration.jekyll['url'], latest.url
+        url = File.join @site.config['url'], latest.url
         <<~BODY
           #{latest.data['date'].strftime('%A, %B %-d %Y')}
           #{latest.data['title']}
@@ -54,7 +56,7 @@ module JekyllRecker
       end
 
       def latest
-        @latest ||= Configuration.latest_post
+        @latest ||= @site.posts.docs.last
       end
 
       def latest_title
@@ -154,7 +156,7 @@ module JekyllRecker
 
       def extract_from_config
         values = cred_fieldnames.map do |k|
-          Shell.run(Configuration.twitter["#{k}_cmd"]).strip
+          Shell.run(twitter_config["#{k}_cmd"]).strip
         end
 
         return nil if values.any? { |v| v.nil? || v.empty? }
@@ -162,6 +164,10 @@ module JekyllRecker
         Hash[cred_fieldnames.zip(values)]
       end
 
+      def twitter_config
+        @site.config.fetch('recker', {}).fetch('twitter', {})
+      end
+
       def cred_fieldnames
         %w[
           access_token_secret

data/lib/jekyll_recker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllRecker
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-recker
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Alex Recker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -184,7 +184,6 @@ files:
 - _layouts/post.html
 - lib/jekyll-recker.rb
 - lib/jekyll_recker/commands.rb
-- lib/jekyll_recker/configuration.rb
 - lib/jekyll_recker/filters.rb
 - lib/jekyll_recker/generators.rb
 - lib/jekyll_recker/mixins.rb

data/lib/jekyll_recker/configuration.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module JekyllRecker
-  # Configuration
-  module Configuration
-    def self.jekyll
-      @jekyll ||= Jekyll.configuration
-    end
-
-    def self.recker
-      jekyll.fetch('recker', {})
-    end
-
-    def self.facebook
-      recker.fetch('facebook', {})
-    end
-
-    def self.twitter
-      recker.fetch('twitter', {})
-    end
-
-    def self.slack
-      recker.fetch('slack', {})
-    end
-
-    def self.site
-      @site = Jekyll::Site.new(jekyll)
-      @site.reset
-      @site.read
-      @site
-    end
-
-    def self.latest_post
-      @latest_post ||= site.posts.docs.last
-    end
-  end
-end