lolcommits-tumblr 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 399ba5d629f2b57d53ac4b497a14685fc9b0ca49
-  data.tar.gz: ebdf68212ed25c7db36c0865b1445c02aec7a887
+SHA256:
+  metadata.gz: b0331ea42b461db76e0326cea99eb542c277669b20bbbbc919db870e389808cf
+  data.tar.gz: '08a5ec9ef7fccdb5155f5d67c925be97d1417c0e88c1663d2e61c02144310383'
 SHA512:
-  metadata.gz: de3b42bf3a568539f16a2b3459d4793749463ed9e324f3d05945a928608b05aaa7b1bf538d3e4ec98887c14058177c2876b77675eeaa2b44382618ba30f584b9
-  data.tar.gz: d5acb2dd96a3aa81f67a854971e3f377d7e9ff6203de7cc6a872b0cfd6238442d624cfcb9e1c33ed6236a0a5fbc7f1c23141725e7a3f9978baf19b85fcebe475
+  metadata.gz: deca73dee9840f60a85ee2cd88331bda3adc76689091365e29e7ce56fe264d7addfcb283ef0f4b720596938992dd578bed66f682b4e554309bac4d79729a555a
+  data.tar.gz: 05ca09dd8385fe6ca4a66c068add9eb1fb7038642f5d62b121d938b3e3e01fc5d7586c524d360c7ceb2ee71fd1bb65736cebf4714b9223586d26b7ed140516f7

data/.travis.yml

@@ -2,15 +2,15 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
- - 2.0.0
  - 2.1.10
- - 2.2.8
- - 2.3.5
- - 2.4.2
+ - 2.2.9
+ - 2.3.6
+ - 2.4.3
+ - 2.5.0
  - ruby-head
 
 before_install:
- - gem install bundler -v 1.13.7
+ - gem update --system
  - git --version
  - git config --global user.email "lol@commits.org"
  - git config --global user.name "Lolcommits"

data/lib/lolcommits/plugin/tumblr.rb

@@ -13,15 +13,6 @@ module Lolcommits
       TUMBLR_CONSUMER_KEY    = '2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2'.freeze
       TUMBLR_CONSUMER_SECRET = 'qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs'.freeze
 
-      ##
-      # Returns the name of the plugin to identify the plugin to lolcommits.
-      #
-      # @return [String] the plugin name
-      #
-      def self.name
-        'tumblr'
-      end
-
       ##
       # Returns position(s) of when this plugin should run during the capture
       # process. Uploading happens when a new capture is ready.
@@ -50,11 +41,11 @@ module Lolcommits
       #
       def run_capture_ready
         print "*** Posting to Tumblr ... "
-        post = client.photo(configuration['tumblr_name'], data: runner.main_image)
+        post = client.photo(configuration[:tumblr_name], data: runner.main_image)
 
         if post.key?('id')
           post_url = tumblr_post_url(post)
-          open_url(post_url) if configuration['open_url']
+          open_url(post_url) if configuration[:open_url]
           print "done! #{post_url}\n"
         else
           print "Post FAILED! #{post.inspect}"
@@ -64,15 +55,14 @@ module Lolcommits
       end
 
       ##
-      # Returns true if the plugin has been configured.
+      # Returns true if the plugin has been configured correctly
       #
-      # @return [Boolean] true/false indicating if plugin is configured
+      # @return [Boolean] true/false indicating if plugin has a valid config
       #
-      def configured?
-        !!(configuration['enabled'] &&
-           configuration['access_token'] &&
-           configuration['secret'] &&
-           configuration['tumblr_name'])
+      def valid_configuration?
+        !!(configuration[:access_token] &&
+           configuration[:secret] &&
+           configuration[:tumblr_name])
       end
 
       ##
@@ -87,7 +77,7 @@ module Lolcommits
       def configure_options!
         options = super
         # ask user to configure tokens if enabling
-        if options['enabled']
+        if options[:enabled]
           auth_config = configure_auth!
           return unless auth_config
           options = options.merge(auth_config).merge(configure_tumblr)
@@ -131,8 +121,8 @@ module Lolcommits
         puts '----------------------------------------'
 
         {
-          'access_token' => access_token.token,
-          'secret'       => access_token.secret
+          access_token: access_token.token,
+          secret: access_token.secret
         }
       end
 
@@ -141,15 +131,15 @@ module Lolcommits
         tumblr_name = 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 }
       end
 
       def client
         @client ||= ::Tumblr.new(
           consumer_key: TUMBLR_CONSUMER_KEY,
           consumer_secret: TUMBLR_CONSUMER_SECRET,
-          oauth_token: configuration['access_token'],
-          oauth_token_secret: configuration['secret']
+          oauth_token: configuration[:access_token],
+          oauth_token_secret: configuration[:secret]
         )
       end
 
@@ -170,7 +160,7 @@ module Lolcommits
       end
 
       def tumblr_post_url(post)
-        "https://#{configuration['tumblr_name']}.tumblr.com/post/#{post['id']}"
+        "https://#{configuration[:tumblr_name]}.tumblr.com/post/#{post['id']}"
       end
 
       def open_url(url)
@@ -178,7 +168,15 @@ module Lolcommits
       end
 
       def local_server
-        @local_server ||= WEBrick::HTTPServer.new(Port: 3000)
+        @local_server ||= WEBrick::HTTPServer.new(
+          Port: 3000,
+          Logger: null_logger,
+          AccessLog: null_logger
+        )
+      end
+
+      def null_logger
+        WEBrick::Log.new(nil, -1)
       end
 
       def oauth_response(heading, message)

data/lib/lolcommits/tumblr/version.rb

@@ -1,5 +1,5 @@
 module Lolcommits
   module Tumblr
-    VERSION = "0.0.3".freeze
+    VERSION = "0.0.5".freeze
   end
 end

data/lolcommits-tumblr.gemspec

@@ -32,13 +32,13 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.1"
 
   spec.add_runtime_dependency('tumblr_client')
   spec.add_runtime_dependency('webrick')
   spec.add_runtime_dependency('oauth')
 
-  spec.add_development_dependency "lolcommits", ">= 0.9.5"
+  spec.add_development_dependency "lolcommits", ">= 0.11.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"

data/test/lolcommits/plugin/tumblr_test.rb

@@ -8,14 +8,6 @@ describe Lolcommits::Plugin::Tumblr do
   include Lolcommits::TestHelpers::GitRepo
   include Lolcommits::TestHelpers::FakeIO
 
-  def plugin_name
-    "tumblr"
-  end
-
-  it "should have a name" do
-    ::Lolcommits::Plugin::Tumblr.name.must_equal plugin_name
-  end
-
   it "should run on capture ready" do
     ::Lolcommits::Plugin::Tumblr.runner_order.must_equal [:capture_ready]
   end
@@ -24,11 +16,7 @@ describe Lolcommits::Plugin::Tumblr do
     def runner
       # a simple lolcommits runner with an empty configuration Hash
       @runner ||= Lolcommits::Runner.new(
-        main_image: Tempfile.new("main_image.jpg").path,
-        config: OpenStruct.new(
-          read_configuration: {},
-          loldir: File.expand_path("#{__dir__}../../../images")
-        )
+        main_image: Tempfile.new("main_image.jpg").path
       )
     end
 
@@ -37,17 +25,13 @@ describe Lolcommits::Plugin::Tumblr do
     end
 
     def valid_enabled_config
-      @config ||= OpenStruct.new(
-        read_configuration: {
-          plugin_name => {
-            "enabled" => true,
-            "access_token" => "tumblr-access-token",
-            "secret" => "tumblr-secret",
-            "tumblr_name" => "my-tumblr",
-            "open_url" => false
-          }
-        }
-      )
+      {
+        enabled: true,
+        access_token: "tumblr-access-token",
+        secret: "tumblr-secret",
+        tumblr_name: "my-tumblr",
+        open_url: false
+      }
     end
 
     describe "#enabled?" do
@@ -56,7 +40,7 @@ describe Lolcommits::Plugin::Tumblr do
       end
 
       it "is true when configured" do
-        plugin.config = valid_enabled_config
+        plugin.configuration = valid_enabled_config
         plugin.enabled?.must_equal true
       end
     end
@@ -67,7 +51,7 @@ describe Lolcommits::Plugin::Tumblr do
 
       it "posts lolcommit image to tumblr showing link to new photo post" do
         in_repo do
-          plugin.config = valid_enabled_config
+          plugin.configuration = valid_enabled_config
 
           stub_request(:post, "https://api.tumblr.com/v2/blog/my-tumblr.tumblr.com/post").to_return(
             body: {
@@ -82,30 +66,26 @@ describe Lolcommits::Plugin::Tumblr do
           output.must_match "done! https://my-tumblr.tumblr.com/post/123456789"
 
           assert_requested :post, "https://api.tumblr.com/v2/blog/my-tumblr.tumblr.com/post", times: 1,
-            headers: {"Content-Type" => /multipart\/form-data/, "Accept" => "application/json" } do |req|
+            headers: { "Content-Type" => /multipart\/form-data/, "Accept" => "application/json" } do |req|
             req.body.must_match 'filename="main_image.jpg'
           end
         end
       end
     end
 
-    describe "configuration" do
-      it "returns false when not configured" do
-        plugin.configured?.must_equal false
-      end
-
-      it "returns false when partially configured" do
-        plugin.config = OpenStruct.new(read_configuration: {
-          plugin_name => { "enabled" => true, "tumblr_name" => "fire" }
-        })
-        plugin.configured?.must_equal false
+    describe "valid_configuration?" do
+      it "returns invalid config when partially configured" do
+        plugin.configuration = { tumblr_name: "fire" }
+        plugin.valid_configuration?.must_equal false
       end
 
-      it "returns true when configured" do
-        plugin.config = valid_enabled_config
-        plugin.configured?.must_equal true
+      it "returns true with a valid configuration" do
+        plugin.configuration = valid_enabled_config
+        plugin.valid_configuration?.must_equal true
       end
+    end
 
+    describe "configuration" do
       it "allows plugin options to be configured" do
         # allow requests to localhost for this test
         WebMock.disable_net_connect!(allow_localhost: true)
@@ -141,11 +121,11 @@ describe Lolcommits::Plugin::Tumblr do
         end
 
         configured_plugin_options.must_equal({
-          "enabled" => true,
-          "access_token" => "tumblr-access-token",
-          "secret" => "tumblr-secret",
-          "tumblr_name" => "my-tumblr",
-          "open_url" => true
+          enabled: true,
+          access_token: "tumblr-access-token",
+          secret: "tumblr-secret",
+          tumblr_name: "my-tumblr",
+          open_url: true
         })
 
         WebMock.disable_net_connect!

data/test/test_helper.rb

@@ -1,10 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-# necessary libs from lolcommits (allowing plugin to run)
-require 'git'
-require 'lolcommits/runner'
-require 'lolcommits/vcs_info'
-require 'lolcommits/backends/git_info'
+# lolcommits gem
+require 'lolcommits'
 
 # lolcommit test helpers
 require 'lolcommits/test_helpers/git_repo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-tumblr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Post lolcommits to Tumblr