see 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc1306fce1ef8f89fa0b52530fbc82aff7a2c53
-  data.tar.gz: 8c7faa2c59a0b29377c8d462248734a549dc102d
+  metadata.gz: 6e47f55852b907f2b8f9a11d0c25d87cffe20f70
+  data.tar.gz: 54a4f9a4e89dc083415c94745b71689dbc79160f
 SHA512:
-  metadata.gz: 5abb94324a05d965ed219007999038d9574e8883ca5c41341519e43577535dff250b8ab307bb24e04403222717f1348bd7e38bb5f05df6dcf584d1f9d9b46073
-  data.tar.gz: d32de757c172c7f6693612802d521cb08519726e44d8b9b174ef9a7943b52a6e29023b958d8cb871b594ba8c64668637923a5fadbdaaaa598d0368d1f19a1fc9
+  metadata.gz: dfdd63c1919cdbf72082b65e3f5c7374d51c8f2c83558ffac215a70ecc176f64e5fcf815f4a3a0e9bc22a4683e6d76b85ae62c991ad1ca813f0b6b9865fb79ff
+  data.tar.gz: f3e9e3bef0b665e1fa860b87dafe026fec90fba94c1676f90eb8a19c2de2d9b2c7841fcd5d656d9e3e423eac28b7d9f2a31efb686c381c1d5d4c68f38d3e84d1

data/lib/see.rb

@@ -1,6 +1,3 @@
+require 'see/config'
 require 'see/plugins'
-require 'see/plugins/github'
-require 'see/plugins/pivotal'
-require 'see/plugins/travis'
-require 'see/plugins/circle'
 require 'see/runner'

data/lib/see/config.rb

@@ -0,0 +1,18 @@
+require 'yaml'
+
+module See
+  module Config
+    def self.load
+      config_path = "#{Dir.pwd}/see.yml"
+      begin
+        config = YAML.load_file(config_path)
+      rescue => error
+        puts "No configuration file found (tried #{config_path})".yellow
+        puts '  (if the file exists it may be malformed)'
+        puts "  #{error}".light_red
+        exit 1
+      end
+      config
+    end
+  end
+end

data/lib/see/plugins.rb

@@ -1,25 +1,47 @@
+require 'colorize'
+
 module See
   module Plugins
-    require 'colorize'
-
-    def self.run_plugin(name, config)
-      plugins = See::Plugins.constants.map do |const|
-        plugin = See::Plugins.const_get(const).new
+    def self.find_plugins(name)
+      See::Plugins.constants.select do |const|
+        const != :Plugin
+      end.map do |const|
+        See::Plugins.const_get(const).new
       end.select do |plugin|
         plugin.config_name == name
       end
-      
-      lines = []
+    end
+
+    def self.run_plugin(name, config)
+      plugins = find_plugins(name)
       if plugins.empty?
-        lines << "\nNo plugin found with the name \"#{name}\"".light_red
-      else
-        plugins.each do |plugin|
-          lines << "\n"
-          lines << plugin.display_name.light_magenta
-          lines.concat(plugin.run(config, config[plugin.config_name]))
+        return ["\nNo plugin found with the name \"#{name}\"".light_red]
+      end
+
+      lines = ["\n"]
+      lines << plugins.map do |plugin|
+        lines_from_plugin = [plugin.display_name.light_magenta]
+        begin
+          lines_from_plugin << plugin.run(config, config[plugin.config_name])
+        rescue => error
+          lines_from_plugin << ["  #{error.message}".red]
+        end
+      end
+    end
+
+    class Plugin
+      def access_token(name)
+        token = ENV[name]
+        unless token
+          raise "  You must set #{name} env variable"
         end
+        token
       end
-      lines
     end
   end
 end
+
+require_relative 'plugins/github'
+require_relative 'plugins/pivotal'
+require_relative 'plugins/travis'
+require_relative 'plugins/circle'

data/lib/see/plugins/circle.rb

@@ -3,7 +3,7 @@ require 'circleci'
 
 module See
   module Plugins
-    class Circle
+    class Circle < Plugin
       def display_name
         'CircleCi'
       end
@@ -12,43 +12,43 @@ module See
         'circle'
       end
 
-      def run(config, plugin_config)
-        lines = []
-        token = ENV['CIRCLE_CI_ACCESS_TOKEN']
-        unless token
-          lines << "  You must set CIRCLE_CI_ACCESS_TOKEN env variable".red
-          return lines
-        end
-
+      def latest_builds(account, repository, lines)
+        token = access_token('CIRCLE_CI_ACCESS_TOKEN')
         CircleCi.configure do |cfg|
           cfg.token = token
         end
 
-        response = CircleCi::Project.recent_builds(plugin_config['account'], plugin_config['repository'])
+        response = CircleCi::Project.recent_builds(account, repository)
         if response.errors.length > 0
           lines << "  Errors encountered:".red
           response.errors.each do |error|
             lines << "    - " + "Error #{error.code}:".red + " #{JSON.parse(error.message)['message'].strip}"
+            raise
           end
+        end
+
+        response.body[0..4]
+      end
+
+      def run(config, plugin_config)
+        lines = []
+
+        begin
+          builds = latest_builds(plugin_config['account'], plugin_config['repository'], lines)
+        rescue => error
           return lines
         end
 
         lines << "  Latest Builds:".light_blue
-        response.body[0..4].each do |thing|
-          if thing['committer_date']
-            time = "- #{Date.parse(thing['committer_date']).strftime("%b %e,%l:%M %p")}".black
-          end
-          if thing['status'].match(/failed|not_run/)
-            status = thing['status'].red
-          else
-            status = thing['status'].green
-          end
-          if thing['committer_name']
-            name = "[#{thing['committer_name']}]".cyan
-          else
-            name = ""
-          end
-          lines << "    - #{status.capitalize} #{thing["vcs_revision"][0..8].light_yellow} #{("#"+thing['build_num'].to_s).light_green} #{thing['subject']} #{name} #{time}"
+        lines << builds.map do |build|
+          time = "- #{Date.parse(build['committer_date']).strftime("%b %e,%l:%M %p")}".black if build['committer_date'] 
+          was_bad = build['status'].match(/failed|not_run/)
+          status = build['status'].capitalize.send(was_bad ? :red : :green)
+          name = "[#{build['committer_name']}]".cyan ||= ''
+          commit_id = build["vcs_revision"][0..8].light_yellow
+          build_number = ("#"+build['build_num'].to_s).light_green
+
+          "    - #{status} #{commit_id} #{build_number} #{build['subject']} #{name} #{time}"
         end
         lines
       end

data/lib/see/plugins/github.rb

@@ -2,7 +2,7 @@ require 'octokit'
 
 module See
   module Plugins
-    class GitHub
+    class GitHub < Plugin
       def display_name
         'GitHub'
       end
@@ -13,42 +13,34 @@ module See
 
       def run(config, plugin_config)
         info = []
-        token = ENV['GITHUB_ACCESS_TOKEN']
-        unless token
-          info << "  You must set GITHUB_ACCESS_TOKEN env variable".red
-          return info
-        end
+        token = access_token('GITHUB_ACCESS_TOKEN')
 
-        client = Octokit::Client.new :access_token => token
         account = plugin_config['account']
         repository = plugin_config['repository']
         github_name = [account, repository].join '/'
 
+        client = Octokit::Client.new :access_token => token
         pull_requests = client.pull_requests(github_name)
-        if pull_requests.count > 0
-          info << "  Open pull requests:".light_blue
-          pull_requests.each do |pull_request|
-            username = "[#{pull_request.user.login}]".cyan
-            time = "- #{pull_request.updated_at.strftime("%b %e,%l:%M %p")}".black
-            info << "    - #{pull_request.title} #{username} #{time}"
-          end
-        else
-          info << "  No open pull requests".yellow
-        end
+        info.concat(show_collection('Pull Requests', pull_requests))
 
         issues = client.issues(github_name)
-        if issues.count > 0
-          info << "  Open issues:".light_blue
-          issues.each do |issue|
-            username = "[#{issue.user.login}]".cyan
-            time = "- #{issue.updated_at.strftime("%b %e,%l:%M %p")}".black
-            info << "    - #{issue.title} #{username} #{time}"
-          end
-        else
-          info << "No open issues".yellow
-        end
+        info.concat(show_collection('Issues', issues))
         info
       end
+
+      def show_collection(name, collection)
+        if collection.count == 0
+          return ["  No open #{name.downcase}".yellow]
+        end
+
+        info = []
+        info << "  Open #{name.downcase}:".light_blue
+        info << collection.map do |github_object|
+          username = "[#{github_object.user.login}]".cyan
+          time = "- #{github_object.updated_at.strftime("%b %e,%l:%M %p")}".black
+          "    - #{github_object.title} #{username} #{time}"
+        end
+      end
     end
   end
 end

data/lib/see/plugins/pivotal.rb

@@ -2,7 +2,7 @@ require 'pivotal-tracker'
 
 module See
   module Plugins
-    class Pivotal
+    class Pivotal < Plugin
       def display_name
         'Pivotal Tracker'
       end
@@ -12,14 +12,10 @@ module See
       end
 
       def run(config, plugin_config)
-        info = []
-        token = ENV['PIVOTAL_TRACKER_ACCESS_TOKEN']
-        unless token
-          info << "  You must set PIVOTAL_TRACKER_ACCESS_TOKEN env variable".red
-          return info
-        end
+        lines = []
+        @token = access_token('PIVOTAL_TRACKER_ACCESS_TOKEN')
 
-        PivotalTracker::Client.token = token
+        PivotalTracker::Client.token = @token
         project = PivotalTracker::Project.find(plugin_config['project'])
 
         next_unowned_story = nil
@@ -40,23 +36,23 @@ module See
         end
 
         if stories.length > 0
-          info << "  Stories being worked on:".light_blue
-          info << stories
+          lines << "  Stories being worked on:".light_blue
+          lines << stories
         else
-          info << "  No stories being worked on".yellow
+          lines << "  No stories being worked on".yellow
         end
 
 
         if next_unowned_story
-          info << "  Next story that can be worked on:".light_blue
+          lines << "  Next story that can be worked on:".light_blue
           time = "- #{next_unowned_story.created_at.strftime("%b %e,%l:%M %p")}".black
           id = "#{next_unowned_story.id}".light_yellow
           name = next_unowned_story.name
-          info << "    - #{id} #{name} #{time}"
+          lines << "    - #{id} #{name} #{time}"
         else
-          info << "No stories ready to work on".yellow
+          lines << "No stories ready to work on".yellow
         end
-        info
+        lines
       end
     end
   end

data/lib/see/runner.rb

@@ -1,12 +1,6 @@
-require 'yaml'
-
 module See
-  class Runner
+  module Runner
     def self.run
-      Runner.new.run
-    end
-
-    def run
       #
       # Whole thing happens in two major steps:
       #   1. load ./see.yml
@@ -15,41 +9,47 @@ module See
       #   2. provide information from each configured plugin
       #     (provide content at the top and no content at the bottom)
       #
-      config_path = "#{Dir.pwd}/see.yml"
-      begin
-        config = YAML.load_file(config_path)
-      rescue
-        puts "No configuration file found (tried #{config_path})".yellow
-        puts '  (if the file exists it may be malformed)'
-        exit 1
-      end
-
-      progress = Thread.new do
-        print "Pulling data from #{config.length} source#{config.length == 1 ? '' : 's'}"
-        loop do
-          sleep 0.25
-          print '.'
-        end
-      end
-
-      threads = []
-      config.each do |cfg|
-        threads << Thread.new do
+      config = See::Config.load
+      progress = ProgressIndicator.start(config.length)
+      threads = config.map do |cfg|
+        Thread.new do
           begin
-            Thread.current[:lines] = [See::Plugins.run_plugin(cfg[0], config)]
+            Thread.current[:lines] = See::Plugins.run_plugin(cfg[0], config)
           rescue => error
-            Thread.current[:lines] = ["Error running plugin: #{cfg[0]}".red]
-            Thread.current[:lines] << "  #{error}".light_red
+            Thread.current[:lines] = "\nError running plugin: #{cfg[0]}".red
+            Thread.current[:lines] << "\n  #{error}".light_red
           end
         end
       end
 
-      lines = threads.map { |t| t.join[:lines].flatten }
-      progress.kill
+      lines = threads.map { |t| t.join[:lines] }.sort_by { |l| l[0] }
+      progress.stop
 
       puts
-      lines.sort_by { |l| l[0] }.each { |l| puts l }
+      lines.each { |t| puts t }
       puts
     end
+
+    class ProgressIndicator
+      def self.start(things_todo_count)
+        progress = ProgressIndicator.new
+        progress.start(things_todo_count)
+        progress
+      end
+
+      def start(things_todo_count)
+        @progress = Thread.new do
+          print "Pulling data from #{things_todo_count} source#{things_todo_count == 1 ? '' : 's'}"
+          loop do
+            sleep 0.25
+            print '.'
+          end
+        end
+      end
+
+      def stop
+        @progress.kill
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: see
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Michael Avila
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/see
+- lib/see/config.rb
 - lib/see/plugins.rb
 - lib/see/plugins/github.rb
 - lib/see/plugins/pivotal.rb