stuff

lib/space/helpers.rb

@@ -1,29 +1,32 @@
 # encoding: UTF-8
 require 'ansi/core'
-require 'ansi/terminal'
 require 'core_ext/string'
 
 module Space
   module Helpers
-    include ANSI::Terminal
-
     def project_title
       "Project: #{name}".ansi(:bold)
     end
 
-    def local_repos
-      format_list(project.local_repos, :width => terminal_width - 2, :prefix => 'Local: ') + "\n" unless project.local_repos.empty?
-    end
-
     def tableize(string)
       string.split(' ')
       project.local_repos.join(', ')
     end
 
-    def repo_title
-      title = "#{repo.name.ansi(:bold)} [#{git.branch}, #{git.commit}] [#{repo.number}]"
-      title += " *" if repo_selected?
-      title
+    def repo_name
+      repo.name.ansi(:bold)
+    end
+
+    def repo_status
+      [repo_local, git.branch, git.commit].compact.join(', ')
+    end
+
+    def repo_local
+      'L'.ansi(:bold, :red) if repo_local?
+    end
+
+    def repo_local?
+      project.local_repos.include?(repo.name)
     end
 
     def repo_selected?
@@ -54,27 +57,6 @@ def format_boolean(value)
       value ? '✔'.ansi(:green, :bold) : '⚡'.ansi(:red, :bold)
     end
 
-    def format_list(list, options = {})
-      width = options[:width] || terminal_width
-      result = "#{options[:prefix]}#{list.join(', ')}"
-      if result.size <= width
-        result
-      else
-        result = wrap_list(list, width).map { |line| i(line) }
-        result.unshift(options[:prefix])
-        result.join("\n")
-      end
-    end
-
-    def wrap_list(list, width)
-      result = ['']
-      list.each do |item|
-        result << '' if (result.last + item).size + 1 > width
-        result.last << "#{item}#{', ' unless list.last == item}"
-      end
-      result.map(&:strip)
-    end
-
     def i(string, width = 2)
       lines = string.split("\n")
       lines = lines.map { |line| line.wrap(80).split("\n") }.flatten

lib/space/screen.rb

@@ -16,7 +16,6 @@ def clear
 
     def render(options = {})
       clear
-      puts render_config
       repos.scope.self_and_dependencies.each do |repo|
         puts render_repo(repo)
       end
@@ -29,10 +28,6 @@ def render_project
          view.render(:project, name: name, project: project)
       end
 
-      def render_config
-         view.render(:config, project: project)
-      end
-
       def render_repo(repo)
         view.render(:repo, repos: repos, repo: repo, git: repo.git, bundle: repo.bundle)
       end

lib/space/templates/repo.erb

@@ -1,4 +1,4 @@
-<%= repo_title %>
+<%= repo.number %> <%= repo_name %>: <%= repo_status %><%= ' *' if repo_selected? %>
 <%=i git_status %> <%= bundle_status %>
 <%=i bundle.clean? ? bundle_deps : bundle_info %>