space 0.0.6 → 0.0.7

data/lib/space.rb

@@ -6,10 +6,6 @@ module Space
   autoload :App,        'space/app'
   autoload :Config,     'space/config'
   autoload :Events,     'space/events'
-  autoload :Helpers,    'space/helpers'
-  autoload :Logger,     'space/logger'
   autoload :Model,      'space/model'
-  autoload :Screen,     'space/screen'
   autoload :Source,     'space/source'
-  autoload :Tmux,       'space/tmux'
 end

data/lib/space/action.rb

@@ -30,8 +30,13 @@ module Space
         scope.each { |repo| yield repo }
       end
 
+      def in_repo(repo, &block)
+        puts "in #{repo.path}".ansi(:bold, :green)
+        Dir.chdir(repo.path, &block)
+      end
+
       def system(cmd)
-        puts cmd
+        puts "#{cmd.ansi(:bold, :black)}\n"
         super
       end
 

data/lib/space/action/builtin.rb

@@ -4,16 +4,13 @@ module Space
   class Action
     class Execute < Action
       def run
-        Events.sources.registered do
-          in_scope do |repo|
-            Dir.chdir(repo.path) do
-              puts "in #{repo.path}\n".ansi(:bold, :green)
-              system(*args)
-              puts
-            end
+        in_scope do |repo|
+          in_repo(repo) do
+            system(*args)
+            puts
           end
-          confirm
         end
+        confirm
       end
     end
 

data/lib/space/action/development.rb

@@ -2,23 +2,19 @@ module Space
   class Action
     class Local < Action
       def run
-        Events.sources.registered do
-          scope.each do |repo|
-            system "bundle config --global local.#{repo.name} #{repo.path}"
-          end
-          sleep 0.2 # not perfect, but fsevent is too slow to trigger
+        scope.each do |repo|
+          system "bundle config --global local.#{repo.name} #{repo.path}"
         end
+        confirm
       end
     end
 
     class Remote < Action
       def run
-        Events.sources.registered do
-          scope.each do |repo|
-            system "bundle config --delete local.#{repo.name}"
-          end
-          sleep 0.2
+        scope.each do |repo|
+          system "bundle config --delete local.#{repo.name}"
         end
+        confirm
       end
     end
 

data/lib/space/action/handler.rb

@@ -17,8 +17,9 @@ module Space
       def run(line)
         scope, type = parse(line)
         action = action_for(scope, type)
-        action.run
-        Events.flush
+        Events.sources.registered do
+          action.run
+        end
       end
 
       private

data/lib/space/app.rb

@@ -4,20 +4,17 @@ require 'thread'
 
 module Space
   class App
-    attr_reader :name, :project, :screen
+    attr_reader :name, :project, :views
 
     def initialize(name)
       @name    = name
       @project = Model::Project.new(name)
-      @screen  = Screen.new(project)
+      @views   = [View::Progress.new(project), View::Dashboard.new(project)]
     end
 
     def run
-      screen.display
       project.refresh
       cli_loop
-      # Thread.new(&method(:cli_loop))
-      # sleep
       puts
     end
 
@@ -26,7 +23,7 @@ module Space
       def cli_loop
         loop do
           print "\e[3;0H"
-          line = Readline.readline(prompt, true) || break
+          line = Readline.readline(views.first.send(:prompt), true) || break
           handle(line)
         end
       rescue Exception => e
@@ -36,9 +33,5 @@ module Space
       def handle(line)
         Action::Handler.new(project).run(line) unless line.empty?
       end
-
-      def prompt
-        "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
-      end
   end
 end

data/lib/space/config.rb

@@ -17,7 +17,7 @@ module Space
         end
     end
 
-    define :template_dir => File.expand_path('../templates', __FILE__)
+    define :template_dir => File.expand_path('../view/templates', __FILE__)
 
     def paths
       @paths ||= repositories.map { |path| base_dir ? "#{base_dir}/#{path}" : path }

data/lib/space/events.rb

@@ -20,12 +20,6 @@ module Space
         subscriptions << Subscription.new(observer, types)
       end
 
-      def flush
-        event = events.first
-        events.clear
-        notify(event, false) if event
-      end
-
       def notify(event)
         # log event
         subscriptions.each do |subscription|

data/lib/space/events/sources.rb

@@ -15,19 +15,21 @@ module Space
         end
       end
 
-      def register(source)
-        Thread.exclusive do
-          events.notify(:start) if sources.empty?
-          sources << source
+      private
+
+        def register(source)
+          Thread.exclusive do
+            events.notify(:start) if sources.empty?
+            sources << source
+          end
         end
-      end
 
-      def unregister(source)
-        Thread.exclusive do
-          sources.delete(source)
-          events.notify(:finish) if sources.empty?
+        def unregister(source)
+          Thread.exclusive do
+            sources.delete(source)
+            events.notify(:finish) if sources.empty?
+          end
         end
-      end
     end
   end
 end

data/lib/space/model/project.rb

@@ -2,6 +2,7 @@ module Space
   module Model
     class Project
       autoload :Bundler, 'space/model/project/bundler'
+      autoload :Tmux,    'space/model/project/tmux'
 
       include Events
 

data/lib/space/model/project/tmux.rb

@@ -0,0 +1,16 @@
+# TODO make this a source?
+#
+module Space
+  module Model
+    class Project
+      module Tmux
+        class << self
+          def windows
+            windows = `tmux list-windows -F '#W'`.split("\n")
+            windows unless windows.empty?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/space/source.rb

@@ -2,7 +2,6 @@ module Space
   module Source
     autoload :Command, 'space/source/command'
     autoload :Watch,   'space/source/watch'
-    autoload :Watcher, 'space/source/watcher'
 
     module ClassMethods
       def commands(commands = nil)
@@ -14,7 +13,7 @@ module Space
       end
     end
 
-    include Events, Watcher
+    include Events
 
     class << self
       def included(base)
@@ -22,11 +21,12 @@ module Space
       end
     end
 
-    attr_reader :results
+    attr_reader :path, :results
 
     def initialize(path)
+      @path = path
       @results = {}
-      super
+      watch
     end
 
     def commands
@@ -35,10 +35,6 @@ module Space
       end
     end
 
-    def result(key)
-      results[key] || ''
-    end
-
     def refresh
       commands.each { |key, command| command.refresh }
     end
@@ -47,5 +43,27 @@ module Space
       results[key] = result
       notify(:update)
     end
+
+    private
+
+      def result(key)
+        results[key] || ''
+      end
+
+      def watch
+        watchers.map(&:run)
+      end
+
+      def watchers
+        @watchers ||= watched_paths.map do |path|
+          Watch.new(path) { |paths| refresh }
+        end
+      end
+
+      def watched_paths
+        @watched_paths ||= self.class.watch.map do |path|
+          path[0, 1] == '~' ? path : "#{self.path}/#{path}"
+        end
+      end
   end
 end

data/lib/space/source/watch.rb

@@ -6,12 +6,11 @@ module Space
       LATENCY = 0.1
       NO_DEFER = FALSE
 
-      attr_reader :path, :callback, :suspended, :fsevent
+      attr_reader :path, :callback, :fsevent
 
       def initialize(path, &block)
         @path = File.expand_path(path)
         @callback = block
-        # @suspended = []
         @fsevent = FSEvent.new
       end
 
@@ -23,23 +22,16 @@ module Space
         self
       end
 
-      # def suspended?
-      #   !suspended.empty?
-      # end
-
-      # def suspend
-      #   suspended << true
-      # end
-
-      # def unsuspend
-      #   suspended.pop
-      # end
-
       private
 
         def watch
           fsevent.watch(path, file: file?, latency: LATENCY, no_defer: NO_DEFER) do |paths|
-            unless git_dir?(paths)
+            # git touches the .git dir on `git status` as we use this command
+            # internally we need to ignore this. as no other relevant action
+            # only touches the .git dir, we can just skip it.
+            paths.reject!(&method(:git_dir?))
+
+            unless paths.empty?
               log "=> WATCH triggered: #{paths.inspect}"
               fsevent.stop
               callback.call(paths)
@@ -55,8 +47,8 @@ module Space
           File.file?(path)
         end
 
-        def git_dir?(paths)
-          paths.size == 1 && File.basename(paths.first) == '.git'
+        def git_dir?(path)
+          File.basename(path) == '.git'
         end
     end
   end

data/lib/space/version.rb

@@ -1,3 +1,3 @@
 module Space
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/space/view.rb

@@ -0,0 +1,57 @@
+require 'erb'
+
+module Space
+  class View
+    autoload :Helpers,   'space/view/helpers'
+    autoload :Progress,  'space/view/progress'
+    autoload :Dashboard, 'space/view/dashboard'
+
+    include Helpers
+
+    attr_reader :project
+
+    def initialize(project)
+      @project = project
+    end
+
+    def notify(event)
+      send(:"on_#{event}")
+    end
+
+    private
+
+      def render_header
+        print "Project #{project.name}\n\n", :at => [0, 0]
+        render_prompt
+        move 0, 5
+      end
+
+      def render_prompt
+        print prompt, :at => [0, 3]
+        print "\e[0K", :at => [prompt.size + 1, 3]
+      end
+
+      def render_template(name, assigns)
+        path = "#{project.config.template_dir}/#{name}.erb"
+        print Template.new(path).render(assigns)
+      end
+
+      def clear
+        print "\e[2J" # clear entire screen
+      end
+
+      def print(string, options = {})
+        move(*options[:at]) if options.key?(:at)
+        super(string)
+      end
+
+      def move(x, y)
+        print "\e[#{y};#{x}H"
+      end
+
+      def prompt
+        "#{project.repos.scoped? ? project.repos.scope.map(&:name).join(', ') : project.name} > "
+      end
+  end
+end
+

data/lib/space/view/dashboard.rb

@@ -0,0 +1,31 @@
+module Space
+  class View
+    class Dashboard < View
+      def initialize(*)
+        Events.subscribe(self, :finish)
+        super
+      end
+
+      private
+
+        def on_finish
+          App.log 'RENDER dashboard'
+          clear
+          render_header
+          render_repos
+          render_prompt
+        end
+
+        def render_repos
+          project.repos.scope.self_and_deps.each do |repo|
+            render_repo(repo)
+          end
+        end
+
+        def render_repo(repo)
+          assigns = { project: project, repos: project.repos, repo: repo, git: repo.git, bundle: repo.bundle }
+          render_template(:repo, assigns)
+        end
+    end
+  end
+end

data/lib/space/view/helpers.rb

@@ -0,0 +1,69 @@
+# encoding: UTF-8
+require 'ansi/core'
+require 'core_ext/string/wrap'
+
+module Space
+  class View
+    module Helpers
+      def project_title
+        "Project: #{name}".ansi(:bold)
+      end
+
+      def tableize(string)
+        string.split(' ')
+        project.local_repos.join(', ')
+      end
+
+      def repo_name
+        repo.name.ansi(:bold)
+      end
+
+      def repo_status
+        [git.branch, git.commit, repo_local].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?
+        repos.scoped? && repos.scope.include?(repo)
+      end
+
+      def git_status
+        "Git: #{format_boolean(git.clean?)}#{git_ahead if git.ahead?}"
+      end
+
+      def git_ahead
+        " #{git.ahead} commit#{'s' if git.ahead > 1} ahead".ansi(:yellow)
+      end
+
+      def bundle_status
+        "Bundle: #{format_boolean(bundle.clean?)}"
+      end
+
+      def bundle_info
+        bundle.info.ansi(:red) unless bundle.clean?
+      end
+
+      def bundle_deps
+        bundle.deps.map { |dep| "• #{dep.ref} #{format_boolean(dep.fresh?)} #{dep.name}" }.join("\n")
+      end
+
+      def format_boolean(value)
+        value ? '✔'.ansi(:green, :bold) : '⚡'.ansi(:red, :bold)
+      end
+
+      def i(string, width = 2)
+        lines = string.split("\n")
+        lines = lines.map { |line| line.wrap(80).split("\n") }.flatten
+        lines = lines.map { |line| [' ' * width, line].join }
+        lines.join("\n")
+      end
+    end
+  end
+end

data/lib/space/{screen → view}/progress.rb

@@ -1,25 +1,25 @@
 module Space
-  class Screen
+  class View
     class Progress < View
       def initialize(*)
-        super
         Events.subscribe(self, :start, :update)
+        super
+        render
       end
 
-      def notify(event)
-        case event
-        when :start
+      private
+
+        def render
           clear
-        when :update
-          print '.'
+          render_header
         end
-      end
 
-      private
+        def on_start
+          render
+        end
 
-        def clear
-          move 0, 5
-          print "\e[0J" # clear from cursor down
+        def on_update
+          print '.'
         end
     end
   end

data/lib/space/view/template.rb

@@ -0,0 +1,33 @@
+module Space
+  class View
+    class Template
+      class << self
+        def [](path)
+          templates[path] ||= ERB.new(File.read(path), nil, '%<>-')
+        end
+
+        def templates
+          @templates ||= {}
+        end
+      end
+
+      include Helpers
+
+      attr_reader :template
+
+      def initialize(path)
+        @template = Template[path]
+      end
+
+      def render(assigns)
+        assigns.each { |key, value| assign(key, value) }
+        template.result(binding)
+      end
+
+      def assign(key, value)
+        instance_variable_set(:"@#{key}", value)
+        (class << self; self; end).send(:attr_reader, key)
+      end
+    end
+  end
+end

data/lib/space/view/templates/header.erb

@@ -0,0 +1 @@
+y%= project_title %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: space
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -33,10 +33,10 @@ files:
 - lib/space/events/sources.rb
 - lib/space/events/subscription.rb
 - lib/space/events.rb
-- lib/space/helpers.rb
 - lib/space/logger.rb
 - lib/space/model/project/bundler/config.rb
 - lib/space/model/project/bundler.rb
+- lib/space/model/project/tmux.rb
 - lib/space/model/project.rb
 - lib/space/model/repo/bundle.rb
 - lib/space/model/repo/dependency.rb
@@ -46,18 +46,17 @@ files:
 - lib/space/model/repos/scope.rb
 - lib/space/model/repos.rb
 - lib/space/model.rb
-- lib/space/screen/dashboard.rb
-- lib/space/screen/progress.rb
-- lib/space/screen/view.rb
-- lib/space/screen.rb
 - lib/space/source/command.rb
 - lib/space/source/watch.rb
-- lib/space/source/watcher.rb
 - lib/space/source.rb
-- lib/space/templates/header.erb
-- lib/space/templates/repo.erb
-- lib/space/tmux.rb
 - lib/space/version.rb
+- lib/space/view/dashboard.rb
+- lib/space/view/helpers.rb
+- lib/space/view/progress.rb
+- lib/space/view/template.rb
+- lib/space/view/templates/header.erb
+- lib/space/view/templates/repo.erb
+- lib/space/view.rb
 - lib/space.rb
 - Gemfile
 - Gemfile.lock

data/lib/space/helpers.rb

@@ -1,68 +0,0 @@
-# encoding: UTF-8
-require 'ansi/core'
-require 'core_ext/string/wrap'
-
-module Space
-  module Helpers
-    def project_title
-      "Project: #{name}".ansi(:bold)
-    end
-
-    def tableize(string)
-      string.split(' ')
-      project.local_repos.join(', ')
-    end
-
-    def repo_name
-      repo.name.ansi(:bold)
-    end
-
-    def repo_status
-      [git.branch, git.commit, repo_local].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?
-      repos.scoped? && repos.scope.include?(repo)
-    end
-
-    def git_status
-      "Git: #{format_boolean(git.clean?)}#{git_ahead if git.ahead?}"
-    end
-
-    def git_ahead
-      " #{git.ahead} commit#{'s' if git.ahead > 1} ahead".ansi(:yellow)
-    end
-
-    def bundle_status
-      "Bundle: #{format_boolean(bundle.clean?)}"
-    end
-
-    def bundle_info
-      bundle.info.ansi(:red) unless bundle.clean?
-    end
-
-    def bundle_deps
-      bundle.deps.map { |dep| "• #{dep.ref} #{format_boolean(dep.fresh?)} #{dep.name}" }.join("\n")
-    end
-
-    def format_boolean(value)
-      value ? '✔'.ansi(:green, :bold) : '⚡'.ansi(:red, :bold)
-    end
-
-    def i(string, width = 2)
-      lines = string.split("\n")
-      lines = lines.map { |line| line.wrap(80).split("\n") }.flatten
-      lines = lines.map { |line| [' ' * width, line].join }
-      lines.join("\n")
-    end
-  end
-end
-

data/lib/space/screen.rb

@@ -1,49 +0,0 @@
-module Space
-  class Screen
-    autoload :Progress,  'space/screen/progress'
-    autoload :Dashboard, 'space/screen/dashboard'
-    autoload :View,      'space/screen/view'
-
-    attr_reader :project, :view
-
-    def initialize(project)
-      @project = project
-      render_header
-    end
-
-    def display
-      @views = [Progress.new(project), Dashboard.new(project)]
-    end
-
-    # def render
-    #   view.render
-    #   move prompt.size + 1, 3
-    # end
-
-    # def notify(event)
-    #   view.notify(event)
-    # end
-
-    private
-
-      def render_header
-        print "\e[2J" # clear entire screen
-        move 0, 0
-        puts "Project #{project.name}\n\n"
-        puts prompt
-      end
-
-      def move(x, y)
-        print "\e[#{y};#{x}H"
-      end
-
-      def prompt
-        "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
-      end
-
-      # def create(screen)
-      #   self.class.const_get(screen.to_s.capitalize).new(project)
-      # end
-  end
-end
-

data/lib/space/screen/dashboard.rb

@@ -1,44 +0,0 @@
-module Space
-  class Screen
-    class Dashboard < View
-      def initialize(*)
-        Events.subscribe(self, :finish)
-        super
-      end
-
-      def notify(event)
-        render
-      end
-
-      private
-
-        def render
-          App.log 'RENDER dashboard'
-          clear
-          render_repos
-          move prompt.size + 1, 3
-          print "\e[0K"
-        end
-
-        def clear
-          move 0, 4
-          print "\e[J" # clear from cursor down
-          move 0, 5
-        end
-
-        def prompt
-          "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
-        end
-
-        def render_repos
-          project.repos.scope.self_and_deps.each do |repo|
-            render_template(:repo, assigns(repo))
-          end
-        end
-
-        def assigns(repo)
-          { repos: project.repos, repo: repo, git: repo.git, bundle: repo.bundle }
-        end
-    end
-  end
-end

data/lib/space/screen/view.rb

@@ -1,39 +0,0 @@
-require 'erb'
-
-module Space
-  class Screen
-    class View
-      include Helpers
-
-      attr_reader :project
-
-      def initialize(project)
-        @project = project
-      end
-
-      private
-
-        def move(x, y)
-          print "\e[#{y};#{x}H"
-        end
-
-        def render_template(name, assigns)
-          assigns.each { |name, value| assign(name, value) }
-          print template(name).result(binding)
-        end
-
-        def assign(key, value)
-          instance_variable_set(:"@#{key}", value)
-          (class << self; self; end).send(:attr_reader, key)
-        end
-
-        def templates
-          @templates ||= {}
-        end
-
-        def template(name)
-          templates[name] ||= ERB.new(File.read("#{project.config.template_dir}/#{name}.erb"), nil, '%<>-')
-        end
-    end
-  end
-end

data/lib/space/source/watcher.rb

@@ -1,32 +0,0 @@
-module Space
-  module Source
-    module Watcher
-      attr_reader :path
-
-      def initialize(path)
-        @path = path
-        start
-      end
-
-      def watched_paths
-        @watched_paths ||= self.class.watch.map do |path|
-          path[0, 1] == '~' ? path : "#{self.path}/#{path}"
-        end
-      end
-
-      private
-
-        def start
-          watchers.map(&:run)
-        end
-
-        def watchers
-          @watchers ||= watched_paths.map do |path|
-            Watch.new(path) do |paths|
-              refresh
-            end
-          end
-        end
-    end
-  end
-end

data/lib/space/templates/header.erb

@@ -1 +0,0 @@
-<%= project_title %>

data/lib/space/tmux.rb

@@ -1,11 +0,0 @@
-module Space
-  module Tmux
-    class << self
-      def windows
-        windows = `tmux list-windows -F '#W'`.split("\n")
-        windows unless windows.empty?
-      end
-    end
-  end
-end
-