lolcommits-flowdock 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da117e289d89581e6e34b7002936eb08ca96917e
-  data.tar.gz: 37a28fcc8654a791ffe64d40b9f2d4b24ec19f4c
+SHA256:
+  metadata.gz: 7b4d082a0f2ffcf6ba1e23524651483ba3d420653a0d32a5f0ead6e95668c580
+  data.tar.gz: d0207703b7a7eb504cf03235ea283c1855c7997a5d568b502515b5ed60af4711
 SHA512:
-  metadata.gz: 4580e61013b34dd74f1378e3d1a4fda9c5ba81129505bacad136b47938d93ddf5231f57416eb5335cb16bf35e103d8b6c5843653a88530f03ed64d3d590899d5
-  data.tar.gz: 53fd8644b307d83c6439c661f0c7eefa72755821834957213931a43f097e6421b90619163a03ac3101798a744a7873762d1c4e63d1004f89edf35736248fdf27
+  metadata.gz: c3861509e304d695f127e7c24aaf05ea14ea95b00eb2be7005bea58de5937489d2f7b186c570c336e8ea3abfce9a8ca8dea9d768055576f69ae0b691573600bc
+  data.tar.gz: '0289f21f6fac6530755e334d5e752b7478d7ff8d0d2d377bf4271fb164c50633135663dbcfde55e9e5fc003b2d71d556c243457035b8bfa4c5f81ad11ae094d1'

data/.travis.yml

@@ -4,13 +4,14 @@ 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/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem "lolcommits", git: "https://github.com/mroth/lolcommits.git"

data/lib/lolcommits/flowdock/version.rb

@@ -1,5 +1,5 @@
 module Lolcommits
   module Flowdock
-    VERSION = "0.0.2".freeze
+    VERSION = "0.0.3".freeze
   end
 end

data/lib/lolcommits/plugin/flowdock.rb

@@ -7,15 +7,6 @@ module Lolcommits
   module Plugin
     class Flowdock < Base
 
-      ##
-      # Returns the name of the plugin. Identifies the plugin to lolcommits.
-      #
-      # @return [String] the plugin name
-      #
-      def self.name
-        'flowdock'
-      end
-
       ##
       # Returns position(s) of when this plugin should run during the capture
       # process. Posting to Flowdock happens when a new capture is ready.
@@ -26,18 +17,6 @@ module Lolcommits
         [:capture_ready]
       end
 
-      ##
-      # Returns true if the plugin has been configured. An access token,
-      # organization and flow must be set.
-      #
-      # @return [Boolean] true/false indicating if plugin is configured
-      #
-      def configured?
-        !!(configuration['access_token'] &&
-           configuration['organization'] &&
-           configuration['flow'])
-      end
-
       ##
       # Prompts the user to configure plugin options. Options are enabled
       # (true/false), a Flowdock Personal API token, and the Flowdock
@@ -47,30 +26,24 @@ module Lolcommits
       #
       def configure_options!
         options = super
-        if options['enabled']
+        if options[:enabled]
           puts "\nCopy (or create) your Flowdock personal API token (paste it below)"
           open_url("https://flowdock.com/account/tokens")
           print "API token: "
           access_token = gets.strip
           flowdock.access_token = access_token
 
-          puts "\nEnter your Flowdock organization name (tab to autocomplete)"
-          organization = prompt_autocomplete_hash("Organization: ", flowdock.organizations)
-
-          puts "\nEnter your Flowdock flow name (tab to autocomplete)"
-          flow = prompt_autocomplete_hash("Flow: ", flowdock.flows)
+          organization = configure_organization
+          flow         = configure_flow
+          raise Interrupt unless flow && organization
 
           options.merge!(
-            'access_token' => access_token,
-            'flow'         => flow,
-            'organization' => organization
+            access_token: access_token,
+            flow: flow,
+            organization: organization
           )
         end
-      rescue Interrupt
-        debug "aborting due to user cancelling configuration"
-        options ||= {}
-        options['enabled'] = false
-      ensure
+
         options
       end
 
@@ -84,8 +57,8 @@ module Lolcommits
       def run_capture_ready
         print "Posting to Flowdock ... "
         message = flowdock.create_message(
-          organization: configuration['organization'],
-          flow: configuration['flow'],
+          organization: configuration[:organization],
+          flow: configuration[:flow],
           params: {
             event: 'file',
             content: File.new(runner.main_image),
@@ -103,24 +76,25 @@ module Lolcommits
 
       private
 
-      def prompt_autocomplete_hash(prompt, items, name: 'name', value: 'parameterized_name', suggest_words: 5)
-        words = items.map {|item| item[name] }.sort
-        puts "e.g. #{words.take(suggest_words).join(", ")}" if suggest_words > 0
-        completed_input = gets_autocomplete(prompt, words)
-        items.find { |item| item[name] == completed_input }[value]
+      def configure_organization
+        orgs = flowdock.organizations
+        if orgs.empty?
+          puts "\nNo Flowdock organizations found, please check your account at flowdock.com"
+          nil
+        else
+          puts "\nEnter your Flowdock organization name (tab to autocomplete, Ctrl+c cancels)"
+          prompt_autocomplete_hash("Organization: ", orgs, value: "parameterized_name")
+        end
       end
 
-      def gets_autocomplete(prompt, words)
-        completion_handler = proc { |s| words.grep(/^#{Regexp.escape(s)}/) }
-        Readline.completion_append_character = ""
-        Readline.completion_proc = completion_handler
-
-        while line = Readline.readline(prompt, true).strip
-          if words.include?(line)
-            return line
-          else
-            puts "'#{line}' not found"
-          end
+      def configure_flow
+        flows = flowdock.flows
+        if flows.empty?
+          puts "\nNo Flowdock flows found, please check your account at flowdock.com"
+          nil
+        else
+          puts "\nEnter your Flowdock flow name (tab to autocomplete, Ctrl+c cancels)"
+          prompt_autocomplete_hash("Flow: ", flows, value: "parameterized_name")
         end
       end
 
@@ -130,7 +104,7 @@ module Lolcommits
 
       def flowdock
         @flowdock ||= Lolcommits::Flowdock::Client.new(
-          configuration['access_token']
+          configuration[:access_token]
         )
       end
     end

data/lolcommits-flowdock.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rest-client"
 
-  spec.add_development_dependency "lolcommits", ">= 0.9.8"
+  spec.add_development_dependency "lolcommits", ">= 0.10.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"

data/test/lolcommits/plugin/flowdock_test.rb

@@ -6,14 +6,6 @@ describe Lolcommits::Plugin::Flowdock do
   include Lolcommits::TestHelpers::GitRepo
   include Lolcommits::TestHelpers::FakeIO
 
-  def plugin_name
-    "flowdock"
-  end
-
-  it "should have a name" do
-    ::Lolcommits::Plugin::Flowdock.name.must_equal plugin_name
-  end
-
   it "should run on capture ready" do
     ::Lolcommits::Plugin::Flowdock.runner_order.must_equal [:capture_ready]
   end
@@ -31,28 +23,22 @@ describe Lolcommits::Plugin::Flowdock do
       @plugin ||= Lolcommits::Plugin::Flowdock.new(runner: runner)
     end
 
-    def valid_enabled_config
-      @config ||= OpenStruct.new(
-        read_configuration: { "flowdock" => flowdock_config }
-      )
-    end
-
-    def flowdock_config
+    def plugin_config
       {
-        "enabled"      => true,
-        "access_token" => "f4f6aa86fd747a00e75238810412x543",
-        'organization' => 'myorg',
-        'flow'         => 'myflow'
+        enabled: true,
+        access_token: "f4f6aa86fd747a00e75238810412x543",
+        organization: "myorg",
+        flow: "myflow"
       }
     end
 
     describe "#enabled?" do
-      it "is false by default" do
-        plugin.enabled?.must_equal false
+      it "is not enabled by default" do
+        assert_nil plugin.enabled?
       end
 
       it "is true when configured" do
-        plugin.config = valid_enabled_config
+        plugin.configuration = plugin_config
         plugin.enabled?.must_equal true
       end
     end
@@ -63,8 +49,8 @@ describe Lolcommits::Plugin::Flowdock do
 
       it "posts lolcommit as a new file message to Flowdock" do
         in_repo do
-          plugin.config = valid_enabled_config
-          message_url = "https://api.flowdock.com/flows/#{flowdock_config['organization']}/#{flowdock_config['flow']}/messages"
+          plugin.configuration = plugin_config
+          message_url = "https://api.flowdock.com/flows/#{plugin_config[:organization]}/#{plugin_config[:flow]}/messages"
           valid_response = { id: "123", event: "file", tags: ["lolcommits"]}
 
           stub_request(:post, message_url).to_return(status: 200, body: valid_response.to_json)
@@ -86,15 +72,6 @@ describe Lolcommits::Plugin::Flowdock do
     end
 
     describe "configuration" do
-      it "returns false when not configured" do
-        plugin.configured?.must_equal false
-      end
-
-      it "returns true when configured" do
-        plugin.config = valid_enabled_config
-        plugin.configured?.must_equal true
-      end
-
       it "allows plugin options to be configured" do
         # enabled, access token, organization and flow
         access_token = "mytoken"
@@ -123,16 +100,16 @@ describe Lolcommits::Plugin::Flowdock do
           configured_plugin_options = plugin.configure_options!
         end
 
-        output.must_match(/Enter your Flowdock organization name \(tab to autocomplete\)/)
+        output.must_match(/Enter your Flowdock organization name \(tab to autocomplete, Ctrl\+c cancels\)/)
         output.must_match(/e.g. Another, My Org/)
-        output.must_match(/Enter your Flowdock flow name \(tab to autocomplete\)/)
+        output.must_match(/Enter your Flowdock flow name \(tab to autocomplete, Ctrl\+c cancels\)/)
         output.must_match(/e.g. Flowtwo, My Flow/)
 
         configured_plugin_options.must_equal({
-          "enabled"      => true,
-          "access_token" => access_token,
-          "organization" => "myorgparam",
-          "flow"         => "myflowparam"
+          enabled: true,
+          access_token: access_token,
+          organization: "myorgparam",
+          flow: "myflowparam"
         })
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-flowdock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,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: Posts lolcommits to Flowdockr