lolcommits-tumblr 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fa6fed2b3430dc31eabd030cfc3964fd1a0b1e5f66861fec8c735bf10bfa83
-  data.tar.gz: 75971beeb5c7ea578842b7e57b827fe97e093dab32fa3a4d67046c7ba527fbf4
+  metadata.gz: 21b193b25080b02af4303dd41a7d3b174643a857a59b9c03c60952e8ba5168f5
+  data.tar.gz: 2655fde55aa048731e26a2b914ff25a7ffb5cc34da4e2d938ccc0525c8203eef
 SHA512:
-  metadata.gz: 5471f92d865465e1096b63b5ea22ee49b6acf1f5e83512d628f9f2e5eca5d84537d12775b213fd1ce220bccafd63019c6ecd8481a20851de5c4eed87b655760d
-  data.tar.gz: 0e855b23e4d60726bd0f0aede0a0d802e8eba2461cb6c42594816e9e7d29dba22cf8cc6affa857a804921cd48f4cdb7408b8216466582bf97ab8a7948b5b4aaf
+  metadata.gz: 570009e87da7aff703f8b9dd441c8a711cc2a0f7c3220518a641b99af005fd6f2471deadcbbf60d5dc1993be5628ca3b110b867208ab8a68b92ff0bf157c5da2
+  data.tar.gz: 4c90252169ae8658faf05f14eb3b205134f4682e5d8786d5afdff4f1740fa7d0c1e249963caeaf64f11c316517c90954a171db076b4c829e403b2bddf37f2e49

data/CHANGELOG.md

@@ -9,6 +9,10 @@ project adheres to [Semantic Versioning][Semver].
 
 - Your contribution here!
 
+## [0.4.1] - 2019-08-16
+### Added
+- allow erb captions, thanks to @xurizaemon
+
 ## [0.4.0] - 2019-05-20
 ### Changed
 - lolcommits gem is a runtime dependency
@@ -63,7 +67,8 @@ project adheres to [Semantic Versioning][Semver].
 ### Changed
 - Initial release
 
-[Unreleased]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.4.1...HEAD
+[0.4.1]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.1.1...v0.2.0

data/README.md

@@ -35,6 +35,7 @@ be asked to visit Tumblr to authenticate and allow access.
     # set enabled to `true`
     # confirm access for this plugin at tumblr.com (link opens automatically)
     # click 'allow' then return to the console to set your Tumblr name
+    # optionally set a caption for each post (ERB friendly, see below)
     # optionally set the plugin to auto-open each created Tumblr post
 
 That's it! Your next lolcommit will automatically be posted to your
@@ -43,6 +44,21 @@ Tumblr blog.  To disable use:
     $ lolcommits --config -p tumblr
     # and set enabled to `false`
 
+### ERB friendly captions
+
+When configuring this plugin, you may optionally set a caption string to for
+each Tumblr post. The ERB bind has these variables available:
+
+* `message` - commit message string
+* `sha` - commit sha (shortened)
+* `branch` - commit branch name
+* `repo` - vcs respository name
+* `vcs_info` - [vcs_info](https://github.com/lolcommits/lolcommits/blob/master/lib/lolcommits/vcs_info.rb) instance (from lolcommits)
+
+Allowing you to set caption strings like this:
+
+    Committed <%= sha %> in <%= repo %> on <%= branch %> - <%= message %>
+
 ## Development
 
 Check out this repo and run `bin/setup`, this will install all

data/lib/lolcommits/plugin/tumblr.rb

@@ -5,6 +5,7 @@ require 'lolcommits/cli/launcher'
 require 'oauth'
 require 'webrick'
 require 'cgi'
+require 'erb'
 require 'tumblr_client'
 
 module Lolcommits
@@ -30,7 +31,8 @@ module Lolcommits
         print "*** Posting to Tumblr ... "
         post = client.photo(
           configuration[:tumblr_name],
-          data: image_path
+          data: image_path,
+          caption: tumblr_caption
         )
 
         if post.key?('id')
@@ -123,9 +125,12 @@ module Lolcommits
       def configure_tumblr
         print "\n* What's your Tumblr name? (i.e. 'http://[THIS PART HERE].tumblr.com'): "
         tumblr_name = parse_user_input(gets.strip)
+        print "\n* Optional caption (ERB friendly with vars message, sha, repo, branch, vcs_info)"
+        print "\n  e.g. Committed <%= sha %> in <%= repo %> on <%= branch %> - <%= message %>\n\n"
+        caption_erb = parse_user_input(gets.strip)
         print "\n* Automatically open Tumblr URL after posting (y/N): "
         open_url = ask_yes_or_no?
-        { tumblr_name: tumblr_name, open_url: open_url }
+        { tumblr_name: tumblr_name, open_url: open_url, caption_erb: caption_erb }
       end
 
       def client
@@ -157,6 +162,21 @@ module Lolcommits
         "https://#{configuration[:tumblr_name]}.tumblr.com/post/#{post['id']}"
       end
 
+      def tumblr_caption
+        return if configuration[:caption_erb].to_s.strip.empty?
+
+        ERB.new(configuration[:caption_erb]).result(
+          binding.tap do |bind|
+            vcs_info = runner.vcs_info
+            bind.local_variable_set(:message, vcs_info.message)
+            bind.local_variable_set(:sha, vcs_info.sha)
+            bind.local_variable_set(:repo, vcs_info.repo)
+            bind.local_variable_set(:branch, vcs_info.branch)
+            bind.local_variable_set(:vcs_info, vcs_info)
+          end
+        )
+      end
+
       def open_url(url)
         Lolcommits::CLI::Launcher.open_url(url)
       end

data/lib/lolcommits/tumblr/version.rb

@@ -2,6 +2,6 @@
 
 module Lolcommits
   module Tumblr
-    VERSION = "0.4.0".freeze
+    VERSION = "0.4.1".freeze
   end
 end

data/test/lolcommits/plugin/tumblr_test.rb

@@ -88,8 +88,8 @@ describe Lolcommits::Plugin::Tumblr do
         # allow requests to localhost for this test
         WebMock.disable_net_connect!(allow_localhost: true)
 
-        # enabled tumblr_name open_url
-        inputs = %w(true my-tumblr Y)
+        # enabled tumblr_name caption_erb open_url
+        inputs = [true, 'my-tumblr', ' ', 'Y']
         configured_plugin_options = {}
 
         # stub Oauth token request flow
@@ -123,7 +123,8 @@ describe Lolcommits::Plugin::Tumblr do
           access_token: "tumblr-access-token",
           secret: "tumblr-secret",
           tumblr_name: "my-tumblr",
-          open_url: true
+          open_url: true,
+          caption_erb: nil
         })
 
         WebMock.disable_net_connect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-tumblr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client