wassup 0.1.2 → 0.3.1

data/examples/josh-fastlane/Supfile

@@ -20,9 +20,13 @@ add_pane do |pane|
   pane.highlight = false
 
   pane.title = "Stats: fastlane-community"
+  pane.description = [
+    "Highlevel stats from fastlane-community about PR count"
+  ]
 
-  pane.interval = 1
-  pane.content do
+  pane.interval = 2
+  pane.show_refresh = false
+  pane.content do |builder|
     days_1 = 0
     days_7 = 0
     days_30 = 0
@@ -41,13 +45,11 @@ add_pane do |pane|
       days_365 +=1 if days <= 365
     end
 
-    [
-      "Opened today: #{days_1}",
-      "Opened 7 days: #{days_7}",
-      "Opened 30 days: #{days_30}",
-      "Opened 60 days: #{days_60}",
-      "Opened 365 days: #{days_365}"
-    ] 
+    builder.add_row("Opened today: #{days_1}")
+    builder.add_row("Opened 7 days: #{days_7}")
+    builder.add_row("Opened 30 days: #{days_30}")
+    builder.add_row("Opened 60 days: #{days_60}")
+    builder.add_row("Opened 365 days: #{days_365}")
   end
 end
 
@@ -63,9 +65,13 @@ add_pane do |pane|
   pane.highlight = false
 
   pane.title = "Stats: fastlane/fastlane"
+  pane.description = [
+    "Highlevel stats from fastlane/fastlane about PR count"
+  ]
 
-  pane.interval = 1
-  pane.content do
+  pane.interval = 2
+  pane.show_refresh = false
+  pane.content do |builder|
     days_1 = 0
     days_7 = 0
     days_30 = 0
@@ -86,14 +92,12 @@ add_pane do |pane|
       days_60_plus +=1 if days > 60
     end
 
-    [
-      "Opened today: #{days_1}",
-      "Opened 7 days: #{days_7}",
-      "Opened 30 days: #{days_30}",
-      "Opened 45 days: #{days_45}",
-      "Opened 60 days: #{days_60}",
-      "More than 60 days: #{days_60_plus}",
-    ] 
+    builder.add_row("Opened today: #{days_1}")
+    builder.add_row("Opened 7 days: #{days_7}")
+    builder.add_row("Opened 30 days: #{days_30}")
+    builder.add_row("Opened 45 days: #{days_45}")
+    builder.add_row("Opened 60 days: #{days_60}")
+    builder.add_row("More than 60 days: #{days_60_plus}")
   end
 end
 
@@ -109,48 +113,22 @@ add_pane do |pane|
   pane.highlight = true
 
   pane.title = "Circle CI - fastlane/fastlane"
+  pane.description = [
+    "Shows workflows from last 14 days"
+  ]
 
   pane.interval = 60 * 5
-  pane.content do 
-    resp = RestClient::Request.execute(
-      method: :get, 
-      url: "https://circleci.com/api/v2/project/github/fastlane/fastlane/pipeline", 
-      headers: { "Circle-Token": ENV["WASSUP_CIRCLE_CI_API_TOKEN"] }
-    )
-    json = JSON.parse(resp)
-    json["items"].select do |item|
-      date = Time.parse(item["updated_at"])
-      days = (Time.now - date).to_i / (24 * 60 * 60)
-      days < 14
-    end.map do |item|
-      id = item["id"]
-      number = item["number"]
-      message = item["vcs"]["commit"]["subject"]
-      login = item["trigger"]["actor"]["login"]
-
-      resp = RestClient::Request.execute(
-        method: :get, 
-        url: "https://circleci.com/api/v2/pipeline/#{id}/workflow", 
-        headers: { "Circle-Token": ENV["WASSUP_CIRCLE_CI_API_TOKEN"] }
-      )
-      json = JSON.parse(resp)
-      workflow = json["items"].first
-      status = workflow["status"]
-
-      if status == "failed"
-        status = "[fg=red]#{status}[fg=white]"
-      elsif status == "success"
-        status = "[fg=green]#{status}[fg=white]"
-      else
-        status = "[fg=yellow]#{status}[fg=white]"
-      end
-
-      ["#{number} (#{status}) by #{login} - #{message}", [item, workflow]]
+  pane.show_refresh = true
+
+  pane.content do |builder|
+    workflows = Helpers::CircleCI.workflows(vcs: 'github', org: 'fastlane', repo: 'fastlane', limit_days: 14)
+    workflows.each do |workflow|
+      display = Helpers::CircleCI::Formatter.workflow(workflow)
+      builder.add_row(display, workflow)
     end
   end
-  pane.selection do |data|
-    workflow = data[1]
 
+  pane.selection('enter', 'Opens up CirceCI workflow') do |workflow|
     slug = workflow["project_slug"]
     pipeline_number = workflow["pipeline_number"]
     workflow_id = workflow["id"]
@@ -158,8 +136,9 @@ add_pane do |pane|
     url = "https://app.circleci.com/pipelines/#{slug}/#{pipeline_number}/workflows/#{workflow_id}"
     `open #{url}`
   end
-  pane.selection('o') do |data|
-    pipeline = data[0]
+
+  pane.selection('o', 'Opens up version control review URL') do |workflow|
+    pipeline = workflow["pipeline"]
     url = pipeline["vcs"]["review_url"]
     `open #{url}`
   end
@@ -177,52 +156,26 @@ add_pane do |pane|
   pane.highlight = true
 
   pane.title = "Open PRs - fastlane-community"
+  pane.description = [
+    "Open PRs from all the fastlane-community repos"
+  ]
 
   pane.interval = 60 * 5
-  pane.content do
+  pane.show_refresh = true
+  pane.content do |builder|
     fastlane_community_prs = []
 
-    resp = RestClient::Request.execute(
-      method: :get, 
-      url: "https://api.github.com/orgs/fastlane-community/repos", 
-      user: ENV["WASSUP_GITHUB_USERNAME"],
-      password: ENV["WASSUP_GITHUB_ACCESS_TOKEN"]
-    )
-    json = JSON.parse(resp)
-    json.map do |repo|
-      name = repo["name"]
-      full_name = repo["full_name"]
-
-      resp = RestClient::Request.execute(
-        method: :get, 
-        url: "https://api.github.com/repos/#{full_name}/pulls",
-        user: ENV["WASSUP_GITHUB_USERNAME"],
-        password: ENV["WASSUP_GITHUB_ACCESS_TOKEN"]
-      )
-      json = JSON.parse(resp)
-      prs = json.map do |pr|
-        fastlane_community_prs << pr
-
-        number = pr["number"]
-        title = pr["title"]
-        created_at = pr["created_at"]
-
-        number_formatted = '%5.5s' % "##{number}"
-
-        date = Time.parse(created_at)
-        days = (Time.now - date).to_i / (24 * 60 * 60)
-        days_formatted = '%3.3s' % days.to_s
-
-        ["[fg=yellow]#{number_formatted}[fg=cyan] #{days_formatted}d ago[fg=white] #{title}",pr]
-      end
-
-      {
-        title: name,
-        content: prs
-      }
+    prs = Wassup::Helpers::GitHub.pull_requests(org: 'fastlane-community')
+    prs.each do |pr|
+      fastlane_community_prs << pr
+
+      repo_name = pr["base"]["repo"]["name"]
+
+      display = Helpers::GitHub::Formatter.pr(pr)
+      builder.add_row(display, pr, page: repo_name)
     end
   end
-  pane.selection do |data|
+  pane.selection('enter', 'Open PR in web browser') do |data|
     url = data["html_url"] 
     `open #{url}`
   end
@@ -241,33 +194,24 @@ add_pane do |pane|
   pane.highlight = true
 
   pane.title = "Open PRs - fastlane/fastlane"
+  pane.description = [
+    "Open PRs from all the fastlane/fastlane repo"
+  ]
 
   pane.interval = 60 * 5
-  pane.content do
+  pane.show_refresh = true
+  pane.content do |builder|
     fastlane_prs = []
 
-    resp = RestClient::Request.execute(
-      method: :get, 
-      url: "https://api.github.com/repos/fastlane/fastlane/pulls?per_page=100", 
-      user: ENV["WASSUP_GITHUB_USERNAME"],
-      password: ENV["WASSUP_GITHUB_ACCESS_TOKEN"]
-    )
-    json = JSON.parse(resp)
-    json.map do |pr|
+    prs = Wassup::Helpers::GitHub.pull_requests(org: 'fastlane', repo: 'fastlane')
+    prs.each do |pr|
       fastlane_prs << pr
 
-      number = pr["number"]
-      title = pr["title"]
-      created_at = pr["created_at"]
-
-      date = Time.parse(created_at)
-      days = (Time.now - date).to_i / (24 * 60 * 60)
-      days_formatted = '%3.3s' % days.to_s
-
-      ["[fg=yellow]##{number}[fg=cyan] #{days_formatted}d ago[fg=white] #{title}",pr]
+      display = Helpers::GitHub::Formatter.pr(pr)
+      builder.add_row(display, pr)
     end
   end
-  pane.selection do |data|
+  pane.selection('enter', 'Open PR in browser') do |data|
     url = data["html_url"] 
     `open #{url}`
   end

data/examples/simple/Supfile

@@ -0,0 +1,17 @@
+add_pane do |pane|
+  pane.height = 0.25
+  pane.width = 0.25
+  pane.top = 0
+  pane.left = 0
+
+  pane.highlight = false
+  pane.title = "The Title"
+
+  pane.interval = 1
+  pane.content do |content|
+    date = `date`
+    content.add_row(date)
+    content.add_row(date, page: "page 2")
+  end
+end
+

data/examples/starter/Supfile

@@ -0,0 +1,44 @@
+add_pane do |pane|
+  pane.height = 0.5
+  pane.width = 0.4
+  pane.top = 0
+  pane.left = 0
+
+  pane.highlight = false
+  pane.title = "Current Time"
+
+  pane.interval = 1
+  pane.content do |content|
+    date = `date`
+
+    content.add_row(date)
+  end
+end
+
+add_pane do |pane|
+  pane.height = 0.5
+  pane.width = 0.6
+  pane.top = 0
+  pane.left = 0.4
+
+  pane.highlight = false
+  pane.title = "Open PRs - fastlane/fastlane"
+
+  pane.interval = 60 * 5
+  pane.content do |content|
+		require 'uri'
+		require 'net/http'
+		require 'json'
+
+		uri = URI('https://api.github.com/repos/fastlane/fastlane/pulls')
+		res = Net::HTTP.get_response(uri)
+
+		JSON.parse(res.body).each do |pr|
+			display = "[fg=cyan]##{pr['number']} - [fg=white]#{pr['title']}"
+    	content.add_row(display)
+		end
+  end
+	pane.selection do |pr|
+		`open #{pr['html_url']}`
+	end
+end

data/lib/wassup/app.rb

@@ -20,6 +20,44 @@ module Wassup
       app = App.new(path: path)
     end
 
+    def self.debug(path:)
+      app = App.new(path: path, debug: true)
+
+      app.panes.each do |k, pane|
+        puts "#{k} - #{pane.title}"
+      end
+
+      puts ""
+      puts "Choose a pane to run:"
+
+      selection = $stdin.gets.chomp.to_s
+
+      pane = app.panes[selection]
+      if pane.nil?
+        puts "That was not a valid option"
+      else
+        puts "Going to run: \"#{pane.title}\""
+
+        builder = Wassup::PaneBuilder::ContentBuilder.new(pane.contents)
+        pane.content_block.call(builder)
+
+        builder.contents.each_with_index do |content, idx|
+          puts "#########################"
+          puts "# #{content.title || (idx == 0 ? "Default" : "<No Title>")}"
+          puts "#########################"
+
+          content.data.each do |data|
+            puts data.display
+              .split(/\[.*?\]/).join('') # Removes colors but make this an option probably
+          end
+
+          puts ""
+          puts ""
+          puts ""
+        end
+      end
+    end
+
     def add_pane
       pane_builder = Wassup::PaneBuilder.new
       yield(pane_builder)
@@ -31,27 +69,62 @@ module Wassup
         pane_builder.top, 
         pane_builder.left, 
         title: pane_builder.title,
+        description: pane_builder.description,
         highlight: pane_builder.highlight, 
         focus_number: number,
         interval: pane_builder.interval,
+        show_refresh: pane_builder.show_refresh,
         content_block: pane_builder.content_block,
-        selection_blocks: pane_builder.selection_blocks
+        selection_blocks: pane_builder.selection_blocks,
+        selection_blocks_description: pane_builder.selection_blocks_description,
+        debug: debug
       )
       pane.focus_handler = @focus_handler
       @panes[number.to_s] = pane
     end
 
-    def initialize(path:)
+    attr_accessor :panes
+    attr_accessor :debug
+
+    def initialize(path:, debug: false)
       @hidden_pane = nil
+      @help_pane = nil
       @focused_pane = nil
       @panes = {}
+      @debug = debug
+
+      if debug
+        self.start_debug(path)
+      else
+        self.start_curses(path)
+      end
+    end
+
+    def start_debug(path)
+      begin
+        eval(File.new(path).read)
+      rescue => err
+        puts err
+        puts err.backtrace
+      end
+    end
+
+    def start_curses(path)
+      @redraw_panes = false
 
       # TODO: this could maybe get replaced with selection_blocks now
       @focus_handler = Proc.new do |input|
+        is_help_open = !@help_pane.nil?
+
         if input == "q"
           exit
+        elsif input == "?"
+          toggle_help
+          next true
         end
 
+        next true if is_help_open
+
         if (pane = @panes[input.to_s])
           @focused_pane.focused = false
 
@@ -73,8 +146,7 @@ module Wassup
       end
 
       begin
-
-        @hidden_pane = Pane.new(0, 0, 0, 0, highlight: false, focus_number: 0, interval: nil, content_block: nil, selection_blocks: nil)
+        @hidden_pane = Pane.new(0, 0, 0, 0, highlight: false, focus_number: 0, interval: nil, show_refresh: false, content_block: nil, selection_blocks: nil, selection_blocks_description: nil)
         @hidden_pane.focus_handler = @focus_handler
         @focused_pane = @hidden_pane
 
@@ -82,13 +154,102 @@ module Wassup
 
         loop do
           @focused_pane.handle_keyboard
-          @panes.each do |id, pane|
-            pane.refresh()
+
+          if @redraw_panes
+            Curses.clear
+            Curses.refresh
+          end
+
+          # This isn't ideal to now refresh other panes when help is open
+          # But it prevents things from getting drawn where the help is showing
+          if @help_pane.nil?
+            @panes.each do |id, pane|
+              pane.redraw() if @redraw_panes
+              pane.refresh()
+            end
+            @redraw_panes = false
+          else
+            @help_pane.refresh()
           end
         end
       ensure
         Curses.close_screen
       end
     end
+
+    def row_help
+      {
+        "j" => "moves row highlight down",
+        "k" => "moves row highlight up",
+        "enter" => "perform selection on highlighted row"
+      }
+    end
+
+    def page_help
+      {
+        "h" => "previous page in pane",
+        "l" => "next page in pane"
+      }
+    end
+
+    def toggle_help
+      if @help_pane.nil?
+        if @focused_pane == @hidden_pane
+          content_block = Proc.new do |content|
+            items = [
+              "Welcome to Wassup!",
+              "",
+              "Press any number key to focus a pane",
+              "",
+              row_help.map { |k,v| "#{k} - #{v}"},
+              "",
+              page_help.map { |k,v| "#{k} - #{v}"},
+              "",
+              "? - opens help for focused pane"
+            ].flatten
+
+            items.each do |item|
+              content.add_row(item)
+            end
+          end
+        else
+          content_block = Proc.new do |content|
+            hash = {}
+
+            hash = hash.merge(row_help)
+            hash = hash.merge(@focused_pane.selection_blocks_description)
+
+            row_help.map { |k,v| "#{k} - #{v}"}
+
+            copy_error = @focused_pane.caught_error.nil? ? [] : [
+              "c - copy stacktrace to clipboard",
+              ""
+            ]
+
+            items = [
+              @focused_pane.description,
+              "",
+              hash.map do |k,v|
+                "#{k} - #{v}" 
+              end,
+              "",
+              copy_error,
+              page_help.map { |k,v| "#{k} - #{v}"},
+            ].flatten.compact
+
+            items.each do |item|
+              content.add_row(item)
+            end
+          end 
+        end
+
+        # Maybe find a way to add some a second border or an clear border to add more space to show its floating
+        @help_pane = Pane.new(0.5, 0.5, 0.25, 0.25, title: "Help", highlight: false, focus_number: nil, interval: 100, show_refresh: false, content_block: content_block, selection_blocks: nil, selection_blocks_description: nil)
+      else
+        @help_pane.close
+        @help_pane = nil 
+        @redraw_panes = true
+      end
+    end
   end
 end

data/lib/wassup/color.rb

@@ -17,6 +17,8 @@ module Wassup
       NORMAL = 20
       HIGHLIGHT = 21
 
+      GRAY = 22
+
       BORDER = 20
       BORDER_FOCUS = 7
 
@@ -44,6 +46,7 @@ module Wassup
       Curses.init_pair(Pair::RED, Curses::COLOR_RED, 0)
       Curses.init_pair(Pair::WHITE, Pair::WHITE, 0)
       Curses.init_pair(Pair::YELLOW, Curses::COLOR_YELLOW, 0)
+      Curses.init_pair(Pair::GRAY, Curses::COLOR_WHITE, 0)
     end
 
     def initialize(string_name)
@@ -64,6 +67,8 @@ module Wassup
                  Pair::WHITE
                when "yellow"
                  Pair::YELLOW
+               when "gray"
+                 Pair::GRAY
                else
                  if string_name.to_i.to_s == string_name
                    string_name.to_i

data/lib/wassup/helpers/circleci.rb

@@ -0,0 +1,75 @@
+module Wassup
+  module Helpers
+    module CircleCI
+      def self.workflows(vcs:, org:, repo:, limit_days: nil)
+        require 'json'
+        require 'rest-client'
+
+        resp = RestClient::Request.execute(
+          method: :get, 
+          url: "https://circleci.com/api/v2/project/#{vcs}/#{org}/#{repo}/pipeline", 
+          headers: { "Circle-Token": ENV["WASSUP_CIRCLE_CI_API_TOKEN"] }
+        )
+        json = JSON.parse(resp)
+
+        return json["items"].select do |item|
+          if !limit_days.nil?
+            date = Time.parse(item["updated_at"])
+            days = (Time.now - date).to_i / (24 * 60 * 60)
+            days < limit_days
+          else
+            true
+          end
+        end.map do |pipeline|
+          id = pipeline["id"]
+
+          resp = RestClient::Request.execute(
+            method: :get, 
+            url: "https://circleci.com/api/v2/pipeline/#{id}/workflow", 
+            headers: { "Circle-Token": ENV["WASSUP_CIRCLE_CI_API_TOKEN"] }
+          )
+          json = JSON.parse(resp)
+          workflow = json["items"].first
+
+          if workflow
+            workflow["pipeline"] = pipeline
+          end
+
+          workflow
+        end.compact
+      end
+    end
+  end
+end
+
+module Wassup
+  module Helpers
+    module CircleCI
+      module Formatter
+        def self.workflow(workflow)
+          pipeline = workflow["pipeline"]
+          number = pipeline["number"]
+          message = (pipeline["vcs"]["commit"] || {})["subject"]
+          login = pipeline["trigger"]["actor"]["login"]
+
+          status = workflow["status"]
+          status_formatted = '%-8.8s' % status
+
+          number_formatted = '%-7.7s' % "##{number}"
+
+          if status == "failed"
+            status_formatted = "[fg=red]#{status_formatted}[fg=white]"
+          elsif status == "success"
+            status_formatted = "[fg=green]#{status_formatted}[fg=white]"
+          else
+            status_formatted = "[fg=yellow]#{status_formatted}[fg=white]"
+          end
+
+          display = "[fg=yellow]#{number_formatted} [fg=while]#{status_formatted} [fg=white]#{login} [fg=gray]#{message}"
+          
+          return display
+        end
+      end
+    end
+  end
+end