see 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d093edd84bc933822b73dfd09f3525e28853120
-  data.tar.gz: a2d074d9228321f52c34ef5acff8b8ac277d6ae4
+  metadata.gz: 6fc1306fce1ef8f89fa0b52530fbc82aff7a2c53
+  data.tar.gz: 8c7faa2c59a0b29377c8d462248734a549dc102d
 SHA512:
-  metadata.gz: 55499fc29349126cab6ab1ef67b77f42f71b8bff63c40101930184148c25db5f30230de41fa0fd9f74b2bc7ac38eb2b47524ae74defe21c800783186777e2a95
-  data.tar.gz: bae96acfe1d4febb1567deadbf1599519484060c217a3765899e1d04b1c6d26c04931fd4795d2e9b17bafd32530094119a14d1c4541b0f9e8f2c4a028f3edd2d
+  metadata.gz: 5abb94324a05d965ed219007999038d9574e8883ca5c41341519e43577535dff250b8ab307bb24e04403222717f1348bd7e38bb5f05df6dcf584d1f9d9b46073
+  data.tar.gz: d32de757c172c7f6693612802d521cb08519726e44d8b9b174ef9a7943b52a6e29023b958d8cb871b594ba8c64668637923a5fadbdaaaa598d0368d1f19a1fc9

data/lib/see/plugins/circle.rb

@@ -1,36 +1,39 @@
 require 'json'
+require 'circleci'
 
 module See
   module Plugins
     class Circle
+      def display_name
+        'CircleCi'
+      end
+
       def config_name
         'circle'
       end
 
-      def run(config)
-        info = []
+      def run(config, plugin_config)
+        lines = []
         token = ENV['CIRCLE_CI_ACCESS_TOKEN']
         unless token
-          info << "\nCircle CI".light_red
-          info << "  You must set CIRCLE_CI_ACCESS_TOKEN env variable".red
-          return info
+          lines << "  You must set CIRCLE_CI_ACCESS_TOKEN env variable".red
+          return lines
         end
 
         CircleCi.configure do |cfg|
           cfg.token = token
         end
 
-        response = CircleCi::Project.recent_builds(config['circle']['account'], config['circle']['repository'])
+        response = CircleCi::Project.recent_builds(plugin_config['account'], plugin_config['repository'])
         if response.errors.length > 0
-          info << "\nCircle CI - " + "Errors encountered:".red
+          lines << "  Errors encountered:".red
           response.errors.each do |error|
-            info << "  - " + "Error #{error.code}:".red + " #{JSON.parse(error.message)['message'].strip}"
+            lines << "    - " + "Error #{error.code}:".red + " #{JSON.parse(error.message)['message'].strip}"
           end
-          return info
+          return lines
         end
 
-        info << "\nCircle CI".light_magenta
-        info << "  Latest Builds:".light_blue
+        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
@@ -45,9 +48,9 @@ module See
           else
             name = ""
           end
-          info << "    - #{status.capitalize} #{thing["vcs_revision"][0..8].light_yellow} #{("#"+thing['build_num'].to_s).light_green} #{thing['subject']} #{name} #{time}"
+          lines << "    - #{status.capitalize} #{thing["vcs_revision"][0..8].light_yellow} #{("#"+thing['build_num'].to_s).light_green} #{thing['subject']} #{name} #{time}"
         end
-        info
+        lines
       end
     end
   end

data/lib/see/plugins/github.rb

@@ -3,26 +3,28 @@ require 'octokit'
 module See
   module Plugins
     class GitHub
+      def display_name
+        'GitHub'
+      end
+
       def config_name
         'github'
       end
 
-      def run(config)
+      def run(config, plugin_config)
         info = []
         token = ENV['GITHUB_ACCESS_TOKEN']
         unless token
-          info << "\nGitHub".light_red
           info << "  You must set GITHUB_ACCESS_TOKEN env variable".red
           return info
         end
 
         client = Octokit::Client.new :access_token => token
-        account = config['github']['account']
-        repository = config['github']['repository']
+        account = plugin_config['account']
+        repository = plugin_config['repository']
         github_name = [account, repository].join '/'
 
         pull_requests = client.pull_requests(github_name)
-        info << "\nGitHub".light_magenta
         if pull_requests.count > 0
           info << "  Open pull requests:".light_blue
           pull_requests.each do |pull_request|

data/lib/see/plugins/pivotal.rb

@@ -3,21 +3,24 @@ require 'pivotal-tracker'
 module See
   module Plugins
     class Pivotal
+      def display_name
+        'Pivotal Tracker'
+      end
+
       def config_name
         "pivotal"
       end
 
-      def run(config)
+      def run(config, plugin_config)
         info = []
         token = ENV['PIVOTAL_TRACKER_ACCESS_TOKEN']
         unless token
-          info << "\nPivotal Tracker".light_red
           info << "  You must set PIVOTAL_TRACKER_ACCESS_TOKEN env variable".red
           return info
         end
 
         PivotalTracker::Client.token = token
-        project = PivotalTracker::Project.find(config['pivotal']['project'])
+        project = PivotalTracker::Project.find(plugin_config['project'])
 
         next_unowned_story = nil
         has_current = false
@@ -36,7 +39,6 @@ module See
           end
         end
 
-        info << "\nPivotal Tracker".light_magenta
         if stories.length > 0
           info << "  Stories being worked on:".light_blue
           info << stories

data/lib/see/plugins/travis.rb

@@ -3,13 +3,17 @@ require 'travis'
 module See
   module Plugins
     class TravisCI
+      def display_name
+        'Travis CI'
+      end
+
       def config_name
         'travis'
       end
 
-      def run(config)
+      def run(config, plugin_config)
         info = []
-        repository = config["travis"]["repository"]
+        repository = plugin_config["repository"]
         builds = Travis::Repository.find(repository).recent_builds[0..4].map do |build|
           time = ( build.finished_at ? "- #{build.finished_at.strftime("%b %e,%l:%M %p")}" : "- running" ).black
           if build.pending?
@@ -22,11 +26,9 @@ module See
         end
 
         if builds.count > 0
-          info << "\nTravis".light_magenta
           info << "  Latest Builds:".light_blue
           info.concat(builds)
         else
-          info << "Travis"
           info << "No available build status".yellow
         end
         info

data/lib/see/plugins.rb

@@ -1,7 +1,6 @@
 module See
   module Plugins
     require 'colorize'
-    require 'circleci'
 
     def self.run_plugin(name, config)
       plugins = See::Plugins.constants.map do |const|
@@ -10,15 +9,17 @@ module See
         plugin.config_name == name
       end
       
-      info = []
-      plugins.each do |plugin|
-        info.concat(plugin.run(config))
-      end
-      
+      lines = []
       if plugins.empty?
-        puts "No plugin found with the name \"#{name}\"".light_red
+        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]))
+        end
       end
-      info
+      lines
     end
   end
 end

data/lib/see/runner.rb

@@ -9,13 +9,13 @@ module See
     def run
       #
       # Whole thing happens in two major steps:
-      #   1. load ./sights.yml
+      #   1. load ./see.yml
       #     (fail if it doesn't exist)
       #
       #   2. provide information from each configured plugin
       #     (provide content at the top and no content at the bottom)
       #
-      config_path = "#{Dir.pwd}/sights.yml"
+      config_path = "#{Dir.pwd}/see.yml"
       begin
         config = YAML.load_file(config_path)
       rescue
@@ -26,7 +26,7 @@ module See
 
       progress = Thread.new do
         print "Pulling data from #{config.length} source#{config.length == 1 ? '' : 's'}"
-        while true
+        loop do
           sleep 0.25
           print '.'
         end
@@ -35,17 +35,20 @@ module See
       threads = []
       config.each do |cfg|
         threads << Thread.new do
-          Thread.current[:lines] = See::Plugins.run_plugin(cfg[0], config)
+          begin
+            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
+          end
         end
       end
-      puts
 
+      lines = threads.map { |t| t.join[:lines].flatten }
       progress.kill
 
-      threads.each do |t|
-        t.join
-        t[:lines].each { |line| puts line }
-      end
+      puts
+      lines.sort_by { |l| l[0] }.each { |l| puts l }
       puts
     end
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: see
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Michael Avila
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -28,14 +42,14 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
 - !ruby/object:Gem::Dependency