lib/lolcommits/plugin/flowdock.rb in lolcommits-flowdock-0.0.2 vs lib/lolcommits/plugin/flowdock.rb in lolcommits-flowdock-0.0.3

@@ -6,73 +6,46 @@
 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.
       #
       # @return [Array] the position(s) (:capture_ready)
       #
       def self.runner_order
         [: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
       # organization and flow names.
       #
       # @return [Hash] a hash of configured plugin options
       #
       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)
+          organization = configure_organization
+          flow         = configure_flow
+          raise Interrupt unless flow && organization
 
-          puts "\nEnter your Flowdock flow name (tab to autocomplete)"
-          flow = prompt_autocomplete_hash("Flow: ", flowdock.flows)
-
           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
 
       ##
       # Post-capture hook, runs after lolcommits captures a snapshot. Posts the
@@ -82,12 +55,12 @@
       # @return [Nil] if an error occurs
       #
       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),
             tags: %w(lolcommits)
           }
@@ -101,37 +74,38 @@
       end
 
 
       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
 
       def open_url(url)
         Lolcommits::CLI::Launcher.open_url(url)
       end
 
       def flowdock
         @flowdock ||= Lolcommits::Flowdock::Client.new(
-          configuration['access_token']
+          configuration[:access_token]
         )
       end
     end
   end
 end